Action Mailer async flag is true by default using a Synchronous impl

3 files changed, 39 insertions, 57 deletions

diff --git a/actionmailer/lib/action_mailer/async.rb b/actionmailer/lib/action_mailer/async.rb
deleted file mode 100644
index a364342745..0000000000
--- a/actionmailer/lib/action_mailer/async.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'delegate'
-
-module ActionMailer
-  module Async
-    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
-
-    def queue
-      Rails.queue
-    end
-
-    class QueuedMessage < ::Delegator
-      attr_reader :queue
-
-      def initialize(queue, mailer_class, method_name, *args)
-        @queue        = queue
-        @mailer_class = mailer_class
-        @method_name  = method_name
-        @args         = args
-      end
-
-      def __getobj__
-        @actual_message ||= @mailer_class.send(:new, @method_name, *@args).message
-      end
-
-      def run
-        __getobj__.deliver
-      end
-
-      # Will push the message onto the Queue to be processed
-      def deliver
-        @queue << self
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 4a099553c0..35ac0423a5 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,4 +1,5 @@
 require 'mail'
+require 'action_mailer/queued_message'
 require 'action_mailer/collector'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
@@ -464,19 +465,6 @@ module ActionMailer #:nodoc:
         super || action_methods.include?(method.to_s)
       end
 
-      # Will force ActionMailer to push new messages to the queue defined
-      # in the ActionMailer class when set to true.
-      #
-      #   class WelcomeMailer < ActionMailer::Base
-      #     self.async = true
-      #   end
-      def async=(truth)
-        if truth
-          require 'action_mailer/async'
-          extend ActionMailer::Async
-        end
-      end
-
     protected
 
       def set_payload_for_mail(payload, mail) #:nodoc:
@@ -491,10 +479,18 @@ module ActionMailer #:nodoc:
         payload[:mail]       = mail.encoded
       end
 
-      def method_missing(method, *args) #:nodoc:
-        return super unless respond_to?(method)
-        new(method, *args).message
+      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
+
+      def queue
+        Rails.queue
+      end
+
     end
 
     attr_internal :message
diff --git a/actionmailer/lib/action_mailer/queued_message.rb b/actionmailer/lib/action_mailer/queued_message.rb
new file mode 100644
index 0000000000..e5868ab43b
--- /dev/null
+++ b/actionmailer/lib/action_mailer/queued_message.rb
@@ -0,0 +1,27 @@
+require 'delegate'
+
+module ActionMailer
+  class QueuedMessage < ::Delegator
+    attr_reader :queue
+
+    def initialize(queue, mailer_class, method_name, *args)
+      @queue        = queue
+      @mailer_class = mailer_class
+      @method_name  = method_name
+      @args         = args
+    end
+
+    def __getobj__
+      @actual_message ||= @mailer_class.send(:new, @method_name, *@args).message
+    end
+
+    def run
+      __getobj__.deliver
+    end
+
+    # Will push the message onto the Queue to be processed
+    def deliver
+      @queue << self
+    end
+  end
+end