excon 0.6.6 → 0.7.0

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.6.6'
-  s.date              = '2011-09-06'
+  s.version           = '0.7.0'
+  s.date              = '2011-09-12'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -90,6 +90,7 @@ Gem::Specification.new do |s|
     lib/excon/constants.rb
     lib/excon/errors.rb
     lib/excon/response.rb
+    lib/excon/socket.rb
     tests/basic_tests.rb
     tests/header_tests.rb
     tests/idempotent_tests.rb

data/lib/excon.rb

@@ -2,6 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'cgi'
+require 'forwardable'
 require 'openssl'
 require 'rbconfig'
 require 'socket'
@@ -11,6 +12,7 @@ require 'excon/constants'
 require 'excon/connection'
 require 'excon/errors'
 require 'excon/response'
+require 'excon/socket'
 
 module Excon
   class << self

data/lib/excon/connection.rb

@@ -20,13 +20,16 @@ module Excon
     def initialize(url, params = {})
       uri = URI.parse(url)
       @connection = {
-        :headers  => {},
-        :host     => uri.host,
-        :mock     => Excon.mock,
-        :path     => uri.path,
-        :port     => uri.port.to_s,
-        :query    => uri.query,
-        :scheme   => uri.scheme
+        :connect_timeout  => 60,
+        :headers          => {},
+        :host             => uri.host,
+        :mock             => Excon.mock,
+        :path             => uri.path,
+        :port             => uri.port.to_s,
+        :query            => uri.query,
+        :read_timeout     => 60,
+        :scheme           => uri.scheme,
+        :write_timeout    => 60
       }.merge!(params)
 
       # use proxy from the environment if present
@@ -36,7 +39,7 @@ module Excon
         @proxy = setup_proxy(params[:proxy])
       end
 
-      if https?
+      if @connection[:scheme] == 'https'
         # use https_proxy if that has been specified
         if ENV.has_key?('https_proxy')
           @proxy = setup_proxy(ENV['https_proxy'])
@@ -157,7 +160,6 @@ module Excon
 
         # write out the request, sans body
         socket.write(request)
-        socket.flush
 
         # write out the body
         if params[:body]
@@ -223,85 +225,15 @@ module Excon
     end
 
   private
-    def connect
-      new_socket = open_socket
-
-      if https?
-        # create ssl context
-        ssl_context = OpenSSL::SSL::SSLContext.new
-
-        if Excon.ssl_verify_peer
-          # turn verification on
-          ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
-
-          if Excon.ssl_ca_path
-            ssl_context.ca_path = Excon.ssl_ca_path
-          else
-            # use default cert store
-            store = OpenSSL::X509::Store.new
-            store.set_default_paths
-            ssl_context.cert_store = store
-          end
-        else
-          # turn verification off
-          ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        if @connection.has_key?(:client_cert) && @connection.has_key?(:client_key)
-          ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@connection[:client_cert]))
-          ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@connection[:client_key]))
-        end
-
-        new_socket = open_ssl_socket(new_socket, ssl_context)
-      end
-
-      new_socket
-    end
-
-    def open_ssl_socket(socket, ssl_context)
-
-      new_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
-      new_socket.sync_close = true
-
-      if @proxy
-        new_socket << "CONNECT " << @connection[:host] << ":" << @connection[:port] << HTTP_1_1
-        new_socket << "Host: " << @connection[:host] << ":" << @connection[:port] << CR_NL << CR_NL
-
-        # eat the proxy's connection response
-        while line = new_socket.readline.strip
-          break if line.empty?
-        end
-      end
-
-      new_socket.connect
-      # verify connection
-      if Excon.ssl_verify_peer
-        new_socket.post_connection_check(@connection[:host])
-      end
-      new_socket
-    end
-
-    def open_socket
-      if @proxy
-        socket = TCPSocket.open(@proxy[:host], @proxy[:port])
-      else
-        socket = TCPSocket.open(@connection[:host], @connection[:port])
-      end
-      socket
-    end
 
     def socket
