Drop rails 6.1/7.0 and ruby 3.0/3.1 support

modosc · modosc · commit 432af2547166 · 2025-03-31T14:36:26.000-07:00
diff --git a/.github/CONTRIBUTING.md b/.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 --git a/.github/workflows/test.yml b/.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 --git a/.rubocop.yml b/.rubocop.yml
@@ -25,7 +25,7 @@ AllCops:
   NewCops: enable
 
   # See "Lowest supported ruby version" in CONTRIBUTING.md
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
 
 Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
@@ -67,7 +67,7 @@ Layout/SpaceAroundOperators:
 # from these is of questionable value.
 Metrics/AbcSize:
   Exclude:
-    - 'spec/dummy_app/db/migrate/*'
+    - "spec/dummy_app/db/migrate/*"
 
 # Not a useful metric compared to, e.g. `AbcSize`.
 Metrics/BlockLength:
@@ -184,8 +184,8 @@ Style/IfUnlessModifier:
 # - https://github.com/bbatsov/ruby-style-guide/issues/556
 Style/ModuleFunction:
   Exclude:
-    - 'lib/paper_trail/serializers/json.rb'
-    - 'lib/paper_trail/serializers/yaml.rb'
+    - "lib/paper_trail/serializers/json.rb"
+    - "lib/paper_trail/serializers/yaml.rb"
 
 # Too subtle to lint. Use `format` for multiple variables. For single variables,
 # use either interpolation or concatenation, whichever is easier to read.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-03-31 17:33:57 UTC using RuboCop version 1.75.1.
+# on 2025-03-31 20:24:49 UTC using RuboCop version 1.75.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -108,18 +108,11 @@ Rails/RedundantActiveRecordAllMethod:
   Exclude:
     - 'spec/paper_trail/cleaner_spec.rb'
 
-# Offense count: 13
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-Security/YAMLLoad:
+Style/ArrayIntersect:
   Exclude:
-    - 'lib/paper_trail/serializers/yaml.rb'
-    - 'spec/models/book_spec.rb'
-    - 'spec/models/gadget_spec.rb'
-    - 'spec/models/no_object_spec.rb'
-    - 'spec/models/person_spec.rb'
-    - 'spec/models/version_spec.rb'
-    - 'spec/paper_trail/events/destroy_spec.rb'
-    - 'spec/paper_trail/serializer_spec.rb'
+    - 'lib/paper_trail/events/base.rb'
 
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
diff --git a/Appraisals b/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 --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ 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 --git a/lib/paper_trail.rb b/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 --git a/lib/paper_trail/attribute_serializers/cast_attribute_serializer.rb b/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 --git a/lib/paper_trail/attribute_serializers/object_attribute.rb b/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 --git a/lib/paper_trail/attribute_serializers/object_changes_attribute.rb b/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 --git a/lib/paper_trail/compatibility.rb b/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 --git a/paper_trail.gemspec b/paper_trail.gemspec
@@ -47,7 +47,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
diff --git a/spec/dummy_app/app/models/fruit.rb b/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 --git a/spec/dummy_app/app/models/vegetable.rb b/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 --git a/spec/paper_trail/compatibility_spec.rb b/spec/paper_trail/compatibility_spec.rb
@@ -5,7 +5,7 @@ module PaperTrail
     describe ".check_activerecord" do
       context "when compatible" do
         it "does not produce output" do
-          ar_version = ::Gem::Version.new("6.1.0")
+          ar_version = ::Gem::Version.new("7.1.0")
           expect {
             described_class.check_activerecord(ar_version)
           }.not_to output.to_stderr
diff --git a/spec/support/shared_examples/active_record_encryption.rb b/spec/support/shared_examples/active_record_encryption.rb
@@ -1,58 +1,56 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples "active_record_encryption" do |model|
-  if PaperTrail.active_record_gte_7_0?
-    context "when ActiveRecord Encryption is enabled", versioning: true do
-      let(:record) { model.create(supplier: "ABC", name: "Tomato") }
-
-      before do
-        ActiveRecord::Encryption.configure(
-          primary_key: "test",
-          deterministic_key: "test",
-          key_derivation_salt: "test"
-        )
-      end
+  context "when ActiveRecord Encryption is enabled", versioning: true do
+    let(:record) { model.create(supplier: "ABC", name: "Tomato") }
+
+    before do
+      ActiveRecord::Encryption.configure(
+        primary_key: "test",
+        deterministic_key: "test",
+        key_derivation_salt: "test"
+      )
+    end
 
