thehenster-resque-scheduler 1.0.8 → 1.0.9

data/lib/resque_scheduler/server.rb

@@ -21,7 +21,7 @@ module ResqueScheduler
             to_time = to_time.to_time if to_time.respond_to?(:to_time)
             distance_in_minutes = (((to_time - from_time).abs)/60).round
             distance_in_seconds = ((to_time - from_time).abs).round
-
+                        
             case distance_in_minutes
               when 0..1
                 return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
@@ -33,7 +33,7 @@ module ResqueScheduler
                   when 40..59 then 'less than a minute'
                   else             '1 minute'
                 end
-
+          
               when 2..44           then "#{distance_in_minutes} minutes"
               when 45..89          then 'about 1 hour'
               when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"

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

@@ -17,8 +17,12 @@
 		<th>Just Once</th>
     <th>Arguments</th>
   </tr>
-	<% ary = Resque.schedule.to_a.sort{|a,b| a['name'] <=> b['name'] } %>
-  <% ary.each do |name, config| %>
+	<% ary = Resque.schedule.to_a.sort{|a,b| a[0] <=> b[0] } %>
+  <% ary.each do |e| %>
+	<% 
+		name = e[0]
+		config = e[1]
+	%>
     <tr>
       <td>
         <form action="<%= url "/schedule/requeue" %>" method="post">
@@ -29,11 +33,11 @@
       <td><%= h name %></td>
       <td><%= h config['description'] %></td>
       <td style="white-space:nowrap"><%= h config['cron'] %></td>
-			<td><%= distance_of_time_in_words(Time.now, Rufus::CronLine.new(config['cron']).next_time, true) %><br /><span style="color:#888;font-size:85%;"><%= (Rufus::CronLine.new(config['cron']).next_time) %></span></td>
+			<td><%= distance_of_time_in_words(Time.now, Rufus::CronLine.new(config['cron']).next_time, true) rescue nil %><br /><span style="color:#888;font-size:85%;"><%= (Rufus::CronLine.new(config['cron']).next_time) %></span></td>
       <td><%= h config['class'] %></td>
       <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
 			<td><%= h config['just_once'].inspect %></td>
       <td><%= h config['args'].inspect %></td>
     </tr>
   <% end %>
-</table>
+</table>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.8'
+  Version = '1.0.9'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Ben VandenBos