-      sockets[@socket_key] ||= connect
+      sockets[@socket_key] ||= Excon::Socket.new(@connection, @proxy)
     end
 
     def sockets
       Thread.current[:_excon_sockets] ||= {}
     end
 
-    def https?
-      @connection[:scheme] == 'https'
-    end
-
     def setup_proxy(proxy)
       uri = URI.parse(proxy)
       unless uri.host and uri.port and uri.scheme

data/lib/excon/constants.rb

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

data/lib/excon/socket.rb

@@ -0,0 +1,114 @@
+module Excon
+  class Socket
+
+    extend Forwardable
+
+    def_delegators(:@socket, :close,    :close)
+    def_delegators(:@socket, :readline, :readline)
+
+    def initialize(connection_params = {}, proxy = {})
+      @connection_params, @proxy = connection_params, proxy
+      @read_buffer, @write_buffer = '', ''
+
+      @socket = ::Socket.new(::Socket::Constants::AF_INET, ::Socket::Constants::SOCK_STREAM, 0)
+
+      # nonblocking connect
+      if @proxy
+        sockaddr = ::Socket.sockaddr_in(@proxy[:port], @proxy[:host])
+      else
+        sockaddr = ::Socket.sockaddr_in(@connection_params[:port], @connection_params[:host])
+      end
+      begin
+        @socket.connect_nonblock(sockaddr)
+      rescue Errno::EINPROGRESS
+        IO.select(nil, [@socket], nil, @connection_params[:connect_timeout])
+        begin
+          @socket.connect_nonblock(sockaddr)
+        rescue Errno::EISCONN
+        end
+      end
+
+      # ssl setup
+      if @connection_params[:scheme] == 'https'
+        # create ssl context
+        ssl_context = OpenSSL::SSL::SSLContext.new
+
+        if Excon.ssl_verify_peer
+          # turn verification on
+          ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+          if Excon.ssl_ca_path
+            ssl_context.ca_path = Excon.ssl_ca_path
+          else
+            # use default cert store
+            store = OpenSSL::X509::Store.new
+            store.set_default_paths
+            ssl_context.cert_store = store
+          end
+        else
+          # turn verification off
+          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]))
+        end
+
+        @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
+        @socket.sync_close = true
+
+        if @proxy
+          @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << HTTP_1_1
+          @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << CR_NL << CR_NL
+
+          # eat the proxy's connection response
+          while line = @socket.readline.strip
+            break if line.empty?
+          end
+        end
+      end
+
+      if @connection_params[:scheme] == 'https'
+        # verify connection
+        if Excon.ssl_verify_peer
+          @socket.post_connection_check(@connection_params[:host])
+        end
+      end
+
+      @socket
+    end
+
+    def read(max_length)
+      begin
+        until @read_buffer.length >= max_length
+          @read_buffer << @socket.read_nonblock(max_length)
+        end
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+        if IO.select([@socket], nil, nil, @connection_params[:read_timeout])
+          retry
+        else
+          raise(Timeout::Error)
+        end
+      end
+      @read_buffer.slice!(0, max_length)
+    end
+
+    def write(data)
+      @write_buffer << data
+      until @write_buffer.empty?
+        begin
+          max_length = [@write_buffer.length, Excon::CHUNK_SIZE].min
+          @socket.write_nonblock(@write_buffer.slice!(0, max_length))
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          if IO.select(nil [@socket], nil, @connection_params[:write_timeout])
+            retry
+          else
+            raise(Timeout::Error)
+          end
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 6
-  version: 0.6.6
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -111,6 +111,7 @@ files:
 - lib/excon/constants.rb
 - lib/excon/errors.rb
 - lib/excon/response.rb
+- lib/excon/socket.rb
 - tests/basic_tests.rb
 - tests/header_tests.rb
 - tests/idempotent_tests.rb