sidekiq-unique-jobs 6.0.19 → 6.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7339c3de1638fdd81aa8d3b90d0d09a6a18caa35fc0452efb97464853b4d3f
-  data.tar.gz: 40a8a95a053e13b2bee8fc34ecd7d684d24e9b109f00412bc0f72952d71c6386
+  metadata.gz: c8ea40e3f79410d8c203d4df254cb6b9b756123b6aacaf15843843c4bd4337c5
+  data.tar.gz: 353ea6c92b0d945ad6571e0c20039c9df7093b74404d05a6e9633447e58827f9
 SHA512:
-  metadata.gz: 2c2c01161c61bf276964c68d637352769e31d02c10bcc7ae378731797c5729ef6f72c9dcfc0eaebc670143e3355703aa2869e13bda222a0251e2149e614d27c6
-  data.tar.gz: ed733e7b12b9411ace00f2c5161e3c7c84ca039988dade9cff4900cdf01c45e42a99d565b4abcd76ce6302ba26e1818bf4fb954ec357f9d98229e4bb37098a48
+  metadata.gz: 9c8c527b0a495bcd33672bf02afafadfe0b737394e2e357ca9d40d011ab5e5aaf6c927ae9c67e0bb7b4d2ebbfd43b485fa10e2fec97e3d0523371c3e06f8f1c7
+  data.tar.gz: ba00d25b2f3c6dc5d40cb472de73417c83e4c9c75005cd3339d80e86bb00964f34d8a0ea485e50af2406db025889e901610bc382af00588f82297d0fb16c9d97

data/README.md

@@ -344,11 +344,17 @@ If you need to perform any additional work after the lock has been released you
 **Exception 1:** UntilExecuting unlocks and calls back before yielding.
 **Exception 2:** UntilExpired expires eventually, no after_unlock hook is called.
 
+**NOTE:** _It is also possible to write this code as a class method._
+
 ```ruby
 class UniqueJobWithFilterMethod
   include Sidekiq::Worker
   sidekiq_options lock: :while_executing,
 
+  def self.after_unlock
+   # block has yielded and lock is released
+  end
+
   def after_unlock
    # block has yielded and lock is released
   end

data/lib/sidekiq_unique_jobs/cli.rb

@@ -46,16 +46,21 @@ module SidekiqUniqueJobs
 
     no_commands do
       def console_class
-        if RUBY_PLATFORM == "JAVA"
-          require "irb"
-          return IRB
-        end
+        return irb if RUBY_PLATFORM == "JAVA"
 
+        pry
+      end
+
+      def irb
+        require "irb"
+        IRB
+      end
+
+      def pry
         require "pry"
         Pry
       rescue LoadError, NameError
-        require "irb"
-        IRB
+        irb
       end
     end
   end

data/lib/sidekiq_unique_jobs/constants.rb

@@ -11,8 +11,10 @@ module SidekiqUniqueJobs
   CLASS_KEY                 ||= "class"
   JAVA                      ||= "java"
   JID_KEY                   ||= "jid"
+  LOCK_DIGEST_KEY           ||= "lock_digest"
   LOCK_EXPIRATION_KEY       ||= "lock_expiration"
   LOCK_TIMEOUT_KEY          ||= "lock_timeout"
+  LOCK_TTL_KEY              ||= "lock_ttl"
   LOG_DUPLICATE_KEY         ||= "log_duplicate_payload"
   QUEUE_KEY                 ||= "queue"
   UNIQUE_ACROSS_QUEUES_KEY  ||= "unique_across_queues"

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -15,9 +15,9 @@ module SidekiqUniqueJobs
     # @param [Sidekiq::RedisConnection, ConnectionPool] redis_pool the redis connection
     def initialize(item, redis_pool = nil)
       # @concurrency   = 1 # removed in a0cff5bc42edbe7190d6ede7e7f845074d2d7af6
-      @ttl           = item[LOCK_EXPIRATION_KEY]
+      @ttl           = item[LOCK_EXPIRATION_KEY] || item[LOCK_TTL_KEY]
       @jid           = item[JID_KEY]
-      @unique_digest = item[UNIQUE_DIGEST_KEY]
+      @unique_digest = item[UNIQUE_DIGEST_KEY] || item[LOCK_DIGEST_KEY]
       @lock_type     = item[LOCK_KEY] || item[UNIQUE_KEY]
       @lock_type   &&= @lock_type.to_sym
       @redis_pool    = redis_pool

data/lib/sidekiq_unique_jobs/options_with_fallback.rb

@@ -57,7 +57,7 @@ module SidekiqUniqueJobs
 
     # @return [Symbol]
     def lock_type
-      @lock_type ||= options[LOCK_KEY] || item[LOCK_KEY] || unique_type
+      @lock_type ||= item[LOCK_KEY] || options[LOCK_KEY] || unique_type
     end
 
     def unique_type

data/lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb

@@ -35,7 +35,13 @@ module SidekiqUniqueJobs
     # The hook to call after a successful unlock
     # @return [Proc]
     def after_unlock_hook
-      -> { worker_class.after_unlock if worker_method_defined?(:after_unlock) }
+      lambda do
+        if @worker_class.respond_to?(:after_unlock)
+          @worker_class.after_unlock # instance method in sidekiq v6
+        elsif worker_class.respond_to?(:after_unlock)
+          worker_class.after_unlock # class method regardless of sidekiq version
+        end
+      end
     end
 
     # Attempt to constantize a string worker_class argument, always

data/lib/sidekiq_unique_jobs/unique_args.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "digest"
+require "openssl"
 require "sidekiq_unique_jobs/normalizer"
 
 module SidekiqUniqueJobs
@@ -47,7 +48,7 @@ module SidekiqUniqueJobs
     # Creates a namespaced unique digest based on the {#digestable_hash} and the {#unique_prefix}
     # @return [String] a unique digest
     def create_digest
-      digest = Digest::MD5.hexdigest(Sidekiq.dump_json(digestable_hash))
+      digest = OpenSSL::Digest::MD5.hexdigest(Sidekiq.dump_json(digestable_hash))
       "#{unique_prefix}:#{digest}"
     end
 

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = "6.0.19"
+  VERSION = "6.0.24"
 end

data/lib/sidekiq_unique_jobs/web.rb

@@ -4,7 +4,7 @@ begin
   require "delegate"
   require "rack"
   require "sidekiq/web"
-rescue LoadError # rubocop:disable Lint/SuppressedException
+rescue LoadError
   # client-only usage
 end
 

data/redis/lock.lua

@@ -49,7 +49,8 @@ redis.call('RPUSH', available_key, job_id)
 
 -- The client should only set ttl for until_expired
 -- The server should set ttl for all other jobs
-if lock == "until_expired" and ttl then
+-- redis.log(redis.LOG_WARNING, "lock: " .. lock .. ", ttl: " .. tostring(ttl))
+if lock == "until_expired" and ttl and ttl > 0 then
   -- We can't keep the key here because it will otherwise never be deleted
   redis.call('SREM', unique_keys, unique_digest)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.19
+  version: 6.0.24
 platform: ruby
 authors:
 - Mikael Henriksson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -54,16 +54,22 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +302,7 @@ metadata:
   documentation_uri: https://mhenrixon.github.io/sidekiq-unique-jobs
   source_code_uri: https://github.com/mhenrixon/sidekiq-unique-jobs
   changelog_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -311,8 +317,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs
 test_files: []