excon 0.27.6 → 0.28.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.27.6)
+    excon (0.28.0)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,15 @@
+0.28.0 10/28/2013
+=================
+
+tag warning messages with [excon]
+allow specific ssl_versions
+fixes around param validation
+create a new connection for redirect_follower middleware
+add connection_uri/request_uri to utils
+avoid mutating connection data
+remove connection key in redirect_follower
+
+
 0.27.6 10/15/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.27.6'
-  s.date              = '2013-10-15'
+  s.version           = '0.28.0'
+  s.date              = '2013-10-28'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -123,7 +123,7 @@ Gem::Specification.new do |s|
     tests/middlewares/idempotent_tests.rb
     tests/middlewares/instrumentation_tests.rb
     tests/middlewares/mock_tests.rb
-    tests/middlewares/redirect_follower.rb
+    tests/middlewares/redirect_follower_tests.rb
     tests/proxy_tests.rb
     tests/query_string_tests.rb
     tests/rackups/basic.rb
@@ -148,6 +148,7 @@ Gem::Specification.new do |s|
     tests/test_helper.rb
     tests/thread_safety_tests.rb
     tests/timeout_tests.rb
+    tests/utils_tests.rb
   ]
   # = MANIFEST =
 

data/lib/excon.rb

@@ -80,7 +80,7 @@ module Excon
     def display_warning(warning)
       # Respect Ruby's $VERBOSE setting, unless EXCON_DEBUG is set
       if !$VERBOSE.nil? || ENV['EXCON_DEBUG']
-        $stderr.puts(warning)
+        $stderr.puts "[excon][WARNING] #{ warning }"
       end
     end
 

data/lib/excon/connection.rb

@@ -128,22 +128,7 @@ module Excon
           request << datum[:path]
 
           # add query to path, if there is one
-          case datum[:query]
-          when String
-            request << '?' << datum[:query]
-          when Hash
-            request << '?'
-            datum[:query].each do |key, values|
-              if values.nil?
-                request << key.to_s << '&'
-              else
-                [values].flatten.each do |value|
-                  request << key.to_s << '=' << CGI.escape(value.to_s) << '&'
-                end
-              end
-            end
-            request.chop! # remove trailing '&'
-          end
+          request << query_string(datum)
 
           # finish first line with "HTTP/1.1\r\n"
           request << HTTP_1_1
@@ -358,9 +343,9 @@ module Excon
     def validate_params(validation, params)
       valid_keys = case validation
       when :connection
-        valid_connection_keys(@data, params)
+        valid_connection_keys(params)
       when :request
-        valid_request_keys(@data, params)
+        valid_request_keys(params)
       end
       invalid_keys = params.keys - valid_keys
       unless invalid_keys.empty?

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.27.6'
+  VERSION = '0.28.0'
 
   CR_NL = "\r\n"
 
@@ -80,6 +80,7 @@ module Excon
     :socket,
     :ssl_ca_file,
     :ssl_verify_peer,
+    :ssl_version,
     :tcp_nodelay,
     :uri_parser,
     :user

data/lib/excon/middlewares/redirect_follower.rb

@@ -14,17 +14,24 @@ module Excon
             # delete old/redirect response
             datum.delete(:response)
 
-            response = datum[:connection].request(
-              datum.merge!(
-                :host       => uri.host,
-                :path       => uri.path,
-                :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)
-              )
+            params = datum.dup
+            params.delete(:stack)
+            params.delete(:connection)
+            params[:headers] = datum[:headers].dup
+            params[:headers].delete('Authorization')
+            params[:headers].delete('Proxy-Connection')
+            params[:headers].delete('Proxy-Authorization')
+            params.merge!(
+              :scheme     => uri.scheme,
+              :host       => uri.host,
+              :port       => uri.port,
+              :path       => uri.path,
+              :query      => uri.query,
+              :user       => (URI.decode(uri.user) if uri.user),
+              :password   => (URI.decode(uri.password) if uri.password)
             )
+
+            response = Excon::Connection.new(params).request
             datum.merge!({:response => response.data})
           else
             @stack.response_call(datum)

data/lib/excon/socket.rb

@@ -25,11 +25,6 @@ module Excon
       @read_buffer = ''
       @eof = false
 
-      @data[:family] ||= ::Socket::Constants::AF_UNSPEC
-      if @data[:proxy]
-        @data[:proxy][:family]  ||= ::Socket::Constants::AF_UNSPEC
-      end
-
       connect
     end
 
@@ -133,9 +128,11 @@ module Excon
       exception = nil
 
       addrinfo = if @data[:proxy]
-        ::Socket.getaddrinfo(@data[:proxy][:host], @data[:proxy][:port], @data[:proxy][:family], ::Socket::Constants::SOCK_STREAM)
+        family = @data[:proxy][:family] || ::Socket::Constants::AF_UNSPEC
+        ::Socket.getaddrinfo(@data[:proxy][:host], @data[:proxy][:port], family, ::Socket::Constants::SOCK_STREAM)
       else
-        ::Socket.getaddrinfo(@data[:host], @data[:port], @data[:family], ::Socket::Constants::SOCK_STREAM)
+        family = @data[:family] || ::Socket::Constants::AF_UNSPEC
+        ::Socket.getaddrinfo(@data[:host], @data[:port], family, ::Socket::Constants::SOCK_STREAM)
       end
 
       addrinfo.each do |_, port, _, ip, a_family, s_type|

data/lib/excon/ssl_socket.rb

