sidekiq 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fa604463fe062e6524c2cd62cd1ec9498aa383
-  data.tar.gz: f2cb301b70fd40393f27ffddf846df952e599840
+  metadata.gz: 608ba6cc7b3fc425bc309c318204b5eae5bc467b
+  data.tar.gz: aaa3c0a205cce3385119d36bf2bf19a18678f9af
 SHA512:
-  metadata.gz: e309828b91e75ee774dfcd4bd09b333a9b9cf94c268298ae1cfead3300088221b541749991f3d36871e70ddf4de9192653ad00bfbce2e4ce6f42f04647860d94
-  data.tar.gz: 554de243393e2dd29efc7fb70bd012a10d8852b072c50c982e58e428de21ccaa8a68771c5886ca8ad36373da13c8176968c09ecf53ab9801163c9838504ce26b
+  metadata.gz: da37f47a821a70ea4ccbd31957354ade6415bc83b8a053d5acbbafcbc7cc33e90ea5d1bbd97b079c740ab4c0f12a759b2ae009e6dbaae2ca709aae5958e1e719
+  data.tar.gz: 25eb856dc4b4c6698b6167d1fa57e874670b6169a63e8eaa9d178aa1a0240d4195a216530fb07f7f65f1076461ab92095714d776c20e53debae6a01efadd1909

data/Changes.md

