excon 0.29.0 → 0.30.0

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 gemspec
 
 gem 'jruby-openssl', :platform => :jruby
-gem 'unicorn', :platform => :mri
+gem 'unicorn', :platforms => [:mri, :rbx]
+gem 'rubysl', '~> 2.0', :platform => :rbx
 
 # group :benchmark do
 #   gem 'em-http-request'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.29.0)
+    excon (0.30.0)
 
 GEM
   remote: http://rubygems.org/
@@ -15,6 +15,7 @@ GEM
       chronic
     eventmachine (1.0.0)
     eventmachine (1.0.0-java)
+    ffi2-generators (0.1.1)
     formatador (0.2.3)
     i18n (0.6.0)
     jruby-openssl (0.8.8)
@@ -22,6 +23,7 @@ GEM
     json (1.7.3)
     json (1.7.3-java)
     kgio (2.8.0)
+    minitest (4.7.5)
     multi_json (1.3.6)
     open4 (1.3.0)
     rack (1.4.1)
@@ -31,6 +33,211 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    rubysl (2.0.14)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-sync (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-test-unit (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.4)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.1)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.2)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.0)
+    rubysl-date (2.0.6)
+    rubysl-delegate (2.0.1)
+    rubysl-digest (2.0.3)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.1)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.4)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.1)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.0.4)
+    rubysl-optparse (2.0.1)
+      rubysl-shellwords (~> 2.0)
+    rubysl-ostruct (2.0.4)
+    rubysl-pathname (2.0.0)
+    rubysl-prettyprint (2.0.2)
+    rubysl-prime (2.0.0)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.2)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.2)
+    rubysl-rinda (2.0.0)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.1)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-sync (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.1)
+    rubysl-test-unit (2.0.1)
+      minitest (~> 4.7)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.3)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.3)
+    rubysl-zlib (2.0.1)
     shindo (0.3.4)
       formatador (>= 0.1.1)
     sinatra (1.3.2)
@@ -56,6 +263,7 @@ DEPENDENCIES
   open4
   rake
   rdoc
+  rubysl (~> 2.0)
   shindo
   sinatra
   unicorn

data/changelog.txt

@@ -1,3 +1,28 @@
+0.30.0 11/25/2013
+=================
+
+ensure schema/host/port are passed to redirect follower with relative location
+add .ruby-version and .ruby-gemset to .gitignore
+pass nil to :response_block for unknown values
+use :response_block if expects middleware is not used
+refactor Response.parse, add tests
+support header continuations
+support chunked trailers
+improve decompress middleware/tests
+add accept-encoding in decompress middleware requests, if missing
+fixes for connection close detection
+support transfer encoding
+fix deprecated URI.decode usage
+do not try to use tcp_nodelay for unix sockets
+nonblocking connect, connect timeouts for unix sockets
+ignore IO#close exceptions
+move conditional nonblock to only SSLSocket
+skip reverse lookups
+avoid mutating canned response from middleware
+test against latest rubinius, no longer allow failures
+add unicorn as rubinius dev dependency
+use webbrick form decode
+
 0.29.0 11/07/2013
 =================
 

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.29.0'
-  s.date              = '2013-11-07'
+  s.version           = '0.30.0'
+  s.date              = '2013-11-25'
   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/data/xs
     tests/errors_tests.rb
     tests/header_tests.rb
+    tests/middlewares/canned_response_tests.rb
     tests/middlewares/decompress_tests.rb
     tests/middlewares/idempotent_tests.rb
     tests/middlewares/instrumentation_tests.rb
@@ -142,9 +143,11 @@ Gem::Specification.new do |s|
     tests/request_headers_tests.rb
     tests/request_method_tests.rb
     tests/requests_tests.rb
+    tests/response_tests.rb
     tests/servers/bad.rb
     tests/servers/eof.rb
     tests/servers/error.rb
+    tests/servers/good.rb
     tests/test_helper.rb
     tests/thread_safety_tests.rb
     tests/timeout_tests.rb

data/lib/excon.rb

@@ -10,6 +10,9 @@ require 'timeout'
 require 'uri'
 require 'zlib'
 require 'stringio'
+require 'webrick/httputils'
+
+BasicSocket.do_not_reverse_lookup = true
 
 # Define defaults first so they will be available to other files
 module Excon
@@ -36,7 +39,7 @@ module Excon
           Excon::Middleware::Mock
         ],
         :mock               => false,
-        :nonblock           => DEFAULT_NONBLOCK,
+        :nonblock           => true,
         :omit_default_port  => false,
         :read_timeout       => 60,
         :retry_limit        => DEFAULT_RETRY_LIMIT,
@@ -139,8 +142,8 @@ module Excon
         :port       => uri.port,
         :query      => uri.query,
         :scheme     => uri.scheme,