@@ -10,7 +10,7 @@ module Excon
       # create ssl context
       ssl_context = OpenSSL::SSL::SSLContext.new
       ssl_context.ciphers = @data[:ciphers]
-
+      ssl_context.ssl_version = @data[:ssl_version] if @data[:ssl_version]
       if @data[:ssl_verify_peer]
         # turn verification on
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/excon/utils.rb

@@ -2,14 +2,29 @@ module Excon
   module Utils
     extend self
 
-    def valid_connection_keys(datum, params = {})
+    def valid_connection_keys(params = {})
       Excon::VALID_CONNECTION_KEYS
     end
 
-    def valid_request_keys(datum, params = {})
+    def valid_request_keys(params = {})
       Excon::VALID_REQUEST_KEYS
     end
 
+    def connection_uri(datum = @data)
+      unless datum
+        raise ArgumentError, '`datum` must be given unless called on a Connection'
+      end
+      if datum[:scheme] == UNIX
+        '' << datum[:scheme] << '://' << datum[:socket]
+      else
+        '' << datum[:scheme] << '://' << datum[:host] << port_string(datum)
+      end
+    end
+
+    def request_uri(datum)
+      connection_uri(datum) << datum[:path] << query_string(datum)
+    end
+
     def port_string(datum)
       if datum[:port].nil? || (datum[:omit_default_port] && ((datum[:scheme].casecmp('http') == 0 && datum[:port] == 80) || (datum[:scheme].casecmp('https') == 0 && datum[:port] == 443)))
         ''
@@ -17,5 +32,26 @@ module Excon
         ':' << datum[:port].to_s
       end
     end
+
+    def query_string(datum)
+      str = ''
+      case datum[:query]
+      when String
+        str << '?' << datum[:query]
+      when Hash
+        str << '?'
+        datum[:query].sort_by {|k,_| k.to_s }.each do |key, values|
+          if values.nil?
+            str << key.to_s << '&'
+          else
+            [values].flatten.each do |value|
+              str << key.to_s << '=' << CGI.escape(value.to_s) << '&'
+            end
+          end
+        end
+        str.chop! # remove trailing '&'
+      end
+      str
+    end
   end
 end

data/tests/utils_tests.rb

@@ -0,0 +1,68 @@
+Shindo.tests('Excon::Utils') do
+
+  tests('#connection_uri') do
+
+    expected_uri = 'unix:///tmp/some.sock'
+    tests('using UNIX scheme').returns(expected_uri) do
+      connection = Excon.new('unix:///some/path', :socket => '/tmp/some.sock')
+      Excon::Utils.connection_uri(connection.data)
+    end
+
+    tests('using HTTP scheme') do
+
+      expected_uri = 'http://foo.com:80'
+      tests('with default port').returns(expected_uri) do
+        connection = Excon.new('http://foo.com/some/path')
+        Excon::Utils.connection_uri(connection.data)
+      end
+
+      expected_uri = 'http://foo.com'
+      tests('without default port').returns(expected_uri) do
+        connection = Excon.new('http://foo.com/some/path', :omit_default_port => true)
+        Excon::Utils.connection_uri(connection.data)
+      end
+
+    end
+
+  end
+
+  tests('#request_uri') do
+
+    tests('using UNIX scheme') do
+
+      expected_uri = 'unix:///tmp/some.sock/some/path'
+      tests('without query').returns(expected_uri) do
+        connection = Excon.new('unix:/', :socket => '/tmp/some.sock')
+        params = { :path => '/some/path' }
+        Excon::Utils.request_uri(connection.data.merge(params))
+      end
+
+      expected_uri = 'unix:///tmp/some.sock/some/path?bar=that&foo=this'
+      tests('with query').returns(expected_uri) do
+        connection = Excon.new('unix:/', :socket => '/tmp/some.sock')
+        params = { :path => '/some/path', :query => { :foo => 'this', :bar => 'that' } }
+        Excon::Utils.request_uri(connection.data.merge(params))
+      end
+
+    end
+
+    tests('using HTTP scheme') do
+
+      expected_uri = 'http://foo.com:80/some/path'
+      tests('without query').returns(expected_uri) do
+        connection = Excon.new('http://foo.com')
+        params = { :path => '/some/path' }
+        Excon::Utils.request_uri(connection.data.merge(params))
+      end
+
+      expected_uri = 'http://foo.com:80/some/path?bar=that&foo=this'
+      tests('with query').returns(expected_uri) do
+        connection = Excon.new('http://foo.com')
+        params = { :path => '/some/path', :query => { :foo => 'this', :bar => 'that' } }
+        Excon::Utils.request_uri(connection.data.merge(params))
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.27.6
+  version: 0.28.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -203,7 +203,7 @@ files:
 - tests/middlewares/idempotent_tests.rb
 - tests/middlewares/instrumentation_tests.rb
 - tests/middlewares/mock_tests.rb
-- tests/middlewares/redirect_follower.rb
+- tests/middlewares/redirect_follower_tests.rb
 - tests/proxy_tests.rb
 - tests/query_string_tests.rb
 - tests/rackups/basic.rb
@@ -228,6 +228,7 @@ files:
 - tests/test_helper.rb
 - tests/thread_safety_tests.rb
 - tests/timeout_tests.rb
+- tests/utils_tests.rb
 homepage: https://github.com/geemus/excon
 licenses:
 - MIT
@@ -244,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 748587891276058241
+      hash: 527099065426297719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: