Merge pull request #80 from viralpraxis/add-rails-7-2-support

Add rails `7.2` support
veeqo · Aug 13, 2024 · e376253 · e376253
2 parents 179184f + 63aa87c
commit e376253
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,6 +33,7 @@ jobs:
           - gemfiles/activejob_6.1.x.gemfile
           - gemfiles/activejob_7.0.x.gemfile
           - gemfiles/activejob_7.1.x.gemfile
+          - gemfiles/activejob_7.2.x.gemfile
           - gemfiles/sidekiq_4.x.gemfile
           - gemfiles/sidekiq_5.x.gemfile
           - gemfiles/sidekiq_6.x.gemfile
@@ -42,6 +43,8 @@ jobs:
             gemfile: gemfiles/activejob_7.0.x.gemfile
           - ruby: 2.5.9
             gemfile: gemfiles/activejob_7.1.x.gemfile
+          - ruby: 2.5.9
+            gemfile: gemfiles/activejob_7.2.x.gemfile
           - ruby: 2.5.9
             gemfile: gemfiles/sidekiq_6.x.gemfile
           - ruby: 2.5.9
@@ -50,18 +53,24 @@ jobs:
             gemfile: gemfiles/activejob_7.0.x.gemfile
           - ruby: 2.6.10
             gemfile: gemfiles/activejob_7.1.x.gemfile
+          - ruby: 2.6.10
+            gemfile: gemfiles/activejob_7.2.x.gemfile
           - ruby: 2.6.10
             gemfile: gemfiles/sidekiq_6.x.gemfile
           - ruby: 2.6.10
             gemfile: gemfiles/sidekiq_7.x.gemfile
           - ruby: 2.7.7
             gemfile: gemfiles/activejob_4.2.x.gemfile
+          - ruby: 2.7.7
+            gemfile: gemfiles/activejob_7.2.x.gemfile
           - ruby: 2.7.7
             gemfile: gemfiles/sidekiq_4.x.gemfile
           - ruby: 3.0.5
             gemfile: gemfiles/activejob_4.2.x.gemfile
           - ruby: 3.0.5
             gemfile: gemfiles/activejob_5.2.x.gemfile
+          - ruby: 3.0.5
+            gemfile: gemfiles/activejob_7.2.x.gemfile
           - ruby: 3.0.5
             gemfile: gemfiles/sidekiq_4.x.gemfile
           - ruby: 3.0.5

diff --git a/Appraisals b/Appraisals
@@ -24,6 +24,10 @@ appraise 'activejob-7.1.x' do
   gem 'activejob', '~> 7.1'
 end
 
+appraise 'activejob-7.2.x' do
+  gem 'activejob', '~> 7.2'
+end
+
 appraise 'sidekiq-4.x' do
   gem 'sidekiq', '~> 4.2'
   gem 'activejob', '~> 5.2'

diff --git a/activejob-uniqueness.gemspec b/activejob-uniqueness.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_dependency 'activejob', '>= 4.2', '< 7.2'
+  spec.add_dependency 'activejob', '>= 4.2', '< 7.3'
   spec.add_dependency 'redlock', '>= 2.0', '< 3'
 
   spec.add_development_dependency 'appraisal', '~> 2.3.0'

diff --git a/gemfiles/activejob_7.2.x.gemfile b/gemfiles/activejob_7.2.x.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activejob", "~> 7.2"
+
+gemspec path: "../"
diff --git a/lib/active_job/uniqueness/sidekiq_patch.rb b/lib/active_job/uniqueness/sidekiq_patch.rb
@@ -41,7 +41,7 @@ def remove_job
       module ScheduledSet
         def delete(score, job_id)
           entry = find_job(job_id)
-          ActiveJob::Uniqueness.unlock_sidekiq_job!(entry.item) if super(score, job_id)
+          ActiveJob::Uniqueness.unlock_sidekiq_job!(entry.item) if super
           entry
         end
       end
@@ -67,7 +67,7 @@ def clear
         end
 
         def delete_by_value(name, value)
-          ActiveJob::Uniqueness.unlock_sidekiq_job!(Sidekiq.load_json(value)) if super(name, value)
+          ActiveJob::Uniqueness.unlock_sidekiq_job!(Sidekiq.load_json(value)) if super
         end
       end
     end