-      it "is versioned with encrypted values" do
-        original_supplier, original_name = record.values_at(:supplier, :name)
-
-        # supplier is encrypted, name is not
-        record.update!(supplier: "XYZ", name: "Avocado")
-
-        expect(record.versions.count).to be 2
-        expect(record.versions.pluck(:event)).to include("create", "update")
-
-        # versioned encrypted value should be something like
-        # "{\"p\":\"zDQU\",\"h\":{\"iv\":\"h2OADmJT3DfK1EZc\",\"at\":\"Urcd0mGSwyu9rGT1vrE5cg==\"}}"
-
-        # check paper trail object
-        object = record.versions.last.object
-        expect(object.to_s).not_to include("XYZ")
-        versioned_supplier, versioned_name = object.values_at("supplier", "name")
-        # encrypted column should be versioned with encrypted value
-        expect(versioned_supplier).not_to eq(original_supplier)
-        # non-encrypted column should be versioned with the original value
-        expect(versioned_name).to eq(original_name)
-        parsed_versioned_supplier = JSON.parse(versioned_supplier)
-        expect(parsed_versioned_supplier)
-          .to match(hash_including("p", "h" => hash_including("iv", "at")))
-
-        # check paper trail object_changes
-        object_changes = record.versions.last.object_changes
-        expect(object_changes.to_s).not_to include("XYZ")
-        supplier_changes, name_changes = object_changes.values_at("supplier", "name")
-        expect(supplier_changes).not_to eq([original_supplier, "XYZ"])
-        expect(name_changes).to eq([original_name, "Avocado"])
-        supplier_changes.each do |supplier|
-          parsed_supplier = JSON.parse(supplier)
-          expect(parsed_supplier).to match(hash_including("p", "h" => hash_including("iv", "at")))
-        end
+    it "is versioned with encrypted values" do
+      original_supplier, original_name = record.values_at(:supplier, :name)
+
+      # supplier is encrypted, name is not
+      record.update!(supplier: "XYZ", name: "Avocado")
+
+      expect(record.versions.count).to be 2
+      expect(record.versions.pluck(:event)).to include("create", "update")
+
+      # versioned encrypted value should be something like
+      # "{\"p\":\"zDQU\",\"h\":{\"iv\":\"h2OADmJT3DfK1EZc\",\"at\":\"Urcd0mGSwyu9rGT1vrE5cg==\"}}"
+
+      # check paper trail object
+      object = record.versions.last.object
+      expect(object.to_s).not_to include("XYZ")
+      versioned_supplier, versioned_name = object.values_at("supplier", "name")
+      # encrypted column should be versioned with encrypted value
+      expect(versioned_supplier).not_to eq(original_supplier)
+      # non-encrypted column should be versioned with the original value
+      expect(versioned_name).to eq(original_name)
+      parsed_versioned_supplier = JSON.parse(versioned_supplier)
+      expect(parsed_versioned_supplier)
+        .to match(hash_including("p", "h" => hash_including("iv", "at")))
+
+      # check paper trail object_changes
+      object_changes = record.versions.last.object_changes
+      expect(object_changes.to_s).not_to include("XYZ")
+      supplier_changes, name_changes = object_changes.values_at("supplier", "name")
+      expect(supplier_changes).not_to eq([original_supplier, "XYZ"])
+      expect(name_changes).to eq([original_name, "Avocado"])
+      supplier_changes.each do |supplier|
+        parsed_supplier = JSON.parse(supplier)
+        expect(parsed_supplier).to match(hash_including("p", "h" => hash_including("iv", "at")))
       end
+    end
 
-      it "reifies encrypted values to decrypted values" do
-        record.update!(supplier: "XYZ", name: "Avocado")
-        expect(record.versions.last.reify.supplier).to eq "ABC"
-      end
+    it "reifies encrypted values to decrypted values" do
+      record.update!(supplier: "XYZ", name: "Avocado")
+      expect(record.versions.last.reify.supplier).to eq "ABC"
     end
   end
 end
