sidekiq-unique-jobs 5.0.9 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7238f6463cf70d3aa15dfa9f13222bfd095be565
-  data.tar.gz: 296c50852200e0fe7f17bef756aa4ed339764c9a
+  metadata.gz: 53332a20911a2add535139974709245c03425d86
+  data.tar.gz: f9b4bd20a09320b593f5e6d30ad7c10b1e8868de
 SHA512:
-  metadata.gz: f3b1d70cb51300b90ed59fc873af2a1722b1775aaea2b077ae9df7b606ebee594bbd8b6ef75611b0ad90ecf7bad7968dd7e05fbbf3c32ffc8bdaac707451f403
-  data.tar.gz: a1ab235a39e48aae97df51df2f912b832008ace438903eca2f386221c7c32d02a361af2f8eadf33aa4bd5702db1d6a094e7c522e1a00d864c5c334302b2344af
+  metadata.gz: b2164f8cd400bb144f5f6fd562177703ef935d55b9310d38dd94a29fd4e514748fdb50e57a5d690f2803c7a58392c534bf5900277af675764242435e53453e82
+  data.tar.gz: 71368b0d324404d60a1ebfc217dc417e7a70e233da312005184030089361c8f9755032f42f256bde1e31c4d6f5a1ec3873e4120af961cb0da1179bf81bc3a882

data/.travis.yml

@@ -8,7 +8,7 @@ cache: bundler
 services:
   - redis-server
 script:
-  - if [[ "${STYLE}" = "true" ]]; then bundle exec rubocop; fi;
+  - if [[ "${STYLE}" = "true" ]]; then bundle exec rubocop - P; fi;
   - bundle exec rspec spec
   - if [[ "${STYLE}" = "true" ]]; then CODECLIMATE_REPO_TOKEN=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5 bundle exec codeclimate-test-reporter; fi;
 rvm:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v5.0.10
+
+- Cleans up test setup and make tests more readable
+- Allow raising all errors 
+- Log previously hidden errors
+- Revert the changes of v5.0.5 (8a4b7648b8b0ee5d7dc1f5f5a036f41d52ad9a42)
+- Allow name errors in unique args method to be raised
+
 ## 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

data/lib/sidekiq-unique-jobs.rb

@@ -29,6 +29,7 @@ module SidekiqUniqueJobs
       default_run_lock_expiration: 60,
       default_lock: :while_executing,
       redis_test_mode: :redis, # :mock
+      raise_unique_args_errors: false,
     )
   end
 
@@ -55,12 +56,19 @@ module SidekiqUniqueJobs
   end
 
   # Attempt to constantize a string worker_class argument, always
-  # failing back to the original argument.
+  # failing back to the original argument when the constant can't be found
+  #
+  # raises an error for other errors
   def worker_class_constantize(worker_class)
     return worker_class unless worker_class.is_a?(String)
     Object.const_get(worker_class)
-  rescue NameError
-    worker_class
+  rescue NameError => ex
+    case ex.message
+    when /uninitialized constant/
+      worker_class
+    else
+      raise
+    end
   end
 
   def mocked?

data/lib/sidekiq_unique_jobs/cli.rb

@@ -44,18 +44,18 @@ module SidekiqUniqueJobs
       console_class.start
     end
 
-    private
-
-    def logger
-      SidekiqUniqueJobs.logger
-    end
-
-    def console_class
-      require 'pry'
-      Pry
-    rescue LoadError
-      require 'irb'
-      IRB
+    no_commands do
+      def logger
+        SidekiqUniqueJobs.logger
+      end
+
+      def console_class
+        require 'pry'
+        Pry
+      rescue LoadError
+        require 'irb'
+        IRB
+      end
     end
   end
 end

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -3,8 +3,6 @@
 module SidekiqUniqueJobs
   module Lock
     class WhileExecuting
-      MUTEX = Mutex.new
-
       def self.synchronize(item, redis_pool = nil)
         new(item, redis_pool).synchronize { yield }
       end
@@ -13,19 +11,19 @@ module SidekiqUniqueJobs
         @item = item
         @redis_pool = redis_pool
         @unique_digest = "#{create_digest}:run"
