excon 0.7.5 → 0.7.6

data/changelog.txt

@@ -1,3 +1,11 @@
+0.7.6 10/04/11
+==============
+
+* fixes to provide for using openssl-nonblock for 1.8.x
+* correctly pass per-request settings to socket
+* fix for nonblocking stuff when waiting for socket close
+* use 127.0.0.1 instead of localhost in tests (fixes some errors)
+
 0.7.5 10/03/11
 ==============
 

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.5'
-  s.date              = '2011-10-03'
+  s.version           = '0.7.6'
+  s.date              = '2011-10-04'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -76,7 +76,9 @@ module Excon
           params[:path].insert(0, '/')
         end
 
-        if params[:mock]
+        unless params[:mock]
+          socket.params = params
+        else
           for stub, response in Excon.stubs
             # all specified non-headers params match and no headers were specified or all specified headers match
             if (stub.keys - [:headers]).all? {|key| stub[key] == params[key] } &&

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.5'
+    VERSION = '0.7.6'
   end
 
   unless const_defined?(:CHUNK_SIZE)
@@ -10,4 +10,17 @@ module Excon
   unless const_defined?(:HTTP_VERBS)
     HTTP_VERBS = %w{connect delete get head options post put trace}
   end
+
+  unless ::IO.const_defined?(:WaitReadable)
+    class ::IO
+      module WaitReadable; end
+    end
+  end
+
+  unless ::IO.const_defined?(:WaitWritable)
+    class ::IO
+      module WaitWritable; end
+    end
+  end
+
 end

data/lib/excon/socket.rb

@@ -3,17 +3,19 @@ module Excon
 
     extend Forwardable
 
+    attr_accessor :params
+
     def_delegators(:@socket, :close,    :close)
     def_delegators(:@socket, :readline, :readline)
 
-    def initialize(connection_params = {}, proxy = {})
-      @connection_params, @proxy = connection_params, proxy
+    def initialize(params = {}, proxy = {})
+      @params, @proxy = params, proxy
       @read_buffer, @write_buffer = '', ''
 
       @sockaddr = if @proxy
         ::Socket.sockaddr_in(@proxy[:port].to_i, @proxy[:host])
       else
-        ::Socket.sockaddr_in(@connection_params[:port].to_i, @connection_params[:host])
+        ::Socket.sockaddr_in(@params[:port].to_i, @params[:host])
       end
 
       @socket = ::Socket.new(::Socket::Constants::AF_INET, ::Socket::Constants::SOCK_STREAM, 0)
@@ -28,7 +30,7 @@ module Excon
       begin
         @socket.connect_nonblock(@sockaddr)
       rescue Errno::EINPROGRESS
-        IO.select(nil, [@socket], nil, @connection_params[:connect_timeout])
+        IO.select(nil, [@socket], nil, @params[:connect_timeout])
         begin
           @socket.connect_nonblock(@sockaddr)
         rescue Errno::EISCONN
@@ -36,27 +38,39 @@ module Excon
       end
     end
 
-    def read(max_length)
+    def read(max_length=nil)
       begin
-        until @read_buffer.length >= max_length
-          @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
+        if max_length
+          until @read_buffer.length >= max_length
+            @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
+          end
+        else
+          while true
+            @read_buffer << @socket.read_nonblock(CHUNK_SIZE)
+          end
         end
       rescue OpenSSL::SSL::SSLError => error
         if error.message == 'read would block'
-          if IO.select([@socket], nil, nil, @connection_params[:read_timeout])
+          if IO.select([@socket], nil, nil, @params[:read_timeout])
             retry
           else
             raise(Excon::Errors::Timeout.new("read timeout reached"))
           end
         end
-      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-        if IO.select([@socket], nil, nil, @connection_params[:read_timeout])
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+        if IO.select([@socket], nil, nil, @params[:read_timeout])
           retry
         else
           raise(Excon::Errors::Timeout.new("read timeout reached"))
         end
+      rescue EOFError
+      end
+      if max_length
+        @read_buffer.slice!(0, max_length)
+      else
+        # read until EOFError, so return everything
+        @read_buffer.slice!(0, @read_buffer.length)
       end
-      @read_buffer.slice!(0, max_length)
     end
 
     def write(data)
@@ -68,14 +82,14 @@ module Excon
           @write_buffer.slice!(0, written)
         rescue OpenSSL::SSL::SSLError => error
           if error.message == 'write would block'
-            if IO.select(nil, [@socket], nil, @connection_params[:write_timeout])
+            if IO.select(nil, [@socket], nil, @params[:write_timeout])
               retry
             else
               raise(Excon::Errors::Timeout.new("write timeout reached"))
             end
           end
-        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          if IO.select(nil, [@socket], nil, @connection_params[:write_timeout])
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable
+          if IO.select(nil, [@socket], nil, @params[:write_timeout])
             retry
           else
             raise(Excon::Errors::Timeout.new("write timeout reached"))

data/lib/excon/ssl_socket.rb

@@ -17,7 +17,7 @@ module Excon
 
     end
 
-    def initialize(connection_params = {}, proxy = {})
+    def initialize(params = {}, proxy = {})
       super
 
       # create ssl context
@@ -40,17 +40,17 @@ module Excon
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      if @connection_params.has_key?(:client_cert) && @connection_params.has_key?(:client_key)
-        ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@connection_params[:client_cert]))
-        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@connection_params[:client_key]))
+      if @params.has_key?(:client_cert) && @params.has_key?(:client_key)
+        ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@params[:client_cert]))
+        ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@params[:client_key]))
       end
 
       @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
       @socket.sync_close = true
 
       if @proxy
-        @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << Excon::Connection::HTTP_1_1
-        @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << Excon::Connection::CR_NL << Excon::Connection::CR_NL
+        @socket << "CONNECT " << @params[:host] << ":" << @params[:port] << Excon::Connection::HTTP_1_1
+        @socket << "Host: " << @params[:host] << ":" << @params[:port] << Excon::Connection::CR_NL << Excon::Connection::CR_NL
 
         # eat the proxy's connection response
         while line = @socket.readline.strip
@@ -63,7 +63,7 @@ module Excon
 
       # verify connection
       if Excon.ssl_verify_peer
-        @socket.post_connection_check(@connection_params[:host])
+        @socket.post_connection_check(@params[:host])
       end
 
       @socket

data/tests/proxy_tests.rb

@@ -106,7 +106,7 @@ Shindo.tests('Excon proxy support') do
   with_rackup('proxy.ru') do
 
     tests('http proxying: http://foo.com:8080') do
-      connection = Excon.new('http://foo.com:8080', :proxy => 'http://localhost:9292')
+      connection = Excon.new('http://foo.com:8080', :proxy => 'http://127.0.0.1:9292')
       response = connection.request(:method => :get, :path => '/bar', :query => {:alpha => 'kappa'})
 
       tests('response.status').returns(200) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4