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

Diff for: .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

Diff for: .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

Diff for: .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

Diff for: 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"

Diff for: 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

Diff for: 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

Diff for: 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

Diff for: 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)

Diff for: 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)

Diff for: 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

Diff for: lib/paper_trail/events/base.rb

@@ -157,7 +157,7 @@ def evaluate_only
       # @api private
       def ignored_attr_has_changed?
         ignored = calculated_ignored_array + @record.paper_trail_options[:skip]
-        ignored.any? && (changed_in_latest_version & ignored).any?
+        ignored.any? && changed_in_latest_version.intersect?(ignored)
       end
 
       # Rails 5.1 changed the API of `ActiveRecord::Dirty`. See

Diff for: paper_trail.gemspec

@@ -48,7 +48,7 @@ has been destroyed.
   # about 3 years, per https://www.ruby-lang.org/en/downloads/branches/
   #
   # See "Lowest supported ruby version" in CONTRIBUTING.md
-  s.required_ruby_version = ">= 3.0.0"
+  s.required_ruby_version = ">= 3.2.0"
 
   # We no longer specify a maximum activerecord version.
   # See discussion in paper_trail/compatibility.rb
@@ -77,13 +77,13 @@ has been destroyed.
   s.add_development_dependency "rails", PaperTrail::Compatibility::ACTIVERECORD_GTE
 
   s.add_development_dependency "rake", "~> 13.0"
-  s.add_development_dependency "rspec-rails", "~> 6.0.3"
+  s.add_development_dependency "rspec-rails", "~> 7.1.1"
   s.add_development_dependency "rubocop", "~> 1.75"
   s.add_development_dependency "rubocop-packaging", "~> 0.6.0"
   s.add_development_dependency "rubocop-performance", "~> 1.24.0"
   s.add_development_dependency "rubocop-rails", "~> 2.30.3"
   s.add_development_dependency "rubocop-rake", "~> 0.7.1"
-  s.add_development_dependency "rubocop-rspec", "~> 2.17.0"
+  s.add_development_dependency "rubocop-rspec", "~> 3.5.0"
   s.add_development_dependency "simplecov", "~> 0.21.2"
 
   # ## Database Adapters

Diff for: spec/controllers/widgets_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe WidgetsController, versioning: true do
+RSpec.describe WidgetsController, :versioning do
   before { request.env["REMOTE_ADDR"] = "127.0.0.1" }
 
   after { RequestStore.store[:paper_trail] = nil }

Diff for: spec/dummy_app/app/models/fruit.rb

@@ -6,7 +6,5 @@ class Fruit < ApplicationRecord
     has_paper_trail versions: { class_name: "JsonVersion" }
   end
 
-  if PaperTrail.active_record_gte_7_0?
-    encrypts :supplier
-  end
+  encrypts :supplier
 end

Diff for: spec/dummy_app/app/models/vegetable.rb

@@ -6,7 +6,5 @@ class Vegetable < ApplicationRecord
     class_name: ENV["DB"] == "postgres" ? "JsonbVersion" : "PaperTrail::Version"
   }, on: %i[create update]
 
-  if PaperTrail.active_record_gte_7_0?
-    encrypts :supplier
-  end
+  encrypts :supplier
 end

Diff for: spec/models/animal_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Animal, versioning: true do
+RSpec.describe Animal, :versioning do
   it "baseline test setup" do
     expect(described_class.new).to be_versioned
     expect(described_class.inheritance_column).to eq("species")

Diff for: spec/models/article_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Article, versioning: true do
+RSpec.describe Article, :versioning do
   describe ".create" do
     it "also creates a version record" do
       expect { described_class.create }.to(

Diff for: spec/models/book_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Book, versioning: true do
+RSpec.describe Book, :versioning do
   context "with :has_many :through" do
     it "store version on source <<" do
       book = described_class.create(title: "War and Peace")
@@ -23,7 +23,7 @@
       expect((PaperTrail::Version.count - count)).to(eq(2))
       expect(
         [PaperTrail::Version.order(:id).to_a[-2].item, PaperTrail::Version.last.item]
-      ).to match_array([Person.last, Authorship.last])
+      ).to contain_exactly(Person.last, Authorship.last)
     end
 
     it "store version on join destroy" do

Diff for: spec/models/boolit_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 require "support/custom_json_serializer"
 
