Add Rails 7.1 testing

.github/workflows/tests.yml

@@ -15,13 +15,16 @@ jobs:
           - gemfiles/rails_6_0.gemfile
           - gemfiles/rails_6_1.gemfile
           - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
         exclude:
           - ruby: '3.1'
             gemfile: gemfiles/rails_5_2.gemfile
           - ruby: '3.0'
             gemfile: gemfiles/rails_5_2.gemfile
           - ruby: '2.6'
             gemfile: gemfiles/rails_7_0.gemfile
+          - ruby: '2.6'
+            gemfile: gemfiles/rails_7_1.gemfile
 
     steps:
     - uses: actions/checkout@v2

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.2.2

Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'rails-5-2' do
   gem 'railties', '~> 5.2.0'
 end
@@ -13,3 +15,7 @@ end
 appraise 'rails-7-0' do
   gem 'railties', '~> 7.0.0'
 end
+
+appraise 'rails-7-1' do
+  gem 'railties', '~> 7.1.0'
+end

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

app/controllers/concerns/journaled/actor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled::Actor
   extend ActiveSupport::Concern
 

app/jobs/journaled/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
   class ApplicationJob < Journaled.job_base_class_name.constantize
   end

app/jobs/journaled/delivery_job.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Journaled
   class DeliveryJob < ApplicationJob
-    DEFAULT_REGION = 'us-east-1'.freeze
+    DEFAULT_REGION = 'us-east-1'
 
     rescue_from(Aws::Kinesis::Errors::InternalFailure, Aws::Kinesis::Errors::ServiceUnavailable, Aws::Kinesis::Errors::Http503Error) do |e|
       Rails.logger.error "Kinesis Error - Server Error occurred - #{e.class}"

app/models/concerns/journaled/changes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled::Changes
   extend ActiveSupport::Concern
 

app/models/journaled/actor_uri_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::ActorUriProvider
   include Singleton
 

app/models/journaled/audit_log/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # FIXME: This cannot be included in lib/ because Journaled::Event is autoloaded via app/models
 #        Autoloading Journaled::Event isn't strictly necessary, and for compatibility it would
 #        make sense to move it to lib/.
@@ -83,7 +85,7 @@ def filter_params
 
       def filtered_attributes
         attrs = record.attributes.dup.symbolize_keys
-        attrs.each do |key, _value|
+        attrs.each_key do |key|
           attrs[key] = '[FILTERED]' if filter_key?(key)
         end
       end

app/models/journaled/change.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::Change
   include Journaled::Event
 

app/models/journaled/change_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::ChangeDefinition
   attr_reader :attribute_names, :logical_operation
 

app/models/journaled/change_writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::ChangeWriter
   attr_reader :model, :change_definition
 

app/models/journaled/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled::Event
   extend ActiveSupport::Concern
 

app/models/journaled/json_schema_model/validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::JsonSchemaModel::Validator
   def initialize(schema_name)
     @schema_name = schema_name

app/models/journaled/not_truly_exceptional_error.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Journaled::NotTrulyExceptionalError < RuntimeError
 end

app/models/journaled/writer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Journaled::Writer
   EVENT_METHOD_NAMES = %i(
     journaled_schema_name

bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('..', __dir__)

config/initializers/change_protection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2)
   require 'journaled/relation_change_protection'
   ActiveRecord::Relation.class_eval { prepend Journaled::RelationChangeProtection }

config/spring.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Spring.application_root = './spec/dummy'

gemfiles/rails_5_2.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

gemfiles/rails_6_0.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

gemfiles/rails_6_1.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

gemfiles/rails_7_0.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

gemfiles/rails_7_1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 7.1.0"
+
+gemspec path: "../"

journaled.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 # Maintain your gem's version:
@@ -34,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "spring"
   s.add_development_dependency "spring-commands-rspec"
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", '~> 1.4'
   s.add_development_dependency "timecop"
   s.add_development_dependency "uncruft"
   s.add_development_dependency "webmock"

lib/journaled.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-kinesis"
 require "active_job"
 require "json-schema"

lib/journaled/audit_log.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module Journaled
@@ -52,7 +54,7 @@ def without_audit_logging
       private
 
       def zeitwerk_exclude!(name)
-        name.constantize.skip_audit_log if Object.const_defined?(name)
+        name.constantize.skip_audit_log if Object.const_defined?(name) && !independent_class_in_7_1?(name)
         Rails.autoloaders.main.on_load(name) { |klass, _path| klass.skip_audit_log }
       end
 
@@ -61,6 +63,14 @@ def classic_exclude!(name)
       rescue NameError
         nil
       end
+
+      def independent_class_in_7_1?(name)
+        return false if Gem::Version.new(Rails.version) < Gem::Version.new('7.1')
+
+        # These classes do not inherit from ActiveRecord::Base in 7.1
+        # so calling `skip_audit_log` on them will raise.
+        %w(ActiveRecord::InternalMetadata ActiveRecord::SchemaMigration).include?(name)
+      end
     end
 
     Config = Struct.new(:enabled, :ignored_columns, :enqueue_opts) do

lib/journaled/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
   module Connection
     class << self

lib/journaled/current.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
   class Current < ActiveSupport::CurrentAttributes
     attribute :tags

lib/journaled/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
   class Engine < ::Rails::Engine
     config.after_initialize do

lib/journaled/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
   class TransactionSafetyError < StandardError; end
 end

lib/journaled/relation_change_protection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled::RelationChangeProtection
   def update_all(updates, opts = { force: false }) # rubocop:disable Metrics/AbcSize
     unless opts[:force] || !@klass.respond_to?(:journaled_attribute_names) || @klass.journaled_attribute_names.empty?

lib/journaled/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/expectations'
 
 RSpec::Matchers.define :journal_changes_to do |*attribute_names, as:|

lib/journaled/transaction_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/connection_adapters/abstract/transaction'
 
 module Journaled

lib/journaled/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Journaled
-  VERSION = "5.3.1".freeze
+  VERSION = "5.3.2"
 end

spec/dummy/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

spec/dummy/bin/bundle

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

spec/dummy/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

spec/dummy/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

spec/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('config/environment', __dir__)

spec/dummy/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('boot', __dir__)
 
 require "active_record/railtie"
@@ -12,6 +14,6 @@ module Dummy
   class Application < Rails::Application
     config.autoloader = Rails::VERSION::MAJOR >= 7 ? :zeitwerk : :classic
     config.active_record.sqlite3.represent_boolean_as_integer = true if Rails::VERSION::MAJOR < 6
-    config.active_record.legacy_connection_handling = false if Rails::VERSION::MAJOR >= 7
+    config.active_record.legacy_connection_handling = false if Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 0
   end
 end

spec/dummy/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 

spec/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require File.expand_path('application', __dir__)
 

spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

spec/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

spec/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

spec/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

spec/dummy/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

spec/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

spec/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which