rails4: use ApplicationMailer pattern

Braulio Bhavamitra
1 parent c6d40a34
Showing 11 changed files with 23 additions and 22 deletions Show diff stats
app/mailers/application_mailer.rb
app/mailers/comment_notifier.rb
app/mailers/contact.rb
app/mailers/mailing.rb
app/mailers/pending_task_notifier.rb
app/mailers/scrap_notifier.rb
app/mailers/task_mailer.rb
app/mailers/user_mailer.rb
lib/noosfero/mailer.rb
lib/noosfero/plugin/mailer_base.rb
plugins/work_assignment/lib/work_assignment_plugin/email_contact.rb
@@ -0,0 +1,12 @@
+class ApplicationMailer < ActionMailer::Base
+
+  attr_accessor :environment
+
+  def default_url_options options = nil
+    options ||= {}
+    options[:host] = environment.default_hostname if environment
+    options
+  end
+
+end
+
-class CommentNotifier < Noosfero::Mailer
+class CommentNotifier < ApplicationMailer
   def notification(comment)
     profile = comment.article.profile
@@ -30,7 +30,7 @@ class Contact
     Contact::Sender.notification(self).deliver
   end
-  class Sender < Noosfero::Mailer
+  class Sender < ApplicationMailer
     def notification(contact)
       self.environment = contact.dest.environment
@@ -48,7 +48,7 @@ class Mailing &lt; ActiveRecord::Base
     end
   end
-  class Sender < Noosfero::Mailer
+  class Sender < ApplicationMailer
     def notification(mailing, recipient)
       @message = mailing.body
-class PendingTaskNotifier < Noosfero::Mailer
+class PendingTaskNotifier < ApplicationMailer
   def notification(person)
     self.environment = person.environment
-class ScrapNotifier < Noosfero::Mailer
+class ScrapNotifier < ApplicationMailer
   def notification(scrap)
     sender, receiver = scrap.sender, scrap.receiver
-class TaskMailer < Noosfero::Mailer
+class TaskMailer < ApplicationMailer
   def target_notification(task, message)
     self.environment = task.environment
-class UserMailer < Noosfero::Mailer
+class UserMailer < ApplicationMailer
   def activation_email_notify(user)
     self.environment = user.environment
@@ -1,13 +0,0 @@
-
-class Noosfero::Mailer < ActionMailer::Base
-
-  attr_accessor :environment
-
-  def default_url_options options = nil
-    options ||= {}
-    options[:host] = environment.default_hostname if environment
-    options
-  end
-
-end
-
-class Noosfero::Plugin::MailerBase < ActionMailer::Base
+require_relative '../../../app/mailers/application_mailer'
+
+class Noosfero::Plugin::MailerBase < ApplicationMailer
   def self.plugin_name
     name.split('::').first.gsub(/Plugin$/, '').underscore
@@ -28,7 +28,7 @@ class WorkAssignmentPlugin::EmailContact
     WorkAssignmentPlugin::EmailContact::EmailSender.notification(self).deliver
   end
-  class EmailSender < Noosfero::Mailer
+  class EmailSender < ApplicationMailer
     def notification(email_contact)
       self.environment = email_contact.sender.environment
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class ApplicationMailer < ActionMailer::Base
	2	+
	3	+ attr_accessor :environment
	4	+
	5	+ def default_url_options options = nil
	6	+ options \|\|= {}
	7	+ options[:host] = environment.default_hostname if environment
	8	+ options
	9	+ end
	10	+
	11	+end
	12	+
1	-class CommentNotifier < Noosfero::Mailer	1	+class CommentNotifier < ApplicationMailer
2		2
3	def notification(comment)	3	def notification(comment)
4	profile = comment.article.profile	4	profile = comment.article.profile
	@@ -30,7 +30,7 @@ class Contact		@@ -30,7 +30,7 @@ class Contact
30	Contact::Sender.notification(self).deliver	30	Contact::Sender.notification(self).deliver
31	end	31	end
32		32
33	- class Sender < Noosfero::Mailer	33	+ class Sender < ApplicationMailer
34		34
35	def notification(contact)	35	def notification(contact)
36	self.environment = contact.dest.environment	36	self.environment = contact.dest.environment
	@@ -48,7 +48,7 @@ class Mailing < ActiveRecord::Base		@@ -48,7 +48,7 @@ class Mailing < ActiveRecord::Base
48	end	48	end
49	end	49	end
50		50
51	- class Sender < Noosfero::Mailer	51	+ class Sender < ApplicationMailer
52		52
53	def notification(mailing, recipient)	53	def notification(mailing, recipient)
54	@message = mailing.body	54	@message = mailing.body
1	-class PendingTaskNotifier < Noosfero::Mailer	1	+class PendingTaskNotifier < ApplicationMailer
2		2
3	def notification(person)	3	def notification(person)
4	self.environment = person.environment	4	self.environment = person.environment
1	-class ScrapNotifier < Noosfero::Mailer	1	+class ScrapNotifier < ApplicationMailer
2		2
3	def notification(scrap)	3	def notification(scrap)
4	sender, receiver = scrap.sender, scrap.receiver	4	sender, receiver = scrap.sender, scrap.receiver
1	-class TaskMailer < Noosfero::Mailer	1	+class TaskMailer < ApplicationMailer
2		2
3	def target_notification(task, message)	3	def target_notification(task, message)
4	self.environment = task.environment	4	self.environment = task.environment
1	-class UserMailer < Noosfero::Mailer	1	+class UserMailer < ApplicationMailer
2		2
3	def activation_email_notify(user)	3	def activation_email_notify(user)
4	self.environment = user.environment	4	self.environment = user.environment
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-
2	-class Noosfero::Mailer < ActionMailer::Base
3	-
4	- attr_accessor :environment
5	-
6	- def default_url_options options = nil
7	- options \|\|= {}
8	- options[:host] = environment.default_hostname if environment
9	- options
10	- end
11	-
12	-end
13	-
1	-class Noosfero::Plugin::MailerBase < ActionMailer::Base	1	+require_relative '../../../app/mailers/application_mailer'
		2	+
		3	+class Noosfero::Plugin::MailerBase < ApplicationMailer
2		4
3	def self.plugin_name	5	def self.plugin_name
4	name.split('::').first.gsub(/Plugin$/, '').underscore	6	name.split('::').first.gsub(/Plugin$/, '').underscore