Add sidekiq 3 compatibility

Close #34
Close #35

.travis.yml

@@ -11,6 +11,7 @@ gemfile:
   - gemfiles/sidekiq_2.15.gemfile
   - gemfiles/sidekiq_2.16.gemfile
   - gemfiles/sidekiq_2.17.gemfile
+  - gemfiles/sidekiq_3.0.gemfile
   - gemfiles/sidekiq_develop.gemfile
 branches:
   only:

Appraisals

@@ -12,4 +12,8 @@ end
 
 appraise "sidekiq-2.15" do
   gem "sidekiq", '2.15'
+end
+
+appraise "sidekiq-3.0" do
+  gem "sidekiq", '3.0'
 end

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 gemspec
 
-gem 'appraisal', '~> 1.0.0.beta'
+gem 'appraisal', '~> 1.0.0'
 gem 'pry'
 gem 'pry-stack_explorer'
 gem 'pry-debugger'

gemfiles/sidekiq_2.15.gemfile

@@ -2,10 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "appraisal", "~> 1.0.0.beta"
+gem "appraisal", "~> 1.0.0"
 gem "pry"
 gem "pry-stack_explorer"
 gem "pry-debugger"
 gem "sidekiq", "2.15"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/sidekiq_2.16.gemfile

@@ -2,10 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "appraisal", "~> 1.0.0.beta"
+gem "appraisal", "~> 1.0.0"
 gem "pry"
 gem "pry-stack_explorer"
 gem "pry-debugger"
 gem "sidekiq", "2.16"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/sidekiq_2.17.gemfile

@@ -2,10 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "appraisal", "~> 1.0.0.beta"
+gem "appraisal", "~> 1.0.0"
 gem "pry"
 gem "pry-stack_explorer"
 gem "pry-debugger"
 gem "sidekiq", "2.17"
 
-gemspec :path=>".././"
+gemspec :path => "../"

gemfiles/sidekiq_3.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 1.0.0"
+gem "pry"
+gem "pry-stack_explorer"
+gem "pry-debugger"
+gem "sidekiq", "3.0"
+
+gemspec :path => "../"

gemfiles/sidekiq_develop.gemfile

@@ -2,10 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "appraisal", "~> 1.0.0.beta"
+gem "appraisal", "~> 1.0.0"
 gem "pry"
 gem "pry-stack_explorer"
 gem "pry-debugger"
-gem "sidekiq", :github=>"mperham/sidekiq"
+gem "sidekiq", :github => "mperham/sidekiq"
 
-gemspec :path=>".././"
+gemspec :path => "../"

lib/sidekiq-unique-jobs/middleware/client/unique_jobs.rb

@@ -4,9 +4,10 @@ module SidekiqUniqueJobs
   module Middleware
     module Client
       class UniqueJobs
-        attr_reader :item, :worker_class
+        attr_reader :item, :worker_class, :redis_pool
 
-        def call(worker_class, item, queue)
+        def call(worker_class, item, queue, redis_pool = nil)
+          @redis_pool = redis_pool
           @worker_class = worker_class_constantize(worker_class)
           @item = item
 
@@ -21,8 +22,14 @@ def unique?
           if testing_enabled?
             unique_for_connection?(SidekiqUniqueJobs.redis_mock)
           else
-            Sidekiq.redis do |conn|
-              unique_for_connection?(conn)
+            if redis_pool
+              redis_pool.with do |conn|
+                unique_for_connection?(conn)
+              end
+            else
+              Sidekiq.redis do |conn|
+                unique_for_connection?(conn)
+              end
             end
           end
         end

lib/sidekiq-unique-jobs/middleware/server/unique_jobs.rb

@@ -4,9 +4,11 @@ module SidekiqUniqueJobs
   module Middleware
     module Server
       class UniqueJobs
-        attr_reader :unlock_order
+        attr_reader :unlock_order, :redis_pool
+
+        def call(worker, item, queue, redis_pool = nil)
+          @redis_pool = redis_pool
 
-        def call(worker, item, queue)
           set_unlock_order(worker.class)
           lock_key = payload_hash(item)
           unlocked = before_yield? ? unlock(lock_key).inspect : 0
@@ -50,7 +52,11 @@ def payload_hash(item)
         end
 
         def unlock(payload_hash)
-          Sidekiq.redis {|conn| conn.del(payload_hash) }
+          if redis_pool
+            redis_pool.with { |conn| conn.del(payload_hash) }
+          else
+            Sidekiq.redis { |conn| conn.del(payload_hash) }
+          end
         end
 
         def logger

lib/sidekiq-unique-jobs/version.rb

@@ -1,3 +1,3 @@
 module SidekiqUniqueJobs
-  VERSION = "2.7.1"
+  VERSION = "3.0.0"
 end

sidekiq-unique-jobs.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |gem|
   gem.name          = "sidekiq-unique-jobs"
   gem.require_paths = ["lib"]
   gem.version       = SidekiqUniqueJobs::VERSION
-  gem.add_dependency             'sidekiq', '~> 2.6'
+  gem.add_dependency             'sidekiq', '>= 2.6'
   gem.add_dependency             'mock_redis'
   gem.add_development_dependency 'rspec', '~> 3.0.0.beta'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec-sidekiq'
-  gem.add_development_dependency 'activesupport', '~> 3'
+  gem.add_development_dependency 'activesupport', '>= 3'
   gem.add_development_dependency 'simplecov'
 end

spec/lib/unlock_order_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'sidekiq/api'
 require 'sidekiq/worker'
 require 'sidekiq-unique-jobs/middleware/server/unique_jobs'
 

spec/spec_helper.rb

@@ -5,7 +5,6 @@
 rescue LoadError
 end
 
-require 'rspec/autorun'
 require 'rspec'
 
 require 'celluloid/test'