resque-scheduler 1.9.8 → 1.9.9

data/HISTORY.md

@@ -3,6 +3,10 @@
 * Dynamic schedule support (brianjlandau, davidyang)
 * Now depends on redis >=1.3
 
+## 1.9.9 (2011-03-29)
+
+* Compatibility with resque 1.15.0
+
 ## 1.9.8 (???)
 
 * Validates delayed jobs prior to insertion into the delayed queue (bogdan)

data/lib/resque_scheduler/server.rb

@@ -26,7 +26,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
@@ -42,7 +42,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>
@@ -27,8 +27,8 @@
       <td><%= h name %></td>
       <td><%= h config['description'] %></td>
       <td style="white-space:nowrap"><%= (config['cron'].nil? && !config['every'].nil?) ?
-                                         h('every: ' + config['every']) : 
-                                         h('cron: ' + config['cron']) %></td>
+                                         h("every: #{config['every']}") : 
+                                         h("cron: #{config['cron']}") %></td>
       <td><%= (config['class'].nil? && !config['custom_job_class'].nil?) ?
               h(config['custom_job_class']) :
               h(config['class']) %></td>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.9.8'
+  Version = '1.9.9'
 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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 8
-  version: 1.9.8
+  - 9
+  version: 1.9.9
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency