httplog 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a563960b35577eb712fdf298a8973b8030e01f
-  data.tar.gz: 3dedc8250dd7b90ee49a3047716895a4ec439efb
+  metadata.gz: 9395e3bb51404b12d1d3504e928ae722793de10c
+  data.tar.gz: a365c1134ff32ec56eb14f0fd26ac9b971269e1e
 SHA512:
-  metadata.gz: 530f311be78977ad7b5b5bb7574201b128f994996e9f4d0587938603a5c75ca6b9fdf6406d4005a09d48a0f3ee9bd2edfffa5704cecc0f4ad8952b316ff8dd07
-  data.tar.gz: 596e07bd67d4c1e9e83499e85abc7646a70f197f82dc2c6e6f069d3c160419add18e8212a7ac7eb60178af51cd055cd750975a6a3d477a68adecdc5786292609
+  metadata.gz: e2a020f5b5e3d7796cf37194e7e77942ffe4f39e6d2ec2319d5c25e1d18ee62780240397df4e71407a5bfd45d04835fce02cfefb3731a19bcad10bcf5965196e
+  data.tar.gz: 9c5dda03458471e2fa64b1853c2b0ddd08820802268dc4c4681de322b008912f2e79a100525135f2b2282939ef157bc4618ac21b178589d8987316747640e460

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    httplog (1.2.1)
+    httplog (1.2.2)
       rack (>= 1.0)
       rainbow (>= 2.0.0)
 

data/httplog.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov', ['~> 0.15']
   gem.add_development_dependency 'thin', ['~> 1.7']
 
-  # gem.add_dependency 'colorize', ['~> 0.8']
-  gem.add_dependency 'rainbow', ['>= 2.0.0']
   gem.add_dependency 'rack', ['>= 1.0']
+  gem.add_dependency 'rainbow', ['>= 2.0.0']
 end

data/lib/httplog/adapters/ethon.rb

@@ -8,7 +8,7 @@ if defined?(Ethon)
       module Http
         alias orig_http_request http_request
         def http_request(url, action_name, options = {})
-          @http_log    = options.merge(method: action_name) # remember this for compact logging
+          @http_log = options.merge(method: action_name) # remember this for compact logging
           orig_http_request(url, action_name, options)
         end
       end
@@ -22,7 +22,6 @@ if defined?(Ethon)
 
           # Not sure where the actual status code is stored - so let's
           # extract it from the response header.
-          status   = response_headers.scan(%r{HTTP/... (\d{3})}).flatten.first
           encoding = response_headers.scan(/Content-Encoding: (\S+)/).flatten.first
           content_type = response_headers.scan(/Content-Type: (\S+(; charset=\S+)?)/).flatten.first
 
@@ -37,7 +36,7 @@ if defined?(Ethon)
             request_headers: @http_log[:headers],
             response_code: @return_code,
             response_body: response_body,
-            response_headers: headers.map{ |header| header.split(/:\s/) }.to_h,
+            response_headers: headers.map { |header| header.split(/:\s/) }.to_h,
             benchmark: bm,
             encoding: encoding,
             content_type: content_type

data/lib/httplog/adapters/excon.rb

@@ -3,7 +3,7 @@
 if defined?(Excon)
   module Excon
     module HttpLogHelper
-      def _httplog_url(datum)
+      def httplog_url(datum)
         @httplog_url ||= "#{datum[:scheme]}://#{datum[:host]}:#{datum[:port]}#{datum[:path]}#{datum[:query]}"
       end
     end
@@ -14,7 +14,7 @@ if defined?(Excon)
       def connect
         host = @data[:proxy] ? @data[:proxy][:host] : @data[:host]
         port = @data[:proxy] ? @data[:proxy][:port] : @data[:port]
-        HttpLog.log_connection(host, port) if ::HttpLog.url_approved?(_httplog_url(@data))
+        HttpLog.log_connection(host, port) if ::HttpLog.url_approved?(httplog_url(@data))
         orig_connect
       end
     end
@@ -30,7 +30,7 @@ if defined?(Excon)
           result = orig_request(params, &block)
         end
 
-        url = _httplog_url(@data)
+        url = httplog_url(@data)
         return result unless HttpLog.url_approved?(url)
 
         headers = result[:headers] || {}

data/lib/httplog/adapters/http.rb

@@ -8,18 +8,17 @@ if defined?(::HTTP::Client) && defined?(::HTTP::Connection)
       alias_method(orig_request_method, request_method) unless method_defined?(orig_request_method)
 
       define_method request_method do |req, options|
-        if HttpLog.url_approved?(req.uri)
+        bm = Benchmark.realtime do
+          @response = send(orig_request_method, req, options)
+        end
 
+        if HttpLog.url_approved?(req.uri)
           body = if defined?(::HTTP::Request::Body)
                    req.body.respond_to?(:source) ? req.body.source : req.body.instance_variable_get(:@body)
                  else
                    req.body
                  end
 
-          bm = Benchmark.realtime do
-            @response = send(orig_request_method, req, options)
-          end
-
           HttpLog.call(
             method: req.verb,
             url: req.uri,

data/lib/httplog/http_log.rb

@@ -119,7 +119,7 @@ module HttpLog
           sio = StringIO.new(body.to_s)
           gz = Zlib::GzipReader.new(sio)
           body = gz.read
-        rescue Zlib::GzipFile::Error => e
+        rescue Zlib::GzipFile::Error
           log("(gzip decompression failed)")
         end
       end
@@ -178,7 +178,7 @@ module HttpLog
     end
 
     def transform_response_code(response_code_name)
-      Rack::Utils::HTTP_STATUS_CODES.detect{ |k, v| v.to_s.downcase == response_code_name.to_s.downcase }.first
+      Rack::Utils::HTTP_STATUS_CODES.detect { |_k, v| v.to_s.casecmp(response_code_name.to_s).zero? }.first
     end
 
     def colorize(msg)
@@ -190,7 +190,7 @@ module HttpLog
         msg = Rainbow(msg).color(config.color)
       end
       msg
-    rescue
+    rescue StandardError
       warn "HTTPLOG CONFIGURATION ERROR: #{config.color} is not a valid color"
       msg
     end

data/lib/httplog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HttpLog
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/spec/support/shared_examples.rb

@@ -3,7 +3,7 @@ RSpec.shared_examples 'logs request' do |method|
   it { is_expected.to include(HttpLog::LOG_PREFIX + "Sending: #{method} http://#{host}:#{port}#{path}") }
 end
 
-RSpec.shared_examples 'logs nothing' do |method|
+RSpec.shared_examples 'logs nothing' do
   subject { log }
   it { is_expected.to eq('') }
 end
@@ -20,7 +20,7 @@ RSpec.shared_examples 'logs status' do |status|
   it { is_expected.to include(["Status:", status].compact.join(' ')) }
 end
 
-RSpec.shared_examples 'logs benchmark' do |data|
+RSpec.shared_examples 'logs benchmark' do
   it { is_expected.to match(/Benchmark: \d+\.\d+ seconds/) }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httplog
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Thilo Rusche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -193,33 +193,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 description: |-
   Log outgoing HTTP requests made from your application. Helpful for tracking API calls
                        of third party gems that don't provide their own log output.