songkick-transport 0.1.1 → 0.1.2

data/examples/foo.rb

@@ -0,0 +1,9 @@
+require './lib/songkick/transport'
+
+t = Songkick::Transport::Curb.new 'localhost:4567'
+r = Songkick::Transport.report
+
+r.execute { t.get '/' }
+
+p r.first.duration
+

data/examples/server.rb

@@ -6,7 +6,7 @@ get '/' do
 end
 
 get '/slow' do
-  sleep 60
+  sleep 3
   '{"helloooooo":"world"}'
 end
 

data/lib/songkick/transport/base.rb

@@ -7,16 +7,18 @@ module Songkick
       HTTP_VERBS.each do |verb|
         class_eval %{
           def #{verb}(path, params = {}, head = {}, timeout = nil)
-            req = Request.new(endpoint, '#{verb}', path, params, headers.merge(head), timeout, Time.now)
+            req = Request.new(endpoint, '#{verb}', path, params, headers.merge(head), timeout)
             Reporting.log_request(req)
             
-            response = execute_request(req)
+            req.response = execute_request(req)
+            
+            Reporting.log_response(req)
+            Reporting.record(req)
+            req.response
             
-            Reporting.log_response(response, req)
-            Reporting.record(req, response)
-            response
           rescue => error
-            Reporting.record(req, nil, error)
+            req.error = error
+            Reporting.record(req)
             raise error
           end
         }

data/lib/songkick/transport/curb.rb

@@ -45,7 +45,7 @@ module Songkick
         end
         
         if req.use_body?
-          connection.headers['Content-Type'] = req.content_type
+          connection.headers['Content-Type'] ||= req.content_type
           connection.__send__("http_#{req.verb}", req.body)
         else
           connection.__send__("http_#{req.verb}")

data/lib/songkick/transport/rack_test.rb

@@ -24,19 +24,20 @@ module Songkick
           def #{verb}(path, params = {}, head = {}, timeout = nil)
             client  = Client.new(@app)
             start   = Time.now
-            request = Request.new(@app, '#{verb}', path, params, headers.merge(head), timeout, start)
+            request = Request.new(@app, '#{verb}', path, params, headers.merge(head), timeout)
             result  = nil
             
             Timeout.timeout(timeout || @timeout) do
               request.headers.each { |key, value| client.header(key, value) }
               response = client.#{verb}(path, params)
-              result = process("\#{path}, \#{params.inspect}", response.status, response.headers, response.body)
-              Reporting.record(request, result)
-              result
+              request.response = process("\#{path}, \#{params.inspect}", response.status, response.headers, response.body)
+              Reporting.record(request)
+              request.response
             end
 
           rescue UpstreamError => error
-            Reporting.record(request, nil, error)
+            request.error = error
+            Reporting.record(request)
             raise error
           
           rescue Object => error

data/lib/songkick/transport/reporting.rb

@@ -6,9 +6,9 @@ module Songkick
         Report.new
       end
       
-      def self.record(request, response, error = nil)
+      def self.record(request)
         return unless report = Thread.current[:songkick_transport_report]
-        report.record(request, response, error)
+        report << request
       end
       
       def self.log_request(request)
@@ -16,8 +16,9 @@ module Songkick
         logger.info(request.to_s)
       end
       
-      def self.log_response(response, request)
+      def self.log_response(request)
         return unless Transport.verbose?
+        response = request.response
         duration = (Time.now.to_f - request.start_time.to_f) * 1000
         logger.info "Response status: #{response.status}, duration: #{duration.ceil}ms"
         logger.debug "Response data: #{response.data.inspect}"
@@ -30,7 +31,7 @@ module Songkick
       class Report
         include Enumerable
         extend Forwardable
-        def_delegators :@requests, :each, :first, :last, :length, :size, :[]
+        def_delegators :@requests, :each, :first, :last, :length, :size, :[], :<<
         
         def initialize
           @requests = []
@@ -43,12 +44,6 @@ module Songkick
           Thread.current[:songkick_transport_report] = nil
         end
         
-        def record(request, response, error)
-          request.response = response
-          request.error = error
-          @requests << request
-        end
-        
         def total_duration
           inject(0) { |s,r| s + r.duration }
         end

data/lib/songkick/transport/request.rb

@@ -2,9 +2,6 @@ module Songkick
   module Transport
     
     class Request
-      attr_accessor :response,
-                    :error
-      
       attr_reader   :endpoint,
                     :verb,
                     :path,
@@ -12,24 +9,37 @@ module Songkick
                     :headers,
                     :timeout,
                     :start_time,
-                    :duration
+                    :response,
+                    :error
       
       alias :http_method :verb
       
-      def initialize(endpoint, verb, path, params, headers = {}, timeout = DEFAULT_TIMEOUT, start_time = nil, response = nil, error = nil)
+      def initialize(endpoint, verb, path, params, headers = {}, timeout = DEFAULT_TIMEOUT)
         @endpoint   = endpoint
         @verb       = verb.to_s.downcase
         @path       = path
         @headers    = headers
         @params     = params
         @timeout    = timeout
-        @response   = response
-        @error      = error
         @start_time = start_time || Time.now
-        @duration   = (Time.now.to_f - start_time.to_f) * 1000
         @multipart  = Serialization.multipart?(params)
       end
       
+      def response=(response)
+        @response = response
+        @end_time = Time.now
+      end
+      
+      def error=(error)
+        @error = error
+        @end_time = Time.now
+      end
+      
+      def duration
+        return nil unless @end_time
+        (@end_time.to_f - @start_time.to_f) * 1000
+      end
+      
       def use_body?
         USE_BODY.include?(@verb)
       end
@@ -61,7 +71,10 @@ module Songkick
       end
       
       def to_s
-        url = Serialization.build_url(@verb, @endpoint, @path, @params, true)
+        url = String === @endpoint ?
+              Serialization.build_url(@verb, @endpoint, @path, @params, true) :
+              @endpoint.to_s
+        
         command = "#{@verb.upcase} '#{url}'"
         @headers.each do |key, value|
           value = Serialization::SANITIZED_VALUE if Serialization.sanitize?(key)

data/spec/songkick/transport_spec.rb

@@ -59,6 +59,11 @@ describe Songkick::Transport do
         data = transport.get("/authenticate").data
         data.should == {"successful" => false}
       end
+      
+      it "can set Content-Type" do
+        data = transport.with_headers("Content-Type" => "application/json").post("/content").data
+        data.should == {"type" => "application/json"}
+      end
     end
     
     describe :post do

data/spec/spec_helper.rb

@@ -34,6 +34,10 @@ class TestApp < Sinatra::Base
     Yajl::Encoder.encode('id' => 'new', 'name' => params[:name].upcase)
   end
   
+  post '/content' do
+    Yajl::Encoder.encode('type' => env['CONTENT_TYPE'])
+  end
+  
   put '/artists/:id' do
     name = params[:name] || CGI.parse(env['rack.input'].read)['name'].first || ''
     Yajl::Encoder.encode('id' => params[:id].to_i, 'name' => name.downcase)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songkick-transport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -167,6 +167,7 @@ files:
 - examples/loop.rb
 - examples/thread_safety.rb
 - examples/server.rb
+- examples/foo.rb
 - examples/example.rb
 - lib/songkick/transport/request.rb
 - lib/songkick/transport/rack_test.rb