better-faraday 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48028546f73694c5803cc254cf7301337b7c7a231451e45abd7aba214b321baa
-  data.tar.gz: 498d6550e544f4e8fb703d14f5f8f2cbd9bd8d369db58c65aa91d1d237e52d4d
+  metadata.gz: 566a4665f7f21fbc42e2ab20190caf5d87d3d49d775ac376135c273728132334
+  data.tar.gz: 4ab4177eb90929e0c3f1f89aa8418c74af97120770c68595cf6ba630e9d8894c
 SHA512:
-  metadata.gz: 4ce4fca25c344845a1be578063849c96cc55e0790e1d2bbecd45cab67cdbaf647e3bd04875beae0ccf5bff607026302fd055c902d478e7166c07a4e4bbc9bd23
-  data.tar.gz: f4c9fc09053ab9ec50080f32c1fd97e7ae7c44c267c41519a76d4f0c6b7f4f93e7fe9e227b0dfddea541b54de01b327fb6d62b72b25a4c885bf3c75c350423a5
+  metadata.gz: 0c459e43aed401c92e6e57957c057bfef94a4194dfb77bb789e3d5466cd99153f17a43b883a9a5896c3c0c5a074ab42f39ddda0ae749bc33744c40aebeb34054
+  data.tar.gz: ceddc5b83c55fc7546b0dd2c6edb88a9711f8308c7c9363f1868b32b67e419b9b44ad41b0a6a3c8a114c34b2497a6db11b79d924a45a64c0ec128c56340f95db

data/better-faraday.gemspec

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

data/lib/better-faraday.rb

@@ -31,9 +31,9 @@ module Faraday
 
   class Response
     def assert_2xx!
-      return self if status >= 200 && status <= 299
+      return self if status_2xx?
 
-      klass = if status >= 400 && status <= 499
+      klass = if status_4xx?
         "Faraday::HTTP#{status}".safe_constantize || Faraday::HTTP4xx
       else
         Faraday::Error
@@ -47,12 +47,27 @@ module Faraday
     alias ok! assert_2xx! # Short name.
     alias assert_success! assert_2xx! # Compatibility.
 
+    def status_2xx?
+      status >= 200 && status <= 299
+    end
+
+    def status_3xx?
+      status >= 300 && status <= 399
+    end
+
+    def status_4xx?
+      status >= 400 && status <= 499
+    end
+
+    def status_5xx?
+      status >= 500 && status <= 599
+    end
+
     def describe
-      request_headers  = env.request_headers.deep_dup
-      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(&method(:protect!))
+      request_headers  = __protect_data(env.request_headers.deep_dup)
+      request_json     = __protect_data(parse_json(env.request_body))
+      response_headers = __protect_data(::Hash === env.response_headers ? env.response_headers.deep_dup : {})
+      response_json    = __protect_data(__parse_json(env.body))
 
       [ "",
         "-- #{status} #{reason_phrase} --",
@@ -80,18 +95,23 @@ module Faraday
 
   private
 
-    def parse_json(json)
-      data = ::JSON.parse(::String === json ? json : json.to_s)
+    def __parse_json(json)
+      return nil unless ::String === json
+      data = ::JSON.parse(json)
       data if ::Hash === data || ::Array === data
     rescue ::JSON::ParserError
       nil
     end
 
-    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]
+    def __protect_data(data)
+      return data.map(&method(:__protect_data)) if ::Array === data
+      return data unless ::Hash === data
+      data.each_with_object({}) do |(key, value), memo|
+        memo[key] = if key.respond_to?(:=~) && Faraday.secrets.any? { |s| key =~ s }
+          "SECRET"
+        else
+          __protect_data(value)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better-faraday
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extends Faraday with useful features.