ActionItem628: send mail when add friend, add member and approve article

Joenio Costa · Antonio Terceiro
1 parent 1cc1999d
Showing 12 changed files with 102 additions and 50 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/add_friend.rb
app/models/add_member.rb
app/models/approve_article.rb
app/models/task.rb
app/models/task_mailer.rb
app/views/task_mailer/target_notification.rhtml
test/unit/add_friend_test.rb
test/unit/add_member_test.rb
test/unit/approve_article_test.rb
test/unit/create_enterprise_test.rb
test/unit/task_test.rb
@@ -159,7 +159,6 @@ class CmsController &lt; MyProfileController
   end
  
   def publish
-
     @article = profile.articles.find(params[:id])
     record_coming_from_public_view
     @groups = profile.memberships - [profile]
@@ -17,12 +17,6 @@ class AddFriend &lt; Task
     target.add_friend(requestor, group_for_friend)
   end
  
-  # Returns <tt>false</tt>. Adding friends by itself does not trigger e-mail
-  # sending.
-  def sends_email?
-    false
-  end
-
   def description
     _('%s wants to be your friend') % requestor.name
   end
@@ -31,4 +25,9 @@ class AddFriend &lt; Task
     :manage_friends
   end
  
+  def target_notification_message
+    description + "\n\n" +
+    _('You need login to accept this.')
+  end
+
 end
@@ -19,11 +19,6 @@ class AddMember &lt; Task
     target.affiliate(requestor, self.roles.map{|i| Role.find(i)})
   end
  
-  # FIXME should send email to community admin?
-  def sends_email?
-    false
-  end
-
   def description
     _('%s wants to be a member') % requestor.name
   end
@@ -32,4 +27,9 @@ class AddMember &lt; Task
     :manage_memberships
   end
  
+  def target_notification_message
+    description + "\n\n" +
+    _('You need login to accept this.')
+  end
+
 end
 class ApproveArticle < Task
   serialize :data, Hash
  
+  validates_presence_of :requestor_id, :target_id
+
   def description
     _('%s wants to publish %s') % [requestor.name, article.name]
   end
@@ -37,7 +39,9 @@ class ApproveArticle &lt; Task
     PublishedArticle.create(:name => name, :profile => target, :reference_article => article)
   end
  
-  def sends_email?
-    true
+  def target_notification_message
+    description + "\n\n" +
+    _('You need login to accept this.')
   end
+
 end
@@ -51,11 +51,17 @@ class Task &lt; ActiveRecord::Base
   end
  
   after_create do |task|
-    task.send(:send_notification, :created)
+    begin
+      task.send(:send_notification, :created)
+    rescue NotImplementedError => ex
+      RAILS_DEFAULT_LOGGER.info ex.to_s
+    end
  
-    target_msg = task.target_notification_message
-    unless target_msg.nil?
+    begin
+      target_msg = task.target_notification_message
       TaskMailer.deliver_target_notification(task, target_msg)
+    rescue NotImplementedError => ex
+      RAILS_DEFAULT_LOGGER.info ex.to_s
     end
   end
  
@@ -68,7 +74,11 @@ class Task &lt; ActiveRecord::Base
       self.end_date = Time.now
       self.save!
       self.perform
-      send_notification(:finished)
+      begin
+        send_notification(:finished)
+      rescue NotImplementedError => ex
+        RAILS_DEFAULT_LOGGER.info ex.to_s
+      end
     end
   end
  
@@ -79,7 +89,11 @@ class Task &lt; ActiveRecord::Base
       self.status = Task::Status::CANCELLED
       self.end_date = Time.now
       self.save!
-      send_notification(:cancelled)
+      begin
+        send_notification(:cancelled)
+      rescue NotImplementedError => ex
+        RAILS_DEFAULT_LOGGER.info ex.to_s
+      end
     end
   end
  
@@ -95,20 +109,19 @@ class Task &lt; ActiveRecord::Base
   # The message that will be sent to the requestor of the task when the task is
   # created.
   def task_created_message
