Merge remote-tracking branch 'origin/master' into actioncable_logging

6 files changed, 25 insertions, 16 deletions

diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
index 0bdeca76a8..bc88221027 100644
--- a/activejob/lib/active_job/gem_version.rb
+++ b/activejob/lib/active_job/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveJob
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta1.1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
index 457015b741..72e4ebf935 100644
--- a/activejob/lib/active_job/queue_adapter.rb
+++ b/activejob/lib/active_job/queue_adapter.rb
@@ -4,25 +4,25 @@ require 'active_support/core_ext/string/inflections'
 
 module ActiveJob
   # The <tt>ActiveJob::QueueAdapter</tt> module is used to load the
-  # correct adapter. The default queue adapter is the +:inline+ queue.
+  # correct adapter. The default queue adapter is the +:async+ queue.
   module QueueAdapter #:nodoc:
     extend ActiveSupport::Concern
 
     included do
       class_attribute :_queue_adapter, instance_accessor: false, instance_predicate: false
-      self.queue_adapter = :inline
+      self.queue_adapter = :async
     end
 
     # Includes the setter method for changing the active queue adapter.
     module ClassMethods
       # Returns the backend queue provider. The default queue adapter
-      # is the +:inline+ queue. See QueueAdapters for more information.
+      # is the +:async+ queue. See QueueAdapters for more information.
       def queue_adapter
         _queue_adapter
       end
 
       # Specify the backend queue provider. The default queue adapter
-      # is the +:inline+ queue. See QueueAdapters for more
+      # is the +:async+ queue. See QueueAdapters for more
       # information.
       def queue_adapter=(name_or_adapter_or_class)
         self._queue_adapter = interpret_adapter(name_or_adapter_or_class)
diff --git a/activejob/lib/active_job/queue_adapters.rb b/activejob/lib/active_job/queue_adapters.rb
index aeb1fe1e73..2c5039ef4d 100644
--- a/activejob/lib/active_job/queue_adapters.rb
+++ b/activejob/lib/active_job/queue_adapters.rb
@@ -27,7 +27,7 @@ module ActiveJob
   #   | Resque            | Yes   | Yes    | Yes (Gem)  | Queue      | Global  | Yes     |
   #   | Sidekiq           | Yes   | Yes    | Yes        | Queue      | No      | Job     |
   #   | Sneakers          | Yes   | Yes    | No         | Queue      | Queue   | No      |
-  #   | Sucker Punch      | Yes   | Yes    | No         | No         | No      | No      |
+  #   | Sucker Punch      | Yes   | Yes    | Yes        | No         | No      | No      |
   #   | Active Job Async  | Yes   | Yes    | Yes        | No         | No      | No      |
   #   | Active Job Inline | No    | Yes    | N/A        | N/A        | N/A     | N/A     |
   #
diff --git a/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb
index c6c35f8ab4..311109e958 100644
--- a/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/sucker_punch_adapter.rb
@@ -5,12 +5,10 @@ module ActiveJob
     # == Sucker Punch adapter for Active Job
     #
     # Sucker Punch is a single-process Ruby asynchronous processing library.
-    # It's girl_friday and DSL sugar on top of Celluloid. With Celluloid's
-    # actor pattern, we can do asynchronous processing within a single process.
-    # This reduces costs of hosting on a service like Heroku along with the
-    # memory footprint of having to maintain additional jobs if hosting on
-    # a dedicated server. All queues can run within a single Rails/Sinatra
-    # process.
+    # This reduces the cost of of hosting on a service like Heroku along
+    # with the memory footprint of having to maintain additional jobs if
+    # hosting on a dedicated server. All queues can run within a
+    # single application (eg. Rails, Sinatra, etc.) process.
     #
     # Read more about Sucker Punch {here}[https://github.com/brandonhilkert/sucker_punch].
     #
@@ -19,11 +17,22 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :sucker_punch
     class SuckerPunchAdapter
       def enqueue(job) #:nodoc:
-        JobWrapper.new.async.perform job.serialize
+        if JobWrapper.respond_to?(:perform_async)
+          # sucker_punch 2.0 API
+          JobWrapper.perform_async job.serialize
+        else
+          # sucker_punch 1.0 API
+          JobWrapper.new.async.perform job.serialize
+        end
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
-        raise NotImplementedError, "This queueing backend does not support scheduling jobs. To see what features are supported go to http://api.rubyonrails.org/classes/ActiveJob/QueueAdapters.html"
+        if JobWrapper.respond_to?(:perform_in)
+          delay = timestamp - Time.current.to_f
+          JobWrapper.perform_in delay, job.serialize
+        else
+          raise NotImplementedError, 'sucker_punch 1.0 does not support `enqueued_at`. Please upgrade to version ~> 2.0.0 to enable this behavior.'
+        end
       end
 
       class JobWrapper #:nodoc:
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
index 6538ac1b30..b249ec09dd 100644
--- a/activejob/lib/active_job/railtie.rb
+++ b/activejob/lib/active_job/railtie.rb
@@ -12,7 +12,7 @@ module ActiveJob
 
     initializer "active_job.set_configs" do |app|
       options = app.config.active_job
-      options.queue_adapter ||= :inline
+      options.queue_adapter ||= :async
 
       ActiveSupport.on_load(:active_job) do
         options.each { |k,v| send("#{k}=", v) }
diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb
index 44ddfa5f69..ed0c05c1e5 100644
--- a/activejob/lib/active_job/test_helper.rb
+++ b/activejob/lib/active_job/test_helper.rb
@@ -58,7 +58,7 @@ module ActiveJob
       # The number of times a specific job is enqueued can be asserted.
       #
       #   def test_logging_job
-      #     assert_enqueued_jobs 2, only: LoggingJob do
+      #     assert_enqueued_jobs 1, only: LoggingJob do
       #       LoggingJob.perform_later
       #       HelloJob.perform_later('jeremy')
       #     end