Merge branch 'master' of github.com:rails/rails

4 files changed, 64 insertions, 2 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index bc540aece0..9aae14ec8c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -548,8 +548,8 @@ module ActionMailer
       end
 
       def method_missing(method_name, *args) # :nodoc:
-        if respond_to?(method_name)
-          new(method_name, *args).message
+        if action_methods.include?(method_name.to_s)
+          MessageDelivery.new(self, method_name, *args)
         else
           super
         end
@@ -586,6 +586,10 @@ module ActionMailer
     class NullMail #:nodoc:
       def body; '' end
 
+      def respond_to?(string, include_all=false)
+        true
+      end
+
       def method_missing(*args)
         nil
       end
diff --git a/actionmailer/lib/action_mailer/delivery_job.rb b/actionmailer/lib/action_mailer/delivery_job.rb
new file mode 100644
index 0000000000..b2cfa245fd
--- /dev/null
+++ b/actionmailer/lib/action_mailer/delivery_job.rb
@@ -0,0 +1,11 @@
+require 'active_job'
+
+module ActionMailer
+  class DeliveryJob < ActiveJob::Base
+    queue_as :mailers
+
+    def perform(mailer, mail_method, delivery_method, *args)
+      mailer.constantize.public_send(mail_method, *args).send(delivery_method)
+    end
+  end
+end
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb
new file mode 100644
index 0000000000..80a0517bff
--- /dev/null
+++ b/actionmailer/lib/action_mailer/message_delivery.rb
@@ -0,0 +1,45 @@
+require 'delegate'
+
+module ActionMailer
+  class MessageDelivery < Delegator
+    def initialize(mailer, mail_method, *args)
+      @mailer = mailer
+      @mail_method = mail_method
+      @args = args
+    end
+
+    def __getobj__
+      @obj ||= @mailer.send(:new, @mail_method, *@args).message
+    end
+
+    def __setobj__(obj)
+      @obj = obj
+    end
+
+    def message #:nodoc:
+      __getobj__
+    end
+
+    def deliver_later!(options={})
+      enqueue_delivery :deliver!, options
+    end
+
+    def deliver_later(options={})
+      enqueue_delivery :deliver, options
+    end
+
+    private
+    def enqueue_delivery(delivery_method, options={})
+      args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args
+      enqueue_method = :enqueue
+      if options[:at]
+        enqueue_method = :enqueue_at
+        args.unshift options[:at]
+      elsif options[:in]
+        enqueue_method = :enqueue_in
+        args.unshift options[:in]
+      end
+      ActionMailer::DeliveryJob.send enqueue_method, *args
+    end
+  end
+end
diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index 33de1dc049..44cf6665ba 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -22,7 +22,9 @@ module ActionMailer
       # :nodoc:
       mattr_accessor :preview_interceptors, instance_writer: false
       self.preview_interceptors = []
+    end
 
+    module ClassMethods
       # Register one or more Interceptors which will be called before mail is previewed.
       def register_preview_interceptors(*interceptors)
         interceptors.flatten.compact.each { |interceptor| register_preview_interceptor(interceptor) }