resque-scheduler 2.0.0.c → 2.0.0.d

data/HISTORY.md

@@ -1,8 +1,27 @@
 ## 2.0.0 (???)
 
+* TODO: address race condition with delayed jobs (using redis transactions)
+
+## 2.0.0.d (2011-04-04)
+
+* porting bug fixes from v1.9-stable
+
+## 2.0.0.c
+
+* Rake task drop a pid file (sreeix)
+
+## 2.0.0.b
+
+* Bug fixes
+
+## 2.0.0.a
+
 * Dynamic schedule support (brianjlandau, davidyang)
 * Now depends on redis >=1.3
-* Rake task drop a pid file (sreeix)
+
+## 1.9.9 (2011-03-29)
+
+* Compatibility with resque 1.15.0
 
 ## 1.9.8 (???)
 

data/README.markdown

@@ -169,7 +169,7 @@ custom job class to support the #scheduled method:
         # Wrapper API to forward a Resque::Job creation API call into
         # a JobWithStatus call.
         def self.scheduled(queue, klass, *args)
-          create(args)
+          create(*args)
         end
       end
     end

data/lib/resque/scheduler.rb

@@ -168,7 +168,7 @@ module Resque
           end
         else
           Resque::Job.create(queue, klass_name, *params)
-        end        
+        end
       rescue
         log! "Failed to enqueue #{klass_name}:\n #{$!}"
       end

data/lib/resque_scheduler/server.rb

@@ -27,7 +27,7 @@ module ResqueScheduler
         post "/schedule/requeue" do
           config = Resque.schedule[params['job_name']]
           Resque::Scheduler.enqueue_from_config(config)
-          redirect url("/overview")
+          redirect u("/overview")
         end
         
         get "/delayed" do
@@ -43,7 +43,7 @@ module ResqueScheduler
         post "/delayed/queue_now" do
           timestamp = params['timestamp']
           Resque::Scheduler.enqueue_delayed_items_for_timestamp(timestamp.to_i) if timestamp.to_i > 0
-          redirect url("/overview")
+          redirect u("/overview")
         end
 
       end

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

@@ -19,19 +19,19 @@
   <% resque.delayed_queue_peek(start, start+20).each do |timestamp| %>
     <tr>
       <td>
-        <form action="<%= url "/delayed/queue_now" %>" method="post">
+        <form action="<%= u "/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><a href="<%= u "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 %>
       <td>
         <% if job && delayed_timestamp_size == 1 %>
           <%= h(job['class']) %>
         <% else %>
-          <a href="<%= url "delayed/#{timestamp}" %>">see details</a>
+          <a href="<%= u "delayed/#{timestamp}" %>">see details</a>
         <% end %>
       </td>
       <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>

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

@@ -19,7 +19,7 @@
     <% config = Resque.schedule[name] %>
     <tr>
       <td>
-        <form action="<%= url "/schedule/requeue" %>" method="post">
+        <form action="<%= u "/schedule/requeue" %>" method="post">
           <input type="hidden" name="job_name" value="<%= h name %>">
           <input type="submit" value="Queue now">
         </form>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '2.0.0.c'
+  Version = '2.0.0.d'
 end

data/test/resque-web_test.rb

@@ -12,7 +12,8 @@ end
 context "on GET to /schedule with scheduled jobs" do
   setup do 
     ENV['rails_env'] = 'production'
-    Resque.schedule = {:some_ivar_job => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp", 'rails_env' => 'production'}}
+    Resque.schedule = {:some_ivar_job => {'cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp", 'rails_env' => 'production'},
+                       :some_other_job => {'queue' => 'high', 'class' => 'SomeOtherJob', 'args' => {:b => 'blah'}}}
     Resque::Scheduler.load_schedule!
     get "/schedule"
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - c
-  version: 2.0.0.c
+  - d
+  version: 2.0.0.d
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency