excon 0.14.0 → 0.14.1

data/changelog.txt

@@ -1,3 +1,10 @@
+0.14.1 07/19/12
+===============
+
+accept port as a separate option
+ensure first read from socket is nonblock (fixes read_timeouts)
+respect upper case env vars
+
 0.14.0 05/31/12
 ===============
 

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.14.0'
-  s.date              = '2012-05-31'
+  s.version           = '0.14.1'
+  s.date              = '2012-06-19'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -115,11 +115,13 @@ Gem::Specification.new do |s|
     tests/rackups/response_header.ru
     tests/rackups/ssl.ru
     tests/rackups/thread_safety.ru
+    tests/rackups/timeout.ru
     tests/request_method_tests.rb
     tests/servers/bad.rb
     tests/stub_tests.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb
+    tests/timeout_tests.rb
   ]
   # = MANIFEST =
 

data/lib/excon/connection.rb

@@ -31,15 +31,15 @@ module Excon
       @proxy = nil
 
       # use proxy from the environment if present
-      if ENV.has_key?('http_proxy')
-        @proxy = setup_proxy(ENV['http_proxy'])
+      if (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
+        @proxy = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
       elsif params.has_key?(:proxy)
         @proxy = setup_proxy(params[:proxy])
       end
 
       # use https_proxy if that has been specified
-      if @connection[:scheme] == HTTPS && ENV.has_key?('https_proxy')
-        @proxy = setup_proxy(ENV['https_proxy'])
+      if @connection[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
+        @proxy = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
       end
 
       if @proxy
@@ -56,7 +56,7 @@ module Excon
         @connection[:headers]['Authorization'] ||= "Basic #{auth}"
       end
 
-      @socket_key = '' << @connection[:host] << ':' << @connection[:port]
+      @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
       reset
     end
 
@@ -258,8 +258,8 @@ module Excon
 
           response
         end
-      rescue Excon::Errors::StubNotFound => stub_not_found
-        raise(stub_not_found)
+      rescue Excon::Errors::StubNotFound, Excon::Errors::Timeout => error
+        raise(error)
       rescue => socket_error
         reset
         raise(Excon::Errors::SocketError.new(socket_error))

data/lib/excon/constants.rb

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

data/lib/excon/response.rb

@@ -18,7 +18,8 @@ module Excon
     end
 
     def self.parse(socket, params={})
-      response = new(:status => socket.readline[9, 11].to_i)
+      response = new(:status => socket.read(12)[9, 11].to_i)
+      socket.readline # read the rest of the status line and CRLF
 
       until ((data = socket.readline).chop!).empty?
         key, value = data.split(/:\s*/, 2)

data/lib/excon/socket.rb

@@ -33,6 +33,11 @@ module Excon
 
           socket = ::Socket.new(a_family, s_type, 0)
 
+          #secs = Integer(timeout)
+          #usecs = Integer((timeout - secs) * 1_000_000)
+          #optval = [secs, usecs].pack("l_2")
+          #sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+
           socket.connect_nonblock(sockaddr)
 
           @socket = socket

data/tests/proxy_tests.rb

@@ -26,7 +26,7 @@ Shindo.tests('Excon proxy support') do
       end
     end
 
-    tests('with proxy config from the environment') do
+    tests('with lowercase proxy config from the environment') do
       ENV['http_proxy'] = 'http://myproxy:8080'
       ENV['https_proxy'] = 'http://mysecureproxy:8081'
 
@@ -78,6 +78,58 @@ Shindo.tests('Excon proxy support') do
       ENV.delete('https_proxy')
     end
 
+    tests('with uppercase proxy config from the environment') do
+      ENV['HTTP_PROXY'] = 'http://myproxy:8080'
+      ENV['HTTPS_PROXY'] = 'http://mysecureproxy:8081'
+
+      tests('an http connection') do
+        connection = Excon.new('http://foo.com')
+
+        tests('connection.proxy.host').returns('myproxy') do
+          connection.proxy[:host]
+        end
+
+        tests('connection.proxy.port').returns(8080) do
+          connection.proxy[:port]
+        end
+
+        tests('connection.proxy.scheme').returns('http') do
+          connection.proxy[:scheme]
+        end
+      end
+
+      tests('an https connection') do
+        connection = Excon.new('https://secret.com')
+
+        tests('connection.proxy.host').returns('mysecureproxy') do
+          connection.proxy[:host]
+        end
+
+        tests('connection.proxy.port').returns(8081) do
+          connection.proxy[:port]
+        end
+
+        tests('connection.proxy.scheme').returns('http') do
+          connection.proxy[:scheme]
+        end
+      end
+
+      tests('http proxy from the environment overrides config') do
+        connection = Excon.new('http://foo.com', :proxy => 'http://hard.coded.proxy:6666')
+
+        tests('connection.proxy.host').returns('myproxy') do
+          connection.proxy[:host]
+        end
+
+        tests('connection.proxy.port').returns(8080) do
+          connection.proxy[:port]
+        end
+      end
+
+      ENV.delete('HTTP_PROXY')
+      ENV.delete('HTTPS_PROXY')
+    end
+
     tests('with only http_proxy config from the environment') do
       ENV['http_proxy'] = 'http://myproxy:8080'
       ENV.delete('https_proxy')

data/tests/rackups/timeout.ru

@@ -0,0 +1,9 @@
+require 'sinatra'
+
+class App < Sinatra::Base
+  get('/timeout') do
+    sleep(1)
+  end
+end
+
+run App

data/tests/timeout_tests.rb

@@ -0,0 +1,10 @@
+with_rackup('timeout.ru') do
+  Shindo.tests('read should timeout') do
+    connection = Excon.new('http://127.0.0.1:9292')
+
+    tests('hits read_timeout').raises(Excon::Errors::Timeout) do
+      connection.request(:method => :get, :path => '/timeout', :read_timeout => 0)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70191342427280 !ruby/object:Gem::Requirement
+  requirement: &70270728323400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342427280
+  version_requirements: *70270728323400
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70191342426160 !ruby/object:Gem::Requirement
+  requirement: &70270728322580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342426160
+  version_requirements: *70270728322580
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70191342425140 !ruby/object:Gem::Requirement
+  requirement: &70270728321900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342425140
+  version_requirements: *70270728321900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70191342424280 !ruby/object:Gem::Requirement
+  requirement: &70270728321100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342424280
+  version_requirements: *70270728321100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70191342423500 !ruby/object:Gem::Requirement
+  requirement: &70270728320640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342423500
+  version_requirements: *70270728320640
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70191342422860 !ruby/object:Gem::Requirement
+  requirement: &70270728320160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342422860
+  version_requirements: *70270728320160
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70191342422180 !ruby/object:Gem::Requirement
+  requirement: &70270728319720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191342422180
+  version_requirements: *70270728319720
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -146,11 +146,13 @@ files:
 - tests/rackups/response_header.ru
 - tests/rackups/ssl.ru
 - tests/rackups/thread_safety.ru
+- tests/rackups/timeout.ru
 - tests/request_method_tests.rb
 - tests/servers/bad.rb
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
+- tests/timeout_tests.rb
 homepage: https://github.com/geemus/excon
 licenses: []
 post_install_message: 
@@ -166,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 830619460380179228
+      hash: -419476000002150185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: