blouson 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a088372f568649175af63be6d52577a3847dd532664ea5a2370ccdf40a4f3db
-  data.tar.gz: c13bc3482ec0a909d85cddb8b4a404ce6f072360b1f5d91fd49e959d70ba1785
+  metadata.gz: 78a44cf04cd15a16cdfb9eb997fbce7d96afb7c5e78c2a27a0bfa41064eccdcd
+  data.tar.gz: 5647cc9aac63b8e4b94690949b3b171cb814b4319f2f673bf959bd03a265cafd
 SHA512:
-  metadata.gz: 6213fbb353b32e31154ea5e986103ec1b6568e82c1cea386062259f4ed99fb2a4a734d4d3c7fec7d2aa184ba65dd671030861125108e47830f6685a3369510e2
-  data.tar.gz: 6fa70f5b597dca1c95929c51c08c5ef4284ee3fe0daf15d7a44a17f9f4c2abf3e9ce2c5b933cc8b750e25b795804ec3a690cbc74841e2d4f82ef252b93229c91
+  metadata.gz: 8c5f39468c0f5de0f9b542d6ff239ddf41bdd6672ec969ec852ca2ff9d6ac67dfe7aa34955737a13ac6b60459d675f707032386941f651abe5e4f3f5d0a175f7
+  data.tar.gz: 740cfacbb6268c9466372e6c6775d7eae6f6b28528f2f255c8b07b57df570b9f38f6c7e45092c9f206b7c8073e9cdc3b296ae8dd479d24583602ca965cd19429

data/.travis.yml

@@ -7,11 +7,18 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 rvm:
   - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.3
+matrix:
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.0.gemfile
 before_install:
   - "[[ $BUNDLE_GEMFILE =~ rails_4\\.2 ]] && gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true"
   - "[[ $BUNDLE_GEMFILE =~ rails_4\\.2 ]] && gem install bundler -v '< 2' || true"

data/Appraisals

@@ -14,4 +14,8 @@ appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end
 
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
 # vim: set ft=ruby:

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/lib/blouson/raven_parameter_filter_processor.rb

@@ -14,7 +14,13 @@ module Blouson
         end
 
         def initialize(client = nil)
-          @parameter_filter = ActionDispatch::Http::ParameterFilter.new(self.class.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(self.class.filters)
         end
 
         def process(value)

data/lib/blouson/sensitive_query_filter.rb

@@ -15,9 +15,10 @@ module Blouson
     end
 
     module StatementInvalidErrorFilter
-      def initialize(message = nil, original_exception = nil)
-        if SensitiveQueryFilter.contain_sensitive_query?(message)
-          message = SensitiveQueryFilter.filter_sensitive_words(message)
+      def initialize(message = nil, original_exception = nil, sql: nil, binds: nil)
+        if SensitiveQueryFilter.contain_sensitive_query?(message) || (SensitiveQueryFilter.contain_sensitive_query?(sql))
+          message = SensitiveQueryFilter.filter_sensitive_words(message) if message
+          sql = SensitiveQueryFilter.filter_sensitive_words(sql) if sql
           if defined?(Mysql2::Error)
             if original_exception.is_a?(Mysql2::Error)
               original_exception.extend(Mysql2Filter)
@@ -30,6 +31,11 @@ module Blouson
         if original_exception
           # Rails < 5.0
           super(message, original_exception)
+        elsif sql
+          # Rails >= 6.0
+          #
+          # - https://github.com/rails/rails/pull/34468
+          super(message, sql: sql, binds: binds)
         else
           # Rails >= 5.0
           #

data/lib/blouson/version.rb

@@ -1,3 +1,3 @@
 module Blouson
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blouson
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Cookpad Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,6 +159,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/blouson.rb
 - lib/blouson/engine.rb
 - lib/blouson/raven_parameter_filter_processor.rb