sidekiq-unique-jobs 7.0.0.beta21 → 7.0.0.beta26

data/lib/sidekiq_unique_jobs/script/caller.rb

@@ -3,12 +3,12 @@
 module SidekiqUniqueJobs
   # Interface to dealing with .lua files
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Script
     #
     # Module Caller provides the convenience method #call_script
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module Caller
       module_function

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -11,7 +11,7 @@ module Sidekiq
     #
     # Provides extensions for unlocking jobs that are removed and deleted
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module UniqueExtension
       #
@@ -48,7 +48,7 @@ module Sidekiq
     #
     # Provides extensions for unlocking jobs that are removed and deleted
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module UniqueExtension
       #
@@ -73,7 +73,7 @@ module Sidekiq
     #
     # Provides extensions for unlocking jobs that are removed and deleted
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module UniqueExtension
       #
@@ -93,7 +93,7 @@ module Sidekiq
     #
     # Provides extensions for unlocking jobs that are removed and deleted
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module UniqueExtension
       #
@@ -113,7 +113,7 @@ module Sidekiq
     #
     # Provides extensions for unlocking jobs that are removed and deleted
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module UniqueExtension
       #

data/lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb

@@ -3,7 +3,7 @@
 #
 # Contains configuration and utility methods that belongs top level
 #
-# @author Mikael Henriksson <mikael@zoolutions.se>
+# @author Mikael Henriksson <mikael@mhenrixon.com>
 module SidekiqUniqueJobs
   include SidekiqUniqueJobs::Connection
   extend SidekiqUniqueJobs::JSON

data/lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Module with convenience methods for the Sidekiq::Worker class
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module SidekiqWorkerMethods
     # Avoids duplicating worker_class.respond_to? in multiple places
     # @return [true, false]
@@ -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/timing.rb

@@ -3,7 +3,7 @@
 module SidekiqUniqueJobs
   # Handles timing of things
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Timing
     module_function
 

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   # Utility module to help manage unique keys in redis.
   # Useful for deleting keys that for whatever reason wasn't deleted
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Unlockable
     module_function
 

data/lib/sidekiq_unique_jobs/update_version.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   #
   # Class UpdateVersion sets the right version in redis
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class UpdateVersion
     #

data/lib/sidekiq_unique_jobs/upgrade_locks.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   #
   # Upgrades locks between gem version upgrades
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class UpgradeLocks # rubocop:disable Metrics/ClassLength
     #

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.0.0.beta21"
+  VERSION = "7.0.0.beta26"
 end

data/lib/sidekiq_unique_jobs/version_check.rb

@@ -4,13 +4,13 @@ module SidekiqUniqueJobs
   #
   # Handles checking if a version is compliant with given constraint
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   #
   class VersionCheck
-    PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable Layout/LineLength
+    PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable Layout/LineLength, Lint/MixedRegexpCaptureTypes
 
     #
-    # Checks if a version is consrtaint is satisfied
+    # Checks if a version is constraint is satisfied
     #
     # @example A satisfied constraint
     #   VersionCheck.satisfied?("5.0.0", ">= 4.0.0") #=> true
@@ -22,12 +22,31 @@ module SidekiqUniqueJobs
     # @param [String] version a version string `5.0.0`
     # @param [String] constraint a version constraint `>= 5.0.0 <= 5.1.1`
     #
-    # @return [<type>] <description>
+    # @return [true, false] <description>
     #
     def self.satisfied?(version, constraint)
       new(version, constraint).satisfied?
     end
 
+    #
+    # Checks if a version is constraint is unfulfilled
+    #
+    # @example A satisfied constraint
+    #   VersionCheck.unfulfilled?("5.0.0", ">= 4.0.0") #=> false
+    #
+    # @example An unfulfilled constraint
+    #   VersionCheck.unfulfilled?("5.0.0", "<= 4.0.0") #=> true
+    #
+    #
+    # @param [String] version a version string `5.0.0`
+    # @param [String] constraint a version constraint `>= 5.0.0 <= 5.1.1`
+    #
+    # @return [true, false] <description>
+    #
+    def self.unfulfilled?(version, constraint)
+      !satisfied?(version, constraint)
+    end
+
     #
     # @!attribute [r] version
     #   @return [String] a version string `5.0.0`

data/lib/sidekiq_unique_jobs/web.rb

@@ -12,7 +12,7 @@ module SidekiqUniqueJobs
   # Utility module to help manage unique keys in redis.
   # Useful for deleting keys that for whatever reason wasn't deleted
   #
-  # @author Mikael Henriksson <mikael@zoolutions.se>
+  # @author Mikael Henriksson <mikael@mhenrixon.com>
   module Web
     def self.registered(app) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       app.helpers do

data/lib/sidekiq_unique_jobs/web/helpers.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     #
     # Provides view helpers for the Sidekiq::Web extension
     #
-    # @author Mikael Henriksson <mikael@zoolutions.se>
+    # @author Mikael Henriksson <mikael@mhenrixon.com>
     #
     module Helpers
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta21
+  version: 7.0.0.beta26
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -94,7 +94,7 @@ description: |
   Prevents simultaneous Sidekiq jobs with the same unique arguments to run.
   Highly configurable to suite your specific needs.
 email:
-- mikael@zoolutions.se
+- mikael@mhenrixon.com
 executables:
 - uniquejobs
 extensions: []
@@ -173,6 +173,7 @@ files:
 - lib/sidekiq_unique_jobs/options_with_fallback.rb
 - lib/sidekiq_unique_jobs/orphans/lua_reaper.rb
 - lib/sidekiq_unique_jobs/orphans/manager.rb
+- lib/sidekiq_unique_jobs/orphans/null_reaper.rb
 - lib/sidekiq_unique_jobs/orphans/observer.rb
 - lib/sidekiq_unique_jobs/orphans/reaper.rb
 - lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb
@@ -212,7 +213,7 @@ metadata:
   bug_tracker_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/issues
   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
+  changelog_uri: https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md
 post_install_message: |
   This version deprecated the configuration options:
     - default_lock_ttl
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Sidekiq middleware that prevents duplicates jobs