Merge pull request reidmorrison#202 from dalibor/rails_7.1.2

Fix compatibility for Rails 7.1.2

Author: reidmorrison

.github/workflows/ci.yml

@@ -13,24 +13,28 @@ jobs:
       matrix:
         include:
           - rails: "6.0"
-            ruby: 2.7
+            ruby: "2.7"
 
           - rails: "6.1"
             ruby: "2.7"
           - rails: "6.1"
             ruby: "3.0"
           - rails: "6.1"
             ruby: "3.1"
+          - rails: "6.1"
+            ruby: "3.2"
 
           - rails: "7.0"
-            ruby: 3.1
+            ruby: "3.1"
           - rails: "7.0"
-            ruby: 3.2
+            ruby: "3.2"
 
           - rails: "7.1"
-            ruby: 3.1
+            ruby: "3.1"
+          - rails: "7.1.1"
+            ruby: "3.2"
           - rails: "7.1"
-            ruby: 3.2
+            ruby: "3.2"
 
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile

.gitignore

@@ -2,6 +2,7 @@
 *.log
 pkg/
 test/dummy/tmp/
+test/dummy/db/test.sqlite3-*
 test/dummy/.sass-cache
 *.gem
 /.idea
@@ -12,6 +13,5 @@ Gemfile.lock
 
 *.sqlite3
 .rakeTasks
-*.sqlite3
 TODO.md
 

Appraisals

@@ -13,6 +13,11 @@ appraise "rails_7.0" do
   gem "sqlite3", "~> 1.4.0", platform: :ruby
 end
 
+appraise "rails_7.1.1" do
+  gem "rails", "7.1.1"
+  gem "sqlite3", "~> 1.4.0", platform: :ruby
+end
+
 appraise "rails_7.1" do
   gem "rails", "~> 7.1.0"
   gem "sqlite3", "~> 1.4.0", platform: :ruby

gemfiles/rails_7.1.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "puma"
+gem "active_model_serializers"
+gem "amazing_print"
+gem "minitest"
+gem "minitest-rails"
+gem "rake"
+gem "sprockets", "< 4.0"
+gem "rails", "7.1.1"
+gem "sqlite3", "~> 1.4.0", platform: :ruby
+gem "rubocop"
+
+gemspec path: "../"

lib/rails_semantic_logger/extensions/active_support/log_subscriber.rb

@@ -1,11 +1,13 @@
-require "active_support/log_subscriber"
+if ActiveSupport::VERSION::STRING == '7.1.1'
+  require "active_support/log_subscriber"
 
-module ActiveSupport
-  class LogSubscriber
-    # @override Rails 7.1
-    def silenced?(event)
-      native_log_level = @event_levels.fetch(event, ::Logger::Severity::FATAL)
-      logger.nil? || SemanticLogger::Levels.index(logger.level) > SemanticLogger::Levels.index(native_log_level)
+  module ActiveSupport
+    class LogSubscriber
+      # @override Rails 7.1
+      def silenced?(event)
+        native_log_level = @event_levels.fetch(event, ::Logger::Severity::FATAL)
+        logger.nil? || SemanticLogger::Levels.index(logger.level) > SemanticLogger::Levels.index(native_log_level)
+      end
     end
   end
 end

test/action_mailer_test.rb

@@ -2,8 +2,8 @@
 
 class ActionMailerTest < Minitest::Test
   class MyMailer < ActionMailer::Base
-    def some_email(to:, from:, subject:)
-      mail(to: to, from: from, subject: subject, body: "Hello")
+    def some_email(opts)
+      mail(to: opts[:to], from: opts[:from], subject: opts[:subject], body: "Hello")
     end
   end
 

test/active_record_test.rb

@@ -96,7 +96,6 @@ class ActiveRecordTest < Minitest::Test
           Sample.where(age: 2..21).first
         end
         assert_equal 1, messages.count, messages
-        ap messages
 
         assert_semantic_logger_event(
           messages[0],