better-faraday 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dffcabe229bcdabe18df3b0404af88381d6cf4ef3e8cebde48d95abc34bf717
-  data.tar.gz: 2ee1d3d4f126fdd52da8e395f5c8cdcc0da7b0f9a1d31708b390989c5f531b8e
+  metadata.gz: f6f0c2729ee0008d378633405c1b5b7ce2487d2ff16c78bce61973a4bc524a2f
+  data.tar.gz: 3e5dc920399d735b9de37efd781430fa1f19ee51a2fc0d11d88cf3b0fe5771c8
 SHA512:
-  metadata.gz: bfb4e6754efb1c44b6074c1cea214bd203c602415f699fe1bf3da728b7049b79ed2b8dfcef93ad378017f74fa1f5016d397af7fcae55802642550d97e32dacba
-  data.tar.gz: d4e0629efd3ef722c1232c5ca085574d679af1063a8a6ef0e038fcf5de85f2893301dc6a32adacb2deb90cb09e293fe45c38fae58a87da2c67e6161a668887a6
+  metadata.gz: 72017939d4eaddce9514bb76d329ae2fba24e9bce2ed4d9bbbc51341f7b21adb68d6a5fa81222abff6d47faae49fb56e0ef1bf648cbc66a69a5553e419529782
+  data.tar.gz: 426bab6ab085ca927e4e7999903286371308b00ce551ef60525555043e8807b2ea0e87f2392a12d8f1b8715474399be40261b490dd84e9eca6574c11f163cdb0

data/better-faraday.gemspec

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

data/lib/better-faraday.rb

@@ -11,14 +11,21 @@ require "active_support/core_ext/string/filters"
 require "active_support/core_ext/string/inflections"
 
 Module.new do
-  def run_request(method, url, body, headers, &block)
-    super.tap { |response| response.env.instance_variable_set(:@request_body, body) }
+  def call(env)
+    env.instance_variable_set(:@request_sent_at, Time.now.utc)
+    super
   end
-end.tap { |m| Faraday::Connection.send(:prepend, m) }
+
+  def save_response(env, status, body, headers = nil, reason_phrase = nil)
+    env.instance_variable_set(:@response_received_at, Time.now.utc)
+    env.instance_variable_set(:@request_body, env.body.respond_to?(:read) ? env.body.read : env.body)
+    super
+  end
+end.tap { |m| Faraday::Adapter.send(:prepend, m) }
 
 module Faraday
   class Env
-    attr_reader :request_body
+    attr_reader :request_body, :request_sent_at, :response_received_at
   end
 
   class Error
@@ -39,7 +46,7 @@ module Faraday
         Faraday::Error
       end
 
-      error = klass.new(describe)
+      error = klass.new("\n#{describe}")
       error.instance_variable_set(:@response, self)
       raise error
     end
@@ -69,8 +76,9 @@ module Faraday
       response_headers = __protect_data(::Hash === env.response_headers ? env.response_headers.deep_dup : {})
       response_json    = __protect_data(__parse_json(env.body))
 
-      [ "",
-        "-- #{status} #{reason_phrase} --",
+      lines = [
+        "",
+        "-- #{status} #{reason_phrase} --".upcase,
         "",
         "-- Request URL --",
         env.url.to_s,
@@ -79,18 +87,33 @@ module Faraday
         env.method.to_s.upcase,
         "",
         "-- Request headers --",
-        ::JSON.generate(request_headers).yield_self { |t| t.truncate(1024, omission: "... (truncated, full length: #{t.length})") },
+        ::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})") },
         "",
+        "-- 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(1024, omission: "... (truncated, full length: #{t.length})") },
+        (response_headers ? ::JSON.generate(response_headers) : env.response_headers.to_s).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(1024, omission: "... (truncated, full length: #{t.length})") },
-        ""
-      ].join("\n")
+        (response_json ? ::JSON.generate(response_json) : env.body.to_s).yield_self { |t| t.truncate(2048, omission: "... (truncated, full length: #{t.length})") }
+      ]
+
+      if env.response_received_at
+        lines.concat [
+          "",
+          "-- Response received at --",
+          env.response_received_at.strftime("%Y-%m-%d %H:%M:%S.%2N") + " UTC",
+          "",
+          "-- Response received in --",
+          "#{((env.response_received_at.to_f - env.request_sent_at.to_f) * 1000.0).round(2)}ms"
+        ]
+      end
+
+      lines.join("\n")
     end
 
   private

metadata

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