-    # FIXME: use a date properly recorded.
-    _("The task was created at %s") % Time.now
+    raise NotImplementedError, "#{self} does not implement #task_created_message"
   end
  
   # The message that will be sent to the requestor of the task when its
   # finished.
   def task_finished_message
-    _("The task was finished at %s") % (self.end_date.to_s)
+    raise NotImplementedError, "#{self} does not implement #task_finished_message"
   end
  
   # The message that will be sent to the requestor of the task when its
   # cancelled.
   def task_cancelled_message
-    _("The task was cancelled at %s") % (self.end_date.to_s)
+    raise NotImplementedError, "#{self} does not implement #task_cancelled_message"
   end
  
   # The message that will be sent to the *target* of the task when it is
@@ -119,7 +132,7 @@ class Task &lt; ActiveRecord::Base
   # not to be sent. If you want to send a notification to the target upon task
   # creation, override this method and return a String.
   def target_notification_message
-    nil
+    raise NotImplementedError, "#{self} does not implement #target_notification_message"
   end
  
   # What permission is required to perform task?
@@ -15,7 +15,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.target.contact_email
  
     from self.class.generate_from(task)
-    subject task.description
+    subject _('%s - %s') % [task.requestor.environment.name, task.description]
     body :requestor => task.requestor.name,
       :target => task.target.name,
       :message => msg,
-Dear <%= @target %>,
+<%= _('Dear %s,') % @target %>
  
 <%= @message %>
  
@@ -57,26 +57,19 @@ class AddFriendTest &lt; ActiveSupport::TestCase
     ok('must validate when target is given') { task.errors.invalid?(:target_id)}
   end
  
-  should 'not send e-mails' do
-
+  should 'send e-mails' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
  
-    TaskMailer.expects(:deliver_task_finished).never
-    TaskMailer.expects(:deliver_task_created).never
+    TaskMailer.expects(:deliver_target_notification).at_least_once
  
     task = AddFriend.create!(:person => p1, :friend => p2)
-    task.finish
-
   end
  
   should 'provide proper description' do
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
  
-    TaskMailer.expects(:deliver_task_finished).never
-    TaskMailer.expects(:deliver_task_created).never
-
     task = AddFriend.create!(:person => p1, :friend => p2)
  
     assert_equal 'testuser1 wants to be your friend', task.description
@@ -96,4 +89,13 @@ class AddFriendTest &lt; ActiveSupport::TestCase
     end
   end
  
+  should 'override target notification message method from Task' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    task = AddFriend.new(:person => p1, :friend => p2)
+    assert_nothing_raised NotImplementedError do
+      task.target_notification_message
+    end
+  end
+
 end
@@ -9,6 +9,7 @@ class AddMemberTest &lt; ActiveSupport::TestCase
   should 'actually add memberships when confirmed' do
     p = create_user('testuser1').person
     c = Community.create!(:name => 'closed community', :closed => true)
+    TaskMailer.stubs(:deliver_target_notification)
     task = AddMember.create!(:person => p, :community => c)
     assert_difference c, :members, [p] do
       task.finish
@@ -38,23 +39,20 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     ok('must validate when target is given') { task.errors.invalid?(:target_id)}
   end
  
-  should 'not send e-mails' do
+  should 'send e-mails' do
     p = create_user('testuser1').person
     c = Community.create!(:name => 'closed community', :closed => true)
  
-    TaskMailer.expects(:deliver_task_finished).never
-    TaskMailer.expects(:deliver_task_created).never
+    TaskMailer.expects(:deliver_target_notification).at_least_once
  
     task = AddMember.create!(:person => p, :community => c)
-    task.finish
   end
  
   should 'provide proper description' do
     p = create_user('testuser1').person
     c = Community.create!(:name => 'closed community', :closed => true)
  
-    TaskMailer.expects(:deliver_task_finished).never
-    TaskMailer.expects(:deliver_task_created).never
+    TaskMailer.stubs(:deliver_target_notification)
  
     task = AddMember.create!(:person => p, :community => c)
  