-        :user       => (URI.decode(uri.user) if uri.user),
-        :password   => (URI.decode(uri.password) if uri.password),
+        :user       => (Utils.unescape_uri(uri.user) if uri.user),
+        :password   => (Utils.unescape_uri(uri.password) if uri.password)
       }.merge!(params)
       Excon::Connection.new(params)
     end

data/lib/excon/connection.rb

@@ -75,7 +75,7 @@ module Excon
         @data[:headers]['Proxy-Connection'] ||= 'Keep-Alive'
         # https credentials happen in handshake
         if @data[:scheme] == 'http' && (@data[:proxy][:user] || @data[:proxy][:password])
-          user, pass = URI.decode_www_form_component(@data[:proxy][:user].to_s), URI.decode_www_form_component(@data[:proxy][:password].to_s)
+          user, pass = Utils.unescape_form(@data[:proxy][:user].to_s), Utils.unescape_form(@data[:proxy][:password].to_s)
           auth = ['' << user.to_s << ':' << pass.to_s].pack('m').delete(Excon::CR_NL)
           @data[:headers]['Proxy-Authorization'] = 'Basic ' << auth
         end
@@ -87,7 +87,7 @@ module Excon
 
       # Use Basic Auth if url contains a login
       if @data[:user] || @data[:password]
-        user, pass = URI.decode_www_form_component(@data[:user].to_s), URI.decode_www_form_component(@data[:password].to_s)
+        user, pass = Utils.unescape_form(@data[:user].to_s), Utils.unescape_form(@data[:password].to_s)
         @data[:headers]['Authorization'] ||= 'Basic ' << ['' << user.to_s << ':' << pass.to_s].pack('m').delete(Excon::CR_NL)
       end
 
@@ -147,6 +147,13 @@ module Excon
             end
           end
 
+          if datum[:response_block]
+            datum[:headers]['TE'] = 'trailers'
+          else
+            datum[:headers]['TE'] = 'trailers, deflate, gzip'
+          end
+          datum[:headers]['Connection'] = 'TE'
+
           # add headers to request
           datum[:headers].each do |key, values|
             [values].flatten.each do |value|
@@ -197,9 +204,10 @@ module Excon
 
     def response_call(datum)
       if datum.has_key?(:response_block) && !datum[:response][:body].empty?
-        content_length = remaining = datum[:response][:body].bytesize
+        response_body = datum[:response][:body].dup
+        content_length = remaining = response_body.bytesize
         while remaining > 0
-          datum[:response_block].call(datum[:response][:body].slice!(0, [datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
+          datum[:response_block].call(response_body.slice!(0, [datum[:chunk_size], remaining].min), [remaining - datum[:chunk_size], 0].max, content_length)
           remaining -= datum[:chunk_size]
         end
       end
@@ -259,8 +267,10 @@ module Excon
       unless datum[:pipeline]
         datum = response(datum)
 
-        if datum[:response][:headers]['Connection'] == 'close'
-          reset
+        if key = datum[:response][:headers].keys.detect {|k| k.casecmp('Connection') == 0 }
+          if split_header_value(datum[:response][:headers][key]).any? {|t| t.casecmp('close') }
+            reset
+          end
         end
 
         Excon::Response.new(datum[:response])
@@ -286,15 +296,19 @@ module Excon
         Excon::Response.new(response(datum)[:response])
       end
 
-      if responses.last[:headers]['Connection'] == 'close'
-        reset
+      if key = responses.last[:headers].keys.detect {|k| k.casecmp('Connection') == 0 }
+        if split_header_value(responses.last[:headers][key]).any? {|t| t.casecmp('close') }
+          reset
+        end
       end
 
       responses
     end
 
     def reset
-      (old_socket = sockets.delete(@socket_key)) && old_socket.close
+      if old_socket = sockets.delete(@socket_key)
+        old_socket.close rescue nil
+      end
     end
 
     # Generate HTTP request verb methods

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.29.0'
+  VERSION = '0.30.0'
 
   CR_NL = "\r\n"
 
@@ -13,10 +13,6 @@ module Excon
     CHUNK_SIZE = DEFAULT_CHUNK_SIZE
   end
 
-  DEFAULT_NONBLOCK = OpenSSL::SSL::SSLSocket.public_method_defined?(:connect_nonblock) &&
-    OpenSSL::SSL::SSLSocket.public_method_defined?(:read_nonblock) &&
-    OpenSSL::SSL::SSLSocket.public_method_defined?(:write_nonblock)
-
   DEFAULT_RETRY_LIMIT = 4
 
   FORCE_ENC = CR_NL.respond_to?(:force_encoding)

data/lib/excon/errors.rb

@@ -20,6 +20,8 @@ module Excon
 
     class Timeout < Error; end
 
+    class ResponseParseError < Error; end
+
     class ProxyParseError < Error; end
 
     class ProxyConnectionError < Error; end