sidekiq-middleware 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 609eb41397719043e799e6d311934fd35d16e858
-  data.tar.gz: 9cda80867210d8a012225fb75481354d6f2242b4
+  metadata.gz: e8bb4d8b8fa9b2c5fd7d043b86e1c4f10ea235de
+  data.tar.gz: f401129a7df9563cdbb542123009715b5c531ef3
 SHA512:
-  metadata.gz: 203ae14906166bbf98c759bb9d6b6ae2308c152009ffefd470d81f69dff88809ff97d5666ea29cc1b7e80155d6e7e5acf6bd4316f69d4e9a881bb47ca6b07e59
-  data.tar.gz: b9c90463c8f03574784263b41daf28b2d18ba8d3aca3b24364fb6a918890327bf98b5f40b130939e4f8a53f51767fb1a9c059dc7c8a6ec1f2f44e893faee1dc4
+  metadata.gz: bb6d7bbe8e8f11f962ff5520ddf46bc0c4f9553ad557b8e3116236b82c2c51c065e05c762a025b7e9c1a33e1b7725ac13606130befdd3b6e60e0319322f7099c
+  data.tar.gz: 53810297993f7ebbc77dcb661af8a0b4b68a2078a8e321dc8d1bf023edd59f9e4956d4a3950134865a657156604b4380c973a6ca7d018933ec8a3ef3e37e2219

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 branches:
   only:
     - master

data/lib/sidekiq-middleware/client/unique_jobs.rb

@@ -2,14 +2,13 @@ module Sidekiq
   module Middleware
     module Client
       class UniqueJobs
-        def call(worker_class, item, queue)
+        def call(worker_class, item, queue, redis_pool = nil)
           worker_class = worker_class.constantize if worker_class.is_a?(String)
           enabled = Sidekiq::Middleware::Helpers.unique_enabled?(worker_class, item)
 
           if enabled
             expiration = Sidekiq::Middleware::Helpers.unique_exiration(worker_class)
             job_id = item['jid']
-            unique = false
 
             # Scheduled
             if item.has_key?('at')
@@ -20,17 +19,11 @@ module Sidekiq
 
             unique_key = Sidekiq::Middleware::Helpers.unique_digest(worker_class, item)
 
-            Sidekiq.redis do |conn|
-              conn.watch(unique_key)
-
-              locked_job_id = conn.get(unique_key)
-              if locked_job_id && locked_job_id != job_id
-                conn.unwatch
-              else
-                unique = conn.multi do
-                  conn.setex(unique_key, expiration, job_id)
-                end
-              end
+            # Sidekiq >= 3.0
+            unique = if redis_pool
+              redis_pool.with { |conn| status(conn, unique_key, expiration, job_id) }
+            else
+              Sidekiq.redis { |conn| status(conn, unique_key, expiration, job_id) }
             end
 
             yield if unique
@@ -38,6 +31,22 @@ module Sidekiq
             yield
           end
         end
+
+        def status(conn, unique_key, expiration, job_id)
+          unique = false
+          conn.watch(unique_key)
+
+          locked_job_id = conn.get(unique_key)
+          if locked_job_id && locked_job_id != job_id
+            conn.unwatch
+          else
+            unique = conn.multi do
+              conn.setex(unique_key, expiration, job_id)
+            end
+          end
+
+          unique
+        end
       end
     end
   end

data/lib/sidekiq-middleware/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Middleware
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/sidekiq-middleware.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::Middleware::VERSION
 
-  gem.add_dependency                  'sidekiq',  '>= 2.12.4', '< 3'
+  gem.add_dependency                  'sidekiq',  '>= 2.12.4'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'bundler',  '~> 1.0'
   gem.add_development_dependency      'minitest', '~> 3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-middleware
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Additional sidekiq middleware