1 files changed, 45 insertions, 0 deletions
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