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,7 +159,6 @@ class CmsController < MyProfileController
159	end	159	end
160		160
161	def publish	161	def publish
162	-
163	@article = profile.articles.find(params[:id])	162	@article = profile.articles.find(params[:id])
164	record_coming_from_public_view	163	record_coming_from_public_view
165	@groups = profile.memberships - [profile]	164	@groups = profile.memberships - [profile]
	@@ -15,7 +15,7 @@ class TaskMailer < ActionMailer::Base		@@ -15,7 +15,7 @@ class TaskMailer < ActionMailer::Base
15	recipients task.target.contact_email	15	recipients task.target.contact_email
16		16
17	from self.class.generate_from(task)	17	from self.class.generate_from(task)
18	- subject task.description	18	+ subject _('%s - %s') % [task.requestor.environment.name, task.description]
19	body :requestor => task.requestor.name,	19	body :requestor => task.requestor.name,
20	:target => task.target.name,	20	:target => task.target.name,
21	:message => msg,	21	:message => msg,
1	-Dear <%= @target %>,	1	+<%= _('Dear %s,') % @target %>
2		2
3	<%= @message %>	3	<%= @message %>
4		4