resque-scheduler 1.0.1 → 1.0.2

data/HISTORY.md

@@ -0,0 +1,9 @@
+## 1.0.2 (2010-02-?)
+
+* Change Delayed Job tab to display job details if only 1 job exists
+  for a given timestamp
+
+## 1.0.1 (2010-01-?)
+
+* Bugfix: delayed jobs close together resulted in a 5 second sleep
+

data/lib/resque_scheduler.rb

@@ -50,6 +50,7 @@ module ResqueScheduler
   # Used internally to stuff the item into the schedule sorted list.
   # +timestamp+ can be either in seconds or a datetime object
   # Insertion if O(log(n)).
+  # Returns true if it's the first job to be scheduled at that time, else false
   def delayed_push(timestamp, item)
     # First add this item to the list for this timestamp
     redis.rpush("delayed:#{timestamp.to_i}", encode(item))
@@ -72,7 +73,7 @@ module ResqueScheduler
 
   # Returns the number of jobs for a given timestamp in the delayed queue schedule
   def delayed_timestamp_size(timestamp)
-    redis.llen "delayed:#{timestamp.to_i}"
+    redis.llen("delayed:#{timestamp.to_i}").to_i
   end
 
   # Returns an array of delayed items for the given timestamp

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

@@ -12,11 +12,22 @@
   <tr>
     <th>Timestamp</th>
     <th>Job count</th>
+    <th>Class</th>
+    <th>Args</th>
   </tr>
   <% resque.delayed_queue_peek(start, start+20).each do |timestamp| %>
     <tr>
       <td><a href="<%= url "delayed/#{timestamp}" %>"><%= format_time(Time.at(timestamp)) %></a></td>
-      <td><%= resque.delayed_timestamp_size(timestamp) %></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>
+        <% end %>
+      </td>
+      <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>
     </tr>
   <% end %>
 </table>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.1'
+  Version = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -08:00
+date: 2010-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- HISTORY.md
 - README.markdown
 - Rakefile
 - lib/resque/scheduler.rb