resque-scheduler 1.8.1 → 1.8.2

data/HISTORY.md

@@ -1,4 +1,8 @@
-## 1.8.1 (TBD)
+## 1.8.2 (2010-06-04)
+
+* Adding queue now functionality to delayed timestamps (daviddoan)
+
+## 1.8.1 (2010-05-19)
 
 * Adding rails_env for scheduled jobs to support scoping jobs by
   RAILS_ENV (gravis).

data/lib/resque/scheduler.rb

@@ -77,21 +77,26 @@ module Resque
         item = nil
         begin
           if timestamp = Resque.next_delayed_timestamp
-            item = nil
-            begin
-              handle_shutdown do
-                if item = Resque.next_item_for_timestamp(timestamp)
-                  log "queuing #{item['class']} [delayed]"
-                  queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
-                  Job.create(queue, item['class'], *item['args'])
-                end
-              end
-            # continue processing until there are no more ready items in this timestamp
-            end while !item.nil?
+            enqueue_delayed_items_for_timestamp(timestamp)
           end
         # continue processing until there are no more ready timestamps
         end while !timestamp.nil?
       end
+      
+      # Enqueues all delayed jobs for a timestamp
+      def enqueue_delayed_items_for_timestamp(timestamp)
+        item = nil
+        begin
+          handle_shutdown do
+            if item = Resque.next_item_for_timestamp(timestamp)
+              log "queuing #{item['class']} [delayed]"
+              queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
+              Job.create(queue, item['class'], *item['args'])
+            end
+          end
+        # continue processing until there are no more ready items in this timestamp
+        end while !item.nil?
+      end
 
       def handle_shutdown
         exit if @shutdown

data/lib/resque_scheduler/server.rb

@@ -38,6 +38,12 @@ module ResqueScheduler
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed_timestamp.erb'))
         end
+        
+        post "/delayed/queue_now" do
+          timestamp = params['timestamp']
+          Resque::Scheduler.enqueue_delayed_items_for_timestamp(timestamp.to_i) if timestamp.present?
+          redirect url("/overview")
+        end
 
       end
 

data/lib/resque_scheduler/server/views/delayed.erb

@@ -10,6 +10,7 @@
 
 <table>
   <tr>
+    <th></th>
     <th>Timestamp</th>
     <th>Job count</th>
     <th>Class</th>
@@ -17,6 +18,12 @@
   </tr>
   <% resque.delayed_queue_peek(start, start+20).each do |timestamp| %>
     <tr>
+      <td>
+        <form action="<%= url "/delayed/queue_now" %>" method="post">
+          <input type="hidden" name="timestamp" value="<%= timestamp.to_i %>">
+          <input type="submit" value="Queue now">
+        </form>
+      </td>
       <td><a href="<%= url "delayed/#{timestamp}" %>"><%= format_time(Time.at(timestamp)) %></a></td>
       <td><%= delayed_timestamp_size = resque.delayed_timestamp_size(timestamp) %></td>
       <% job = resque.delayed_timestamp_peek(timestamp, 0, 1).first %>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.8.1'
+  Version = '1.8.2'
 end

data/resque-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-scheduler}
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben VandenBos"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-06-04}
   s.description = %q{Light weight job scheduling on top of Resque.
   Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
   Also supports queueing jobs on a fixed, cron-like schedule.}

data/test/delayed_queue_test.rb

@@ -116,6 +116,22 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     Resque.expects(:queue_from_class).never # Should NOT need to load the class
     Resque::Scheduler.handle_delayed_items
   end
+  
+  def test_enqueue_delayed_items_for_timestamp
+    t = Time.now + 60
+    
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue_at(t, SomeIvarJob)
+
+    # 2 SomeIvarJob jobs should be created in the "ivar" queue
+    Resque::Job.expects(:create).twice.with('ivar', 'SomeIvarJob', nil)
+    Resque.expects(:queue_from_class).never # Should NOT need to load the class
+
+    Resque::Scheduler.enqueue_delayed_items_for_timestamp(t)
+    
+    # delayed queue for timestamp should be empty
+    assert_equal(0, Resque.delayed_timestamp_peek(t, 0, 3).length)
+  end
 
   def test_works_with_out_specifying_queue__upgrade_case
     t = Time.now - 60

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency