excon 0.7.1 → 0.7.2

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.7.1'
-  s.date              = '2011-09-13'
+  s.version           = '0.7.2'
+  s.date              = '2011-09-23'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -214,7 +214,7 @@ module Excon
     def reset
       (old_socket = sockets.delete(@socket_key)) && old_socket.close
     end
-    
+
     # Generate HTTP request verb methods
     Excon::HTTP_VERBS.each do |method|
       eval <<-DEF

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/errors.rb

@@ -17,6 +17,8 @@ module Excon
       end
     end
 
+    class Timeout < Error; end
+
     class ProxyParseError < Error; end
 
     class StubNotFound < Error; end

data/lib/excon/socket.rb

@@ -45,7 +45,7 @@ module Excon
         if IO.select([@socket], nil, nil, @connection_params[:read_timeout])
           retry
         else
-          raise(Timeout::Error)
+          raise(Excon::Errors::Timeout.new("read timeout reached"))
         end
       end
       @read_buffer.slice!(0, max_length)
@@ -56,12 +56,13 @@ module Excon
       until @write_buffer.empty?
         begin
           max_length = [@write_buffer.length, Excon::CHUNK_SIZE].min
-          @socket.write_nonblock(@write_buffer.slice!(0, max_length))
+          written = @socket.write_nonblock(@write_buffer.slice(0, max_length))
+          @write_buffer.slice!(0, written)
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          if IO.select(nil [@socket], nil, @connection_params[:write_timeout])
+          if IO.select(nil, [@socket], nil, @connection_params[:write_timeout])
             retry
           else
-            raise(Timeout::Error)
+            raise(Excon::Errors::Timeout.new("write timeout reached"))
           end
         end
       end

data/tests/rackups/basic.ru

@@ -5,6 +5,10 @@ class App < Sinatra::Base
     headers("Custom" => "Foo: bar")
     'x' * value.to_i
   end
+
+  post('/body-sink') do
+    request.body.read.size.to_s
+  end
 end
 
 run App

data/tests/rackups/ssl.ru

@@ -8,6 +8,10 @@ class App < Sinatra::Base
     headers("Custom" => "Foo: bar")
     'x' * value.to_i
   end
+
+  post('/body-sink') do
+    request.body.read.size.to_s
+  end
 end
 
 Rack::Handler::WEBrick.run(App, {

data/tests/test_helper.rb

@@ -48,6 +48,17 @@ def basic_tests(url = 'http://127.0.0.1:9292')
       end
       data
     end
+
+  end
+
+  tests('POST /body-sink') do
+
+    connection = Excon.new(url)
+    response = connection.request(:method => :post, :path => '/body-sink', :body => 'x' * 5_000_000)
+
+    tests('response.body').returns("5000000") do
+      response.body
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4