sidekiq-unique-jobs 5.0.2 → 5.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ca11c77223ec339ed2dba0bbfa3630c17db88df
-  data.tar.gz: 8ac3ea5ed96f4303663cd7a43b3b70e93ece13c5
+SHA256:
+  metadata.gz: 87c40a03b7114fd7c5b1c56ceaaf8f4d96b19939bd06f0b76e0c3ce088e34ee1
+  data.tar.gz: 7b41fc69c8cd77117a56beb1d15a17b523f4bff7a742317735cfcc28cda121de
 SHA512:
-  metadata.gz: ab6f325ea2633be2150c15f9441133901ec42fa767a5777328df8c44438fab1e8eddbb674a4f11132028899f7fab6c2a19dc1541dd9e2acea257e58bb96b3aca
-  data.tar.gz: ece51ecdb1244507c06a5336d78106b92423b13d026d4c1f8a0ebadad778526522ce52efc7199b41530295fd2865f1732e53029ad929c51f70ef62ab944d79c3
+  metadata.gz: 78dbf85901350c5b9e9e10889b25de771ef1c9757ac1e9a3565bc7b447501d0505770a3e9befda2242f855319c373777fee01e9c92c37bf1facdbeac87cb052e
+  data.tar.gz: ae243b12f6a0b4db056f474584e53017076226a93e87cc9fd45f7525f7e4a0e44da076a5725895405a3f6db6588578664cd0bc3fba746f139bb0ff65aba8f565

data/.gitignore

@@ -14,3 +14,11 @@ tmp/
 rails_example/spec/examples.txt
 
 *.sublime-*
+
+/sidekiq/
+
+/spec/examples.txt
+
+/gemfiles/.bundle/
+
+/.rspec_status

data/.rubocop.yml

@@ -1,13 +1,13 @@
 AllCops:
   Include:
     - '**/Rakefile'
-    - '**/lib'
-    - '**/bin'
-    - '**/spec'
+    - 'lib/**/*.rb'
+    - 'bin/**/*.rb'
+    - 'spec/**/*.rb'
   Exclude:
     - 'Gemfile.lock'
     - 'gemfiles/**/*'
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Lint/HandleExceptions:
   Enabled: true
@@ -35,23 +35,26 @@ Metrics/BlockLength:
 Metrics/PerceivedComplexity:
   Max: 8
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: true
 
-Style/ConstantName:
+Naming/ConstantName:
   Enabled: true
 
+Naming/FileName:
+  Enabled: true
+  Exclude:
+    - 'lib/sidekiq-unique-jobs.rb'
+    - '**/Gemfile'
+    - '**/Appraisals'
+    - '**/*.gemspec'
+
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
 
 Style/Documentation:
   Enabled: false
 
-Style/FileName:
-  Enabled: true
-  Exclude:
-    - 'lib/sidekiq-unique-jobs.rb'
-
 Style/GlobalVars:
   Enabled: true
 
@@ -77,6 +80,10 @@ Style/TrailingCommaInArguments:
   Enabled: true
   EnforcedStyleForMultiline: comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   Enabled: true
   EnforcedStyleForMultiline: comma

data/.simplecov

@@ -2,7 +2,7 @@ require 'simplecov-json'
 require 'codeclimate-test-reporter'
 
 SimpleCov.command_name 'rspec'
-SimpleCov.refuse_coverage_drop
+# SimpleCov.refuse_coverage_drop
 SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::JSONFormatter,

data/.travis.yml

@@ -1,38 +1,48 @@
-sudo: false
+env:
+  matrix:
+    - COV=false
+  global:
+    - CC_TEST_REPORTER_ID=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+dist: trusty
+sudo: required
 language: ruby
 cache: bundler
-# before_install:
-#   - rvm get head
-#   - gem update --system
-#   - gem install bundler
 services:
   - redis-server
+
+before_install:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+before_script:
+  - ./cc-test-reporter before-build
 script:
