Merge ad90c8b into 5b08ccd

lib/delayed/performable_mail.rb

@@ -0,0 +1,15 @@
+require 'mail'
+
+module Delayed
+  class PerformableMail < PerformableMethod
+    def initialize(raw_mail, method_name, args)
+      super(Mail.new(raw_mail), method_name, args)
+    end
+  end
+
+  module DelayMailMessage
+    def delay(options = {})
+      DelayProxy.new(PerformableMail, self.encoded, options)
+    end
+  end
+end

lib/delayed/performable_mailer.rb

@@ -13,9 +13,3 @@ def delay(options = {})
     end
   end
 end
-
-Mail::Message.class_eval do
-  def delay(*args)
-    raise RuntimeError, "Use MyMailer.delay.mailer_action(args) to delay sending of emails."
-  end
-end

lib/delayed/railtie.rb

@@ -6,6 +6,7 @@ class Railtie < Rails::Railtie
     initializer :after_initialize do
       ActiveSupport.on_load(:action_mailer) do
         ActionMailer::Base.extend(Delayed::DelayMail)
+        Mail::Message.extend(Delayed::DelayMailMessage)
       end
     end
 

lib/delayed_job.rb

@@ -7,6 +7,7 @@
 if defined?(ActionMailer)
   require 'action_mailer/version'
   require 'delayed/performable_mailer'
+  require 'delayed/performable_mail'
 end
 
 require 'delayed/yaml_ext'

spec/helper.rb

@@ -27,6 +27,7 @@
 
 # Add this to simulate Railtie initializer being executed
 ActionMailer::Base.extend(Delayed::DelayMail)
+Mail::Message.extend(Delayed::DelayMailMessage)
 
 
 # Used to test interactions between DJ and an ORM