Update to Rails 8

gregnavis · gregnavis · commit 4ee897cac9d1 · 2024-11-09T05:37:13.000+01:00
This commit adds support for Rails 8, drops old Gemfiles, updates
dependencies, and resolves a few Rubocop issues that were reported after
the update.
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   test-latest:
-    name: "Active Record 7.1 + Ruby 3.3"
+    name: "Active Record 8.0 + Ruby 3.3"
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -21,7 +21,7 @@ jobs:
         ports:
           - 3306:3306
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-7.1.x
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-8.0.x
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -64,10 +64,10 @@ jobs:
     strategy:
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
-        active_record: ["6.1", "7.0", "7.1"]
+        active_record: ["7.0", "7.1", "7.2"]
         exclude:
-          - ruby: "3.3"
-            active_record: "7.1"
+          - ruby: "3.0"
+            active_record: "7.2"
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-${{ matrix.active_record }}.x
     steps:
diff --git a/.github/workflows/postgresql.yml b/.github/workflows/postgresql.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   test-latest:
-    name: "Active Record 7.1 + Ruby 3.3"
+    name: "Active Record 8.0 + Ruby 3.3"
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -20,7 +20,7 @@ jobs:
         ports:
           - 5432:5432
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-7.1.x
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-8.0.x
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -64,10 +64,10 @@ jobs:
     strategy:
       matrix:
         ruby: ["3.0", "3.1", "3.2", "3.3"]
-        active_record: ["6.1", "7.0", "7.1"]
+        active_record: ["7.0", "7.1", "7.2"]
         exclude:
-          - ruby: "3.3"
-            active_record: "7.1"
+          - ruby: "3.0"
+            active_record: "7.2"
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.activerecord-${{ matrix.active_record }}.x
     steps:
diff --git a/active_record_doctor.gemspec b/active_record_doctor.gemspec
@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 require "active_record_doctor/version"
 
-ACTIVE_RECORD_SPEC = ">= 6.1.0"
+ACTIVE_RECORD_SPEC = ">= 7.0.0"
 
 Gem::Specification.new do |s|
   s.name     = "active_record_doctor"
@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
 
   s.metadata["rubygems_mfa_required"] = "true"
 
-  s.required_ruby_version = ">= 2.5.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "activerecord", ACTIVE_RECORD_SPEC
 
   s.add_development_dependency "minitest-fork_executor", "~> 1.0.2"
-  s.add_development_dependency "mysql2", "~> 0.5.3"
-  s.add_development_dependency "pg", "~> 1.5.6"
+  s.add_development_dependency "mysql2", "~> 0.5.6"
+  s.add_development_dependency "pg", "~> 1.5.9"
   s.add_development_dependency "railties", ACTIVE_RECORD_SPEC
-  s.add_development_dependency "rake", "~> 12.3.3"
-  s.add_development_dependency "rubocop", "~> 1.57.1"
+  s.add_development_dependency "rake", "~> 13.2.1"
+  s.add_development_dependency "rubocop", "~> 1.68.0"
   s.add_development_dependency "transient_record", "~> 2.0.0"
 end
diff --git a/gemfiles/Gemfile.activerecord-5.1.x b/gemfiles/Gemfile.activerecord-5.1.x
diff --git a/gemfiles/Gemfile.activerecord-5.2.x b/gemfiles/Gemfile.activerecord-5.2.x
diff --git a/gemfiles/Gemfile.activerecord-6.0.x b/gemfiles/Gemfile.activerecord-6.0.x
diff --git a/gemfiles/Gemfile.activerecord-6.1.x b/gemfiles/Gemfile.activerecord-6.1.x
diff --git a/gemfiles/Gemfile.activerecord-7.0.x b/gemfiles/Gemfile.activerecord-7.0.x
@@ -2,7 +2,5 @@ source "https://rubygems.org"
 gemspec path: File.join(File.dirname(__FILE__), "..")
 
 gem "activerecord", "~> 7.0.0"
-
-# Older versions result in lots of warnings in Ruby 2.7.
-gem "pg", "~> 1.4.5"
-gem "mysql2", "~> 0.5.3"
+gem "pg", "~> 1.5.9"
+gem "mysql2", "~> 0.5.6"
diff --git a/gemfiles/Gemfile.activerecord-7.1.x b/gemfiles/Gemfile.activerecord-7.1.x
@@ -2,7 +2,5 @@ source "https://rubygems.org"
 gemspec path: File.join(File.dirname(__FILE__), "..")
 
 gem "activerecord", "~> 7.1.0"
-
-# Older versions result in lots of warnings in Ruby 2.7.
-gem "pg", "~> 1.4.5"
-gem "mysql2", "~> 0.5.3"
+gem "pg", "~> 1.5.9"
+gem "mysql2", "~> 0.5.6"
diff --git a/gemfiles/Gemfile.activerecord-7.2.x b/gemfiles/Gemfile.activerecord-7.2.x
@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 gemspec path: File.join(File.dirname(__FILE__), "..")
 
-gem "activerecord", "~> 4.2.0"
-gem "pg", "<= 0.20"
+gem "activerecord", "~> 7.2.0"
+gem "pg", "~> 1.5.9"
+gem "mysql2", "~> 0.5.6"
diff --git a/gemfiles/Gemfile.activerecord-8.0.x b/gemfiles/Gemfile.activerecord-8.0.x
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 gemspec path: File.join(File.dirname(__FILE__), "..")
 
-gem "activerecord", "~> 5.0.0"
-gem "pg", "~> 1.0.0"
-gem "mysql2", "~> 0.5.3"
+gem "activerecord", "~> 8.0.0"
+gem "pg", "~> 1.5.9"
+gem "mysql2", "~> 0.5.6"
diff --git a/lib/active_record_doctor.rb b/lib/active_record_doctor.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_record_doctor/railtie" if defined?(Rails) && defined?(Rails::Railtie)
+require "active_record_doctor/railtie" if defined?(Rails::Railtie)
 require "active_record_doctor/utils"
 require "active_record_doctor/logger"
 require "active_record_doctor/logger/dummy"
diff --git a/lib/active_record_doctor/runner.rb b/lib/active_record_doctor/runner.rb
@@ -27,7 +27,7 @@ def run_all
       # We can't use #all? because of its short-circuit behavior - it stops
       # iteration and returns false upon the first falsey value. This
       # prevents other detectors from running if there's a failure.
-      ActiveRecordDoctor.detectors.each do |name, _|
+      ActiveRecordDoctor.detectors.each_key do |name|
         success = false if !run_one(name)
       end
 
diff --git a/lib/active_record_doctor/utils.rb b/lib/active_record_doctor/utils.rb
@@ -13,7 +13,7 @@ def mysql?(connection = ActiveRecord::Base.connection)
 
       def expression_indexes_unsupported?(connection = ActiveRecord::Base.connection)
         # Active Record is unable to correctly parse expression indexes for MySQL.
-        (mysql?(connection) && ActiveRecord::VERSION::STRING < "7.1")
+        mysql?(connection) && ActiveRecord::VERSION::STRING < "7.1"
       end
     end
   end
diff --git a/test/active_record_doctor/runner_test.rb b/test/active_record_doctor/runner_test.rb
@@ -30,7 +30,7 @@ def test_run_all_returns_false_when_errors
   end
 
   def test_help_prints_help
-    ActiveRecordDoctor.detectors.each do |name, _|
+    ActiveRecordDoctor.detectors.each_key do |name|
       @io.truncate(0)
 
       @runner.help(name)
