activejob-uniqueness 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47756fe648b47e5e2be0c37e2d57d8ddc13beea68eff40cba671002813965b25
-  data.tar.gz: 8d9aeec1c29e60b4f98eb7f5ce77be820238f84e2e103175fc039fd7fac5aeca
+  metadata.gz: 9554ab5de5c83f0af7528f4618155b8cd4b68673760fdc7c6113bce6fd2f2f53
+  data.tar.gz: 69849f32a26a29f2c644c2a6749c7ca45221f2d04650d369880a2e5050005d0f
 SHA512:
-  metadata.gz: 1903499d9c4f069ffc62df68353475404aac537e2eb65561e26f4d2fa527a75b0e9edb2c8e69a55a2c5ca3e13ee35891c7ab7292bd25647a8db89970d3f6696e
-  data.tar.gz: 9893c234256d0e91e988cdd7a1acf8db8a6e29bca23363d194f8c8f1b48d6d631347a5ad7c9299269eb0dccf35390900c71a28a824b55df4d9c4d6ba2c5e38e7
+  metadata.gz: c661da1de663277171fd5d8fff5a89f54c1dee158c26383863b359439e64e3a29d4d4a611ec16a6e7e13c953eea1abce017d225e242a9877a423ffd8a1aaa486
+  data.tar.gz: 4300874d054bb6b33eb0e6960fe63c2497b193e6cca64e32bf2b77a3d886c21919478e915434f995855f625cacc36155be0519fc296026de5a7cd2cad5038795

data/CHANGELOG.md

