sidekiq-middleware 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b188c23f68544df2038746bd369ba9d4ab965b3f
-  data.tar.gz: 4c3b61f360e917fd733b247d6aa60349a11b2270
+  metadata.gz: 609eb41397719043e799e6d311934fd35d16e858
+  data.tar.gz: 9cda80867210d8a012225fb75481354d6f2242b4
 SHA512:
-  metadata.gz: aca4da5872a73e6da626ff87cccc48653238dae8aa88580837e16605d1d23e8dda8980177f24832af564cb472d21f56b4801fdbe3eca684f389ac4adde9ba30c
-  data.tar.gz: a3eaa745e7d6cfca147602a7845994e3f53f6660b2e7b9a8cf86fd3a31ebdcc14857d49712e2224ac9e8cbc3a21a7cc380854d13d818fb8f9ccbee9ed7cb2d2f
+  metadata.gz: 203ae14906166bbf98c759bb9d6b6ae2308c152009ffefd470d81f69dff88809ff97d5666ea29cc1b7e80155d6e7e5acf6bd4316f69d4e9a881bb47ca6b07e59
+  data.tar.gz: b9c90463c8f03574784263b41daf28b2d18ba8d3aca3b24364fb6a918890327bf98b5f40b130939e4f8a53f51767fb1a9c059dc7c8a6ec1f2f44e893faee1dc4

data/CHANGES.md

@@ -1,7 +1,12 @@
+0.2.1
+-----------
+
+- Make middleware work properly even for ```Sidekiq::Extensions``` workers ([dimko](https://github.com/dimko))
+
 0.2.0
 -----------
 
-- Fix scheduled jobs locking when ```unique``` is not set to ```:all``` ([dimko](https://github.com/dimko))
+- Fix redundant scheduled jobs locking when ```unique``` is not set to ```:all``` ([dimko](https://github.com/dimko))
 
 0.1.4
 -----------

data/lib/sidekiq-middleware.rb

@@ -1,7 +1,7 @@
 require 'digest/md5'
 require 'sidekiq-middleware/version'
 require 'sidekiq-middleware/core_ext'
-require 'sidekiq-middleware/worker'
+require 'sidekiq-middleware/helpers'
 require 'sidekiq-middleware/server/unique_jobs'
 require 'sidekiq-middleware/client/unique_jobs'
 require 'sidekiq-middleware/middleware'

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

@@ -4,10 +4,10 @@ module Sidekiq
       class UniqueJobs
         def call(worker_class, item, queue)
           worker_class = worker_class.constantize if worker_class.is_a?(String)
-          enabled = worker_class.unique_enabled?(item)
+          enabled = Sidekiq::Middleware::Helpers.unique_enabled?(worker_class, item)
 
           if enabled
-            expiration = worker_class.unique_exiration
+            expiration = Sidekiq::Middleware::Helpers.unique_exiration(worker_class)
             job_id = item['jid']
             unique = false
 
@@ -18,7 +18,7 @@ module Sidekiq
               expiration += (item['at'].to_i - Time.now.to_i)
             end
 
-            unique_key = worker_class.unique_digest(item)
+            unique_key = Sidekiq::Middleware::Helpers.unique_digest(worker_class, item)
 
             Sidekiq.redis do |conn|
               conn.watch(unique_key)

data/lib/sidekiq-middleware/{worker.rb → helpers.rb}

@@ -1,12 +1,14 @@
 module Sidekiq
   module Middleware
-    module Worker
+    module Helpers
+      extend self
+
       UNIQUE_EXPIRATION = 30 * 60 # 30 minutes
 
-      def unique_digest(item)
-        if respond_to?(:lock)
+      def unique_digest(klass, item)
+        if klass.respond_to?(:lock)
           args = item['args']
-          lock(*args)
+          klass.lock(*args)
         else
           dumped = Sidekiq.dump_json(item.slice('class', 'queue', 'args'))
           digest = Digest::MD5.hexdigest(dumped)
@@ -15,25 +17,21 @@ module Sidekiq
         end
       end
 
-      def unique_exiration
-        get_sidekiq_options['expiration'] || UNIQUE_EXPIRATION
+      def unique_exiration(klass)
+        klass.get_sidekiq_options['expiration'] || UNIQUE_EXPIRATION
       end
 
-      def unique_enabled?(item)
-        enabled = get_sidekiq_options['unique']
+      def unique_enabled?(klass, item)
+        enabled = klass.get_sidekiq_options['unique']
         if item.has_key?('at') && enabled != :all
           enabled = false
         end
         enabled
       end
 
-      def unique_manual?
-        get_sidekiq_options['manual']
+      def unique_manual?(klass)
+        klass.get_sidekiq_options['manual']
       end
     end
   end
 end
-
-Sidekiq::Worker::ClassMethods.class_eval do
-  include Sidekiq::Middleware::Worker
-end

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

@@ -4,13 +4,13 @@ module Sidekiq
       class UniqueJobs
         def call(worker_instance, item, queue)
           worker_class = worker_instance.class
-          enabled = worker_class.unique_enabled?(item)
+          enabled = Sidekiq::Middleware::Helpers.unique_enabled?(worker_class, item)
 
           if enabled
             begin
               yield
             ensure
-              unless worker_class.unique_manual?
+              unless Sidekiq::Middleware::Helpers.unique_manual?(worker_class)
                 clear(worker_class, item)
               end
             end
@@ -21,7 +21,7 @@ module Sidekiq
 
         def clear(worker_class, item)
           Sidekiq.redis do |conn|
-            conn.del worker_class.unique_digest(item)
+            conn.del Sidekiq::Middleware::Helpers.unique_digest(worker_class, item)
           end
         end
       end

data/lib/sidekiq-middleware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-middleware
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dmitry Krasnoukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -103,10 +103,10 @@ files:
 - lib/sidekiq-middleware.rb
 - lib/sidekiq-middleware/client/unique_jobs.rb
 - lib/sidekiq-middleware/core_ext.rb
+- lib/sidekiq-middleware/helpers.rb
 - lib/sidekiq-middleware/middleware.rb
 - lib/sidekiq-middleware/server/unique_jobs.rb
 - lib/sidekiq-middleware/version.rb
-- lib/sidekiq-middleware/worker.rb
 - sidekiq-middleware.gemspec
 - test/helper.rb
 - test/test_core_ext.rb