-  - if [[ "${STYLE}" = "true" ]]; then bundle exec rubocop; fi;
-  - bundle exec rspec spec
-  - if [[ "${STYLE}" = "true" ]]; then CODECLIMATE_REPO_TOKEN=88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5 bundle exec codeclimate-test-reporter; fi;
+  - if [[ "${COV}" = "true" ]]; then bundle exec rubocop -P; fi;
+  - bundle exec rspec
+after_script:
+  - if [[ "${COV}" = "true" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi;
 rvm:
-  - 2.4.1
+  - 2.5.3
+  - 2.4.2
   - 2.3.2
-  - jruby-9.1.8.0
-env: STYLE=false
+  - 2.2.7
+  - jruby-9.2.0.0
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 2.5.3
+      gemfile: gemfiles/sidekiq_develop.gemfile
+      env: COV=true
 gemfile:
   - gemfiles/sidekiq_develop.gemfile
   - gemfiles/sidekiq_4.0.gemfile
   - gemfiles/sidekiq_4.1.gemfile
   - gemfiles/sidekiq_4.2.gemfile
   - gemfiles/sidekiq_5.0.gemfile
+  - gemfiles/sidekiq_5.1.gemfile
+  - gemfiles/sidekiq_5.2.gemfile
 
 notifications:
   email:
     recipients:
       - mikael@zoolutions.se
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.4.1
-      gemfile: gemfiles/sidekiq_develop.gemfile
-      env: STYLE=true
-addons:
-  code_climate:
-    repo_token: 88e524e8f638efe690def7a6e2c72b1a9db5cdfa74548921b734d609a5858ee5

data/Appraisals

@@ -1,4 +1,4 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
 
 appraise 'sidekiq-develop' do
   gem 'sidekiq', github: 'mperham/sidekiq'
@@ -17,5 +17,13 @@ appraise 'sidekiq-4.2' do
 end
 
 appraise 'sidekiq-5.0' do
-  gem 'sidekiq', '>= 5.0.0.beta', '< 6'
+  gem 'sidekiq', '>= 5.0.0', '< 5.1'
+end
+
+appraise 'sidekiq-5.1' do
+  gem 'sidekiq', '>= 5.1.0', '< 5.2'
+end
+
+appraise 'sidekiq-5.2' do
+  gem 'sidekiq', '>= 5.2.0', '< 6'
 end

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 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
+
+## 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)
+
+## v5.0.6
+- Allow across worker uniquenes: See https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/spec/jobs/unique_acrosss_workers_job.rb for information
+
+## v5.0.5
+- Use a class level mutex for `while_executing`
+
+## v5.0.4
+- Fixes a problem with installing the gem
+
+## v5.0.3
+- Removes test files and appraisals and such from the released gem version to speed up gem installs 
+
+## v5.0.2
+- Added more helpful debug, warning and error messages for failures to collect unique arghuments
+
 ## v5.0.1
 
 - Added a command line util for cleaning out expired keys

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at mikael@zoolutions.se. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,20 +1,21 @@
-# rubocop:disable Style/FileName
+# frozen_string_literal: true
 
 source 'https://rubygems.org'
 gemspec
 
-gem 'appraisal', '~> 2.0.0'
+gem 'appraisal', '>= 2.0.0'
 gem 'rspec-its',  require: false
 gem 'rspec-wait', require: false
 
-platforms :mri_24 do
-  gem 'benchmark-ips',             require: false
-  gem 'codeclimate-test-reporter', require: false
-  gem 'fasterer',                  require: false
-  gem 'memory_profiler',           require: false
-  gem 'mock_redis',                require: false
-  gem 'pry-byebug',                require: false
-  gem 'rubocop',                   require: false
-  gem 'simplecov-json',            require: false
-  gem 'travis',                    require: false
+platforms :mri_25 do
+  gem 'benchmark-ips',                         require: false
+  gem 'codeclimate-test-reporter', '>= 1.0.8', require: false
+  gem 'fasterer',                              require: false
+  gem 'memory_profiler',                       require: false
+  gem 'mock_redis',                            require: false
+  gem 'pry-byebug',                            require: false
+  gem 'rubocop',                               require: false
+  gem 'simplecov', '>= 0.13',                  require: false
+  gem 'simplecov-json',                        require: false
+  gem 'travis',                                require: false
 end

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Mikael Henriksson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -41,6 +41,27 @@ sidekiq_options unique: :while_executing
 
 Is to make sure that a job can be scheduled any number of times but only executed a single time per argument provided to the job we call this runtime uniqueness. This is probably most useful for background jobs that are fast to execute. (See mhenrixon/sidekiq-unique-jobs#111 for a great example of when this would be right.) While the job is executing/performing no other jobs can be executed at the same time.
 
+The way it currently works is that the jobs can be put on the queue but any succeedent job will wait until the first one finishes. 
+
+There is an example of this to try it out in the `rails_example` application. Run `foreman start` in the root of the directory and open the url: `localhost:5000/work/duplicate_while_executing`.
+
+In the console you should see something like:
+
+```
+0:32:24 worker.1 | 2017-04-23T08:32:24.955Z 84404 TID-ougq4thko WhileExecutingWorker JID-400ec51c9523f41cd4a35058 INFO: start
+10:32:24 worker.1 | 2017-04-23T08:32:24.956Z 84404 TID-ougq8csew WhileExecutingWorker JID-8d6d9168368eedaed7f75763 INFO: start
+10:32:24 worker.1 | 2017-04-23T08:32:24.957Z 84404 TID-ougq8crt8 WhileExecutingWorker JID-affcd079094c9b26e8b9ba60 INFO: start
+10:32:24 worker.1 | 2017-04-23T08:32:24.959Z 84404 TID-ougq8cs8s WhileExecutingWorker JID-9e197460c067b22eb1b5d07f INFO: start
+10:32:24 worker.1 | 2017-04-23T08:32:24.959Z 84404 TID-ougq4thko WhileExecutingWorker JID-400ec51c9523f41cd4a35058 WhileExecutingWorker INFO: perform(1, 2)
+10:32:34 worker.1 | 2017-04-23T08:32:34.964Z 84404 TID-ougq4thko WhileExecutingWorker JID-400ec51c9523f41cd4a35058 INFO: done: 10.009 sec
+10:32:34 worker.1 | 2017-04-23T08:32:34.965Z 84404 TID-ougq8csew WhileExecutingWorker JID-8d6d9168368eedaed7f75763 WhileExecutingWorker INFO: perform(1, 2)
+10:32:44 worker.1 | 2017-04-23T08:32:44.965Z 84404 TID-ougq8crt8 WhileExecutingWorker JID-affcd079094c9b26e8b9ba60 WhileExecutingWorker INFO: perform(1, 2)
+10:32:44 worker.1 | 2017-04-23T08:32:44.965Z 84404 TID-ougq8csew WhileExecutingWorker JID-8d6d9168368eedaed7f75763 INFO: done: 20.009 sec
+10:32:54 worker.1 | 2017-04-23T08:32:54.970Z 84404 TID-ougq8cs8s WhileExecutingWorker JID-9e197460c067b22eb1b5d07f WhileExecutingWorker INFO: perform(1, 2)
+10:32:54 worker.1 | 2017-04-23T08:32:54.969Z 84404 TID-ougq8crt8 WhileExecutingWorker JID-affcd079094c9b26e8b9ba60 INFO: done: 30.012 sec
+10:33:04 worker.1 | 2017-04-23T08:33:04.973Z 84404 TID-ougq8cs8s WhileExecutingWorker JID-9e197460c067b22eb1b5d07f INFO: done: 40.014 sec
+```
+
 ### Until Executing
 
 ```ruby
@@ -81,8 +102,10 @@ That means it locks for any job with the same arguments to be persisted into red
 
 ### Uniqueness Scope
 
+
 - Queue specific locks
-- Across all queues.
+- Across all queues - [spec/jobs/unique_on_all_queues_job.rb](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/spec/jobs/unique_on_all_queues_job.rb)
+- Across all workers - [spec/jobs/unique_across_workers_job.rb](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/spec/jobs/unique_across_workers_job.rb)
 - Timed / Scheduled jobs
 
 ## Usage
@@ -135,11 +158,11 @@ The method or the proc can return a modified version of args without the transie
 ```ruby
 class UniqueJobWithFilterMethod
   include Sidekiq::Worker
-  sidekiq_options unique: :until_and_while_execution,
+  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
 
   ...
@@ -158,6 +181,27 @@ end
 
 The previous problems with unique args being string in server and symbol in client is no longer a problem because the `UniqueArgs` class accounts for this and converts everything to json now. If you find an edge case please provide and example so that we can add coverage and fix it.
 
+
+It is also quite possible to ensure different types of unique args based on context. I can't vouch for the below example but see [#203](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/203) for the discussion.
+
+```ruby
+class UniqueJobWithFilterMethod
+  include Sidekiq::Worker
+  sidekiq_options unique: :until_and_while_executing, unique_args: :unique_args
+
+  def self.unique_args(args)
+    if Sidekiq::ProcessSet.new.size > 1
+      # sidekiq runtime; uniqueness for the object (first arg)
+      args.first
+    else
+      # queuing from the app; uniqueness for all params
+      args
+    end
+  end
+end
+```
+
+
 ### After Unlock Callback
 
 If you are using :after_yield as your unlock ordering, Unique Job offers a callback to perform some work after the block is yielded.

data/Rakefile

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

data/bin/bench

@@ -14,7 +14,7 @@ ITERATIONS ||= 10_000
 Benchmark.ips do |x|
   x.config(time: 5, warmup: 2)
   x.report('new_shit') do |_times|
-    SidekiqUniqueJobs::Scripts.call(:acquire_lock, nil, keys: [SecureRandom.hex], argv: [SecureRandom.hex])
+    SidekiqUniqueJobs::Scripts::AcquireLock.execute(nil, SecureRandom.hex, SecureRandom.hex)
   end
   x.compare!
 end

data/lib/sidekiq/simulator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sidekiq/launcher'
 require 'timeout'
 
@@ -38,19 +40,11 @@ module Sidekiq
     end
 
     def terminate_launcher
-      if launcher.respond_to?(:alive?)
-        launcher.terminate # Better to be fast than graceful for our purposes
-      else
-        launcher.stop # New sidekiq works better
-      end
+      launcher.stop
     end
 
     def alive?
-      if launcher.respond_to?(:alive?)
-        launcher.alive?
-      else
-        launcher.manager.workers.any?
-      end
+      launcher.manager.workers.any?
     end
 
     def stopped?

data/lib/sidekiq-unique-jobs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml' if RUBY_VERSION.include?('2.0.0')
 require 'forwardable'
 require 'sidekiq_unique_jobs/version'
@@ -27,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
 
@@ -49,16 +52,23 @@ module SidekiqUniqueJobs
   end
 
   def namespace
-    @namespace ||= connection { |c| c.respond_to?(:namespace) ? c.namespace : nil }
+    @namespace ||= connection { |conn| conn.respond_to?(:namespace) ? conn.namespace : nil }
   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)
-    worker_class.constantize
-  rescue NameError
-    worker_class
+    Object.const_get(worker_class)
+  rescue NameError => ex
+    case ex.message
+    when /uninitialized constant/
+      worker_class
+    else
+      raise
+    end
   end
 
   def mocked?
@@ -66,7 +76,7 @@ module SidekiqUniqueJobs
   end
 
   def redis_version
-    @redis_version ||= connection { |c| c.info('server'.freeze)['redis_version'.freeze] }
+    @redis_version ||= connection { |conn| conn.info('server')['redis_version'] }
   end
 
   def connection(redis_pool = nil)

data/lib/sidekiq_unique_jobs/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module SidekiqUniqueJobs
@@ -42,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/client/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sidekiq_unique_jobs/server/middleware'
 
 module SidekiqUniqueJobs

data/lib/sidekiq_unique_jobs/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SidekiqUniqueJobs
   class Config < OpenStruct
     def inline_testing_enabled?

data/lib/sidekiq_unique_jobs/constants.rb

@@ -1,19 +1,22 @@
+# frozen_string_literal: true
+
 module SidekiqUniqueJobs
-  ARGS_KEY ||= 'args'.freeze
-  AT_KEY ||= 'at'.freeze
-  CLASS_KEY ||= 'class'.freeze
-  JID_KEY ||= 'jid'.freeze
-  LOG_DUPLICATE_KEY ||= 'log_duplicate_payload'.freeze
-  QUEUE_KEY ||= 'queue'.freeze
-  HASH_KEY ||= 'uniquejobs'.freeze
-  QUEUE_LOCK_TIMEOUT_KEY ||= 'unique_expiration'.freeze
-  RUN_LOCK_TIMEOUT_KEY ||= 'run_lock_expiration'.freeze
-  TESTING_CONSTANT ||= 'Testing'.freeze
-  UNIQUE_KEY ||= 'unique'.freeze
-  UNIQUE_LOCK_KEY ||= 'unique_lock'.freeze
-  UNIQUE_ARGS_KEY ||= 'unique_args'.freeze
-  UNIQUE_PREFIX_KEY ||= 'unique_prefix'.freeze
-  UNIQUE_DIGEST_KEY ||= 'unique_digest'.freeze
-  UNIQUE_ON_ALL_QUEUES_KEY ||= 'unique_on_all_queues'.freeze
-  UNIQUE_ARGS_ENABLED_KEY ||= 'unique_args_enabled'.freeze
+  ARGS_KEY ||= 'args'
+  AT_KEY ||= 'at'
+  CLASS_KEY ||= 'class'
+  JID_KEY ||= 'jid'
+  LOG_DUPLICATE_KEY ||= 'log_duplicate_payload'
+  QUEUE_KEY ||= 'queue'
+  HASH_KEY ||= 'uniquejobs'
+  QUEUE_LOCK_TIMEOUT_KEY ||= 'unique_expiration'
+  RUN_LOCK_TIMEOUT_KEY ||= 'run_lock_expiration'
+  TESTING_CONSTANT ||= 'Testing'
+  UNIQUE_KEY ||= 'unique'
+  UNIQUE_LOCK_KEY ||= 'unique_lock'
+  UNIQUE_ARGS_KEY ||= 'unique_args'
+  UNIQUE_PREFIX_KEY ||= 'unique_prefix'
+  UNIQUE_DIGEST_KEY ||= 'unique_digest'
+  UNIQUE_ON_ALL_QUEUES_KEY ||= 'unique_on_all_queues'
+  UNIQUE_ACROSS_WORKERS_KEY ||= 'unique_across_workers'
+  UNIQUE_ARGS_ENABLED_KEY ||= 'unique_args_enabled'
 end

data/lib/sidekiq_unique_jobs/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'active_support/core_ext/hash/keys'
   require 'active_support/core_ext/hash/deep_merge'
@@ -10,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/lock/until_and_while_executing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SidekiqUniqueJobs
   module Lock
     class UntilAndWhileExecuting < UntilExecuting