Upgrade rubocop + rubocop plugins (#1515)

* Upgrade rubocop + rubocop plugins

* run unsafe autofix on newly added todo items

* Revert "run unsafe autofix on newly added todo items"

This reverts commit d80e696.

* autofix RSpec/BeEq

* unsafe autofix all spec issues _except_ RSpec/Rails/InferredSpecType

* Revert "unsafe autofix all spec issues _except_ RSpec/Rails/InferredSpecType"

This reverts commit 7448551.

* autofix RSpec/DescribedClass

* autofix RSpec/ExpectChange

* fix RSpec/ExampleWording

* fix RSpec/NoExpectationExample

* autofix RSpec/Rails/InferredSpecType

* Revert "autofix RSpec/Rails/InferredSpecType"

This reverts commit 73da18a.

* try RSpec/Rails/InferredSpecType again

* reorder Gemspec/RequireMFA

* fix RSpec/VerifiedDoubleReference

* fix Rails/RedundantActiveRecordAllMethod

* fix Gemspec/DevelopmentDependencies

* Revert "fix Gemspec/DevelopmentDependencies"

This reverts commit f73c2af.

* disable Gemspec/DevelopmentDependencies

* fix Performance/MapMethodChain

* explicitly disable Security/YAMLLoad

* fix Style/ConcatArrayLiterals

* enable / fix -Gemspec/RequireMFA

* explicitly disable Rails/ApplicationRecord

* remove configuration for RSpec/Rails/InferredSpecType, add config.infer_spec_type_from_file_location! to rspec

* add spaces

* disable Style/FetchEnvVar

* revert RSpec/BeEq changes and disable

* revert / disable Rails/Delegate

Author: modosc

.rubocop.yml

@@ -1,9 +1,11 @@
 require:
+  - rubocop-rspec
+
+plugins:
   - rubocop-packaging
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
-  - rubocop-rspec
 
 inherit_from: .rubocop_todo.yml
 
@@ -25,6 +27,9 @@ AllCops:
   # See "Lowest supported ruby version" in CONTRIBUTING.md
   TargetRubyVersion: 3.0
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
@@ -65,7 +70,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:
@@ -115,6 +120,12 @@ Performance/CollectionLiteralInLoop:
   Exclude:
     - spec/**/*
 
+Rails/ApplicationRecord:
+  Enabled: false
+
+Rails/Delegate:
+  Enabled: false
+
 # This cop only applies to app dev, not gem dev.
 Rails/RakeEnvironment:
   Enabled: false
@@ -123,6 +134,9 @@ Rails/RakeEnvironment:
 Rails/SkipsModelValidations:
   Enabled: false
 
+RSpec/BeEq:
+  Enabled: false
+
 # This cop does not seem to work in rubocop-rspec 1.28.0
 RSpec/DescribeClass:
   Enabled: false
@@ -140,6 +154,12 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Enabled: false
 
+# It may be possible for us to use safe_load, but we'd have to pass the
+# safelists, like `whitelist_classes` into our serializer, and the serializer
+# interface is a public API, so that would be a breaking change.
+Security/YAMLLoad:
+  Enabled: false
+
 # Please use semantic style, e.g. `do` when there's a side-effect, else `{}`.
 # The semantic style is too nuanced to lint, so the cop is disabled.
 Style/BlockDelimiters:
@@ -150,6 +170,9 @@ Style/BlockDelimiters:
 Style/DoubleNegation:
   Enabled: false
 
+Style/FetchEnvVar:
+  Enabled: false
+
 # Avoid annotated tokens except in desperately complicated format strings.
 # In 99% of format strings they actually make it less readable.
 Style/FormatStringToken:
@@ -182,8 +205,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.

.rubocop_todo.yml

@@ -1,23 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-11-26 07:45:38 UTC using RuboCop version 1.22.3.
+# on 2025-03-31 23:04:51 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
 # versions of RuboCop, may require this file to be generated again.
 
-# It may be possible for us to use safe_load, but we'd have to pass the
-# safelists, like `whitelist_classes` into our serializer, and the serializer
-# interface is a public API, so that would be a breaking change.
-# Offense count: 13
-# Cop supports --auto-correct.
-Security/YAMLLoad:
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/ActiveSupportOnLoad:
   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/frameworks/active_record.rb"

Rakefile

@@ -13,7 +13,7 @@ task :install_database_yml do
   # It's tempting to use `git clean` here, but this rake task will be run by
   # people working on changes that haven't been committed yet, so we have to
   # be more selective with what we delete.
-  ::FileUtils.rm("spec/dummy_app/db/database.yml", force: true)
+  FileUtils.rm("spec/dummy_app/db/database.yml", force: true)
 
   FileUtils.cp(
     "spec/dummy_app/config/database.#{ENV['DB']}.yml",
@@ -32,7 +32,7 @@ task :clean do
     # TODO: only works locally. doesn't respect database.yml
     system "dropdb --if-exists paper_trail_test > /dev/null 2>&1"
   when nil, "sqlite"
-    ::FileUtils.rm(::Dir.glob("spec/dummy_app/db/*.sqlite3"))
+    FileUtils.rm(Dir.glob("spec/dummy_app/db/*.sqlite3"))
   else
     raise "Don't know how to clean specified RDBMS: #{ENV['DB']}"
   end

lib/generators/paper_trail/install/install_generator.rb

@@ -27,8 +27,8 @@ class InstallGenerator < MigrationGenerator
       desc: "Use uuid instead of bigint for item_id type (use only if tables use UUIDs)"
     )
 
-    desc "Generates (but does not run) a migration to add a versions table." \
-         "  See section 5.c. Generators in README.md for more information."
+    desc "Generates (but does not run) a migration to add a versions table.  " \
+         "See section 5.c. Generators in README.md for more information."
 
     def create_migration_file
       add_paper_trail_migration(

lib/generators/paper_trail/update_item_subtype/update_item_subtype_generator.rb

@@ -8,7 +8,7 @@ class UpdateItemSubtypeGenerator < MigrationGenerator
     source_root File.expand_path("templates", __dir__)
 
     desc(
-      "Generates (but does not run) a migration to update item_subtype for "\
+      "Generates (but does not run) a migration to update item_subtype for " \
       "STI entries in an existing versions table."
     )
 

lib/paper_trail/frameworks/active_record.rb

@@ -3,7 +3,7 @@
 # Either ActiveRecord has already been loaded by the Lazy Load Hook in our
 # Railtie, or else we load it now.
 require "active_record"
-::PaperTrail::Compatibility.check_activerecord(::ActiveRecord.gem_version)
+PaperTrail::Compatibility.check_activerecord(ActiveRecord.gem_version)
 
 # Now we can load the parts of PT that depend on AR.
 require "paper_trail/has_paper_trail"

lib/paper_trail/frameworks/cucumber.rb

@@ -5,7 +5,7 @@
   PaperTrail.enabled = false
   PaperTrail.request.enabled = true
   PaperTrail.request.whodunnit = nil
-  PaperTrail.request.controller_info = {} if defined?(::Rails)
+  PaperTrail.request.controller_info = {} if defined?(Rails)
 end
 
 module PaperTrail

lib/paper_trail/frameworks/rspec.rb

@@ -5,24 +5,24 @@
 require "paper_trail/frameworks/rspec/helpers"
 
 RSpec.configure do |config|
-  config.include ::PaperTrail::RSpec::Helpers::InstanceMethods
-  config.extend ::PaperTrail::RSpec::Helpers::ClassMethods
+  config.include PaperTrail::RSpec::Helpers::InstanceMethods
+  config.extend PaperTrail::RSpec::Helpers::ClassMethods
 
   config.before(:each) do
-    ::PaperTrail.enabled = false
-    ::PaperTrail.request.enabled = true
-    ::PaperTrail.request.whodunnit = nil
-    ::PaperTrail.request.controller_info = {} if defined?(::Rails) && defined?(::RSpec::Rails)
+    PaperTrail.enabled = false
+    PaperTrail.request.enabled = true
+    PaperTrail.request.whodunnit = nil
+    PaperTrail.request.controller_info = {} if defined?(Rails) && defined?(RSpec::Rails)
   end
 
   config.before(:each, versioning: true) do
-    ::PaperTrail.enabled = true
+    PaperTrail.enabled = true
   end
 end
 
 RSpec::Matchers.define :be_versioned do
   # check to see if the model has `has_paper_trail` declared on it
-  match { |actual| actual.is_a?(::PaperTrail::Model::InstanceMethods) }
+  match { |actual| actual.is_a?(PaperTrail::Model::InstanceMethods) }
 end
 
 RSpec::Matchers.define :have_a_version_with do |attributes|

lib/paper_trail/model_config.rb

@@ -4,7 +4,7 @@ module PaperTrail
   # Configures an ActiveRecord model, mostly at application boot time, but also
   # sometimes mid-request, with methods like enable/disable.
   class ModelConfig
-    E_CANNOT_RECORD_AFTER_DESTROY = <<-STR.strip_heredoc.freeze
+    E_CANNOT_RECORD_AFTER_DESTROY = <<~STR
       paper_trail.on_destroy(:after) is incompatible with ActiveRecord's
       belongs_to_required_by_default. Use on_destroy(:before)
       or disable belongs_to_required_by_default.
@@ -49,7 +49,7 @@ def on_create
     def on_destroy(recording_order = "before")
       assert_valid_recording_order_for_on_destroy(recording_order)
       @model_class.send(
-        "#{recording_order}_destroy",
+        :"#{recording_order}_destroy",
         lambda do |r|
           return unless r.paper_trail.save_version?
           r.paper_trail.record_destroy(recording_order)
@@ -236,7 +236,7 @@ def setup_associations(options)
 
     def setup_callbacks_from_options(options_on = [])
       options_on.each do |event|
-        public_send("on_#{event}")
+        public_send(:"on_#{event}")
       end
     end
 

lib/paper_trail/queries/versions/where_object.rb

@@ -39,7 +39,7 @@ def json
           values = []
           @attributes.each do |field, value|
             predicates.push "object->>? = ?"
-            values.concat([field, value.to_s])
+            values.push(field, value.to_s)
           end
           sql = predicates.join(" and ")
           @version_model_class.where(sql, *values)

lib/paper_trail/queries/versions/where_object_changes.rb

@@ -53,7 +53,7 @@ def json
             predicates.push(
               "((object_changes->>? ILIKE ?) OR (object_changes->>? ILIKE ?))"
             )
-            values.concat([field, "[#{value.to_json},%", field, "[%,#{value.to_json}]%"])
+            values.push(field, "[#{value.to_json},%", field, "[%,#{value.to_json}]%")
           end
           sql = predicates.join(" and ")
           @version_model_class.where(sql, *values)

lib/paper_trail/queries/versions/where_object_changes_from.rb

@@ -46,7 +46,7 @@ def json
             predicates.push(
               "(object_changes->>? ILIKE ?)"
             )
-            values.concat([field, "[#{value.to_json},%"])
+            values.push(field, "[#{value.to_json},%")
           end
           sql = predicates.join(" and ")
           @version_model_class.where(sql, *values)

lib/paper_trail/queries/versions/where_object_changes_to.rb

@@ -46,7 +46,7 @@ def json
             predicates.push(
               "(object_changes->>? ILIKE ?)"
             )
-            values.concat([field, "[%#{value.to_json}]"])
+            values.push(field, "[%#{value.to_json}]")
           end
           sql = predicates.join(" and ")
           @version_model_class.where(sql, *values)

lib/paper_trail/record_trail.rb

@@ -22,7 +22,7 @@ def clear_rolled_back_versions
     # Invoked via`after_update` callback for when a previous version is
     # reified and then saved.
     def clear_version_instance
-      @record.send("#{@record.class.version_association_name}=", nil)
+      @record.send(:"#{@record.class.version_association_name}=", nil)
     end
 
     # Returns true if this instance is the current, live one;
@@ -128,7 +128,7 @@ def record_update(force:, in_after_callback:, is_touch:)
     def reset_timestamp_attrs_for_update_if_needed
       return if live?
       @record.send(:timestamp_attributes_for_update_in_model).each do |column|
-        @record.send("restore_#{column}!")
+        @record.send(:"restore_#{column}!")
       end
     end
 
@@ -202,7 +202,7 @@ def versions_between(start_time, end_time)
 
     # @api private
     def assign_and_reset_version_association(version)
-      @record.send("#{@record.class.version_association_name}=", version)
+      @record.send(:"#{@record.class.version_association_name}=", version)
       @record.send(@record.class.versions_association_name).reset
     end
 

lib/paper_trail/reifier.rb

@@ -14,7 +14,7 @@ def reify(version, options)
         attrs = version.object_deserialized
         model = init_model(attrs, options, version)
         reify_attributes(model, version, attrs)
-        model.send "#{model.class.version_association_name}=", version
+        model.send :"#{model.class.version_association_name}=", version
         model
       end
 
@@ -93,8 +93,8 @@ def init_unversioned_attrs(attrs, model)
       def reify_attribute(k, v, model, version)
         if model.has_attribute?(k)
           model[k.to_sym] = v
-        elsif model.respond_to?("#{k}=")
-          model.send("#{k}=", v)
+        elsif model.respond_to?(:"#{k}=")
+          model.send(:"#{k}=", v)
         elsif version.logger
           version.logger.warn(
             "Attribute #{k} does not exist on #{version.item_type} (Version id: #{version.id})."

lib/paper_trail/serializers/yaml.rb

@@ -27,7 +27,7 @@ def load(string)
       # recent [memory optimizations](https://github.com/paper-trail-gem/paper_trail/pull/1189),
       # when coming from `recordable_object_changes`, it will be a `HashWithIndifferentAccess`.
       def dump(object)
-        object = object.to_hash if object.is_a?(HashWithIndifferentAccess)
+        object = object.to_hash if object.is_a?(ActiveSupport::HashWithIndifferentAccess)
         ::YAML.dump object
       end
 

lib/paper_trail/version_concern.rb

@@ -320,7 +320,7 @@ def load_changeset
       end
 
       # First, deserialize the `object_changes` column.
-      changes = HashWithIndifferentAccess.new(object_changes_deserialized)
+      changes = ActiveSupport::HashWithIndifferentAccess.new(object_changes_deserialized)
 
       # The next step is, perhaps unfortunately, called "de-serialization",
       # and appears to be responsible for custom attribute serializers. For an

paper_trail.gemspec

@@ -20,7 +20,8 @@ has been destroyed.
   s.license = "MIT"
 
   s.metadata = {
-    "changelog_uri" => "https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md"
+    "changelog_uri" => "https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md",
+    "rubygems_mfa_required" => "true"
   }
 
   # > Files included in this gem. .. Only add files you can require to this
@@ -51,7 +52,7 @@ has been destroyed.
 
   # We no longer specify a maximum activerecord version.
   # See discussion in paper_trail/compatibility.rb
-  s.add_dependency "activerecord", ::PaperTrail::Compatibility::ACTIVERECORD_GTE
+  s.add_dependency "activerecord", PaperTrail::Compatibility::ACTIVERECORD_GTE
 
   # PT supports request_store versions for 3 years.
   s.add_dependency "request_store", "~> 1.4"
@@ -73,16 +74,16 @@ has been destroyed.
   # For `spec/dummy_app`. Technically, we only need `actionpack` (as of 2020).
   # However, that might change in the future, and the advantages of specifying a
   # subset (e.g. actionpack only) are unclear.
-  s.add_development_dependency "rails", ::PaperTrail::Compatibility::ACTIVERECORD_GTE
+  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 "rubocop", "~> 1.22.2"
-  s.add_development_dependency "rubocop-packaging", "~> 0.5.1"
-  s.add_development_dependency "rubocop-performance", "~> 1.11.5"
-  s.add_development_dependency "rubocop-rails", "~> 2.12.4"
-  s.add_development_dependency "rubocop-rake", "~> 0.6.0"
-  s.add_development_dependency "rubocop-rspec", "~> 2.5.0"
+  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 "simplecov", "~> 0.21.2"
 
   # ## Database Adapters

spec/controllers/articles_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe ArticlesController, type: :controller do
+RSpec.describe ArticlesController do
   describe "PaperTrail.request.enabled?" do
     context "when PaperTrail.enabled? == true" do
       before { PaperTrail.enabled = true }