+        @mutex = Mutex.new
       end
 
       def synchronize
-        MUTEX.lock
-        sleep 0.1 until locked?
-
-        yield
+        @mutex.synchronize do
+          sleep 0.1 until locked?
+          yield
+        end
       rescue Sidekiq::Shutdown
         logger.fatal { "the unique_key: #{@unique_digest} needs to be unlocked manually" }
         raise
       ensure
         SidekiqUniqueJobs.connection(@redis_pool) { |conn| conn.del @unique_digest }
-        MUTEX.unlock
       end
 
       def locked?

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -9,7 +9,6 @@ module SidekiqUniqueJobs
   class UniqueArgs
     CLASS_NAME = 'SidekiqUniqueJobs::UniqueArgs'
     extend Forwardable
-    include Normalizer
 
     def_delegators :SidekiqUniqueJobs, :config, :worker_class_constantize
     def_delegators :Sidekiq, :logger
@@ -62,9 +61,13 @@ module SidekiqUniqueJobs
         logger.debug { "#{__method__} : unique arguments disabled" }
         args
       end
-    rescue NameError
-      # fallback to not filtering args when class can't be instantiated
-      return args
+    rescue NameError => ex
+      logger.error "#{__method__}(#{args}) : failed with (#{ex.message})"
+      logger.error ex
+
+      raise if config.raise_unique_args_errors
+
+      args
     end
 
     def unique_on_all_queues?
@@ -114,6 +117,7 @@ module SidekiqUniqueJobs
         logger.warn { "#{__method__} : unique_args_method is nil. Returning (#{args})" }
         return args
       end
+
       filter_args = unique_args_method.call(args)
       logger.debug { "#{__method__} : #{args} -> #{filter_args}" }
       filter_args

data/lib/sidekiq_unique_jobs/util.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  module Util
-    SCAN_PATTERN ||= '*'
-    DEFAULT_COUNT ||= 1_000
-    KEYS_METHOD ||= 'keys'
-    SCAN_METHOD ||= 'scan'
-    EXPIRE_BATCH_SIZE ||= 100
+  module Util # rubocop:disable Metrics/ModuleLength
+    COUNT             = 'COUNT'
+    DEFAULT_COUNT     = 1_000
+    EXPIRE_BATCH_SIZE = 100
+    MATCH             = 'MATCH'
+    KEYS_METHOD       = 'keys'
+    SCAN_METHOD       = 'scan'
+    SCAN_PATTERN      = '*'
 
-    module_function
+    extend self # rubocop:disable Style/ModuleFunction
 
     def keys(pattern = SCAN_PATTERN, count = DEFAULT_COUNT)
       send("keys_by_#{redis_keys_method}", pattern, count)
@@ -26,7 +28,7 @@ module SidekiqUniqueJobs
       keys, time = timed { keys(pattern, count) }
       logger.debug { "#{keys.size} matching keys found in #{time} sec." }
       keys = dry_run(keys)
-      logger.debug { "#{keys.size} matching keys after postprocessing" }
+      logger.debug { "#{keys.size} matching keys after post-processing" }
       unless dry_run
         logger.debug { "deleting #{keys}..." }
         _, time = timed { batch_delete(keys) }
@@ -41,23 +43,33 @@ module SidekiqUniqueJobs
       end
     end
 
-    def expire
+    def expire # rubocop:disable Metrics/MethodLength
       removed_keys = {}
       connection do |conn|
         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
+        loop do
+          cursor, jobs = get_jobs(conn, cursor)
+          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'
+          break if cursor == '0'
+        end
       end
+
       removed_keys
     end
 
+    private
+
+    def get_jobs(conn, cursor)
+      conn.hscan(SidekiqUniqueJobs::HASH_KEY, [cursor, MATCH, SCAN_PATTERN, COUNT, EXPIRE_BATCH_SIZE])
+    end
+
     def keys_by_scan(pattern, count)
       connection { |conn| conn.scan_each(match: prefix(pattern), count: count).to_a }
     end

data/lib/sidekiq_unique_jobs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 5.0.9
+  version: 5.0.10
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq