better-faraday 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f0c2729ee0008d378633405c1b5b7ce2487d2ff16c78bce61973a4bc524a2f
-  data.tar.gz: 3e5dc920399d735b9de37efd781430fa1f19ee51a2fc0d11d88cf3b0fe5771c8
+  metadata.gz: 3c28a4a8921cc595ea37a968efe8127a9ac3da2044ff76168bfe076761965a93
+  data.tar.gz: 937005a9d7e8dea011d3872e42f470bded405821186e414bcea64b0cd9953367
 SHA512:
-  metadata.gz: 72017939d4eaddce9514bb76d329ae2fba24e9bce2ed4d9bbbc51341f7b21adb68d6a5fa81222abff6d47faae49fb56e0ef1bf648cbc66a69a5553e419529782
-  data.tar.gz: 426bab6ab085ca927e4e7999903286371308b00ce551ef60525555043e8807b2ea0e87f2392a12d8f1b8715474399be40261b490dd84e9eca6574c11f163cdb0
+  metadata.gz: 142c021bc1f27154292f8ce8a8b52ba5742cea07d34d3d7bf5b69700655bb83ae51be5ca89ac4444863711d66d1289116c9be5379d4e7d893f4ef70d29c7aef0
+  data.tar.gz: f3a5b027c3be795db544b320b66edcdf537577f580fc231e7ee40e8bdad6935e5d1beb57f9c27e704e6a8c5b1d2b5ba1faf0333ca6dde5aa0724d982eec9b43d

data/better-faraday.gemspec

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

data/lib/better-faraday.rb

@@ -71,10 +71,19 @@ module Faraday
     end
 
     def describe
-      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))
+      request_headers = __protect_data(env.request_headers.deep_dup)
+
+      if env.request_headers["Content-Type"].to_s.match?(/\bapplication\/json\b/)
+        request_json = __protect_data(__parse_json(env.request_body.dup))
+      end
+
+      if env.response_headers
+        response_headers = __protect_data(env.response_headers.deep_dup)
+      end
+
+      if env.response_headers && env.response_headers["Content-Type"].to_s.match?(/\bapplication\/json\b/)
+        response_json = __protect_data(__parse_json(env.body.dup))
+      end
 
       lines = [
         "",
@@ -89,17 +98,43 @@ module Faraday
         "-- Request headers --",
         ::JSON.generate(request_headers).yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") },
         "",
+
         "-- Request body --",
-        (request_json ? ::JSON.generate(request_json) : env.request_body.to_s).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
+        if request_json
+          ::JSON.generate(request_json)
+        else
+          body = env.request_body.to_s.dup
+          if body.encoding.name == "ASCII-8BIT"
+            "Binary (#{body.size} bytes)"
+          else
+            body
+          end
+        end.yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
         "",
+
         "-- Request sent at --",
         env.request_sent_at.strftime("%Y-%m-%d %H:%M:%S.%2N") + " UTC",
         "",
+
         "-- Response headers --",
-        (response_headers ? ::JSON.generate(response_headers) : env.response_headers.to_s).yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") },
+        if response_headers
+          ::JSON.generate(response_headers)
+        else
+          env.response_headers.to_s
+        end.yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") },
         "",
+
         "-- Response body --",
-        (response_json ? ::JSON.generate(response_json) : env.body.to_s).yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") }
+        if response_json
+          ::JSON.generate(response_json)
+        else
+          body = env.body.to_s.dup
+          if body.encoding.name == "ASCII-8BIT"
+            "Binary (#{body.size} bytes)"
+          else
+            body
+          end
+        end.yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") }
       ]
 
       if env.response_received_at
@@ -113,7 +148,7 @@ module Faraday
         ]
       end
 
-      lines.join("\n")
+      lines.join("\n") + "\n"
     end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better-faraday
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday