Remove support for EOL Rails 5.2

.rubocop.yml

@@ -12,7 +12,7 @@ inherit_mode:
 
 AllCops:
   TargetRubyVersion: 2.5
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.0
   DisplayCopNames: true
   DisplayStyleGuide: true
   Include:

Appraisals

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
-ruby_2 = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
 ruby_27_or_higher = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
 ruby_31_or_higher = Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1')
 jruby = RUBY_PLATFORM.include?('java')
 
-if ruby_2
-  appraise "rails-5.2" do
-    gem "rails", "~> 5.2.0"
-  end
-end
-
 unless ruby_31_or_higher # https://github.com/rails/rails/issues/44090#issuecomment-1007686519
   appraise "rails-6.0" do
     gem "rails", "~> 6.0.0"

Gemfile.lock

@@ -12,11 +12,11 @@ PATH
   remote: .
   specs:
     good_job (2.99.0)
-      activejob (>= 5.2.0)
-      activerecord (>= 5.2.0)
+      activejob (>= 6.0.0)
+      activerecord (>= 6.0.0)
       concurrent-ruby (>= 1.0.2)
       fugit (>= 1.1)
-      railties (>= 5.2.0)
+      railties (>= 6.0.0)
       thor (>= 0.14.1)
       webrick (>= 1.3)
       zeitwerk (>= 2.0)

app/views/layouts/good_job/application.html.erb

@@ -16,7 +16,7 @@
   <%= tag.script "", src: rails_ujs_path(format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
 
   <%= tag.script "", src: es_module_shims_path(format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
-  <% importmaps = { imports: GoodJob::AssetsController.js_modules.keys.each_with_object({}) { |module_name, imports| imports[module_name] = modules_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } } %>
+  <% importmaps = { imports: GoodJob::AssetsController.js_modules.keys.index_with { |module_name| modules_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } } %>
   <%= tag.script importmaps.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce %>
   <%= tag.script "", src: scripts_path(format: :js, v: GoodJob::VERSION, locale: nil), type: "module", nonce: content_security_policy_nonce %>
 </head>

good_job.gemspec

@@ -50,11 +50,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_dependency "activejob", ">= 5.2.0"
-  spec.add_dependency "activerecord", ">= 5.2.0"
+  spec.add_dependency "activejob", ">= 6.0.0"
+  spec.add_dependency "activerecord", ">= 6.0.0"
   spec.add_dependency "concurrent-ruby", ">= 1.0.2"
   spec.add_dependency "fugit", ">= 1.1"
-  spec.add_dependency "railties", ">= 5.2.0"
+  spec.add_dependency "railties", ">= 6.0.0"
   spec.add_dependency "thor", ">= 0.14.1"
   spec.add_dependency "webrick", ">= 1.3"
   spec.add_dependency "zeitwerk", ">= 2.0"

lib/good_job/current_thread.rb

@@ -56,8 +56,8 @@ def self.reset(values = {})
     # Exports values to hash
     # @return [Hash]
     def self.to_h
-      ACCESSORS.each_with_object({}) do |accessor, hash|
-        hash[accessor] = send(accessor)
+      ACCESSORS.index_with do |accessor|
+        send(accessor)
       end
     end
 

spec/lib/models/good_job/execution_spec.rb

@@ -289,32 +289,29 @@ def perform(result_value = nil, raise_error: false)
             expect(result.unhandled_error).to be_an_instance_of TestJob::ExpectedError
           end
 
-          if Gem::Version.new(Rails.version) > Gem::Version.new("6")
-            # Necessary instrumentation was added in Rails 6.0
-            context 'when retry_on is used' do
-              before do
-                TestJob.retry_on(StandardError, wait: 0, attempts: Float::INFINITY) { nil }
-              end
-
-              it 'returns the error' do
-                result = good_job.perform
-
-                expect(result.value).to be_nil
-                expect(result.handled_error).to be_an_instance_of TestJob::ExpectedError
-              end
+          context 'when retry_on is used' do
+            before do
+              TestJob.retry_on(StandardError, wait: 0, attempts: Float::INFINITY) { nil }
             end
 
-            context 'when discard_on is used' do
-              before do
-                TestJob.discard_on(StandardError) { nil }
-              end
+            it 'returns the error' do
+              result = good_job.perform
 
-              it 'returns the error' do
-                result = good_job.perform
+              expect(result.value).to be_nil
+              expect(result.handled_error).to be_an_instance_of TestJob::ExpectedError
+            end
+          end
+
+          context 'when discard_on is used' do
+            before do
+              TestJob.discard_on(StandardError) { nil }
+            end
+
+            it 'returns the error' do
+              result = good_job.perform
 
-                expect(result.value).to be_nil
-                expect(result.handled_error).to be_an_instance_of TestJob::ExpectedError
-              end
+              expect(result.value).to be_nil
+              expect(result.handled_error).to be_an_instance_of TestJob::ExpectedError
             end
           end
         end