dry-monitor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea5ea283589f7fcf5e657a51044c7085348464de
-  data.tar.gz: 70cb63d6bea9a42c7002b90cd994bd4a6cc549d9
+SHA256:
+  metadata.gz: 8efc7beb94cb02a20c12514ad8beea5914a069d957b48f7c089b588fce4c8bf1
+  data.tar.gz: ad200194b170bfdfdb8f3fe473078c6b309fc73170203deb27b61b1ace4afad4
 SHA512:
-  metadata.gz: 5383bf2d033695ea44b7404bbc04f59bb412bf0cde5449e1b279aa9be147044205ab1d027b746345f837db25d9975975068c0a2e041cb580cfeccaa3205e25d1
-  data.tar.gz: 1b3952264e029600d2aba9baf9c96bae93766a420c87492f31c0734a8e479a00879cf796467bccac584f4d809482b4e73ea4500e4a42fd70e25ff490648f0b1f
+  metadata.gz: bd7e41300b4ea1c908719cd69efd6e9bd357978af9c5ae71a39a38dde35c59c5f989d26208fa56763854dcd6f7b581d87782eb26baf65ea00a944f182151767e
+  data.tar.gz: fc6c2027758916b5447648c176f1a839fa172f1f2e0561b8c471bbcdfb79f670f5dfcab1588f7cac1d46978e118f14869f297d8211a24f3fa0992f7d5a26cabb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.1.1 2018-01-03
+
+### Fixed
+
+* Query params containing arrays of primitives (e.g. `?ids[]=1&ids[]=2`) no longer crash the logger (timriley)
+
 # v0.1.0 2018-01-02
 
 ### Fixed

data/lib/dry/monitor/rack/logger.rb

@@ -91,12 +91,12 @@ module Dry
 
         def filter_params(params)
           params.each_with_object({}) do |(k, v), h|
-            if v.is_a?(Hash)
+            if config.filtered_params.include?(k)
+              h.update(k => FILTERED)
+            elsif v.is_a?(Hash)
               h.update(k => filter_params(v))
             elsif v.is_a?(Array)
-              h.update(k => v.map { |m| filter_params(m) })
-            elsif config.filtered_params.include?(k)
-              h.update(k => FILTERED)
+              h.update(k => v.map { |m| m.is_a?(Hash) ? filter_params(m) : m })
             else
               h[k] = v
             end

data/lib/dry/monitor/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Monitor
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/spec/integration/instrumentation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe 'Subscribing to instrumentation events' do
   subject(:notifications) { Dry::Monitor::Notifications.new(:app) }
 

data/spec/integration/logger_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe Dry::Monitor::Logger do
   subject(:logger) do
     Dry::Monitor::Logger.new($stdout)

data/spec/integration/rack_middleware_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe Dry::Monitor::Rack::Middleware do
   subject(:middleware) { Dry::Monitor::Rack::Middleware.new(notifications).new(rack_app) }
 
@@ -25,7 +23,17 @@ RSpec.describe Dry::Monitor::Rack::Middleware do
     end
 
     let(:query_params) do
-      '_csrf=123456&password=secret&user[password]=secret&other[][password]=secret&other[][password]=secret&foo=bar&one=1'
+      %w[
+        _csrf=123456
+        password=secret
+        user[password]=secret
+        others[][password]=secret1
+        others[][password]=secret2
+        foo=bar
+        one=1
+        ids[]=1
+        ids[]=2
+      ].join('&')
     end
 
     before do
@@ -45,7 +53,7 @@ RSpec.describe Dry::Monitor::Rack::Middleware do
 
       expect(log_file_content).to include('Started GET "/hello-world"')
       expect(log_file_content).to include('Finished GET "/hello-world"')
-      expect(log_file_content).to include('Query parameters {"_csrf"=>"[FILTERED]", "password"=>"[FILTERED]", "user"=>{"password"=>"[FILTERED]"}, "other"=>[{"password"=>"[FILTERED]"}, {"password"=>"[FILTERED]"}], "foo"=>"bar", "one"=>"1"}')
+      expect(log_file_content).to include('Query parameters {"_csrf"=>"[FILTERED]", "password"=>"[FILTERED]", "user"=>{"password"=>"[FILTERED]"}, "others"=>[{"password"=>"[FILTERED]"}, {"password"=>"[FILTERED]"}], "foo"=>"bar", "one"=>"1", "ids"=>["1", "2"]}')
     end
   end
 

data/spec/integration/sql_logger_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 RSpec.describe Dry::Monitor::SQL::Logger do
   subject(:logger) { sql_logger.new(Dry::Monitor::Logger.new(log_file_path)) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Monitoring and instrumentation APIs