Merge remote-tracking branch 'origin/master' into guides-template-inheritance

2 files changed, 12 insertions, 20 deletions

diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index b564813ccf..b9162055f7 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -1,5 +1,5 @@
 module ActionMailer
-  # Returns the version of the currently loaded ActionMailer as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded Action Mailer as a <tt>Gem::Version</tt>
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
@@ -8,7 +8,7 @@ module ActionMailer
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "alpha"
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb
index 30425d38f9..7118f9b02c 100644
--- a/actionmailer/lib/action_mailer/message_delivery.rb
+++ b/actionmailer/lib/action_mailer/message_delivery.rb
@@ -38,14 +38,14 @@ module ActionMailer
     # that the message will be sent bypassing checking +perform_deliveries+
     # and +raise_delivery_errors+, so use with caution.
     #
-    #   Notifier.welcome(User.first).deliver_later
-    #   Notifier.welcome(User.first).deliver_later(in: 1.hour)
-    #   Notifier.welcome(User.first).deliver_later(at: 10.hours.from_now)
+    #   Notifier.welcome(User.first).deliver_later!
+    #   Notifier.welcome(User.first).deliver_later!(wait: 1.hour)
+    #   Notifier.welcome(User.first).deliver_later!(wait_until: 10.hours.from_now)
     #
     # Options:
     #
-    # * <tt>:in</tt> - Enqueue the email to be delivered with a delay
-    # * <tt>:at</tt> - Enqueue the email to be delivered at (after) a specific date / time
+    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
+    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
     def deliver_later!(options={})
       enqueue_delivery :deliver_now!, options
     end
@@ -54,13 +54,13 @@ module ActionMailer
     # job runs it will send the email using +deliver_now+.
     #
     #   Notifier.welcome(User.first).deliver_later
-    #   Notifier.welcome(User.first).deliver_later(in: 1.hour)
-    #   Notifier.welcome(User.first).deliver_later(at: 10.hours.from_now)
+    #   Notifier.welcome(User.first).deliver_later(wait: 1.hour)
+    #   Notifier.welcome(User.first).deliver_later(wait_until: 10.hours.from_now)
     #
     # Options:
     #
-    # * <tt>:in</tt> - Enqueue the email to be delivered with a delay
-    # * <tt>:at</tt> - Enqueue the email to be delivered at (after) a specific date / time
+    # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
+    # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
     def deliver_later(options={})
       enqueue_delivery :deliver_now, options
     end
@@ -98,15 +98,7 @@ module ActionMailer
 
       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
+        ActionMailer::DeliveryJob.set(options).perform_later(*args)
       end
   end
 end