sidekiq-unique-jobs 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce50cc9a0255008a8e2fb460ba0c19bc23c835bf
-  data.tar.gz: 282838bd96a4016fcc9358ea2b003d7d59b4e229
+  metadata.gz: 7238f6463cf70d3aa15dfa9f13222bfd095be565
+  data.tar.gz: 296c50852200e0fe7f17bef756aa4ed339764c9a
 SHA512:
-  metadata.gz: 9aa9bd40afaac4d11d4fa88965b3e2d332ba322e694a950787c11ff7b37059e830350ec49b76e21e1ef9dbac9c3834fb774af29ac4cb1b3165546cd1d551b8fd
-  data.tar.gz: 7af6f0c5d504eb8883a73be064fdc780690e8f4cdbf85f0b335363461a56af4ec7df405d8c8d28f9a350d848b4d20bff1fceae6e4288a40b07134c2ca4514ad0
+  metadata.gz: f3b1d70cb51300b90ed59fc873af2a1722b1775aaea2b077ae9df7b606ebee594bbd8b6ef75611b0ad90ecf7bad7968dd7e05fbbf3c32ffc8bdaac707451f403
+  data.tar.gz: a1ab235a39e48aae97df51df2f912b832008ace438903eca2f386221c7c32d02a361af2f8eadf33aa4bd5702db1d6a094e7c522e1a00d864c5c334302b2344af

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v5.0.9
+- [#229](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/#229) Use HSCAN for expiring keys
+- [#232](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/#232) Fix testing helper
+
+## v5.0.8
+- Fixes [#220](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/220)
+
 ## v5.0.7
 - Fixes [#218](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/218)
 

data/README.md

@@ -161,8 +161,8 @@ class UniqueJobWithFilterMethod
   sidekiq_options unique: :until_and_while_executing,
                   unique_args: :unique_args
 
-  def self.unique_args(name, id, options)
-    [ name, options[:type] ]
+  def self.unique_args(args)
+    [ args[0], args[2][:type] ]
   end
 
   ...

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # frozen_string_literal: true
 
 require 'rubygems'

data/lib/sidekiq-unique-jobs.rb

@@ -58,7 +58,7 @@ module SidekiqUniqueJobs
   # failing back to the original argument.
   def worker_class_constantize(worker_class)
     return worker_class unless worker_class.is_a?(String)
-    worker_class.constantize
+    Object.const_get(worker_class)
   rescue NameError
     worker_class
   end

data/lib/sidekiq_unique_jobs/core_ext.rb

@@ -12,6 +12,22 @@ rescue LoadError
       end
     end
 
+    unless {}.respond_to?(:stringify_keys)
+      def stringify_keys
+        transform_keys(&:to_s)
+      end
+    end
+
+    unless {}.respond_to?(:transform_keys)
+      def transform_keys
+        result = {}
+        each_key do |key|
+          result[yield(key)] = self[key]
+        end
+        result
+      end
+    end
+
     unless {}.respond_to?(:slice!)
       def slice!(*keys)
         keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)

data/lib/sidekiq_unique_jobs/options_with_fallback.rb

@@ -3,8 +3,7 @@
 module SidekiqUniqueJobs
   module OptionsWithFallback
     def self.included(base)
-      base.class_attribute :lock_cache unless base.respond_to?(:lock_cache)
-      base.lock_cache ||= {}
+      base.send(:extend, SidekiqUniqueJobs::OptionsWithFallback::ClassMethods)
     end
 
     def unique_enabled?
@@ -24,7 +23,7 @@ module SidekiqUniqueJobs
     end
 
     def lock_class
-      lock_cache[unique_lock.to_sym] ||= "SidekiqUniqueJobs::Lock::#{unique_lock.to_s.classify}".constantize
+      lock_cache[unique_lock.to_sym] ||= Object.const_get("SidekiqUniqueJobs::Lock::#{unique_lock.to_s.classify}")
     end
 
     def unique_lock
@@ -47,11 +46,29 @@ module SidekiqUniqueJobs
       hash[key]
     end
 
+    def lock_cache
+      self.class.lock_cache
+    end
+
+    def lock_cache=(obj)
+      self.class.lock_cache = obj
+    end
+
     def options
       @options ||= worker_class.get_sidekiq_options if worker_class.respond_to?(:get_sidekiq_options)
       @options ||= Sidekiq.default_worker_options
       @options ||= {}
       @options &&= @options.stringify_keys
     end
+
+    module ClassMethods
+      def lock_cache
+        @lock_cache ||= {}
+      end
+
+      def lock_cache=(obj)
+        @lock_cache = obj
+      end
+    end
   end
 end

data/lib/sidekiq_unique_jobs/script_mock.rb

@@ -22,9 +22,10 @@ module SidekiqUniqueJobs
         stored_jid = conn.get(unique_key)
 
         return (stored_jid == job_id) ? 1 : 0 if stored_jid
-
         return 0 unless conn.set(unique_key, job_id, nx: true, ex: expires)
+
         conn.hsetnx(SidekiqUniqueJobs::HASH_KEY, job_id, unique_key)
+
         return 1
       end
     end
@@ -40,6 +41,7 @@ module SidekiqUniqueJobs
 
         conn.del(unique_key)
         conn.hdel(SidekiqUniqueJobs::HASH_KEY, job_id)
+
         return 1
       end
     end

data/lib/sidekiq_unique_jobs/testing.rb

@@ -46,8 +46,8 @@ module SidekiqUniqueJobs
         worker_class = SidekiqUniqueJobs.worker_class_constantize(worker_class)
 
         if Sidekiq::Testing.inline?
-          _server.call(worker_class.new, item, queue, redis_pool) do
-            call_real(worker_class, item, queue, redis_pool) do
+          call_real(worker_class, item, queue, redis_pool) do
+            _server.call(worker_class.new, item, queue, redis_pool) do
               yield
             end
           end

data/lib/sidekiq_unique_jobs/util.rb

@@ -6,6 +6,7 @@ module SidekiqUniqueJobs
     DEFAULT_COUNT ||= 1_000
     KEYS_METHOD ||= 'keys'
     SCAN_METHOD ||= 'scan'
+    EXPIRE_BATCH_SIZE ||= 100
 
     module_function
 
@@ -43,11 +44,16 @@ module SidekiqUniqueJobs
     def expire
       removed_keys = {}
       connection do |conn|
-        conn.hgetall(SidekiqUniqueJobs::HASH_KEY).each do |jid, unique_key|
+        cursor = '0'
+        cursor, jobs = conn.hscan(SidekiqUniqueJobs::HASH_KEY, [cursor, 'MATCH', '*', 'COUNT', EXPIRE_BATCH_SIZE])
+        jobs.each do |job_array|
+          jid, unique_key = job_array
           next if conn.get(unique_key)
           conn.hdel(SidekiqUniqueJobs::HASH_KEY, jid)
           removed_keys[jid] = unique_key
         end
+
+        break if cursor == '0'
       end
       removed_keys
     end

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '5.0.8'
+  VERSION = '5.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Uniqueness for Sidekiq Jobs