blouson 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: debaa94dc33912dc0432b49d4f73e3b3753ad5a335d14d7aff5be862790f5aec
-  data.tar.gz: 64ee1c8a595e0101e87c5316554a3b937188fd2d82cb9c5eb66aacf53b394496
+  metadata.gz: 893f69fbcd20b47c42747057d94ef6dc8a28b85f7d01555c75c4153de9ba70c9
+  data.tar.gz: 28c135959444fad3f1534dedaf66ab15a3a77f68c826f62bb7c03b7b308602c5
 SHA512:
-  metadata.gz: 46fed87bbd604f81ec7e5c599efc89681db1d0a25fe7be3d3249d1b1ae6e08cf5cf81fb26429be086caf1221b4e776f7433fea4cc37853704d5a624085a44829
-  data.tar.gz: e87e60345dd41be9c51274f2ac718c77bc9a4b5e88300bad64daaa8fd70b5af6f5ddc21f7d910a9bbcad134834acbe672ed6bf2bca9e50d5cbda016d08fcd564
+  metadata.gz: aa8dfa921b4dccd56b4b2f6ee72462581818ebf5c71147529fffd45c3c8b463ecec63d8263dd511a8be01875ca7efd856322189c1d077dc6c587f401f4329acb
+  data.tar.gz: 599ca220db2713d02327de03e789ed83b83ca96625bf7ce469853451669cccf71db97ee3ed8d188f3074c2693d46ff28175869c6bc1c621409ee729386515a87

data/.github/workflows/ci.yml

@@ -11,25 +11,20 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.0'
           - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'
         gemfile:
-          - rails_7.0
           - rails_7.1
           - rails_7.2
           - rails_8.0
+          - rails_8.1
         exclude:
-          - ruby: '3.0'
-            gemfile: rails_7.2
-          - ruby: '3.0'
-            gemfile: rails_8.0
           - ruby: '3.1'
             gemfile: rails_8.0
-          - ruby: '3.4'
-            gemfile: rails_7.0
+          - ruby: '3.1'
+            gemfile: rails_8.1
     name: Run test with Ruby ${{ matrix.ruby }} and Gemfile ${{ matrix.gemfile }}
     services:
       mysql:

data/.gitignore

@@ -8,6 +8,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gemfiles/.bundle/config
 
 # rspec failure tracking
 .rspec_status

data/Appraisals

@@ -1,8 +1,3 @@
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-  gem 'concurrent-ruby', '1.3.4'
-end
-
 appraise 'rails-7.1' do
   gem 'rails', '~> 7.1.0'
 end
@@ -15,4 +10,8 @@ appraise 'rails-8.0' do
   gem 'rails', '~> 8.0.0'
 end
 
+appraise 'rails-8.1' do
+  gem 'rails', '~> 8.1.0'
+end
+
 # vim: set ft=ruby:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 5.0.0 (2026-01-23)
+- [Breaking change] Drop support for Ruby 3.0
+- [Breaking change] Drop support for Rails 7.0
+- Support Rails 8.1
+- Fix version matching errors; Blouson::SensitiveQueryFilter::AbstractAdapterFilter was not loaded with Rails 8.0
+
 # 4.0.0 (2025-02-04)
 - [Breaking change] Drop support for arproxy v0. Please update >= v1
 - [Breaking change] Drop support for Ruby 2.7

data/blouson.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '>= 7.0.0'
+  spec.add_dependency 'rails', '>= 7.1.0'
 
   spec.add_development_dependency 'arproxy', '>= 1.0.0'
   spec.add_development_dependency 'mysql2'