@@ -3,13 +3,33 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.3...HEAD)
+## [Unreleased](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.5...HEAD)
+
+
+## [0.2.5](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.4...v0.2.5) - 2023-02-01
+
+### Added
+- [#45](https://github.com/veeqo/activejob-uniqueness/pull/45) Add Dependabot for GitHub Actions by [@petergoldstein](https://github.com/petergoldstein)
+- [#51](https://github.com/veeqo/activejob-uniqueness/pull/51) Add support for Sidekiq 7 by [@dwightwatson](https://github.com/dwightwatson)
+- [#52](https://github.com/veeqo/activejob-uniqueness/pull/52) Add Ruby 3.2.0 to the CI matrix by [@petergoldstein](https://github.com/petergoldstein)
+
+### Changed
+- [#46](https://github.com/veeqo/activejob-uniqueness/pull/46) Fix a method name typo in CHANGELOG by [@y-yagi](https://github.com/y-yagi)
+
+## [0.2.4](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.3...v0.2.4) - 2022-06-22
+
+### Added
+- [#43](https://github.com/veeqo/activejob-uniqueness/pull/43) Run rubocop on Github Actions
+- [#44](https://github.com/veeqo/activejob-uniqueness/pull/44) Add ActiveJob::Uniqueness.reset_manager! method to reset lock manager by [@akostadinov](https://github.com/akostadinov)
+
+### Changed
+- [#42](https://github.com/veeqo/activejob-uniqueness/pull/42) Actualize rubies and gems for tests
 
 ## [0.2.3](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.2...v0.2.3) - 2022-02-28
 
 ### Added
 - [#36](https://github.com/veeqo/activejob-uniqueness/pull/36) Support ActiveJob/Rails 7.0
-- [#37](https://github.com/veeqo/activejob-uniqueness/pull/37) Add Ruby 3.1 to CI by [@petergoldstein]
+- [#37](https://github.com/veeqo/activejob-uniqueness/pull/37) Add Ruby 3.1 to CI by [@petergoldstein](https://github.com/petergoldstein)
 
 ## [0.2.2](https://github.com/veeqo/activejob-uniqueness/compare/v0.2.1...v0.2.2) - 2021-10-22
 

data/lib/active_job/uniqueness/lock_key.rb

@@ -40,7 +40,7 @@ module ActiveJob
         [
           lock_prefix,
           normalized_job_class_name,
-          arguments.any? ? arguments_key_part + '*' : '*'
+          arguments.any? ? "#{arguments_key_part}*" : '*'
         ].compact.join(':')
       end
 

data/lib/active_job/uniqueness/lock_manager.rb

@@ -9,7 +9,7 @@ module ActiveJob
       # Unlocks a resource by resource only.
       def delete_lock(resource)
         @servers.each do |server|
-          server.instance_variable_get(:'@redis').with do |conn|
+          server.instance_variable_get(:@redis).with do |conn|
             conn.del resource
           end
         end
@@ -20,7 +20,7 @@ module ActiveJob
       # Unlocks multiple resources by key wildcard.
       def delete_locks(wildcard)
         @servers.each do |server|
-          server.instance_variable_get(:'@redis').with do |conn|
+          server.instance_variable_get(:@redis).with do |conn|
             conn.scan_each(match: wildcard).each { |key| conn.del key }
           end
         end

data/lib/active_job/uniqueness/log_subscriber.rb

@@ -3,7 +3,7 @@
 require 'active_support/log_subscriber'
 
 module ActiveJob
-  class LogSubscriber < ActiveSupport::LogSubscriber #:nodoc:
+  class LogSubscriber < ActiveSupport::LogSubscriber # :nodoc:
     def lock(event)
       job = event.payload[:job]
       resource = event.payload[:resource]
@@ -66,8 +66,7 @@ module ActiveJob
 
     def args_info(job)
       if job.arguments.any? && log_arguments?(job)
-        ' with arguments: ' +
-          job.arguments.map { |arg| format(arg).inspect }.join(', ')
+        " with arguments: #{job.arguments.map { |arg| format(arg).inspect }.join(', ')}"
       else
         ''
       end

data/lib/active_job/uniqueness/sidekiq_patch.rb

@@ -91,6 +91,8 @@ end
 
 # Global death handlers are introduced in Sidekiq 5.1
 # https://github.com/mperham/sidekiq/blob/e7acb124fbeb0bece0a7c3d657c39a9cc18d72c6/Changes.md#510
-if sidekiq_version >= Gem::Version.new('5.1')
+if sidekiq_version >= Gem::Version.new('7.0')
+  Sidekiq.default_configuration.death_handlers << ->(job, _ex) { ActiveJob::Uniqueness.unlock_sidekiq_job!(job) }
+elsif sidekiq_version >= Gem::Version.new('5.1')
   Sidekiq.death_handlers << ->(job, _ex) { ActiveJob::Uniqueness.unlock_sidekiq_job!(job) }
 end

data/lib/active_job/uniqueness/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Uniqueness
-    VERSION = '0.2.3'
+    VERSION = '0.2.5'
   end
 end

data/lib/active_job/uniqueness.rb

@@ -38,6 +38,10 @@ module ActiveJob
       def test_mode!
         @lock_manager = ActiveJob::Uniqueness::TestLockManager.new
       end
+
+      def reset_manager!
+        @lock_manager = nil
+      end
     end
   end
 end

data/lib/generators/active_job/uniqueness/templates/config/initializers/active_job_uniqueness.rb

@@ -15,7 +15,7 @@ ActiveJob::Uniqueness.configure do |config|
   # Allowed values are
   #   :raise - raises ActiveJob::Uniqueness::JobNotUnique
   #   :log - instruments ActiveSupport::Notifications and logs event to the ActiveJob::Logger
-  #   proc - custom Proc. For example, ->(job) { job.logger.info('Oops') }
+  #   proc - custom Proc. For example, ->(job) { job.logger.info("Job already in queue: #{job.class.name} #{job.arguments.inspect} (#{job.job_id})") }
   #
   # config.on_conflict = :raise
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-uniqueness
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Rustam Sharshenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -106,6 +106,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 description: Ensure uniqueness of your ActiveJob jobs
 email:
 - rustam@sharshenov.com
@@ -143,6 +171,7 @@ metadata:
   homepage_uri: https://github.com/veeqo/activejob-uniqueness
   source_code_uri: https://github.com/veeqo/activejob-uniqueness
   changelog_uri: https://github.com/veeqo/activejob-uniqueness/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: