remove AM delegating register_observer and register_interceptor to Mail and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests.

Signed-off-by: José Valim <jose.valim@gmail.com>

3 files changed, 73 insertions, 5 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 16fcf112b7..c21fd764b9 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -4,6 +4,7 @@ require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/proc'
+require 'active_support/core_ext/string/inflections'
 require 'action_mailer/log_subscriber'
 
 module ActionMailer #:nodoc:
@@ -349,9 +350,6 @@ module ActionMailer #:nodoc:
     helper  ActionMailer::MailHelper
     include ActionMailer::OldApi
 
-    delegate :register_observer, :to => Mail
-    delegate :register_interceptor, :to => Mail
-
     private_class_method :new #:nodoc:
 
     class_attribute :default_params
@@ -363,6 +361,32 @@ module ActionMailer #:nodoc:
     }.freeze
 
     class << self
+      # Register one or more Observers which will be notified when mail is delivered.
+      def register_observers(*observers)
+        observers.flatten.compact.each { |observer| register_observer(observer) }
+      end
+
+      # Register one or more Interceptors which will be called before mail is sent.
+      def register_interceptors(*interceptors)
+        interceptors.flatten.compact.each { |interceptor| register_interceptor(interceptor) }
+      end
+
+      # Register an Observer which will be notified when mail is delivered.
+      # Either a class or a string can be passed in as the Observer. If a string is passed in
+      # it will be <tt>constantize</tt>d.
+      def register_observer(observer)
+        delivery_observer = (observer.respond_to?(:delivered_email) ? observer : observer.constantize)
+        Mail.register_observer(delivery_observer)
+      end
+
+      # Register an Inteceptor which will be called before mail is sent.
+      # Either a class or a string can be passed in as the Observer. If a string is passed in
+      # it will be <tt>constantize</tt>d.
+      def register_interceptor(interceptor)
+        delivery_interceptor = (interceptor.respond_to?(:delivering_email) ? interceptor : interceptor.constantize)
+        Mail.register_interceptor(delivery_interceptor)
+      end
+
       def mailer_name
         @mailer_name ||= name.underscore
       end
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 4ec478067f..444754d0e9 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -19,13 +19,17 @@ module ActionMailer
       options.stylesheets_dir ||= paths["public/stylesheets"].first
 
       # make sure readers methods get compiled
-      options.asset_path           ||= app.config.asset_path
-      options.asset_host           ||= app.config.asset_host
+      options.asset_path      ||= app.config.asset_path
+      options.asset_host      ||= app.config.asset_host
 
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
         include app.routes.mounted_helpers
+
+        register_interceptors(options.delete(:interceptors))
+        register_observers(options.delete(:observers))
+
         options.each { |k,v| send("#{k}=", v) }
       end
     end
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6a7931da8c..9fdd0e1ced 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -478,6 +478,11 @@ class BaseTest < ActiveSupport::TestCase
     end
   end
 
+  class MySecondObserver
+    def self.delivered_email(mail)
+    end
+  end
+
   test "you can register an observer to the mail object that gets informed on email delivery" do
     ActionMailer::Base.register_observer(MyObserver)
     mail = BaseMailer.welcome
@@ -485,11 +490,31 @@ class BaseTest < ActiveSupport::TestCase
     mail.deliver
   end
 
+  test "you can register an observer using its stringified name to the mail object that gets informed on email delivery" do
+    ActionMailer::Base.register_observer("BaseTest::MyObserver")
+    mail = BaseMailer.welcome
+    MyObserver.expects(:delivered_email).with(mail)
+    mail.deliver
+  end
+
+  test "you can register multiple observers to the mail object that both get informed on email delivery" do
+    ActionMailer::Base.register_observers("BaseTest::MyObserver", MySecondObserver)
+    mail = BaseMailer.welcome
+    MyObserver.expects(:delivered_email).with(mail)
+    MySecondObserver.expects(:delivered_email).with(mail)
+    mail.deliver
+  end
+
   class MyInterceptor
     def self.delivering_email(mail)
     end
   end
 
+  class MySecondInterceptor
+    def self.delivering_email(mail)
+    end
+  end
+
   test "you can register an interceptor to the mail object that gets passed the mail object before delivery" do
     ActionMailer::Base.register_interceptor(MyInterceptor)
     mail = BaseMailer.welcome
@@ -497,6 +522,21 @@ class BaseTest < ActiveSupport::TestCase
     mail.deliver
   end
 
+  test "you can register an interceptor using its stringified name to the mail object that gets passed the mail object before delivery" do
+    ActionMailer::Base.register_interceptor("BaseTest::MyInterceptor")
+    mail = BaseMailer.welcome
+    MyInterceptor.expects(:delivering_email).with(mail)
+    mail.deliver
+  end
+
+  test "you can register multiple interceptors to the mail object that both get passed the mail object before delivery" do
+    ActionMailer::Base.register_interceptors("BaseTest::MyInterceptor", MySecondInterceptor)
+    mail = BaseMailer.welcome
+    MyInterceptor.expects(:delivering_email).with(mail)
+    MySecondInterceptor.expects(:delivering_email).with(mail)
+    mail.deliver
+  end
+
   test "being able to put proc's into the defaults hash and they get evaluated on mail sending" do
     mail1 = ProcMailer.welcome
     yesterday = 1.day.ago