Support for custom queues on the mailer

Credit goes to *Aaron Patterson* (tenderlove)

2 files changed, 14 insertions, 13 deletions

diff --git a/actionmailer/lib/action_mailer/async.rb b/actionmailer/lib/action_mailer/async.rb
index 6fcc94d50e..d7c34c1a7b 100644
--- a/actionmailer/lib/action_mailer/async.rb
+++ b/actionmailer/lib/action_mailer/async.rb
@@ -1,22 +1,23 @@
 require 'delegate'
 
 module ActionMailer::Async
-  def self.included(base)
-    base.extend(ClassMethods)
+  def method_missing(method_name, *args)
+    if action_methods.include?(method_name.to_s)
+      QueuedMessage.new(queue, self, method_name, *args)
+    else
+      super
+    end
   end
 
-  module ClassMethods
-    def method_missing(method_name, *args)
-      if action_methods.include?(method_name.to_s)
-        QueuedMessage.new(self, method_name, *args)
-      else
-        super
-      end
-    end
+  def queue
+    Rails.queue
   end
 
   class QueuedMessage < ::Delegator
-    def initialize(mailer_class, method_name, *args)
+    attr_reader :queue
+
+    def initialize(queue, mailer_class, method_name, *args)
+      @queue        = queue
       @mailer_class = mailer_class
       @method_name  = method_name
       @args         = args
@@ -37,7 +38,7 @@ module ActionMailer::Async
       if force
         run
       else
-        Rails.queue << self
+        @queue << self
       end
     end
   end
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 5686e78dfc..1f6c00ce11 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -460,7 +460,7 @@ module ActionMailer #:nodoc:
       def async=(truth)
         if truth
           require 'action_mailer/async'
-          include ActionMailer::Async
+          extend ActionMailer::Async
         end
       end