excon 0.16.4 → 0.16.5

data/changelog.txt

@@ -1,3 +1,14 @@
+0.16.5 10/17/2012
+=================
+
+Also retry Timeouts on idempotent requests
+Excon.stub now breaks out user/pass from url if supplied
+loosen ssl version requirement to allow negotiation
+eof on read should return '' instead of nil
+build host_port up front to avoid recalculating
+set Proxy-Connection: Keep-Alive for https proxies
+postpone https upgrade until after proxy connect
+
 0.16.4 09/25/2012
 =================
 

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.16.4'
-  s.date              = '2012-09-25'
+  s.version           = '0.16.5'
+  s.date              = '2012-10-17'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -119,6 +119,7 @@ Gem::Specification.new do |s|
     tests/rackups/timeout.ru
     tests/request_method_tests.rb
     tests/servers/bad.rb
+    tests/servers/eof.rb
     tests/stub_tests.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb

data/lib/excon.rb

@@ -103,6 +103,20 @@ module Excon
     #   @param [Hash<Symbol, >] request params to match against, omitted params match all
     #   @param [Hash<Symbol, >] response params to return from matched request or block to call with params
     def stub(request_params, response_params = nil)
+      if url = request_params.delete(:url)
+        uri = URI.parse(url)
+        request_params.update(
+          :host              => uri.host,
+          :path              => uri.path,
+          :port              => uri.port.to_s,
+          :query             => uri.query,
+          :scheme            => uri.scheme
+        )
+        if uri.user || uri.password
+          request_params[:headers] ||= {}
+          request_params[:headers]['Authorization'] ||= 'Basic ' << ['' << uri.user.to_s << ':' << uri.password.to_s].pack('m').delete(Excon::CR_NL)
+        end
+      end
       if block_given?
         if response_params
           raise(ArgumentError.new("stub requires either response_params OR a block"))

data/lib/excon/connection.rb

@@ -19,11 +19,12 @@ module Excon
     def initialize(url, params = {})
       uri = URI.parse(url)
       @connection = Excon.defaults.merge({
-        :host              => uri.host,
-        :path              => uri.path,
-        :port              => uri.port.to_s,
-        :query             => uri.query,
-        :scheme            => uri.scheme,
+        :host       => uri.host,
+        :host_port  => '' << uri.host << ':' << uri.port.to_s,
+        :path       => uri.path,
+        :port       => uri.port.to_s,
+        :query      => uri.query,
+        :scheme     => uri.scheme,
       }).merge!(params)
       # merge does not deep-dup, so make sure headers is not the original
       @connection[:headers] = @connection[:headers].dup
@@ -56,7 +57,7 @@ module Excon
         @connection[:headers]['Authorization'] ||= 'Basic ' << ['' << uri.user.to_s << ':' << uri.password.to_s].pack('m').delete(Excon::CR_NL)
       end
 
-      @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
+      @socket_key = '' << @connection[:host_port]
       reset
     end
 
@@ -74,7 +75,7 @@ module Excon
       # connection has defaults, merge in new params to override
       params = @connection.merge(params)
       params[:headers] = @connection[:headers].merge(params[:headers] || {})
-      params[:headers]['Host'] ||= '' << params[:host] << ':' << params[:port]
+      params[:headers]['Host'] ||= '' << params[:host_port]
 
       # if path is empty or doesn't start with '/', insert one
       unless params[:path][0, 1] == '/'
@@ -101,7 +102,7 @@ module Excon
         request_kernel(params)
       end
     rescue => request_error
