rack-client 0.3.1.pre.h → 0.3.1.pre.i

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

@@ -15,19 +15,26 @@ module Rack
         def sync_call(env)
           request = Rack::Request.new(env)
 
-          net_response = connection_for(request).request(net_request_for(request), body_for(request))
+          net_connection, net_request = net_connection_for(request), net_request_for(request)
+
+          if streaming_body?(request)
+            net_response = net_connection.request(net_request)
+          else
+            net_response = net_connection.request(net_request, body_for(request))
+          end
+
           parse(net_response).finish
         end
 
         def async_call(env)
           request = Rack::Request.new(env)
 
-          connection_for(request).request(net_request_for(request), body_for(request)) do |net_response|
+          net_connection_for(request).request(net_request_for(request), body_for(request)) do |net_response|
             yield parse_stream(net_response).finish
           end
         end
 
-        def connection_for(request)
+        def net_connection_for(request)
           connection = Net::HTTP.new(request.host, request.port)
 
           if request.scheme == 'https'
@@ -48,7 +55,11 @@ module Rack
                   when 'PUT'    then Net::HTTP::Put
                   end
 
-          klass.new(request.fullpath, Headers.from(request.env).to_http)
+          net_request = klass.new(request.fullpath, Headers.from(request.env).to_http)
+
+          net_request.body_stream = request.body if streaming_body?(request)
+
+          net_request
         end
 
         def body_for(request)
@@ -60,6 +71,18 @@ module Rack
           end
         end
 
+        def streaming_body?(request)
+          request.request_method == 'POST' &&
+            required_streaming_headers?(request) &&
+            request.body.is_a?(IO) &&
+            !request.body.is_a?(StringIO)
+        end
+
+        def required_streaming_headers?(request)
+          request.env.keys.include?('HTTP_CONTENT_LENGTH') ||
+            request.env['HTTP_TRANSFER_ENCODING'] == 'chunked'
+        end
+
         def parse(net_response)
           body = (net_response.body.nil? || net_response.body.empty?) ? [] : StringIO.new(net_response.body)
           Response.new(net_response.code.to_i, parse_headers(net_response), body)

data/lib/rack/client/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Client
-    VERSION = "0.3.1.pre.h"
+    VERSION = "0.3.1.pre.i"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rack-client
 version: !ruby/object:Gem::Version 
-  hash: 1923832059
+  hash: 1923832060
   prerelease: 6
   segments: 
   - 0
   - 3
   - 1
   - pre
-  - h
-  version: 0.3.1.pre.h
+  - i
+  version: 0.3.1.pre.i
 platform: ruby
 authors: 
 - Tim Carey-Smith
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -07:00
+date: 2011-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,59 +105,59 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- lib/rack/client.rb
-- lib/rack/client/middleware/cache.rb
-- lib/rack/client/middleware/follow_redirects.rb
+- lib/rack/client/adapter/base.rb
+- lib/rack/client/adapter/simple.rb
+- lib/rack/client/adapter.rb
+- lib/rack/client/body.rb
+- lib/rack/client/core/dual_band.rb
+- lib/rack/client/core/headers.rb
+- lib/rack/client/core/response.rb
+- lib/rack/client/core.rb
+- lib/rack/client/handler/em-http.rb
+- lib/rack/client/handler/excon.rb
+- lib/rack/client/handler/net_http.rb
+- lib/rack/client/handler/typhoeus.rb
+- lib/rack/client/handler.rb
+- lib/rack/client/middleware/auth/abstract/challenge.rb
+- lib/rack/client/middleware/auth/basic.rb
+- lib/rack/client/middleware/auth/digest/challenge.rb
+- lib/rack/client/middleware/auth/digest/md5.rb
+- lib/rack/client/middleware/auth/digest/params.rb
+- lib/rack/client/middleware/auth.rb
 - lib/rack/client/middleware/cache/cachecontrol.rb
-- lib/rack/client/middleware/cache/options.rb
-- lib/rack/client/middleware/cache/response.rb
-- lib/rack/client/middleware/cache/request.rb
-- lib/rack/client/middleware/cache/metastore.rb
 - lib/rack/client/middleware/cache/context.rb
 - lib/rack/client/middleware/cache/entitystore.rb
-- lib/rack/client/middleware/cache/storage.rb
 - lib/rack/client/middleware/cache/key.rb
+- lib/rack/client/middleware/cache/metastore.rb
+- lib/rack/client/middleware/cache/options.rb
+- lib/rack/client/middleware/cache/request.rb
+- lib/rack/client/middleware/cache/response.rb
+- lib/rack/client/middleware/cache/storage.rb
+- lib/rack/client/middleware/cache.rb
+- lib/rack/client/middleware/cookie_jar/context.rb
+- lib/rack/client/middleware/cookie_jar/cookie.rb
+- lib/rack/client/middleware/cookie_jar/cookiestore.rb
 - lib/rack/client/middleware/cookie_jar/options.rb
-- lib/rack/client/middleware/cookie_jar/response.rb
 - lib/rack/client/middleware/cookie_jar/request.rb
-- lib/rack/client/middleware/cookie_jar/context.rb
+- lib/rack/client/middleware/cookie_jar/response.rb
 - lib/rack/client/middleware/cookie_jar/storage.rb
-- lib/rack/client/middleware/cookie_jar/cookiestore.rb
-- lib/rack/client/middleware/cookie_jar/cookie.rb
-- lib/rack/client/middleware/auth.rb
 - lib/rack/client/middleware/cookie_jar.rb
-- lib/rack/client/middleware/auth/basic.rb
-- lib/rack/client/middleware/auth/digest/params.rb
-- lib/rack/client/middleware/auth/digest/challenge.rb
-- lib/rack/client/middleware/auth/digest/md5.rb
-- lib/rack/client/middleware/auth/abstract/challenge.rb
-- lib/rack/client/body.rb
-- lib/rack/client/version.rb
+- lib/rack/client/middleware/follow_redirects.rb
 - lib/rack/client/middleware.rb
 - lib/rack/client/parser/base.rb
+- lib/rack/client/parser/body_collection.rb
+- lib/rack/client/parser/context.rb
 - lib/rack/client/parser/json.rb
-- lib/rack/client/parser/response.rb
-- lib/rack/client/parser/request.rb
 - lib/rack/client/parser/middleware.rb
-- lib/rack/client/parser/context.rb
+- lib/rack/client/parser/request.rb
+- lib/rack/client/parser/response.rb
 - lib/rack/client/parser/yaml.rb
-- lib/rack/client/parser/body_collection.rb
-- lib/rack/client/core.rb
-- lib/rack/client/adapter/base.rb
-- lib/rack/client/adapter/simple.rb
 - lib/rack/client/parser.rb
-- lib/rack/client/handler/em-http.rb
-- lib/rack/client/handler/typhoeus.rb
-- lib/rack/client/handler/net_http.rb
-- lib/rack/client/handler/excon.rb
-- lib/rack/client/adapter.rb
-- lib/rack/client/core/headers.rb
-- lib/rack/client/core/response.rb
-- lib/rack/client/core/dual_band.rb
-- lib/rack/client/handler.rb
+- lib/rack/client/version.rb
+- lib/rack/client.rb
 - demo/client.rb
-- demo/demo_spec.rb
 - demo/demo.rb
+- demo/demo_spec.rb
 has_rdoc: true
 homepage: http://github.com/halorgium/rack-client
 licenses: []
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A client wrapper around a Rack app or HTTP