@@ -74,6 +72,7 @@ class AddMemberTest &lt; ActiveSupport::TestCase
   should 'have roles' do
     p = create_user('testuser1').person
     c = Community.create!(:name => 'community_test')
+    TaskMailer.stubs(:deliver_target_notification)
     task = AddMember.create!(:roles => [1,2,3], :person => p, :community => c)
     assert_equal [1,2,3], task.roles
   end
@@ -83,6 +82,7 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     c = Community.create!(:name => 'community_test')
  
     roles = [Profile::Roles.member, Profile::Roles.admin]
+    TaskMailer.stubs(:deliver_target_notification)
     task = AddMember.create!(:roles => roles.map(&:id), :person => p, :community => c)
     task.finish
  
@@ -91,4 +91,13 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     assert_includes current_roles, roles[1]
   end
  
+  should 'override target notification message method from Task' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    task = AddFriend.new(:person => p1, :friend => p2)
+    assert_nothing_raised NotImplementedError do
+      task.target_notification_message
+    end
+  end
+
 end
@@ -6,7 +6,7 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     profile = create_user('test_user').person
     article = profile.articles.create!(:name => 'test article')
  
-    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile)
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
  
     assert_equal 'test name', a.name
     assert_equal article, a.article
@@ -16,11 +16,20 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
   should 'create published article when finished' do
     profile = create_user('test_user').person
     article = profile.articles.create!(:name => 'test article')
-    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile)
+    a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
  
     assert_difference PublishedArticle, :count do
       a.finish
     end
+  end
  
+  should 'override target notification message method from Task' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    task = AddFriend.new(:person => p1, :friend => p2)
+    assert_nothing_raised NotImplementedError do
+      task.target_notification_message
+    end
   end
+
 end
@@ -161,10 +161,11 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
   end
  
   should 'override message methods from Task' do
-    generic = Task.new
     specific = CreateEnterprise.new
     %w[ task_created_message task_finished_message task_cancelled_message ].each do |method|
-      assert_not_equal generic.send(method), specific.send(method)
+      assert_nothing_raised NotImplementedError do
+        specific.send(method)
+      end
     end
   end
  
@@ -127,7 +127,7 @@ class TaskTest &lt; Test::Unit::TestCase
     assert_nil Task.find_by_code(task.code)
   end
  
-  should 'be able to find active tasks ' do
+  should 'be able to find active tasks' do
     task = Task.new
     task.requestor = sample_user
     task.save!
@@ -144,11 +144,11 @@ class TaskTest &lt; Test::Unit::TestCase
     assert_equal 7, Task.create(:code_length => 7).code.size
   end
  
-  should 'not send notification to target when target_notification_message is nil (as in Task base class)' do
+  should 'throws exception when try to send target_notification_message in Task base class' do
     task = Task.new
-    TaskMailer.expects(:deliver_target_notification).never
-    task.save!
-    assert_nil task.target_notification_message
+    assert_raise NotImplementedError do
+      task.target_notification_message
+    end
   end
  
   should 'send notification to target just after task creation' do
@@ -191,6 +191,22 @@ class TaskTest &lt; Test::Unit::TestCase
     end
   end
  
+  should 'not deliver notification message to target' do
+    task = Task.new
+    assert_raise NotImplementedError do
+      task.target_notification_message
+    end
+  end
+
+  should 'not send message when created, finished or cancelled' do
+    task = Task.new
+    %w[ created finished cancelled ].each do |action|
+      assert_raise NotImplementedError do
+        task.send("task_#{action}_message")
+      end
+    end
+  end
+
   protected
  
   def sample_user
