sidekiq 2.15.2 → 2.16.0

data/test/test_retry.rb

@@ -210,7 +210,7 @@ class TestRetry < Sidekiq::Test
         end
 
         it 'calls worker.retries_exhausted after too many retries' do
-          assert_equal [1,2, "foo", "retried_method"], handler.retries_exhausted(worker.new, msg)
+          assert_equal [1,2, "foo", "retried_method"], handler.send(:retries_exhausted, worker.new, msg)
         end
       end
 
@@ -226,7 +226,7 @@ class TestRetry < Sidekiq::Test
         end
 
         it 'calls worker sidekiq_retries_exhausted_block after too many retries' do
-          new_msg      = handler.retries_exhausted(worker.new, msg)
+          new_msg      = handler.send(:retries_exhausted, worker.new, msg)
           expected_msg = msg.merge('called_by_callback' => true)
 
           assert_equal expected_msg, new_msg, "sidekiq_retries_exhausted block not called"
@@ -288,15 +288,15 @@ class TestRetry < Sidekiq::Test
       let(:handler) { Sidekiq::Middleware::Server::RetryJobs.new }
 
       it "retries with a default delay" do
-        refute_equal 4, handler.delay_for(worker, 2)
+        refute_equal 4, handler.send(:delay_for, worker, 2)
       end
 
       it "retries with a custom delay" do
-        assert_equal 4, handler.delay_for(custom_worker, 2)
+        assert_equal 4, handler.send(:delay_for, custom_worker, 2)
       end
 
       it "falls back to the default retry on exception" do
-        refute_equal 4, handler.delay_for(error_worker, 2)
+        refute_equal 4, handler.send(:delay_for, error_worker, 2)
         assert_match(/Failure scheduling retry using the defined `sidekiq_retry_in`/,
                      File.read(@tmp_log_path), 'Log entry missing for sidekiq_retry_in')
       end

data/test/test_web.rb

@@ -282,6 +282,22 @@ class TestWeb < Sidekiq::Test
       assert_equal 200, last_response.status
     end
 
+    Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "fixtures")
+    it 'can show user defined tab with custom locales' do
+      begin
+        Sidekiq::Web.tabs['Custom Tab'] = '/custom'
+        Sidekiq::Web.get('/custom') do
+          t('translated_text')
+        end
+
+        get '/custom'
+        assert_match /Changed text/, last_response.body
+
+      ensure
+        Sidekiq::Web.tabs.delete 'Custom Tab'
+      end
+    end
+
     describe 'stats' do
       before do
         Sidekiq.redis do |conn|

data/web/assets/stylesheets/application.css

@@ -82,18 +82,10 @@ h3 {
   padding: 60px 0;
 }
 
-.row.header .actions {
-  padding-top: 0.9em;
-}
-
 header.row .pagination {
   margin: 12px 0;
 }
 
-.summary_bar .actions {
-  padding: 10px 0px;
-}
-
 .summary_bar .status {
   margin-left: 10px;
 }
@@ -114,7 +106,7 @@ header.row .pagination {
   border-width: 0px;
 }
 .poll-wrapper {
-  padding: 9px 0 0 0;
+  margin: 9px 0px;
 }
 .nav #live-poll {
   height: 25px;
