Merge pull request #35 from mperham/enqueue_at

Implement enqueue_at/enqueue_in

11 files changed, 83 insertions, 4 deletions

diff --git a/lib/active_job/enqueuing.rb b/lib/active_job/enqueuing.rb
index 61734fdfb6..80b10cdbcb 100644
--- a/lib/active_job/enqueuing.rb
+++ b/lib/active_job/enqueuing.rb
@@ -14,5 +14,25 @@ module ActiveJob
       ActiveSupport::Notifications.instrument "enqueue.active_job", adapter: queue_adapter, job: self, args: serialized_args
       queue_adapter.queue self, *serialized_args
     end
+
+    # Enqueue a job to be performed at +interval+ from now.
+    #
+    #   enqueue_in(1.week, "mike")
+    #
+    # Returns truthy if a job was scheduled.
+    def enqueue_in(interval, *args)
+      enqueue_at(interval.from_now, *args)
+    end
+
+    # Enqueue a job to be performed at an explicit point in time.
+    #
+    #   enqueue_at(Date.tomorrow.midnight, "mike")
+    #
+    # Returns truthy if a job was scheduled.
+    def enqueue_at(timestamp, *args)
+      timestamp = timestamp.to_f
+      ActiveSupport::Notifications.instrument "enqueue_at.active_job", adapter: queue_adapter, timestamp: timestamp, job: self, args: args
+      queue_adapter.queue_at self, timestamp, *Parameters.serialize(args)
+    end
   end
 end
diff --git a/lib/active_job/log_subscriber.rb b/lib/active_job/log_subscriber.rb
index 472c9f3081..eae6c30745 100644
--- a/lib/active_job/log_subscriber.rb
+++ b/lib/active_job/log_subscriber.rb
@@ -4,12 +4,21 @@ module ActiveJob
   class LogSubscriber < ActiveSupport::LogSubscriber
     def enqueue(event)
       queue_name = event.payload[:adapter].name.demodulize.remove('Adapter')
-      job_name   = event.payload[:job].name      
+      job_name   = event.payload[:job].name
       args       = event.payload[:args].any? ? ": #{event.payload[:args].inspect}" : ""
 
       info "Enqueued #{job_name} to #{queue_name}" + args
     end
 
+    def enqueue_at(event)
+      queue_name = event.payload[:adapter].name.demodulize.remove('Adapter')
+      job_name   = event.payload[:job].name
+      args       = event.payload[:args].any? ? ": #{event.payload[:args].inspect}" : ""
+      time       = event.payload[:timestamp]
+
+      info "Enqueued #{job_name} to #{queue_name} at #{time}" + args
+    end
+
     def logger
       ActiveJob::Base.logger
     end
diff --git a/lib/active_job/queue_adapters/backburner_adapter.rb b/lib/active_job/queue_adapters/backburner_adapter.rb
index 0ac745c7f2..0d023d9ee7 100644
--- a/lib/active_job/queue_adapters/backburner_adapter.rb
+++ b/lib/active_job/queue_adapters/backburner_adapter.rb
@@ -7,7 +7,11 @@ module ActiveJob
         def queue(job, *args)
           Backburner::Worker.enqueue JobWrapper, [ job.name, *args ], queue: job.queue_name
         end
-      end
+
+        def queue_at(job, timestamp, *args)
+          raise NotImplementedError
+        end
+     end
 
       class JobWrapper
         class << self
diff --git a/lib/active_job/queue_adapters/delayed_job_adapter.rb b/lib/active_job/queue_adapters/delayed_job_adapter.rb
index 14072e2801..214733e3a6 100644
--- a/lib/active_job/queue_adapters/delayed_job_adapter.rb
+++ b/lib/active_job/queue_adapters/delayed_job_adapter.rb
@@ -7,8 +7,12 @@ module ActiveJob
         def queue(job, *args)
           JobWrapper.new.delay(queue: job.queue_name).perform(job, *args)
         end
+
+        def queue_at(job, timestamp, *args)
+          JobWrapper.new.delay(queue: job.queue_name, run_at: timestamp).perform(job, *args)
+        end
       end
-      
+
       class JobWrapper
         def perform(job, *args)
           job.new.perform *Parameters.deserialize(args)