...	...	@@ -159,7 +159,6 @@ class CmsController < MyProfileController
159	159	end
160	160
161	161	def publish
162		-
163	162	@article = profile.articles.find(params[:id])
164	163	record_coming_from_public_view
165	164	@groups = profile.memberships - [profile]
...	...
...	...	@@ -17,12 +17,6 @@ class AddFriend < Task
17	17	target.add_friend(requestor, group_for_friend)
18	18	end
19	19
20		- # Returns <tt>false</tt>. Adding friends by itself does not trigger e-mail
21		- # sending.
22		- def sends_email?
23		- false
24		- end
25		-
26	20	def description
27	21	_('%s wants to be your friend') % requestor.name
28	22	end
...	...	@@ -31,4 +25,9 @@ class AddFriend < Task
31	25	:manage_friends
32	26	end
33	27
	28	+ def target_notification_message
	29	+ description + "\n\n" +
	30	+ _('You need login to accept this.')
	31	+ end
	32	+
34	33	end
...	...
...	...	@@ -19,11 +19,6 @@ class AddMember < Task
19	19	target.affiliate(requestor, self.roles.map{\|i\| Role.find(i)})
20	20	end
21	21
22		- # FIXME should send email to community admin?
23		- def sends_email?
24		- false
25		- end
26		-
27	22	def description
28	23	_('%s wants to be a member') % requestor.name
29	24	end
...	...	@@ -32,4 +27,9 @@ class AddMember < Task
32	27	:manage_memberships
33	28	end
34	29
	30	+ def target_notification_message
	31	+ description + "\n\n" +
	32	+ _('You need login to accept this.')
	33	+ end
	34	+
35	35	end
...	...
1	1	class ApproveArticle < Task
2	2	serialize :data, Hash
3	3
	4	+ validates_presence_of :requestor_id, :target_id
	5	+
4	6	def description
5	7	_('%s wants to publish %s') % [requestor.name, article.name]
6	8	end
...	...	@@ -37,7 +39,9 @@ class ApproveArticle < Task
37	39	PublishedArticle.create(:name => name, :profile => target, :reference_article => article)
38	40	end
39	41
40		- def sends_email?
41		- true
	42	+ def target_notification_message
	43	+ description + "\n\n" +
	44	+ _('You need login to accept this.')
42	45	end
	46	+
43	47	end
...	...
...	...	@@ -51,11 +51,17 @@ class Task < ActiveRecord::Base
51	51	end
52	52
53	53	after_create do \|task\|
54		- task.send(:send_notification, :created)
	54	+ begin
	55	+ task.send(:send_notification, :created)
	56	+ rescue NotImplementedError => ex
	57	+ RAILS_DEFAULT_LOGGER.info ex.to_s
	58	+ end
55	59
56		- target_msg = task.target_notification_message
57		- unless target_msg.nil?
	60	+ begin
	61	+ target_msg = task.target_notification_message
58	62	TaskMailer.deliver_target_notification(task, target_msg)
	63	+ rescue NotImplementedError => ex
	64	+ RAILS_DEFAULT_LOGGER.info ex.to_s
59	65	end
60	66	end
61	67
...	...	@@ -68,7 +74,11 @@ class Task < ActiveRecord::Base
68	74	self.end_date = Time.now
69	75	self.save!
70	76	self.perform
71		- send_notification(:finished)
	77	+ begin
	78	+ send_notification(:finished)
	79	+ rescue NotImplementedError => ex
	80	+ RAILS_DEFAULT_LOGGER.info ex.to_s
	81	+ end
72	82	end
73	83	end
74	84
...	...	@@ -79,7 +89,11 @@ class Task < ActiveRecord::Base
79	89	self.status = Task::Status::CANCELLED
80	90	self.end_date = Time.now
81	91	self.save!
82		- send_notification(:cancelled)
	92	+ begin
	93	+ send_notification(:cancelled)
	94	+ rescue NotImplementedError => ex
	95	+ RAILS_DEFAULT_LOGGER.info ex.to_s
	96	+ end
83	97	end
84	98	end
85	99
...	...	@@ -95,20 +109,19 @@ class Task < ActiveRecord::Base
95	109	# The message that will be sent to the requestor of the task when the task is
96	110	# created.
97	111	def task_created_message
98		- # FIXME: use a date properly recorded.
99		- _("The task was created at %s") % Time.now
	112	+ raise NotImplementedError, "#{self} does not implement #task_created_message"