@@ -551,8 +543,7 @@ img.smallogo {
   }
 
   .poll-wrapper {
-    padding: 0px 20px 5px 0px;
-    width: 20%;
+    margin: 0px 9px 9px;
   }
 
   .navbar.navbar-fixed-bottom ul {

data/web/locales/en.yml

@@ -60,5 +60,4 @@ en: # <---- change this to your locale code
   OneMonth: 1 month
   ThreeMonths: 3 months
   SixMonths: 6 months
-  Batches: Batches
   Failures: Failures

data/web/views/_nav.erb

@@ -23,7 +23,7 @@
       <% end %>
     </ul>
 
-    <div class="col-sm-2 pull-right poll-wrapper">
+    <div class="poll-wrapper pull-right">
       <%= erb :_poll %>
     </div>
   </div>

data/web/views/_paging.erb

@@ -1,23 +1,23 @@
 <% if @total_size > @count %>
   <ul class="pagination pull-right">
     <li class="<%= 'disabled' if @current_page == 1 %>">
-      <a href="<%= url %>?page=1">«</a>
+      <a href="<%= url %>?page=1">&laquo;</a>
     </li>
     <% if @current_page > 1 %>
       <li>
-        <a href="<%= url %>?page=<%= @current_page - 1 %>"><%= @current_page - 1 %></a>
+        <a href="<%= url %>?<%= qparams(page: @current_page - 1) %>"><%= @current_page - 1 %></a>
       </li>
     <% end %>
     <li class="disabled">
-      <a href="<%= url %>?page=<%= @current_page %>"><%= @current_page %></a>
+      <a href="<%= url %>?<%= qparams(page: @current_page) %>"><%= @current_page %></a>
     </li>
     <% if @total_size > @current_page * @count %>
       <li>
-        <a href="<%= url %>?page=<%= @current_page + 1 %>"><%= @current_page + 1 %></a>
+        <a href="<%= url %>?<%= qparams(page: @current_page + 1) %>"><%= @current_page + 1 %></a>
       </li>
     <% end %>
     <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
-      <a href="<%= url %>?page=<%= (@total_size.to_f / @count).ceil %>">»</a>
+      <a href="<%= url %>?<%= qparams(page: (@total_size.to_f / @count).ceil) %>">&raquo;</a>
     </li>
   </ul>
 <% end %>

data/web/views/_poll.erb

@@ -4,11 +4,9 @@
   </script>
 <% end %>
 <% unless current_path == '' %>
-  <div class="actions">
-    <% if params[:poll] %>
-      <a id="live-poll" class="btn btn-block btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
-    <% else %>
-      <a id="live-poll" class="btn btn-block btn-primary" href="<%= root_path %><%= current_path %>?poll=true"><%= t('LivePoll') %></a>
-    <% end %>
-  </div>
+  <% if params[:poll] %>
+    <a id="live-poll" class="btn btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
+  <% else %>
+    <a id="live-poll" class="btn btn-primary" href="<%= root_path %><%= current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>
+  <% end %>
 <% end %>

data/web/views/_summary.erb

@@ -13,10 +13,10 @@
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>
-  <li class="scheduled col-sm-2">
-    <a href="<%= root_path %>scheduled">
-      <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
-      <span class="desc"><%= t('Scheduled') %></span>
+  <li class="enqueued col-sm-2">
+    <a href="<%= root_path %>queues">
+      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+      <span class="desc"><%= t('Enqueued') %></span>
     </a>
   </li>
   <li class="retries col-sm-2">
@@ -25,10 +25,10 @@
       <span class="desc"><%= t('Retries') %></span>
     </a>
   </li>
-  <li class="enqueued col-sm-2">
-    <a href="<%= root_path %>queues">
-      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
-      <span class="desc"><%= t('Enqueued') %></span>
+  <li class="scheduled col-sm-2">
+    <a href="<%= root_path %>scheduled">
+      <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
+      <span class="desc"><%= t('Scheduled') %></span>
     </a>
   </li>
 </ul>

data/web/views/layout.erb

@@ -35,7 +35,7 @@
               <p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>
             </li>
             <li>
-              <p class="navbar-text">Redis: <%= location %></p>
+              <p class="navbar-text">Redis: <%= redis_connection %></p>
             </li>
             <li>
               <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>

data/web/views/retries.erb

@@ -42,7 +42,7 @@
             <div class="args"><%= display_args(msg['args']) %></div>
           </td>
           <td>
-            <div><%= truncate("#{msg['error_class']}: #{msg['error_message']}", 200) %></div>
+            <div><%= h truncate("#{msg['error_class']}: #{msg['error_message']}", 200) %></div>
           </td>
         </tr>
       <% end %>

data/web/views/retry.erb

@@ -11,7 +11,7 @@
     </tr>
     <tr>
       <th><%= t('ErrorMessage') %></th>
-      <td><%= @retry['error_message'] %></td>
+      <td><%= h(@retry['error_message']) %></td>
     </tr>
     <% if !@retry['error_backtrace'].nil? %>
       <tr>

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.15.2
-  prerelease: 
+  version: 2.16.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,65 +111,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple, efficient background processing for Ruby
@@ -213,6 +190,7 @@ files:
 - lib/sidekiq/actor.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/capistrano.rb
+- lib/sidekiq/capistrano2.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
 - lib/sidekiq/core_ext.rb
@@ -235,6 +213,7 @@ files:
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_connection.rb
 - lib/sidekiq/scheduled.rb
+- lib/sidekiq/tasks/sidekiq.rake
 - lib/sidekiq/testing.rb
 - lib/sidekiq/testing/inline.rb
 - lib/sidekiq/util.rb
@@ -247,6 +226,7 @@ files:
 - test/config.yml
 - test/env_based_config.yml
 - test/fake_env.rb
+- test/fixtures/en.yml
 - test/helper.rb
 - test/test_api.rb
 - test/test_cli.rb
@@ -355,32 +335,32 @@ files:
 homepage: http://sidekiq.org
 licenses:
 - LGPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple, efficient background processing for Ruby
 test_files:
 - test/config.yml
 - test/env_based_config.yml
 - test/fake_env.rb
+- test/fixtures/en.yml
 - test/helper.rb
 - test/test_api.rb
 - test/test_cli.rb