Version bump 1.1

.ruby-gemset

@@ -0,0 +1 @@
+sidekiq_status

.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.4

.travis.yml

@@ -1,24 +1,24 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-#  - jruby-19mode # JRuby in 1.9 mode
-#  - rbx-19mode
+  - 2.1.4
+  - 2.2.4
+  - 2.3.0
 env:
   global:
     - SHOW_SIDEKIQ=true
   matrix:
-    - SIDEKIQ_VERSION="~>2.4.0"
-    - SIDEKIQ_VERSION="~>2.6.5"
-    - SIDEKIQ_VERSION="~>2.8.0"
-    - SIDEKIQ_VERSION="~>2.10.0"
-    - SIDEKIQ_VERSION="~>2.12.0"
-    - SIDEKIQ_VERSION="~>2.14.0"
-    - SIDEKIQ_VERSION="~>2.15.0"
-    - SIDEKIQ_VERSION="~>2.16.0"
-    - SIDEKIQ_VERSION="~>2.17.7"
+    - SIDEKIQ_VERSION="~>4.1.0"
+    - SIDEKIQ_VERSION="~>4.0.2"
+    - SIDEKIQ_VERSION="~>3.5.4"
+    - SIDEKIQ_VERSION="~>3.4.2"
+    - SIDEKIQ_VERSION="~>3.3.4"
+
+before_install:
+  - gem update --system
+  - gem update bundler
+  - gem --version
+  - bundle --version
+
 script: bundle exec rake
 services:
   - redis-server

README.md

@@ -147,6 +147,13 @@ and clean status containers.
 
 ## Changelog
 
+### 1.1.0
+
+  * Support for sidekiq 4.1, 4.0, 3.5, 3.4
+  * Dropped support for sidekiq versions older than 3.3
+  * Dropped support for ruby 1.9.x, 2.0.x
+
+
 ### 1.0.7
 
    * Sidekiq 2.16 support

lib/sidekiq_status/client_middleware.rb

@@ -2,7 +2,7 @@
 
 module SidekiqStatus
   class ClientMiddleware
-    def call(worker, item, queue)
+    def call(worker, item, queue, redis_pool = nil)
       worker = worker.constantize if worker.is_a?(String)
       return yield unless worker < SidekiqStatus::Worker
 

lib/sidekiq_status/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module SidekiqStatus
   # SidekiqStatus version
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

sidekiq_status.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SidekiqStatus::VERSION
 
-  gem.add_runtime_dependency("sidekiq", ">= 2.4", "< 3.0")
+  gem.add_runtime_dependency("sidekiq", ">= 3.3", "< 4.2")
 
   gem.add_development_dependency("activesupport")
-  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rspec", '>= 3.4.0')
+  gem.add_development_dependency("rspec-its")
   gem.add_development_dependency("simplecov")
   gem.add_development_dependency("rake")
   gem.add_development_dependency("timecop")

spec/container_spec.rb

@@ -102,7 +102,7 @@ def test_container(container, hash, jid = nil)
     test_container(container, described_class::DEFAULTS.reject{|k, v| k == 'args' }, jid)
 
     Sidekiq.redis do |conn|
-      conn.exists(status_key).should be_true
+      conn.exists(status_key).should be true
     end
   end
 
@@ -112,7 +112,7 @@ def test_container(container, hash, jid = nil)
     end
 
     it "loads a container from the redis key" do
-      json = MultiJson.dump(sample_json_hash)
+      json = Sidekiq.dump_json(sample_json_hash)
       Sidekiq.redis { |conn| conn.set(status_key, json) }
 
       container = described_class.load(jid)
@@ -128,7 +128,7 @@ def test_container(container, hash, jid = nil)
         )
       end
 
-      json = MultiJson.dump(sample_json_hash)
+      json = Sidekiq.dump_json(sample_json_hash)
       Sidekiq.redis { |conn| conn.set(status_key, json) }
       described_class.load(jid)
 
@@ -151,7 +151,7 @@ def test_container(container, hash, jid = nil)
     described_class.new(jid, hash).save
 
     result = Sidekiq.redis{ |conn| conn.get(status_key) }
-    result = MultiJson.load(result)
+    result = Sidekiq.load_json(result)
 
     result.should == hash.merge('last_updated_at' => Time.now.to_i)
 
@@ -168,14 +168,14 @@ def test_container(container, hash, jid = nil)
     container.delete
 
     Sidekiq.redis do |conn|
-      conn.exists(status_key).should be_false
+      conn.exists(status_key).should be false
       conn.zscore(described_class.kill_key, jid).should be_nil
     end
   end
 
   specify "#request_kill, #should_kill?, #killable?" do
     container = described_class.new(jid)
-    container.kill_requested?.should be_false
+    container.kill_requested?.should be_falsey
     container.should be_killable
 
     Sidekiq.redis do |conn|
@@ -302,10 +302,10 @@ def test_container(container, hash, jid = nil)
       context "status is #{status_name1}" do
         subject{ described_class.create().tap{|c| c.status = status_name1} }
 
-        its("#{status_name1}?") { should be_true }
+        its("#{status_name1}?") { should be true }
 
         (described_class::STATUS_NAMES - [status_name1]).each do |status_name2|
-          its("#{status_name2}?") { should be_false }
+          its("#{status_name2}?") { should be false }
         end
       end
     end

spec/spec_helper.rb

@@ -13,6 +13,7 @@
 require 'coveralls'
 Coveralls.wear!
 
+require 'rspec/its'
 require 'sidekiq_status'
 require 'sidekiq/util'
 

spec/worker_spec.rb

@@ -44,7 +44,7 @@ def some_method(*args); end
       jid = SomeWorker.perform_async(*args)
       worker.perform(jid)
 
-      has_been_run.should be_true
+      has_been_run.should be true
       worker.status_container.reload.status.should == 'complete'
     end