@@ -1,3 +1,16 @@
+3.4.2
+-----------
+
+- Don't allow `Sidekiq::Worker` in ActiveJob::Base classes. [#2424]
+- Safer display of job data in Web UI [#2405]
+- Fix CSRF vulenerability in Web UI, thanks to Egor Homakov for
+  reporting. [#2422] If you are running the Web UI as a standalone Rack app,
+  ensure you have a [session middleware
+configured](https://github.com/mperham/sidekiq/wiki/Monitoring#standalone):
+```ruby
+use Rack::Session::Cookie, :secret => "some unique secret string here"
+```
+
 3.4.1
 -----------
 

data/Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'rails', '~> 4.2'
+gem 'simplecov'
+gem 'minitest'
+
 platforms :rbx do
   gem 'rubysl', '~> 2.0'         # if using anything in the ruby standard library
   gem 'psych'                    # if using yaml

data/Pro-2.0-Upgrade.md

@@ -97,8 +97,8 @@ lots of jobs.
   Sidekiq Pro functionality is affected by this change but some 3rd party
   plugins might be.
 - The Lua script used inside the reliable scheduler is not safe for use
-  with Redis Cluster, Redis Sentinel or other distributed Redis solutions.
-  It is safe to use with a typical master/slave replication setup.
+  with Redis Cluster or other multi-master Redis solutions.
+  It is safe to use with Redis Sentinel or a typical master/slave replication setup.
 
 **You no longer require anything to use the Reliability features.**
 

data/Pro-Changes.md

@@ -6,6 +6,13 @@ Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and
 HEAD
 -----------
 
+- Atomic scheduler now sets `enqueued_at` [#2414]
+- Batches now account for jobs which are stopped by client middleware [#2406]
+
+2.0.4
+-----------
+
+- Reliable push now supports sharding [#2409]
 - Reliable push now only catches Redis exceptions [#2307]
 
 2.0.3

data/README.md

@@ -4,7 +4,6 @@ Sidekiq
 [![Gem Version](https://badge.fury.io/rb/sidekiq.svg)](https://rubygems.org/gems/sidekiq)
 [![Code Climate](https://codeclimate.com/github/mperham/sidekiq.svg)](https://codeclimate.com/github/mperham/sidekiq)
 [![Build Status](https://travis-ci.org/mperham/sidekiq.svg)](https://travis-ci.org/mperham/sidekiq)
-[![Coverage Status](https://coveralls.io/repos/mperham/sidekiq/badge.svg?branch=master)](https://coveralls.io/r/mperham/sidekiq)
 [![Gitter Chat](https://badges.gitter.im/mperham/sidekiq.svg)](https://gitter.im/mperham/sidekiq)
 
 

data/bin/sidekiq

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+# Quiet some warnings we see when running in warning mode:
+# RUBYOPT=-w bundle exec sidekiq
+$TESTING = false
+$CELLULOID_DEBUG = false
+
 require_relative '../lib/sidekiq/cli'
 
 begin

data/lib/sidekiq/api.rb

@@ -159,14 +159,15 @@ module Sidekiq
 
         while i < @days_previous
           date = @start_date - i
-          keys << "stat:#{stat}:#{date}"
-          dates << date
+          datestr = date.strftime("%Y-%m-%d".freeze)
+          keys << "stat:#{stat}:#{datestr}"
+          dates << datestr
           i += 1
         end
 
         Sidekiq.redis do |conn|
           conn.mget(keys).each_with_index do |value, idx|
-            stat_hash[dates[idx].to_s] = value ? value.to_i : 0
+            stat_hash[dates[idx]] = value ? value.to_i : 0
           end
         end
 
@@ -262,7 +263,6 @@ module Sidekiq
   # removed from the queue via Job#delete.
   #
   class Job
-    KNOWN_WRAPPERS = [/\ASidekiq::Extensions::Delayed/, "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"]
     attr_reader :item
 
     def initialize(item, queue_name=nil)

data/lib/sidekiq/client.rb

@@ -210,10 +210,9 @@ module Sidekiq
     end
 
     def normalize_item(item)
-      raise(ArgumentError, "Message must be a Hash of the form: { 'class' => SomeWorker, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
-      raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
-      raise(ArgumentError, "Message args must be an Array") unless item['args'].is_a?(Array)
-      raise(ArgumentError, "Message class must be either a Class or String representation of the class name") unless item['class'].is_a?(Class) || item['class'].is_a?(String)
+      raise(ArgumentError, "Job must be a Hash with 'class' and 'args' keys: { 'class' => SomeWorker, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash) && item.has_key?('class'.freeze) && item.has_key?('args'.freeze)
+      raise(ArgumentError, "Job args must be an Array") unless item['args'].is_a?(Array)
+      raise(ArgumentError, "Job class must be either a Class or String representation of the class name") unless item['class'.freeze].is_a?(Class) || item['class'.freeze].is_a?(String)
 
       normalized_hash(item['class'.freeze])
         .each{ |key, value| item[key] = value if item[key].nil? }

data/lib/sidekiq/fetch.rb

@@ -83,7 +83,7 @@ module Sidekiq
     end
 
     def self.done?
-      @done
+      defined?(@done) && @done
     end
 
     def self.strategy

data/lib/sidekiq/util.rb

@@ -51,5 +51,18 @@ module Sidekiq
       end
     end
 
+    def want_a_hertz_donut?
+      # what's a hertz donut?
+      # punch!  Hurts, don't it?
+      info = Sidekiq.redis {|c| c.info }
+      if info['connected_clients'].to_i > 1000 && info['hz'].to_i >= 10
+        Sidekiq.logger.warn { "Your Redis `hz` setting is too high at #{info['hz']}.  See mperham/sidekiq#2431.  Set it to 3 in #{info[:config_file]}" }
+        true
+      else
+        Sidekiq.logger.debug { "Redis hz: #{info['hz']}.  Client count: #{info['connected_clients']}" }
+        false
+      end
+    end
+
   end
 end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.4.1"
+  VERSION = "3.4.2"
 end

data/lib/sidekiq/web.rb

@@ -11,6 +11,8 @@ module Sidekiq
   class Web < Sinatra::Base
     include Sidekiq::Paginator
 
+    use Rack::Protection, :use => :authenticity_token unless ENV['RACK_ENV'] == 'test'
+
     set :root, File.expand_path(File.dirname(__FILE__) + "/../../web")
     set :public_folder, proc { "#{root}/assets" }
     set :views, proc { "#{root}/views" }
@@ -98,7 +100,7 @@ module Sidekiq
     end
 
     post '/morgue' do
-      halt 404 unless params['key']
+      redirect request.path unless params['key']
 
       params['key'].each do |key|
         job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first

data/lib/sidekiq/web_helpers.rb

@@ -45,7 +45,7 @@ module Sidekiq
     end
 
     def display_custom_head
-      return unless @head_html
+      return unless defined?(@head_html)
       @head_html.map { |block| capture(&block) }.join
     end
 
@@ -169,11 +169,26 @@ module Sidekiq
 
     def display_args(args, truncate_after_chars = 2000)
       args.map do |arg|
-        a = arg.inspect
-        h(truncate(a))
+        h(truncate(to_display(arg)))
       end.join(", ")
     end
 
+    def csrf_tag
+      "<input type='hidden' name='authenticity_token' value='#{session[:csrf]}'/>"
+    end
+
+    def to_display(arg)
+      begin
+        arg.inspect
+      rescue
+        begin
+          arg.to_s
+        rescue => ex
+          "Cannot display argument: [#{ex.class.name}] #{ex.message}"
+        end
+      end
+    end
+
     RETRY_JOB_KEYS = Set.new(%w(
       queue class args retry_count retried_at failed_at
       jid error_message error_class backtrace

data/lib/sidekiq/worker.rb

@@ -24,6 +24,8 @@ module Sidekiq
     attr_accessor :jid
 
     def self.included(base)
+      raise ArgumentError, "You cannot include Sidekiq::Worker in an ActiveJob: #{base.name}" if base.ancestors.any? {|c| c.name == 'ActiveJob::Base' }
+
       base.extend(ClassMethods)
       base.class_attribute :sidekiq_options_hash
       base.class_attribute :sidekiq_retry_in_block

data/sidekiq.gemspec

@@ -4,7 +4,8 @@ require File.expand_path('../lib/sidekiq/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Mike Perham"]
   gem.email         = ["mperham@gmail.com"]
-  gem.description   = gem.summary = "Simple, efficient background processing for Ruby"
+  gem.summary       = "Simple, efficient background processing for Ruby"
+  gem.description   = "Simple, efficient background processing for Ruby."
   gem.homepage      = "http://sidekiq.org"
   gem.license       = "LGPL-3.0"
 
@@ -14,14 +15,13 @@ Gem::Specification.new do |gem|
   gem.name          = "sidekiq"
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::VERSION
-  gem.add_dependency                  'redis', '>= 3.0.6'
-  gem.add_dependency                  'redis-namespace', '>= 1.3.1'
-  gem.add_dependency                  'connection_pool', '>= 2.1.1'
+  gem.add_dependency                  'redis', '~> 3.2', '>= 3.2.1'
+  gem.add_dependency                  'redis-namespace', '~> 1.5', '>= 1.5.2'
+  gem.add_dependency                  'connection_pool', '~> 2.2', '>= 2.2.0'
   gem.add_dependency                  'celluloid', '~> 0.16.0'
-  gem.add_dependency                  'json'
-  gem.add_development_dependency      'sinatra'
-  gem.add_development_dependency      'minitest', '~> 5.3.3'
-  gem.add_development_dependency      'rake'
-  gem.add_development_dependency      'rails', '~> 4.1.1'
-  gem.add_development_dependency      'coveralls'
+  gem.add_dependency                  'json', '~> 1.0'
+  gem.add_development_dependency      'sinatra', '~> 1.4', '>= 1.4.6'
+  gem.add_development_dependency      'minitest', '~> 5.7', '>= 5.7.0'
+  gem.add_development_dependency      'rake', '~> 10.0'
+  gem.add_development_dependency      'rails', '~> 4', '>= 3.2.0'
 end

data/test/helper.rb

@@ -1,18 +1,13 @@
+$CELLULOID_DEBUG = false
 $TESTING = true
-require 'coveralls'
-Coveralls.wear! do
-  add_filter "/test/"
-  add_filter "/myapp/"
-end
-
-ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
-if ENV.has_key?("SIMPLECOV")
+if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start do
     add_filter "/test/"
     add_filter "/myapp/"
   end
 end
+ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
 
 begin
   require 'pry-byebug'
@@ -37,3 +32,17 @@ REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL, :namespace => 'testy'
 Sidekiq.configure_client do |config|
   config.redis = { :url => REDIS_URL, :namespace => 'testy' }
 end
+
+def capture_logging(lvl=Logger::INFO)
+  old = Sidekiq.logger
+  begin
+    out = StringIO.new
+    logger = Logger.new(out)
+    logger.level = lvl
+    Sidekiq.logger = logger
+    yield
+    out.string
+  ensure
+    Sidekiq.logger = old
+  end
+end

data/test/test_api.rb

@@ -4,10 +4,16 @@ class TestApi < Sidekiq::Test
 
   describe "stats" do
     before do
+      @before = DateTime::DATE_FORMATS[:default]
+      DateTime::DATE_FORMATS[:default] = "%d/%m/%Y %H:%M:%S"
       Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 
+    after do
+      DateTime::DATE_FORMATS[:default] = @before
+    end
+
     describe "processed" do
       it "is initially zero" do
         s = Sidekiq::Stats.new

data/test/test_cli.rb

@@ -362,4 +362,28 @@ class TestCli < Sidekiq::Test
     end
   end
 
+  describe 'misc' do
+    it 'handles interrupts' do
+      cli = Sidekiq::CLI.new
+      assert_raises Interrupt do
+        cli.handle_signal('INT')
+      end
+      assert_raises Interrupt do
+        cli.handle_signal('TERM')
+      end
+      cli.handle_signal('USR2')
+      cli.handle_signal('TTIN')
+    end
+
+    it 'can fire events' do
+      count = 0
+      Sidekiq.options[:lifecycle_events][:startup] = [proc {
+        count += 1
+      }]
+      cli = Sidekiq::CLI.new
+      cli.fire_event(:startup)
+      assert_equal 1, count
+    end
+  end
+
 end

data/test/test_rails.rb

@@ -0,0 +1,23 @@
+require_relative 'helper'
+require 'sidekiq'
+require 'sidekiq/web_helpers'
+
+$HAS_AJ = true
+begin
+  require 'active_job'
+rescue LoadError
+  $HAS_AJ = false
+end
+
+class TestRails < Sidekiq::Test
+
+  describe 'ActiveJob' do
+    it 'does not allow Sidekiq::Worker in AJ::Base classes' do
+      ex = assert_raises ArgumentError do
+        c = Class.new(ActiveJob::Base)
+        c.send(:include, Sidekiq::Worker)
+      end
+      assert_includes ex.message, "cannot include"
+    end if $HAS_AJ
+  end
+end

data/test/test_retry.rb

@@ -39,18 +39,35 @@ class TestRetry < Sidekiq::Test
     it 'allows a numeric retry' do
       @redis.expect :zadd, 1, ['retry', String, String]
       msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => 2 }
-      msg2 = msg.dup
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
-        handler.call(worker, msg2, 'default') do
+        handler.call(worker, msg, 'default') do
           raise "kerblammo!"
         end
       end
-      msg2.delete('failed_at')
-      assert_equal({"class"=>"Bob", "args"=>[1, 2, "foo"], "retry"=>2, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "retry_count"=>0}, msg2)
+      msg.delete('failed_at')
+      assert_equal({"class"=>"Bob", "args"=>[1, 2, "foo"], "retry"=>2, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "retry_count"=>0}, msg)
       @redis.verify
     end
 
+    it 'allows 0 retry => no retry and dead queue' do
+      @redis.expect :zadd, 1, ['dead', Float, String]
+      @redis.expect :zremrangebyscore, 0, ['dead', String, Float]
+      @redis.expect :zremrangebyrank, 0, ['dead', Numeric, Numeric]
+      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => 0 }
+      msg2 = msg.dup
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      assert_raises RuntimeError do
+        handler.call(worker, msg, 'default') do
+          raise "kerblammo!"
+        end
+      end
+      msg.delete('failed_at')
+      expected = msg2.merge "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "retry_count"=>0
+      assert_equal expected, msg
+      @redis.verify # not called
+    end
+
     it 'handles zany characters in error message, #1705' do
       skip 'skipped! test requires ruby 2.1+' if RUBY_VERSION <= '2.1.0'
       @redis.expect :zadd, 1, ['retry', String, String]
@@ -354,7 +371,7 @@ class TestRetry < Sidekiq::Test
           rescue ::StandardError => e1
             begin
               raise ::StandardError, 'Error 2'
-            rescue ::StandardError => e2
+            rescue ::StandardError
               raise e1
             end
           end

data/test/test_scheduled.rb

@@ -98,8 +98,8 @@ class TestScheduled < Sidekiq::Test
         i = 500
         intervals = i.times.map{ @poller.send(:random_poll_interval) }
 
-        assert intervals.all?{|i| i >= 5}
-        assert intervals.all?{|i| i <= 15}
+        assert intervals.all?{|x| x >= 5}
+        assert intervals.all?{|x| x <= 15}
         assert_in_delta 10, intervals.reduce(&:+).to_f / i, 0.5
       end
     end

data/test/test_sidekiq.rb

@@ -66,4 +66,22 @@ class TestSidekiq < Sidekiq::Test
       assert_equal 'cat', Sidekiq.default_worker_options['queue']
     end
   end
+
+  describe 'error handling' do
+    it 'deals with user-specified error handlers which raise errors' do
+      output = capture_logging do
+        begin
+          Sidekiq.error_handlers << proc {|x, hash|
+            raise 'boom'
+          }
+          cli = Sidekiq::CLI.new
+          cli.handle_exception(RuntimeError.new("hello"))
+        ensure
+          Sidekiq.error_handlers.pop
+        end
+      end
+      assert_includes output, "boom"
+      assert_includes output, "ERROR"
+    end
+  end
 end

data/test/test_util.rb

@@ -0,0 +1,18 @@
+require_relative 'helper'
+require 'sidekiq'
+require 'sidekiq/web_helpers'
+
+class TestUtil < Sidekiq::Test
+
+  class Helpers
+    include Sidekiq::Util
+  end
+
+  def test_hertz_donut
+    obj = Helpers.new
+    output = capture_logging(Logger::DEBUG) do
+      assert_equal false, obj.want_a_hertz_donut?
+    end
+    assert_includes output, "hz: 10"
+  end
+end

data/test/test_web.rb

@@ -292,7 +292,13 @@ class TestWeb < Sidekiq::Test
 
       get '/queues/default'
       assert_equal 200, last_response.status
-      assert_match /#{msg['args'][2]}/, last_response.body
+      assert_match(/#{msg['args'][2]}/, last_response.body)
+    end
+
+    it 'calls updatePage() once when polling' do
+      get '/busy?poll=true'
+      assert_equal 200, last_response.status
+      assert_equal 1, last_response.body.scan('updatePage(').count
     end
 
     it 'escape job args and error messages' do

data/web/assets/stylesheets/application.css

@@ -759,16 +759,16 @@ div.interval-slider input {
 
 @media (min-width: 992px) {
   .redis-url {
-    max-width: 340px;
+    max-width: 390px;
   }
 
   .redis-namespace {
-    max-width: 350px;
+    max-width: 300px;
   }
 }
 @media (min-width: 1200px) {
   .redis-url {
-    max-width: 540px;
+    max-width: 480px;
   }
 
   .redis-namespace {

data/web/views/_nav.erb

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
       </button>
       <div class="navbar-toggle collapsed navbar-livereload">
-        <%= erb :_poll %>
+        <%= erb :_poll_link %>
         <% if Sidekiq::Web.app_url %>
           <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
         <% end %>
@@ -54,7 +54,7 @@
       <ul class="nav navbar-nav navbar-right navbar-livereload" data-navbar="static">
         <li>
           <div class="poll-wrapper pull-right">
-            <%= erb :_poll %>
+            <%= erb :_poll_link %>
             <% if Sidekiq::Web.app_url %>
               <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
             <% end %>

data/web/views/_poll_js.erb

@@ -0,0 +1,5 @@
+<% if current_path != '' && params[:poll] %>
+  <script>
+    updatePage('<%= root_path + current_path %>')
+  </script>
+<% end %>

data/web/views/{_poll.erb → _poll_link.erb}

@@ -1,8 +1,5 @@
 <% if current_path != '' %>
   <% if params[:poll] %>
-    <script>
-      updatePage('<%= root_path + current_path %>')
-    </script>
     <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>

data/web/views/busy.erb

@@ -4,6 +4,7 @@
   </div>
   <div class="col-sm-4 pull-right">
     <form method="POST" style="margin-top: 20px; margin-bottom: 10px;">
+      <%= csrf_tag %>
       <div class="btn-group pull-right">
         <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('QuietAll') %></button>
         <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('StopAll') %></button>
@@ -40,6 +41,7 @@
         <td>
           <div class="btn-group pull-right">
             <form method="POST">
+              <%= csrf_tag %>
               <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
               <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
               <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>

data/web/views/dead.erb

@@ -27,6 +27,7 @@
 </div>
 
 <form class="form-horizontal" action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

data/web/views/layout.erb

@@ -26,5 +26,6 @@
       </div>
     </div>
     <%=  erb :_footer %>
+    <%= erb :_poll_js %>
   </body>
 </html>

data/web/views/morgue.erb

@@ -12,6 +12,7 @@
 
 <% if @dead.size > 0 %>
   <form action="<%= root_path %>morgue" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>
@@ -57,9 +58,11 @@
   </form>
 
   <form action="<%= root_path %>morgue/all/delete" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
   <form action="<%= root_path %>morgue/all/retry" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 

data/web/views/queue.erb

@@ -33,6 +33,7 @@
         </td>
         <td>
           <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
+            <%= csrf_tag %>
             <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>

data/web/views/queues.erb

@@ -18,6 +18,7 @@
         <td><%= number_with_delimiter(queue.size) %> </td>
         <td width="20%">
           <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
+            <%= csrf_tag %>
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
           </form>
         </td>

data/web/views/retries.erb

@@ -12,6 +12,7 @@
 
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>
@@ -60,9 +61,11 @@
   </form>
 
   <form action="<%= root_path %>retries/all/delete" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
   <form action="<%= root_path %>retries/all/retry" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 

data/web/views/retry.erb

@@ -27,6 +27,7 @@
 </div>
 
 <form class="form-horizontal" action="<%= root_path %>retries/<%= job_params(@retry, @retry.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>retries"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

data/web/views/scheduled.erb

@@ -13,6 +13,7 @@
 <% if @scheduled.size > 0 %>
 
   <form action="<%= root_path %>scheduled" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>

data/web/views/scheduled_job_info.erb

@@ -1,6 +1,7 @@
 <%= erb :_job_info, :locals => {:job => @job, :type => :scheduled} %>
 
 <form class="form-horizontal" action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>scheduled"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

metadata

@@ -1,57 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -70,87 +88,91 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.3.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.7.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Simple, efficient background processing for Ruby
+        version: 3.2.0
+description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
 executables:
@@ -225,6 +247,7 @@ files:
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduled.rb
@@ -233,9 +256,9 @@ files:
 - test/test_testing.rb
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-- test/test_worker_generator.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
 - web/assets/images/logo.png
@@ -316,7 +339,8 @@ files:
 - web/views/_job_info.erb
 - web/views/_nav.erb
 - web/views/_paging.erb
-- web/views/_poll.erb
+- web/views/_poll_js.erb
+- web/views/_poll_link.erb
 - web/views/_status.erb
 - web/views/_summary.erb
 - web/views/busy.erb
@@ -370,6 +394,7 @@ test_files:
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduled.rb
@@ -378,6 +403,6 @@ test_files:
 - test/test_testing.rb
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-- test/test_worker_generator.rb

data/test/test_worker_generator.rb

@@ -1,17 +0,0 @@
-require_relative 'helper'
-require 'rails/generators/test_case'
-require 'generators/sidekiq/worker_generator'
-
-class WorkerGeneratorTest < Rails::Generators::TestCase
-  tests Sidekiq::Generators::WorkerGenerator
-  arguments %w(foo)
-  destination File.expand_path("../tmp", File.dirname(__FILE__))
-  setup :prepare_destination
-
-  test "worker is created and its test" do
-    run_generator
-
-    assert_file "app/workers/foo_worker.rb"
-    assert_file "test/workers/foo_worker_test.rb"
-  end
-end