100	113	end
101	114
102	115	# The message that will be sent to the requestor of the task when its
103	116	# finished.
104	117	def task_finished_message
105		- _("The task was finished at %s") % (self.end_date.to_s)
	118	+ raise NotImplementedError, "#{self} does not implement #task_finished_message"
106	119	end
107	120
108	121	# The message that will be sent to the requestor of the task when its
109	122	# cancelled.
110	123	def task_cancelled_message
111		- _("The task was cancelled at %s") % (self.end_date.to_s)
	124	+ raise NotImplementedError, "#{self} does not implement #task_cancelled_message"
112	125	end
113	126
114	127	# The message that will be sent to the target of the task when it is
...	...	@@ -119,7 +132,7 @@ class Task < ActiveRecord::Base
119	132	# not to be sent. If you want to send a notification to the target upon task
120	133	# creation, override this method and return a String.
121	134	def target_notification_message
122		- nil
	135	+ raise NotImplementedError, "#{self} does not implement #target_notification_message"
123	136	end
124	137
125	138	# What permission is required to perform task?
...	...
...	...	@@ -15,7 +15,7 @@ class TaskMailer < ActionMailer::Base
15	15	recipients task.target.contact_email
16	16
17	17	from self.class.generate_from(task)
18		- subject task.description
	18	+ subject _('%s - %s') % [task.requestor.environment.name, task.description]
19	19	body :requestor => task.requestor.name,
20	20	:target => task.target.name,
21	21	:message => msg,
...	...
1		-Dear <%= @target %>,
	1	+<%= _('Dear %s,') % @target %>
2	2
3	3	<%= @message %>
4	4
...	...
...	...	@@ -57,26 +57,19 @@ class AddFriendTest < ActiveSupport::TestCase
57	57	ok('must validate when target is given') { task.errors.invalid?(:target_id)}
58	58	end
59	59
60		- should 'not send e-mails' do
61		-
	60	+ should 'send e-mails' do
62	61	p1 = create_user('testuser1').person
63	62	p2 = create_user('testuser2').person
64	63
65		- TaskMailer.expects(:deliver_task_finished).never
66		- TaskMailer.expects(:deliver_task_created).never
	64	+ TaskMailer.expects(:deliver_target_notification).at_least_once
67	65
68	66	task = AddFriend.create!(:person => p1, :friend => p2)
69		- task.finish
70		-
71	67	end
72	68
73	69	should 'provide proper description' do
74	70	p1 = create_user('testuser1').person
75	71	p2 = create_user('testuser2').person
76	72
77		- TaskMailer.expects(:deliver_task_finished).never
78		- TaskMailer.expects(:deliver_task_created).never
79		-
80	73	task = AddFriend.create!(:person => p1, :friend => p2)
81	74
82	75	assert_equal 'testuser1 wants to be your friend', task.description
...	...	@@ -96,4 +89,13 @@ class AddFriendTest < ActiveSupport::TestCase
96	89	end
97	90	end
98	91
	92	+ should 'override target notification message method from Task' do
	93	+ p1 = create_user('testuser1').person
	94	+ p2 = create_user('testuser2').person
	95	+ task = AddFriend.new(:person => p1, :friend => p2)
	96	+ assert_nothing_raised NotImplementedError do
	97	+ task.target_notification_message
	98	+ end
	99	+ end
	100	+
99	101	end
...	...
...	...	@@ -9,6 +9,7 @@ class AddMemberTest < ActiveSupport::TestCase
9	9	should 'actually add memberships when confirmed' do
10	10	p = create_user('testuser1').person
11	11	c = Community.create!(:name => 'closed community', :closed => true)
	12	+ TaskMailer.stubs(:deliver_target_notification)