-RSpec.describe Boolit, versioning: true do
+RSpec.describe Boolit, :versioning do
   let(:boolit) { described_class.create! }
 
   before { boolit.update!(name: FFaker::Name.name) }

Diff for: spec/models/callback_modifier_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe CallbackModifier, versioning: true do
+RSpec.describe CallbackModifier, :versioning do
   describe "paper_trail_on_destroy" do
     it "adds :destroy to paper_trail_options[:on]" do
       modifier = NoArgDestroyModifier.create!(some_content: FFaker::Lorem.sentence)

Diff for: spec/models/car_spec.rb

@@ -5,15 +5,15 @@
 RSpec.describe Car do
   it { is_expected.to be_versioned }
 
-  describe "changeset", versioning: true do
+  describe "changeset", :versioning do
     it "has the expected keys (see issue 738)" do
       car = described_class.create!(name: "Alice")
       car.update(name: "Bob")
       assert_includes car.versions.last.changeset.keys, "name"
     end
   end
 
-  describe "attributes and accessors", versioning: true do
+  describe "attributes and accessors", :versioning do
     it "reifies attributes that are not AR attributes" do
       car = described_class.create name: "Pinto", color: "green"
       car.update color: "yellow"

Diff for: spec/models/cat_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Cat, versioning: true do
+RSpec.describe Cat, :versioning do
   describe "#descends_from_active_record?" do
     it "returns false, meaning that Cat is an STI subclass" do
       expect(described_class.descends_from_active_record?).to eq(false)

Diff for: spec/models/custom_primary_key_record_spec.rb

@@ -6,7 +6,7 @@
   it { is_expected.to be_versioned }
 
   describe "#versions" do
-    it "returns instances of CustomPrimaryKeyRecordVersion", versioning: true do
+    it "returns instances of CustomPrimaryKeyRecordVersion", :versioning do
       custom_primary_key_record = described_class.create!
       custom_primary_key_record.update!(name: "bob")
       version = custom_primary_key_record.versions.last

Diff for: spec/models/document_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Document, versioning: true do
+RSpec.describe Document, :versioning do
   describe "have_a_version_with matcher" do
     it "works with custom versions association" do
       document = described_class.create!(name: "Foo")

Diff for: spec/models/family/celebrity_family_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Family
-  RSpec.describe CelebrityFamily, versioning: true do
+  RSpec.describe CelebrityFamily, :versioning do
     describe "#joins" do
       it "works on an STI model" do
         described_class.create!

Diff for: spec/models/foo_widget_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 require "support/performance_helpers"
 
-RSpec.describe(FooWidget, versioning: true) do
+RSpec.describe(FooWidget, :versioning) do
   context "with a subclass" do
     let(:foo) { described_class.create }
 

Diff for: spec/models/fruit_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 if ENV["DB"] == "postgres" && JsonVersion.table_exists?
-  RSpec.describe Fruit, versioning: true do
+  RSpec.describe Fruit, :versioning do
     describe "have_a_version_with_changes matcher" do
       it "works with Fruit because Fruit uses JsonVersion" do
         # As of PT 9.0.0, with_version_changes only supports json(b) columns,
@@ -17,7 +17,7 @@
       end
     end
 
-    describe "queries of versions", versioning: true do
+    describe "queries of versions", :versioning do
       let!(:fruit) { described_class.create(name: "Apple", mass: 1, color: "green") }
 
       before do

Diff for: spec/models/gadget_spec.rb

@@ -7,7 +7,7 @@
 
   it { is_expected.to be_versioned }
 
-  describe "updates", versioning: true do
+  describe "updates", :versioning do
     it "generates a version for updates" do
       expect { gadget.update_attribute(:name, "Hammer") }.to(change { gadget.versions.size }.by(1))
     end

Diff for: spec/models/gizmo_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 require "support/performance_helpers"
 
-RSpec.describe Gizmo, versioning: true do
+RSpec.describe Gizmo, :versioning do
   context "with a persisted record" do
     it "does not use the gizmo `updated_at` as the version's `created_at`" do
       gizmo = described_class.create(name: "Fred", created_at: 1.day.ago)

Diff for: spec/models/joined_version_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe JoinedVersion, versioning: true do
+RSpec.describe JoinedVersion, :versioning do
   let(:widget) { Widget.create!(name: FFaker::Name.name) }
   let(:version) { described_class.first }