sidekiq 3.0.2 → 3.1.0

data/web/views/dashboard.erb

@@ -1,15 +1,22 @@
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
+<div class= "dashboard clearfix">
+  <h3 >
+    <%= t('Dashboard') %>
+    <span class="beacon">
+      <span class="ring"></span>
+      <span class="dot"></span>
+    </span>
+  </h3>
+  <div class="interval-slider">
+    <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
+    <span class="current-interval">2 sec</span>
+    <br/>
+    <input type="range" min="2000" max="20000" step="1000" value="2000"/>
+  </div>
+</div>
 
-<h3>
-  <%= t('Dashboard') %>
-  <span class="beacon">
-    <span class="ring"></span>
-    <span class="dot"></span>
-  </span>
-</h3>
-
-<h5></h5>
-<div id="realtime"></div>
+<div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
+<div id="realtime-legend"></div>
 
 <h5>
   <span class="history-heading"><%= t('History') %></span>
@@ -18,7 +25,8 @@
   <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
   <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
 </h5>
-<div id="history" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></div>
+<div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></div>
+<div id="history-legend"></div>
 
 <br/>
 <h5>Redis</h5>

data/web/views/morgue.erb

@@ -22,7 +22,7 @@
           </th>
           <th width="25%"><%= t('LastRetry') %></th>
           <th><%= t('Queue') %></th>
-          <th><%= t('Worker') %></th>
+          <th><%= t('Job') %></th>
           <th><%= t('Arguments') %></th>
           <th><%= t('Error') %></th>
         </tr>
@@ -40,9 +40,9 @@
           <td>
             <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= entry.klass %></td>
+          <td><%= entry.display_class %></td>
           <td>
-            <div class="args"><%= display_args(entry.args) %></div>
+            <div class="args"><%= display_args(entry.display_args) %></div>
           </td>
           <td>
             <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>

data/web/views/queue.erb

@@ -13,25 +13,26 @@
 </header>
 <table class="queue table table-hover table-bordered table-striped">
   <thead>
-    <th><%= t('Class') %></th>
+    <th><%= t('Job') %></th>
     <th><%= t('Arguments') %></th>
     <th></th>
   </thead>
   <% @messages.each_with_index do |msg, index| %>
     <tr>
-      <td><%= msg['class'] %></td>
+      <td><%= msg.display_class %></td>
       <td>
-        <% if msg['args'] and msg['args'].to_s.size > 100 %>
-          <%= h(msg['args'].inspect[0..100]) + "... " %>
+        <% a = msg.display_args.inspect -%>
+        <% if a.size > 100 %>
+          <%= h(msg.display_args.inspect[0..100]) + "... " %>
           <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-          <div class="toggle" id="worker_<%= index %>" style="display: none;"><%= h(msg['args']) %></div>
+          <div class="toggle" id="worker_<%= index %>" style="display: none;"><%= h(msg.display_args) %></div>
         <% else %>
-          <%= h(msg['args']) %>
+          <%= h(msg.display_args) %>
         <% end %>
       </td>
       <td>
         <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
-          <input name="key_val" value="<%= h Sidekiq.dump_json(msg) %>" type="hidden" />
+          <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
           <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
         </form>
       </td>

data/web/views/retries.erb

@@ -23,7 +23,7 @@
           <th width="25%"><%= t('NextRetry') %></th>
           <th width="11%"><%= t('RetryCount') %></th>
           <th><%= t('Queue') %></th>
-          <th><%= t('Worker') %></th>
+          <th><%= t('Job') %></th>
           <th><%= t('Arguments') %></th>
           <th><%= t('Error') %></th>
         </tr>
@@ -42,9 +42,9 @@
           <td>
             <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= entry.klass %></td>
+          <td><%= entry.display_class %></td>
           <td>
-            <div class="args"><%= display_args(entry.args) %></div>
+            <div class="args"><%= display_args(entry.display_args) %></div>
           </td>
           <td>
             <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>

data/web/views/scheduled.erb

@@ -21,7 +21,7 @@
           </th>
           <th width="25%"><%= t('When') %></th>
           <th width="10%"><%= t('Queue') %></th>
-          <th><%= t('Worker') %></th>
+          <th><%= t('Job') %></th>
           <th><%= t('Arguments') %></th>
         </tr>
       </thead>
@@ -36,9 +36,9 @@
           <td>
             <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= entry.klass %></td>
+          <td><%= entry.display_class %></td>
           <td>
-             <div class="args"><%= display_args(entry.args) %></div>
+             <div class="args"><%= display_args(entry.display_args) %></div>
           </td>
         </tr>
       <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement