httplog 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d68ccbe75956716551dd1c429ebec57d1930fe
-  data.tar.gz: 365d302175b5c0c7470d8ec25184791aafe0efb7
+  metadata.gz: bc801e5fc39b6c93832bbadaa2c1204e2d969339
+  data.tar.gz: 3e040bc3c9bda9eb1ae93bf66c3828dd5df4482d
 SHA512:
-  metadata.gz: ddee93a1e7282327c9efe1273c3c7b603d5691e49743b5214b8fd430f3564469a946a04a845dea6ee27f4b22a104f583421d6c8def81ac77227c00f739f85a65
-  data.tar.gz: 300a45a60aa947acc95b9cd9dbec6affe40467f8e49efad0a56d486738d03d9ce3fcd15997d7144efc3b8855c8844157e61a88a6970c03a77cc5958dbf119d65
+  metadata.gz: a25911aaa39b63cf038adf005c47d2c5793f171e3ad6d37d72ca54535b38243870a6508c825e7fb5ea4628121d371aee3025d357ed835cbc38b37c15a3e98b09
+  data.tar.gz: 28955f8848345352693e58227659977db677739c9cf11e2a34dbdaf075a8c245fad92cbe0b8ab8ac1d129b48bde312d0ff25c9fac46e5501d0b1b0f271b8bbed

data/README.md

@@ -15,6 +15,7 @@ So far this gem works with the following ruby modules and libraries:
 * [Patron](https://github.com/toland/patron)
 * [HTTPClient](https://github.com/nahi/httpclient)
 * [HTTParty](https://github.com/jnunemaker/httparty)
+* [HTTP](http://rubygems.org/gems/http)
 
 These libraries are at least partially supported, where they use one of the above as adapters:
 
@@ -54,8 +55,8 @@ You can override the following default options:
 
 	# only log requests made to specified hosts (URLs)
     HttpLog.options[:url_whitelist_pattern] = /.*/
-    # overrides whitelist 
-    HttpLog.options[:url_blacklist_pattern] = nil 
+    # overrides whitelist
+    HttpLog.options[:url_blacklist_pattern] = nil
 
 So if you want to use this in a Rails app:
 
@@ -109,6 +110,8 @@ With the default configuration, the log output might look like this:
 * When using Ethon or Patron, and any library based on them (such as Typhoeus),
   the TCP connection is not logged (since it's established by libcurl).
 
+* Benchmarking only covers the time between starting the HTTP request and receiving the response. It does *not* cover the time it takes to establish the TCP connection.
+
 ### Running the specs
 
 Make sure you have the necessary dependencies installed by running `bundle install`.
@@ -132,3 +135,4 @@ Thanks to these fine folks for contributing pull requests:
 * [Nikos Dimitrakopoulos](https://github.com/nikosd)
 * [Marcos Hack](https://github.com/marcoshack)
 * [Andrew Hammond](https://github.com/andrhamm)
+* [Chris Keele](https://github.com/christhekeele)

data/lib/httplog.rb

@@ -5,3 +5,4 @@ require "httplog/adapters/httpclient"
 require "httplog/adapters/excon"
 require "httplog/adapters/ethon"
 require "httplog/adapters/patron"
+require "httplog/adapters/http"

data/lib/httplog/adapters/http.rb

@@ -0,0 +1,44 @@
+if defined?(::HTTP::Client) and defined?(::HTTP::Connection)
+  module ::HTTP
+    class Client
+      alias_method(:orig_make_request, :make_request) unless method_defined?(:orig_make_request)
+
+      def make_request(req, options)
+
+        log_enabled = HttpLog.url_approved?(req.uri)
+
+        if log_enabled
+          HttpLog.log_request(req.verb, req.uri)
+          HttpLog.log_headers(req.headers.to_h)
+          HttpLog.log_data(req.body) if req.verb == :post
+        end
+
+        bm = Benchmark.realtime do
+          @response = orig_make_request(req, options)
+        end
+
+        if log_enabled
+          HttpLog.log_compact(req.verb, req.uri, @response.code, bm)
+          HttpLog.log_status(@response.code)
+          HttpLog.log_benchmark(bm)
+          HttpLog.log_headers(@response.headers.to_h)
+          HttpLog.log_body(@response.body, @response.headers["Content-Encoding"])
+        end
+
+        @response
+      end
+
+    end
+
+    class Connection
+      alias_method(:orig_initialize, :initialize) unless method_defined?(:orig_initialize)
+
+      def initialize(req, options)
+
+        HttpLog.log_connection(req.uri.host, req.uri.port) if HttpLog.url_approved?(req.uri)
+
+        orig_initialize(req, options)
+      end
+    end
+  end
+end

data/lib/httplog/version.rb

@@ -1,4 +1,4 @@
 module HttpLog
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httplog
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Thilo Rusche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,6 +164,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,7 @@ files:
 - lib/httplog.rb
 - lib/httplog/adapters/ethon.rb
 - lib/httplog/adapters/excon.rb
+- lib/httplog/adapters/http.rb
 - lib/httplog/adapters/httpclient.rb
 - lib/httplog/adapters/net_http.rb
 - lib/httplog/adapters/patron.rb
@@ -244,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Logs outgoing HTTP requests.