diff --git a/lib/active_job/queue_adapters/inline_adapter.rb b/lib/active_job/queue_adapters/inline_adapter.rb
index cffa55af82..414a918d2b 100644
--- a/lib/active_job/queue_adapters/inline_adapter.rb
+++ b/lib/active_job/queue_adapters/inline_adapter.rb
@@ -5,7 +5,19 @@ module ActiveJob
         def queue(job, *args)
           job.new.perform *Parameters.deserialize(args)
         end
+
+        def queue_at(job, ts, *args)
+          Thread.new do
+            begin
+              interval = Time.now.to_f - ts
+              sleep(interval) if interval > 0
+              job.new.perform *Parameters.deserialize(args)
+            rescue => ex
+              ActiveJob::Base.logger.info "Error performing #{job}: #{ex.message}"
+            end
+          end
+        end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/active_job/queue_adapters/que_adapter.rb b/lib/active_job/queue_adapters/que_adapter.rb
index 6750882b91..30c23a35b9 100644
--- a/lib/active_job/queue_adapters/que_adapter.rb
+++ b/lib/active_job/queue_adapters/que_adapter.rb
@@ -7,6 +7,10 @@ module ActiveJob
         def queue(job, *args)
           JobWrapper.enqueue job, *args, queue: job.queue_name
         end
+
+        def queue_at(job, timestamp, *args)
+          raise NotImplementedError
+        end
       end
 
       class JobWrapper < Que::Job
diff --git a/lib/active_job/queue_adapters/queue_classic_adapter.rb b/lib/active_job/queue_adapters/queue_classic_adapter.rb
index b82edae977..d0e2e1aa22 100644
--- a/lib/active_job/queue_adapters/queue_classic_adapter.rb
+++ b/lib/active_job/queue_adapters/queue_classic_adapter.rb
@@ -7,6 +7,10 @@ module ActiveJob
         def queue(job, *args)
           QC::Queue.new(job.queue_name).enqueue("#{JobWrapper.name}.perform", job, *args)
         end
+
+        def queue_at(job, timestamp, *args)
+          raise NotImplementedError
+        end
       end
 
       class JobWrapper
diff --git a/lib/active_job/queue_adapters/resque_adapter.rb b/lib/active_job/queue_adapters/resque_adapter.rb
index 6686f10593..353b3ae690 100644
--- a/lib/active_job/queue_adapters/resque_adapter.rb
+++ b/lib/active_job/queue_adapters/resque_adapter.rb
@@ -1,6 +1,7 @@
 require 'resque'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/array/access'
+require 'resque_scheduler'
 
 module ActiveJob
   module QueueAdapters
@@ -9,6 +10,10 @@ module ActiveJob
         def queue(job, *args)
           Resque.enqueue JobWrapper.new(job), job, *args
         end
+
+        def queue_at(job, timestamp, *args)
+          Resque.enqueue_at timestamp, JobWrapper.new(job), job, *args
+        end
       end
 
       class JobWrapper
diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb
index 43bd69790c..be6bd4ee01 100644
--- a/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -11,6 +11,15 @@ module ActiveJob
             'args'  => [ job, *args ],
             'retry' => true
         end
+
+        def queue_at(job, timestamp, *args)
+          Sidekiq::Client.push \
+            'class' => JobWrapper,
+            'queue' => job.queue_name,
+            'args'  => [ job, *args ],
+            'at'    => timestamp,
+            'retry' => true
+        end
       end
 
       class JobWrapper
diff --git a/lib/active_job/queue_adapters/sneakers_adapter.rb b/lib/active_job/queue_adapters/sneakers_adapter.rb
index 7be6b2a085..b299b25a96 100644
--- a/lib/active_job/queue_adapters/sneakers_adapter.rb
+++ b/lib/active_job/queue_adapters/sneakers_adapter.rb
@@ -13,6 +13,10 @@ module ActiveJob
             JobWrapper.enqueue [ job, *args ]
           end
         end
+
+        def queue_at(job, timestamp, *args)
+          raise NotImplementedError
+        end
       end
 
       class JobWrapper
diff --git a/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/lib/active_job/queue_adapters/sucker_punch_adapter.rb
index 6ca6726456..8a3d6d10a1 100644
--- a/lib/active_job/queue_adapters/sucker_punch_adapter.rb
+++ b/lib/active_job/queue_adapters/sucker_punch_adapter.rb
@@ -7,6 +7,10 @@ module ActiveJob
         def queue(job, *args)
           JobWrapper.new.async.perform(job, *args)
         end
+
+        def queue_at(job, timestamp, *args)
+          raise NotImplementedError
+        end
       end
 
       class JobWrapper