12	13	task = AddMember.create!(:person => p, :community => c)
13	14	assert_difference c, :members, [p] do
14	15	task.finish
...	...	@@ -38,23 +39,20 @@ class AddMemberTest < ActiveSupport::TestCase
38	39	ok('must validate when target is given') { task.errors.invalid?(:target_id)}
39	40	end
40	41
41		- should 'not send e-mails' do
	42	+ should 'send e-mails' do
42	43	p = create_user('testuser1').person
43	44	c = Community.create!(:name => 'closed community', :closed => true)
44	45
45		- TaskMailer.expects(:deliver_task_finished).never
46		- TaskMailer.expects(:deliver_task_created).never
	46	+ TaskMailer.expects(:deliver_target_notification).at_least_once
47	47
48	48	task = AddMember.create!(:person => p, :community => c)
49		- task.finish
50	49	end
51	50
52	51	should 'provide proper description' do
53	52	p = create_user('testuser1').person
54	53	c = Community.create!(:name => 'closed community', :closed => true)
55	54
56		- TaskMailer.expects(:deliver_task_finished).never
57		- TaskMailer.expects(:deliver_task_created).never
	55	+ TaskMailer.stubs(:deliver_target_notification)
58	56
59	57	task = AddMember.create!(:person => p, :community => c)
60	58
...	...	@@ -74,6 +72,7 @@ class AddMemberTest < ActiveSupport::TestCase
74	72	should 'have roles' do
75	73	p = create_user('testuser1').person
76	74	c = Community.create!(:name => 'community_test')
	75	+ TaskMailer.stubs(:deliver_target_notification)
77	76	task = AddMember.create!(:roles => [1,2,3], :person => p, :community => c)
78	77	assert_equal [1,2,3], task.roles
79	78	end
...	...	@@ -83,6 +82,7 @@ class AddMemberTest < ActiveSupport::TestCase
83	82	c = Community.create!(:name => 'community_test')
84	83
85	84	roles = [Profile::Roles.member, Profile::Roles.admin]
	85	+ TaskMailer.stubs(:deliver_target_notification)
86	86	task = AddMember.create!(:roles => roles.map(&:id), :person => p, :community => c)
87	87	task.finish
88	88
...	...	@@ -91,4 +91,13 @@ class AddMemberTest < ActiveSupport::TestCase
91	91	assert_includes current_roles, roles[1]
92	92	end
93	93
	94	+ should 'override target notification message method from Task' do
	95	+ p1 = create_user('testuser1').person
	96	+ p2 = create_user('testuser2').person
	97	+ task = AddFriend.new(:person => p1, :friend => p2)
	98	+ assert_nothing_raised NotImplementedError do
	99	+ task.target_notification_message
	100	+ end
	101	+ end
	102	+
94	103	end
...	...
...	...	@@ -6,7 +6,7 @@ class ApproveArticleTest < ActiveSupport::TestCase
6	6	profile = create_user('test_user').person
7	7	article = profile.articles.create!(:name => 'test article')
8	8
9		- a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile)
	9	+ a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
10	10
11	11	assert_equal 'test name', a.name
12	12	assert_equal article, a.article
...	...	@@ -16,11 +16,20 @@ class ApproveArticleTest < ActiveSupport::TestCase
16	16	should 'create published article when finished' do
17	17	profile = create_user('test_user').person
18	18	article = profile.articles.create!(:name => 'test article')
19		- a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile)
	19	+ a = ApproveArticle.create!(:name => 'test name', :article => article, :target => profile, :requestor => profile)
20	20
21	21	assert_difference PublishedArticle, :count do
22	22	a.finish
23	23	end
	24	+ end
24	25
	26	+ should 'override target notification message method from Task' do
	27	+ p1 = create_user('testuser1').person
	28	+ p2 = create_user('testuser2').person
	29	+ task = AddFriend.new(:person => p1, :friend => p2)
	30	+ assert_nothing_raised NotImplementedError do
	31	+ task.target_notification_message
	32	+ end
25	33	end
	34	+
26	35	end
...	...