rack-client 0.3.0 → 0.3.1.pre.a

data/lib/rack/client/handler/typhoeus.rb

@@ -6,8 +6,8 @@ module Rack
       class Typhoeus
         include Rack::Client::DualBand
 
-        def initialize(url, hydra = Typhoeus::Hydra.new)
-          @uri, @hydra = URI.parse(url), hydra
+        def initialize(hydra = ::Typhoeus::Hydra.new)
+          @hydra = hydra
         end
 
         def async_call(env)
@@ -30,15 +30,22 @@ module Rack
 
         def parse(typhoeus_response)
           body = (typhoeus_response.body.nil? || typhoeus_response.body.empty?) ? [] : StringIO.new(typhoeus_response.body)
-          Response.new(typhoeus_response.code, Headers.new(typhoeus_response.headers_hash).to_http, body)
+          Response.new(typhoeus_response.code, headers_for(typhoeus_response).to_http, body)
         end
 
         def request_for(rack_request)
-          ::Typhoeus::Request.new((@uri + rack_request.path).to_s, params_for(rack_request))
+          ::Typhoeus::Request.new((rack_request.url).to_s, params_for(rack_request))
+        end
+
+        def headers_for(typhoeus_response)
+          headers = typhoeus_response.headers_hash
+          headers.reject! {|k,v| v.nil? }           # Typhoeus Simple bug: http://github.com/pauldix/typhoeus/issues#issue/42
+
+          Headers.new(headers)
         end
 
         def process(rack_request)
-          ::Typhoeus::Request.run((@uri + rack_request.path).to_s, params_for(rack_request))
+          ::Typhoeus::Request.run((rack_request.url).to_s, params_for(rack_request))
         end
 
         def params_for(rack_request)