data/gemfiles/{rails_7.0.gemfile → rails_8.1.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
-gem "concurrent-ruby", "1.3.4"
+gem "rails", "~> 8.1.0"
 
 gemspec path: "../"

data/lib/blouson/engine.rb

@@ -19,9 +19,15 @@ module Blouson
           ActiveRecord::StatementInvalid.class_eval do
             prepend Blouson::SensitiveQueryFilter::StatementInvalidErrorFilter
           end
-          if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 1 && defined?(Mysql2::Error)
+          if ActiveRecord.gem_version >= Gem::Version.new('7.1') && defined?(Mysql2::Error)
             ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-              prepend Blouson::SensitiveQueryFilter::AbstractAdapterFilter
+              if ActiveRecord.gem_version >= Gem::Version.new('8.1')
+                prepend Blouson::SensitiveQueryFilter::AbstractAdapterFilter81
+              elsif ActiveRecord.gem_version >= Gem::Version.new('8.0')
+                prepend Blouson::SensitiveQueryFilter::AbstractAdapterFilter80
+              else
+                prepend Blouson::SensitiveQueryFilter::AbstractAdapterFilter71
+              end
             end
           end
         end

data/lib/blouson/sensitive_query_filter.rb

@@ -26,17 +26,7 @@ module Blouson
           end
         end
 
-        if connection_pool
-          # Rails >= 7.1
-          #
-          # - https://github.com/rails/rails/pull/48295
-          super(message, sql: sql, binds: binds, connection_pool: connection_pool)
-        else
-          # Rails >= 6.0
-          #
-          # - https://github.com/rails/rails/pull/34468
-          super(message, sql: sql, binds: binds)
-        end
+        super(message, sql:, binds:, connection_pool:)
       end
 
       def set_query(sql, binds)
@@ -62,13 +52,25 @@ module Blouson
       end
     end
 
-    module AbstractAdapterFilter
+    module AbstractAdapterFilter71
+      # https://github.com/rails/rails/blob/v7.1.0/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L1133
       def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false, &block)
-        if Rails::VERSION::MAJOR >= 8
-          super(sql, name, binds, type_casted_binds, async: false, &block)
-        else
-          super(sql, name, binds, type_casted_binds, statement_name, async: false, &block)
+        super(sql, name, binds, type_casted_binds, statement_name, async:, &block)
+      rescue ActiveRecord::RecordNotUnique, Mysql2::Error => ex
+        if ex.cause.is_a?(Mysql2::Error)
+          ex.cause.extend(Mysql2Filter)
+        elsif $!.is_a?(Mysql2::Error)
+          $!.extend(Mysql2Filter)
         end
+        raise ex
+      end
+      private :log
+    end
+
+    module AbstractAdapterFilter80
+      # https://github.com/rails/rails/blob/v8.0.0/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L1128
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], async: false, &block)
+        super(sql, name, binds, type_casted_binds, async:, &block)
       rescue ActiveRecord::RecordNotUnique, Mysql2::Error => ex
         if ex.cause.is_a?(Mysql2::Error)
           ex.cause.extend(Mysql2Filter)
@@ -77,7 +79,21 @@ module Blouson
         end
         raise ex
       end
+      private :log
+    end
 
+    module AbstractAdapterFilter81
+      # https://github.com/rails/rails/blob/v8.1.0/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L1200
+      def log(sql, name = "SQL", binds = [], type_casted_binds = [], async: false, allow_retry: false, &block)
+        super(sql, name, binds, type_casted_binds, async:, allow_retry:, &block)
+      rescue ActiveRecord::RecordNotUnique, Mysql2::Error => ex
+        if ex.cause.is_a?(Mysql2::Error)
+          ex.cause.extend(Mysql2Filter)
+        elsif $!.is_a?(Mysql2::Error)
+          $!.extend(Mysql2Filter)
+        end
+        raise ex
+      end
       private :log
     end
   end

data/lib/blouson/sentry_parameter_filter.rb

@@ -1,13 +1,7 @@
 module Blouson
   class SentryParameterFilter
     def initialize(filters, header_filters = [])
-      # ActionDispatch::Http::ParameterFilter is deprecated and will be removed from Rails 6.1.
-      parameter_filter_klass = if defined?(ActiveSupport::ParameterFilter)
-                                 ActiveSupport::ParameterFilter
-                               else
-                                 ActionDispatch::Http::ParameterFilter
-                               end
-      @parameter_filter = parameter_filter_klass.new(filters)
+      @parameter_filter = ActiveSupport::ParameterFilter.new(filters)
       @header_filters = header_filters.map(&:downcase)
     end
 

data/lib/blouson/version.rb

@@ -1,3 +1,3 @@
 module Blouson
-  VERSION = "4.0.0"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: blouson
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Cookpad Inc.
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: arproxy
   requirement: !ruby/object:Gem::Requirement
@@ -168,10 +168,10 @@ files:
 - bin/console
 - bin/setup
 - blouson.gemspec
-- gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
 - gemfiles/rails_7.2.gemfile
 - gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/blouson.rb
 - lib/blouson/engine.rb
 - lib/blouson/raven_parameter_filter_processor.rb
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Filter tools to mask sensitive data in various logs
 test_files: []