Drop rails 6.1/7.0 and ruby 3.0/3.1 support (#1514)

* Drop rails 6.1/7.0 and ruby 3.0/3.1 support

* upgrade rubocop-rspec + rspec-rails

* disable RSpec/IndexedLet

* autofix RSpec/IndexedLet

* auto-fix Style/ArrayIntersect

* autofix RSpec/ReceiveMessages

* autofix RSpec/MetadataStyle

* revert changes from bad rebase

* revert .rubocop_todo.yml changes

* empty line

Author: modosc

.github/CONTRIBUTING.md

@@ -54,11 +54,11 @@ For most development, testing with sqlite only is easiest and sufficient. CI
 will run the rest.
 
 ```
-DB=sqlite bundle exec appraisal rails-6.1 rake
-DB=sqlite bundle exec appraisal rails-7.0 rake
-DB=mysql bundle exec appraisal rails-7.0 rake
+DB=sqlite bundle exec appraisal rails-7.1 rake
+DB=sqlite bundle exec appraisal rails-8.0 rake
+DB=mysql bundle exec appraisal rails-7.1 rake
 createuser --superuser postgres
-DB=postgres bundle exec appraisal rails-7.0 rake
+DB=postgres bundle exec appraisal rails-7.1 rake
 ```
 
 ## The dummy_app

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           # See "Lowest supported ruby version" in CONTRIBUTING.md
-          ruby-version: '3.0'
+          ruby-version: '3.2'
       - name: Bundle
         run: |
           gem install bundler
@@ -59,18 +59,11 @@ jobs:
       # have set this up with each database as a separate job, but then we'd be
       # duplicating the matrix configuration three times.
       matrix:
-        gemfile: [ 'rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2', 'rails_8.0' ]
+        gemfile: [ 'rails_7.1', 'rails_7.2', 'rails_8.0' ]
 
         # To keep matrix size down, only test highest and lowest rubies.
         # See "Lowest supported ruby version" in CONTRIBUTING.md
-        ruby: [ '3.0', '3.3' ]
-        exclude:
-          # Rails 8 requires ruby 3.2+.
-          - gemfile: 'rails_8.0'
-            ruby: '3.0'
-          # Rails 7.2 requires ruby 3.1+.
-          - gemfile: 'rails_7.2'
-            ruby: '3.0'
+        ruby: [ '3.2', '3.4' ]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4

.rubocop.yml

@@ -1,11 +1,9 @@
-require:
-  - rubocop-rspec
-
 plugins:
   - rubocop-packaging
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
+  - rubocop-rspec
 
 inherit_from: .rubocop_todo.yml
 
@@ -25,7 +23,7 @@ AllCops:
   NewCops: enable
 
   # See "Lowest supported ruby version" in CONTRIBUTING.md
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
 
 Gemspec/DevelopmentDependencies:
   Enabled: false
@@ -147,6 +145,9 @@ RSpec/DescribeClass:
 RSpec/ExampleLength:
   Enabled: false
 
+RSpec/IndexedLet:
+  Enabled: false
+
 # In an ideal world, each example has a single expectation. In the real world,
 # sometimes setup is a pain and you don't want to duplicate setup in multiple
 # examples, or make the specs more confusing with many nested `context`s, and

Appraisals

@@ -9,16 +9,6 @@
 # > the version from the appraisal takes precedence.
 # > https://github.com/thoughtbot/appraisal
 
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1.0"
-  gem "rails-controller-testing", "~> 1.0.5"
-end
-
-appraise "rails-7.0" do
-  gem "rails", "~> 7.0.3.1"
-  gem "rails-controller-testing", "~> 1.0.5"
-end
-
 appraise "rails-7.1" do
   gem "rails", "~> 7.1.0"
   gem "rails-controller-testing", "~> 1.0.5"

CHANGELOG.md

@@ -17,6 +17,13 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 - None
 
+### Dependencies
+
+- Drop support for Rails 6.1, which [reached EoL on 2024-10-01][2]
+- Drop support for Rails 7.0, which [reached EoL on 2025-04-01][2]
+- Drop support for Ruby 3.0, which [reached EoL on 2024-04-23][3]
+- Drop support for Ruby 3.1, which [reached EoL on 2024-03-31][3]
+
 ## 16.0.0 (2024-11-08)
 
 ### Breaking Changes

lib/paper_trail.rb

@@ -115,10 +115,6 @@ def version
       VERSION::STRING
     end
 
-    def active_record_gte_7_0?
-      @active_record_gte_7_0 ||= ::ActiveRecord.gem_version >= ::Gem::Version.new("7.0.0")
-    end
-
     def deprecator
       @deprecator ||= ActiveSupport::Deprecation.new("16.0", "PaperTrail")
     end

lib/paper_trail/attribute_serializers/cast_attribute_serializer.rb

@@ -32,7 +32,7 @@ def deserialize(attr, val)
         if defined_enums[attr] && val.is_a?(::String)
           # Because PT 4 used to save the string version of enums to `object_changes`
           val
-        elsif PaperTrail.active_record_gte_7_0? && val.is_a?(ActiveRecord::Type::Time::Value)
+        elsif val.is_a?(ActiveRecord::Type::Time::Value)
           # Because Rails 7 time attribute throws a delegation error when you deserialize
           # it with the factory.
           # See ActiveRecord::Type::Time::Value crashes when loaded from YAML on rails 7.0

lib/paper_trail/attribute_serializers/object_attribute.rb

@@ -10,10 +10,7 @@ def initialize(model_class)
         @model_class = model_class
 
         # ActiveRecord since 7.0 has a built-in encryption mechanism
-        @encrypted_attributes =
-          if PaperTrail.active_record_gte_7_0?
-            @model_class.encrypted_attributes&.map(&:to_s)
-          end
+        @encrypted_attributes = @model_class.encrypted_attributes&.map(&:to_s)
       end
 
       def serialize(attributes)

lib/paper_trail/attribute_serializers/object_changes_attribute.rb

@@ -10,10 +10,7 @@ def initialize(item_class)
         @item_class = item_class
 
         # ActiveRecord since 7.0 has a built-in encryption mechanism
-        @encrypted_attributes =
-          if PaperTrail.active_record_gte_7_0?
-            @item_class.encrypted_attributes&.map(&:to_s)
-          end
+        @encrypted_attributes = @item_class.encrypted_attributes&.map(&:to_s)
       end
 
       def serialize(changes)

lib/paper_trail/compatibility.rb

@@ -17,7 +17,7 @@ module PaperTrail
   # newer rails versions. Most PT users should avoid incompatible rails
   # versions.
   module Compatibility
-    ACTIVERECORD_GTE = ">= 6.1" # enforced in gemspec
+    ACTIVERECORD_GTE = ">= 7.1" # enforced in gemspec
     ACTIVERECORD_LT = "< 8.1" # not enforced in gemspec
 
     E_INCOMPATIBLE_AR = <<-EOS