better-faraday 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c396050eb803fc44370487683e12b77b07b808d563264aa372c847cd5be21c
-  data.tar.gz: e8a5f25e26e98d39adf5cb87653fa99b25f2a365382b8996434f68c0c8215a4d
+  metadata.gz: 99c10f80bd720f60bad4cef31fa82b7eb35eff291c7375c6b16afecaeeea768b
+  data.tar.gz: f22d48fb3b8f72bce97751e66562e7bc5afe16ccc4236a4d1ac2b02dce214bc1
 SHA512:
-  metadata.gz: d68b1aec17fdbc160393fad93a9afdfa5650cdab9413226830054f84568efca1315ef1a34de2b3b44075b5a843627cfb75bb8b451d03fea405c02fae634aa097
-  data.tar.gz: 5dfb59a2f91082cf3e305db4d965a8f7c41d7617f7642adb1f7505fac1673bcedce22124465053a950ab2434878e434a34a835d39cefaec36c343975b9d099e3
+  metadata.gz: 4ced29c94068d38cc9e648639af9e1f41522527fdae7374042b6e61316b935410d0d5231e720957f260fd53f07e92d0c99575e330a9888438ace0e8c15960051
+  data.tar.gz: dc784bf72977b0e0e5591e5b01f33833235619c261a2d12a5424b37e81180355f215bb354e0a0a897b6b904f94cd476649eb578ca9f00d0e83d31472dc89b929

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.1

data/README.md

@@ -1,3 +1,7 @@
 # better-faraday
 
 A gem extending Faraday (popular Ruby HTTP client) with useful features without breaking anything.
+
+## Ruby before 2.5
+
+Please, add `backport_yield_self` to your dependencies.

data/better-faraday.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name                  = "better-faraday"
-  s.version               = "1.0.3"
+  s.version               = "1.0.4"
   s.author                = "Yaroslav Konoplov"
   s.email                 = "eahome00@gmail.com"
   s.summary               = "Extends Faraday with useful features."

data/lib/better-faraday.rb

@@ -7,6 +7,7 @@ require "faraday/error"
 require "faraday/options"
 require "faraday/response"
 require "active_support/core_ext/object/deep_dup"
+require "active_support/core_ext/string/filters"
 
 Module.new do
   def run_request(method, url, body, headers, &block)
@@ -46,7 +47,7 @@ module Faraday
       request_json     = parse_json(env.request_body)
       response_headers = ::Hash === env.response_headers ? env.response_headers.deep_dup : {}
       response_json    = parse_json(env.body)
-      [request_headers, request_json, response_headers, response_json].compact.each { |hash| sanitize(hash) }
+      [request_headers, request_json, response_headers, response_json].compact.each(&method(:protect!))
 
       [ "",
         "-- #{status} #{reason_phrase} --",
@@ -58,16 +59,16 @@ module Faraday
         env.method.to_s.upcase,
         "",
         "-- Request headers --",
-        ::JSON.generate(request_headers),
+        ::JSON.generate(request_headers).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
         "",
         "-- Request body --",
-        request_json ? ::JSON.generate(request_json) : env.request_body.to_s,
+        (request_json ? ::JSON.generate(request_json) : env.request_body.to_s).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
         "",
         "-- Response headers --",
-        response_headers ? ::JSON.generate(response_headers) : env.response_headers.to_s,
+        (response_headers ? ::JSON.generate(response_headers) : env.response_headers.to_s).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
         "",
         "-- Response body --",
-        response_json ? ::JSON.generate(response_json) : env.body.to_s,
+        (response_json ? ::JSON.generate(response_json) : env.body.to_s).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
         ""
       ].join("\n")
     end
@@ -75,15 +76,17 @@ module Faraday
   private
 
     def parse_json(json)
-      ::JSON.parse(::String === json ? json : json.to_s, quirks_mode: false)
+      data = ::JSON.parse(::String === json ? json : json.to_s)
+      data if ::Hash === data || ::Array === data
     rescue ::JSON::ParserError
       nil
     end
 
-    def sanitize(h)
-      h.keys.map(&:to_s).each do |k|
-        h[k] = "SECRET" if k.respond_to?(:=~) && Faraday.secrets.any? { |s| k =~ s }
-        sanitize(h[k]) if ::Hash === h[k]
+    def protect!(x)
+      return x.map!(&method(:protect!)) if ::Array === x
+      x.keys.each do |k|
+        x[k] = "SECRET" if k.respond_to?(:=~) && Faraday.secrets.any? { |s| k =~ s }
+        protect!(x[k]) if ::Hash === x[k]
       end
     end
   end
@@ -100,5 +103,5 @@ module Faraday
     attr_accessor :secrets
   end
 
-  self.secrets = [/pass(?:word|phrase)/i, /authorization/i, /secret/i]
+  self.secrets = [/\bpass(?:word|phrase)\b/i, /\bauthorization\b/i, /\bsecret\b/i, /\b(:?access?)token\b/i]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better-faraday
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Extends Faraday with useful features.