-      if params[:idempotent] && [Excon::Errors::SocketError,
+      if params[:idempotent] && [Excon::Errors::Timeout, Excon::Errors::SocketError,
           Excon::Errors::HTTPStatusError].any? {|ex| request_error.kind_of? ex }
         retries_remaining ||= params[:retry_limit]
         retries_remaining -= 1
@@ -194,7 +195,7 @@ module Excon
           # start with "METHOD /path"
           request = params[:method].to_s.upcase << ' '
           if @proxy
-            request << params[:scheme] << '://' << params[:host] << ':' << params[:port]
+            request << params[:scheme] << '://' << params[:host_port]
           end
           request << params[:path]
 
@@ -375,11 +376,12 @@ module Excon
         raise Excon::Errors::ProxyParseError, "Proxy is invalid"
       end
       {
-        :host     => uri.host,
-        :password => uri.password,
-        :port     => uri.port,
-        :scheme   => uri.scheme,
-        :user     => uri.user
+        :host       => uri.host,
+        :host_port  => '' << uri.host << ':' << uri.port.to_s,
+        :password   => uri.password,
+        :port       => uri.port,
+        :scheme     => uri.scheme,
+        :user       => uri.user
       }
     end
 

data/lib/excon/constants.rb

@@ -29,7 +29,7 @@ module Excon
 
   REDACTED = 'REDACTED'
 
-  VERSION = '0.16.4'
+  VERSION = '0.16.5'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/socket.rb

@@ -78,7 +78,7 @@ module Excon
     def read(max_length=nil)
       return nil if @eof
       if @eof
-        nil
+        ''
       elsif @params[:nonblock]
         begin
           if max_length

data/lib/excon/ssl_socket.rb

@@ -9,7 +9,6 @@ module Excon
 
       # create ssl context
       ssl_context = OpenSSL::SSL::SSLContext.new
-      ssl_context.ssl_version = 'SSLv3'
 
       if params[:ssl_verify_peer]
         # turn verification on
@@ -35,28 +34,26 @@ module Excon
         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
-        request = 'CONNECT ' << @params[:host] << ':' << @params[:port] << Excon::HTTP_1_1
-        request << 'Host: ' << @params[:host] << ':' << @params[:port] << Excon::CR_NL
+        request = 'CONNECT ' << @params[:host_port] << Excon::HTTP_1_1
+        request << 'Host: ' << @params[:host_port] << Excon::CR_NL
 
         if @proxy[:password] || @proxy[:user]
           auth = ['' << @proxy[:user].to_s << ':' << @proxy[:password].to_s].pack('m').delete(Excon::CR_NL)
           request << "Proxy-Authorization: Basic " << auth << Excon::CR_NL
         end
 
+        request << 'Proxy-Connection: Keep-Alive' << Excon::CR_NL
+
         request << Excon::CR_NL
 
         # write out the proxy setup request
         @socket.write(request)
-
-        # eat the proxy's connection response
-        Excon::Response.parse(@socket, {})
       end
 
-      # connect the new OpenSSL::SSL::SSLSocket
+      # convert Socket to OpenSSL::SSL::SSLSocket
+      @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
+      @socket.sync_close = true
       @socket.connect
 
       # Server Name Indication (SNI) RFC 3546

data/tests/bad_tests.rb

@@ -32,4 +32,16 @@ Shindo.tests('Excon bad server interaction') do
 
   end
 
+  with_server('eof') do
+
+    tests('eof server: causes EOFError') do
+
+      tests('request').raises(Excon::Errors::SocketError) do
+        Excon.get('http://127.0.0.1:9292/eof')
+      end
+
+    end
+
+  end
+
 end

data/tests/servers/eof.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require "eventmachine"
+
+module EOFServer
+  def receive_data(data)
+    case data
+    when %r{^GET /eof\s}
+      close_connection(true)
+    end
+  end
+end
+
+EM.run do
+  EM.start_server("127.0.0.1", 9292, EOFServer)
+  $stderr.puts "ready"
+end

data/tests/stub_tests.rb

@@ -148,6 +148,16 @@ Shindo.tests('Excon stubs') do
 
   Excon.stubs.clear
 
+  tests("stub({:url => 'https://user:pass@foo.bar.com:9999/baz?quux=true'}, {:status => 200})") do
+    Excon.stub({:url => 'https://user:pass@foo.bar.com:9999/baz?quux=true'}, {:status => 200})
+
+    tests("get(:expects => 200)") do
+      Excon.new("https://user:pass@foo.bar.com:9999/baz?quux=true", :mock => true).get(:expects => 200)
+    end
+  end
+
+  Excon.stubs.clear
+
   tests("stub({}, {:status => 404, :body => 'Not Found'}") do
 
     connection = Excon.new('http://127.0.0.1:9292', :mock => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70229726929200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726929200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70229726928740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726928740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70229726928320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726928320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70229726927900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726927900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70229726927480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726927480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70229726943440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726943440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70229726943020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +119,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70229726943020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -150,6 +185,7 @@ files:
 - tests/rackups/timeout.ru
 - tests/request_method_tests.rb
 - tests/servers/bad.rb
+- tests/servers/eof.rb
 - tests/stub_tests.rb
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
@@ -169,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2397568301879595027
+      hash: 1584881564479548792
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)