httplog 0.2.3 → 0.2.4

data/README.md

@@ -8,7 +8,7 @@ So far this gem works with the following ruby modules and libraries:
 
 * [Net::HTTP](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/net/http/rdoc/index.html)
 * [Ethon](https://github.com/typhoeus/ethon)
-* [Excon](https://github.com/geemus/excon)
+* [Excon](https://github.com/geemus/excon) (for excon >= v18.0, httplog >= 0.2.4 is required)
 * [OpenURI](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/open-uri/rdoc/index.html)
 * [Patron](https://github.com/toland/patron)
 * [HTTPClient](https://github.com/nahi/httpclient)

data/lib/httplog/adapters/excon.rb

@@ -3,8 +3,8 @@ if defined?(Excon)
     class Socket
       alias_method :orig_connect, :connect
       def connect
-        host = @proxy ? @proxy[:host] : @params[:host]
-        port = @proxy ? @proxy[:port] : @params[:port]
+        host = @data[:proxy] ? @data[:proxy][:host] : @data[:host]
+        port = @data[:proxy] ? @data[:proxy][:port] : @data[:port]
         HttpLog.log_connection(host, port)
         orig_connect
       end
@@ -12,24 +12,39 @@ if defined?(Excon)
     end
 
     class Connection
-      alias_method :orig_request_kernel, :request_kernel
-      def request_kernel(params)
-       url = "#{params[:scheme]}://#{params[:host]}:#{params[:port]}#{params[:path]}#{params[:query]}"
-        HttpLog.log_request(params[:method], url)
-        HttpLog.log_headers(params[:headers])
-        HttpLog.log_data(params[:body]) if params[:method] == :post
 
-        response = nil
+      def _httplog_url(datum)
+        "#{datum[:scheme]}://#{datum[:host]}:#{datum[:port]}#{datum[:path]}#{datum[:query]}"
+      end
+
+      alias_method :orig_request, :request
+      def request(params, &block)
+        datum = nil
         bm = Benchmark.realtime do
-          response = orig_request_kernel(params)
+          datum = orig_request(params, &block)
         end
-
-        HttpLog.log_compact(params[:method], url, response.status, bm)
-        HttpLog.log_status(response.status)
+        HttpLog.log_compact(datum[:method], _httplog_url(datum), datum[:status], bm)
         HttpLog.log_benchmark(bm)
-        HttpLog.log_body(response.body)
+        datum
+      end
 
-        response
+      alias_method :orig_request_call, :request_call
+      def request_call(datum)
+        HttpLog.log_request(datum[:method], _httplog_url(datum))
+        HttpLog.log_headers(datum[:headers])
+        HttpLog.log_data(datum[:body]) if datum[:method] == :post
+        orig_request_call(datum)
+      end
+
+      alias_method :orig_response, :response
+      def response(datum={})
+        bm = Benchmark.realtime do
+          datum = orig_response(datum)
+        end
+        response = datum[:response]
+        HttpLog.log_status(response[:status])
+        HttpLog.log_body(response[:body])
+        datum
       end
     end
   end

data/lib/httplog/adapters/net_http.rb

@@ -23,7 +23,8 @@ module Net
         HttpLog.log_compact(req.method, url, @response.code, bm)
         HttpLog.log_status(@response.code)
         HttpLog.log_benchmark(bm)
-        HttpLog.log_body(@response.body)
+        HttpLog.log_headers(@response.each_header.collect)
+        HttpLog.log_body(@response.body, @response.header["Content-Encoding"])
       end
 
       @response

data/lib/httplog/http_log.rb

@@ -57,14 +57,20 @@ module HttpLog
       log("Benchmark: #{seconds} seconds")
     end
 
-    def log_body(body)
+    def log_body(body, encoding = nil)
       return if options[:compact_log] || !options[:log_response]
       if body.is_a?(Net::ReadAdapter)
         # open-uri wraps the response in a Net::ReadAdapter that defers reading
         # the content, so the reponse body is not available here.
         log("Response: (not available yet)")
       else
-        log("Response:\n#{body.to_s}")
+        if encoding =~ /gzip/
+          sio = StringIO.new( body.to_s )
+          gz = Zlib::GzipReader.new( sio )
+          log("Response: (deflated)\n#{gz.read}")
+        else
+          log("Response:\n#{body.to_s}")
+        end
       end
     end
 

data/lib/httplog/version.rb

@@ -1,4 +1,4 @@
 module HttpLog
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httplog
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -202,18 +202,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1928624489278995380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1928624489278995380
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -221,3 +215,4 @@ signing_key:
 specification_version: 3
 summary: Logs outgoing HTTP requests.
 test_files: []
+has_rdoc: