excon 0.20.1 → 0.21.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.20.1'
-  s.date              = '2013-03-19'
+  s.version           = '0.21.0'
+  s.date              = '2013-05-04'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -80,7 +80,7 @@ Gem::Specification.new do |s|
     benchmarks/excon_vs.rb
     benchmarks/for_vs_array_each.rb
     benchmarks/for_vs_hash_each.rb
-    benchmarks/has_key-vs-hash[key].rb
+    benchmarks/has_key-vs-lookup.rb
     benchmarks/headers_case_sensitivity.rb
     benchmarks/headers_split_vs_match.rb
     benchmarks/implicit_block-vs-explicit_block.rb

data/lib/excon.rb

@@ -138,7 +138,8 @@ module Excon
         )
         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)
+          user, pass = URI.decode_www_form_component(uri.user.to_s), URI.decode_www_form_component(uri.password.to_s)
+          request_params[:headers]['Authorization'] ||= 'Basic ' << ['' << user << ':' << pass].pack('m').delete(Excon::CR_NL)
         end
       end
       if block_given?
@@ -156,6 +157,40 @@ module Excon
       stub
     end
 
+    # get a stub matching params or nil
+    def stub_for(request_params={})
+      Excon.stubs.each do |stub, response|
+        captures = { :headers => {} }
+        headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
+          case value = stub[:headers][key]
+          when Regexp
+            if match = value.match(request_params[:headers][key])
+              captures[:headers][key] = match.captures
+            end
+            match
+          else
+            value == request_params[:headers][key]
+          end
+        end
+        non_headers_match = (stub.keys - [:headers]).all? do |key|
+          case value = stub[key]
+          when Regexp
+            if match = value.match(request_params[key])
+              captures[key] = match.captures
+            end
+            match
+          else
+            value == request_params[key]
+          end
+        end
+        if headers_match && non_headers_match
+          request_params[:captures] = captures
+          return response
+        end
+      end
+      nil
+    end
+
     # get a list of defined stubs
     def stubs
       @stubs ||= []

data/lib/excon/connection.rb

@@ -3,6 +3,15 @@ module Excon
 
     attr_reader :data
 
+    def connection
+      $stderr.puts("Excon::Connection#connection is deprecated use Excon::Connection#data instead (#{caller.first})")
+      @data
+    end
+    def connection=(new_params)
+      $stderr.puts("Excon::Connection#connection= is deprecated use Excon::Connection#data= instead (#{caller.first})")
+      @data = new_params
+    end
+
     def params
       $stderr.puts("Excon::Connection#params is deprecated use Excon::Connection#data instead (#{caller.first})")
       @data
@@ -45,19 +54,24 @@ module Excon
 
       @data.merge!(params)
 
-      if @data[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
-        @data[:proxy] = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
-      elsif (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
-        @data[:proxy] = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
-      elsif @data.has_key?(:proxy)
-        @data[:proxy] = setup_proxy(@data[:proxy])
+      no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"] || ""
+      no_proxy_list = no_proxy_env.scan(/\*?\.?([^\s,:]+)(?::(\d+))?/i).map { |s| [s[0], s[1]] }
+      unless no_proxy_list.index { |h| /(^|\.)#{h[0]}$/.match(@data[:host]) && (h[1].nil? || h[1].to_i == @data[:port]) }
+        if @data[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
+          @data[:proxy] = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
+        elsif (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
+          @data[:proxy] = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
+        elsif @data.has_key?(:proxy)
+          @data[:proxy] = setup_proxy(@data[:proxy])
+        end
       end
 
       if @data[:proxy]
         @data[:headers]['Proxy-Connection'] ||= 'Keep-Alive'
         # https credentials happen in handshake
         if @data[:scheme] == 'http' && (@data[:proxy][:user] || @data[:proxy][:password])
-          auth = ['' << @data[:proxy][:user].to_s << ':' << @data[:proxy][:password].to_s].pack('m').delete(Excon::CR_NL)
+          user, pass = URI.decode_www_form_component(@data[:proxy][:user].to_s), URI.decode_www_form_component(@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
       end
@@ -68,10 +82,11 @@ module Excon
 
       # Use Basic Auth if url contains a login
       if @data[:user] || @data[:password]
-        @data[:headers]['Authorization'] ||= 'Basic ' << ['' << @data[:user].to_s << ':' << @data[:password].to_s].pack('m').delete(Excon::CR_NL)
+        user, pass = URI.decode_www_form_component(@data[:user].to_s), URI.decode_www_form_component(@data[:password].to_s)
+        @data[:headers]['Authorization'] ||= 'Basic ' << ['' << user.to_s << ':' << pass.to_s].pack('m').delete(Excon::CR_NL)
       end
 
-      @socket_key = '' << @data[:host] << ':' << @data[:port].to_s
+      @socket_key = '' << @data[:scheme] << '://' << @data[:host] << ':' << @data[:port].to_s
       reset
     end
 

data/lib/excon/constants.rb

@@ -71,7 +71,7 @@ module Excon
     :write_timeout
   ]
 
-  VERSION = '0.20.1'
+  VERSION = '0.21.0'
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO

data/lib/excon/middlewares/mock.rb

@@ -14,70 +14,45 @@ module Excon
            datum[:body] = datum[:body].read
           end
 
-          datum[:captures] = {:headers => {}} # setup data to hold captures
-          Excon.stubs.each do |stub, response|
-            headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
-              case value = stub[:headers][key]
-              when Regexp
-                if match = value.match(datum[:headers][key])
-                  datum[:captures][:headers][key] = match.captures
-                end
-                match
-              else
-                value == datum[:headers][key]
-              end
-            end
-            non_headers_match = (stub.keys - [:headers]).all? do |key|
-              case value = stub[key]
-              when Regexp
-                if match = value.match(datum[key])
-                  datum[:captures][key] = match.captures
-                end
-                match
-              else
-                value == datum[key]
-              end
-            end
-            if headers_match && non_headers_match
-              datum[:response] = {
-                :body       => '',
-                :headers    => {},
-                :status     => 200,
-                :remote_ip  => '127.0.0.1'
-              }
+          if response = Excon.stub_for(datum)
+            datum[:response] = {
+              :body       => '',
+              :headers    => {},
+              :status     => 200,
+              :remote_ip  => '127.0.0.1'
+            }
 
-              stub_datum = case response
-              when Proc
-                response.call(datum)
-              else
-                response
-              end
+            stub_datum = case response
+            when Proc
+              response.call(datum)
+            else
+              response
+            end
 
-              datum[:response].merge!(stub_datum.reject {|key,value| key == :headers})
-              if stub_datum.has_key?(:headers)
-                datum[:response][:headers].merge!(stub_datum[:headers])
-              end
+            datum[:response].merge!(stub_datum.reject {|key,value| key == :headers})
+            if stub_datum.has_key?(:headers)
+              datum[:response][:headers].merge!(stub_datum[:headers])
+            end
 
-              if datum[:expects] && ![*datum[:expects]].include?(datum[:response][:status])
-                # don't pass stuff into a block if there was an error
-              elsif datum.has_key?(:response_block) && datum[:response].has_key?(:body)
-                body = datum[:response].delete(:body)
-                content_length = remaining = body.bytesize
-                i = 0
-                while i < body.length
-                  datum[:response_block].call(body[i, datum[:chunk_size]], [remaining - datum[:chunk_size], 0].max, content_length)
-                  remaining -= datum[:chunk_size]
-                  i += datum[:chunk_size]
-                end
+            if datum[:expects] && ![*datum[:expects]].include?(datum[:response][:status])
+              # don't pass stuff into a block if there was an error
+            elsif datum.has_key?(:response_block) && datum[:response].has_key?(:body)
+              body = datum[:response].delete(:body)
+              content_length = remaining = body.bytesize
+              i = 0
+              while i < body.length
+                datum[:response_block].call(body[i, datum[:chunk_size]], [remaining - datum[:chunk_size], 0].max, content_length)
+                remaining -= datum[:chunk_size]
+                i += datum[:chunk_size]
               end
-              return @stack.request_call(datum)
             end
+          else
+            # if we reach here no stubs matched
+            raise(Excon::Errors::StubNotFound.new('no stubs matched ' << datum.inspect))
           end
-          # if we reach here no stubs matched
-          raise(Excon::Errors::StubNotFound.new('no stubs matched ' << datum.inspect))
-        else
-          @stack.request_call(datum)
         end
+
+        @stack.request_call(datum)
       end
     end
   end

data/lib/excon/socket.rb

@@ -32,67 +32,6 @@ module Excon
       connect
     end
 
-    def connect
-      @socket = nil
-      exception = nil
-
-      addrinfo = if @data[:proxy]
-        ::Socket.getaddrinfo(@data[:proxy][:host], @data[:proxy][:port], @data[:proxy][:family], ::Socket::Constants::SOCK_STREAM)
-      else
-        ::Socket.getaddrinfo(@data[:host], @data[:port], @data[:family], ::Socket::Constants::SOCK_STREAM)
-      end
-
-      addrinfo.each do |_, port, _, ip, a_family, s_type|
-        @remote_ip = ip
-
-        # nonblocking connect
-        begin
-          sockaddr = ::Socket.sockaddr_in(port, ip)
-
-          socket = ::Socket.new(a_family, s_type, 0)
-
-          if @data[:nonblock]
-            socket.connect_nonblock(sockaddr)
-          else
-            begin
-              Timeout.timeout(@data[:connect_timeout]) do
-                socket.connect(sockaddr)
-              end
-            rescue Timeout::Error
-              raise Excon::Errors::Timeout.new('connect timeout reached')
-            end
-          end
-
-          @socket = socket
-          break
-        rescue Errno::EINPROGRESS
-          unless IO.select(nil, [socket], nil, @data[:connect_timeout])
-            raise(Excon::Errors::Timeout.new("connect timeout reached"))
-          end
-          begin
-            socket.connect_nonblock(sockaddr)
-
-            @socket = socket
-            break
-          rescue Errno::EISCONN
-            @socket = socket
-            break
-          rescue SystemCallError => exception
-            socket.close
-            next
-          end
-        rescue SystemCallError => exception
-          socket.close
-          next
-        end
-      end
-
-      unless @socket
-        # this will be our last encountered exception
-        raise exception
-      end
-    end
-
     def read(max_length=nil)
       if @eof
         return nil
@@ -198,5 +137,68 @@ module Excon
       end
     end
 
+    private
+
+    def connect
+      @socket = nil
+      exception = nil
+
+      addrinfo = if @data[:proxy]
+        ::Socket.getaddrinfo(@data[:proxy][:host], @data[:proxy][:port], @data[:proxy][:family], ::Socket::Constants::SOCK_STREAM)
+      else
+        ::Socket.getaddrinfo(@data[:host], @data[:port], @data[:family], ::Socket::Constants::SOCK_STREAM)
+      end
+
+      addrinfo.each do |_, port, _, ip, a_family, s_type|
+        @remote_ip = ip
+
+        # nonblocking connect
+        begin
+          sockaddr = ::Socket.sockaddr_in(port, ip)
+
+          socket = ::Socket.new(a_family, s_type, 0)
+
+          if @data[:nonblock]
+            socket.connect_nonblock(sockaddr)
+          else
+            begin
+              Timeout.timeout(@data[:connect_timeout]) do
+                socket.connect(sockaddr)
+              end
+            rescue Timeout::Error
+              raise Excon::Errors::Timeout.new('connect timeout reached')
+            end
+          end
+
+          @socket = socket
+          break
+        rescue Errno::EINPROGRESS
+          unless IO.select(nil, [socket], nil, @data[:connect_timeout])
+            raise(Excon::Errors::Timeout.new("connect timeout reached"))
+          end
+          begin
+            socket.connect_nonblock(sockaddr)
+
+            @socket = socket
+            break
+          rescue Errno::EISCONN
+            @socket = socket
+            break
+          rescue SystemCallError => exception
+            socket.close
+            next
+          end
+        rescue SystemCallError => exception
+          socket.close if socket
+          next
+        end
+      end
+
+      unless @socket
+        # this will be our last encountered exception
+        raise exception
+      end
+    end
+
   end
 end

data/lib/excon/ssl_socket.rb

@@ -67,11 +67,6 @@ module Excon
       @socket
     end
 
-    def connect
-      check_nonblock_support
-      super
-    end
-
     def read(max_length=nil)
       check_nonblock_support
       super
@@ -92,5 +87,10 @@ module Excon
       end
     end
 
+    def connect
+      check_nonblock_support
+      super
+    end
+
   end
 end

data/tests/authorization_header_tests.rb

@@ -2,6 +2,7 @@ with_rackup('basic_auth.ru') do
   Shindo.tests('Excon basics (Authorization data redacted)') do
     cases = [
              ['user & pass', 'http://user1:pass1@foo.com/', 'Basic dXNlcjE6cGFzczE='],
+             ['email & pass', 'http://foo%40bar.com:pass1@foo.com/', 'Basic Zm9vQGJhci5jb206cGFzczE='],
              ['user no pass', 'http://three_user@foo.com/', 'Basic dGhyZWVfdXNlcjo='],
              ['pass no user', 'http://:derppass@foo.com/', 'Basic OmRlcnBwYXNz']
             ]

data/tests/header_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Excon response header support') do
+  env_init
 
   with_rackup('response_header.ru') do
 
@@ -46,4 +47,5 @@ Shindo.tests('Excon response header support') do
 
   end
 
+  env_restore
 end

data/tests/middlewares/mock_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Excon stubs') do
+  env_init
 
   tests("missing stub").raises(Excon::Errors::StubNotFound) do
     connection = Excon.new('http://127.0.0.1:9292', :mock => true)
@@ -198,4 +199,5 @@ Shindo.tests('Excon stubs') do
     end
   end
 
+  env_restore
 end

data/tests/proxy_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Excon proxy support') do
+  env_init
 
   tests('proxy configuration') do
 
@@ -26,9 +27,8 @@ Shindo.tests('Excon proxy support') do
       end
     end
 
-    tests('with lowercase proxy config from the environment') do
-      ENV['http_proxy'] = 'http://myproxy:8080'
-      ENV['https_proxy'] = 'http://mysecureproxy:8081'
+    def env_proxy_tests(env)
+      env_init(env)
 
       tests('an http connection') do
         connection = Excon.new('http://foo.com')
@@ -74,65 +74,49 @@ Shindo.tests('Excon proxy support') do
         end
       end
 
-      ENV.delete('http_proxy')
-      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('an http connection in no_proxy') do
+        connection = Excon.new('http://somesubdomain.noproxy')
 
-        tests('connection.data[:proxy][:host]').returns('myproxy') do
-          connection.data[:proxy][:host]
-        end
-
-        tests('connection.data[:proxy][:port]').returns('8080') do
-          connection.data[:proxy][:port]
-        end
-
-        tests('connection.data[:proxy][:scheme]').returns('http') do
-          connection.data[:proxy][:scheme]
+        tests('connection.data[:proxy]').returns(nil) do 
+          connection.data[:proxy]
         end
       end
 
-      tests('an https connection') do
-        connection = Excon.new('https://secret.com')
+      tests('an http connection not completely matching no_proxy') do
+        connection = Excon.new('http://noproxy2')
 
-        tests('connection.data[:proxy][:host]').returns('mysecureproxy') do
+        tests('connection.data[:proxy][:host]').returns('myproxy') do
           connection.data[:proxy][:host]
         end
-
-        tests('connection.data[:proxy][:port]').returns('8081') do
-          connection.data[:proxy][:port]
-        end
-
-        tests('connection.data[:proxy][:scheme]').returns('http') do
-          connection.data[: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.data[:proxy][:host]').returns('myproxy') do
-          connection.data[:proxy][:host]
-        end
+      tests('an http connection with subdomain in no_proxy') do
+        connection = Excon.new('http://a.subdomain.noproxy2')
 
-        tests('connection.data[:proxy][:port]').returns('8080') do
-          connection.data[:proxy][:port]
+        tests('connection.data[:proxy]').returns(nil) do
+          connection.data[:proxy]
         end
       end
 
-      ENV.delete('HTTP_PROXY')
-      ENV.delete('HTTPS_PROXY')
+      env_restore
+    end
+
+    tests('with complete proxy config from the environment') do
+      env = {
+        'http_proxy' => 'http://myproxy:8080',
+        'https_proxy' => 'http://mysecureproxy:8081',
+        'no_proxy' => 'noproxy, subdomain.noproxy2'
+      }
+      tests('lowercase') { env_proxy_tests(env) }
+      upperenv = {}
+      env.each do |k, v|
+        upperenv[k.upcase] = v
+      end
+      tests('uppercase') { env_proxy_tests(upperenv) }
     end
 
     tests('with only http_proxy config from the environment') do
-      ENV['http_proxy'] = 'http://myproxy:8080'
-      ENV.delete('https_proxy')
+      env_init({'http_proxy' => 'http://myproxy:8080' })
 
       tests('an https connection') do
         connection = Excon.new('https://secret.com')
@@ -150,7 +134,7 @@ Shindo.tests('Excon proxy support') do
         end
       end
 
-      ENV.delete('http_proxy')
+      env_restore
     end
 
   end
@@ -211,4 +195,5 @@ Shindo.tests('Excon proxy support') do
 
   end
 
+  env_restore
 end