sidekiq-unique-jobs 2.7.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b39f24bdf9c726995309be6197b768d386f10f7
-  data.tar.gz: eff0e7d8830cb959a212c1ddb6305eb83a4ecaba
+  metadata.gz: 7f966944556a4eade8e0cd88092db81ce2aaf79f
+  data.tar.gz: 73ceb2cff924bedb9eb7aa20d50b594cabd582c1
 SHA512:
-  metadata.gz: a4b47722b22edfb2157dfd13b49b212cf64e860f0c6ee4fee26045ed854a00511c98a8b89a729e6c0329d3033c603b7bb3e7e24b1b3cfe50cf21c13510de2d78
-  data.tar.gz: 79c75c467a0ed416b3a5db44d5f1f119df472e1d5ad4aab4fddcf12ee300a6c90f9585b176c4caed2418b74e270993ff912b17d5af772a269d9f34922906a06d
+  metadata.gz: 0646749915775d78d40a01667f37642a0dcb6f9748cad2700b7e7957f39735631643b76024ef505363a433c1da305c157218a9bea80c6292344cbcebc9078a8a
+  data.tar.gz: 23ce922714c75e7c33caf45983bca4a103b75514cf78e90137c937dfbb894456391009ed3dd1911283a3728f85f86d58b2e4f282e82f675b6c32678a5b3a9522

data/.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:

data/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

data/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'

data/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 => "../"

data/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 => "../"

data/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 => "../"

data/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 => "../"

data/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 => "../"

data/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 @@ module SidekiqUniqueJobs
           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

data/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 @@ module SidekiqUniqueJobs
         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

data/lib/sidekiq-unique-jobs/version.rb

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

data/sidekiq-unique-jobs.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Mikael Henriksson"]
   gem.email         = ["mikael@zoolutions.se"]
   gem.description   = gem.summary = "The unique jobs that were removed from sidekiq"
-  gem.homepage      = "http://mperham.github.com/sidekiq"
+  gem.homepage      = "https://github.com/mhenrixon/sidekiq-unique-jobs"
   gem.license       = "LGPL-3.0"
 
   # gem.executables   = ['']
@@ -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
+end

data/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'
 

data/spec/spec_helper.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -127,6 +127,7 @@ files:
 - gemfiles/sidekiq_2.15.gemfile
 - gemfiles/sidekiq_2.16.gemfile
 - gemfiles/sidekiq_2.17.gemfile
+- gemfiles/sidekiq_3.0.gemfile
 - gemfiles/sidekiq_develop.gemfile
 - lib/sidekiq-unique-jobs.rb
 - lib/sidekiq-unique-jobs/config.rb
@@ -145,7 +146,7 @@ files:
 - spec/support/my_worker.rb
 - spec/support/sidekiq_meta.rb
 - spec/support/unique_worker.rb
-homepage: http://mperham.github.com/sidekiq
+homepage: https://github.com/mhenrixon/sidekiq-unique-jobs
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The unique jobs that were removed from sidekiq