excon 0.27.2 → 0.27.3

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,9 @@
+0.27.3 10/11/2013
+=================
+
+better invalid key handling
+avoid mutating port value
+
 0.27.2 10/10/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.2'
-  s.date              = '2013-10-10'
+  s.version           = '0.27.3'
+  s.date              = '2013-10-11'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon.rb

@@ -134,7 +134,7 @@ module Excon
       params = {
         :host       => uri.host,
         :path       => uri.path,
-        :port       => uri.port.to_s,
+        :port       => uri.port,
         :query      => uri.query,
         :scheme     => uri.scheme,
         :user       => (URI.decode(uri.user) if uri.user),
@@ -155,7 +155,7 @@ module Excon
         request_params.update(
           :host              => uri.host,
           :path              => uri.path,
-          :port              => uri.port.to_s,
+          :port              => uri.port,
           :query             => uri.query,
           :scheme            => uri.scheme
         )

data/lib/excon/connection.rb

@@ -46,7 +46,7 @@ module Excon
     #     @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
     #     @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
     def initialize(params = {})
-      validate_params!(:connection, params)
+      params = validate_params(:connection, params)
       @data = Excon.defaults.dup
       # merge does not deep-dup, so make sure headers is not the original
       @data[:headers] = @data[:headers].dup
@@ -101,7 +101,7 @@ module Excon
           @socket_key << '://' << @data[:socket]
         end
       else
-        @socket_key << '://' << @data[:host]<< ':' << @data[:port].to_s
+        @socket_key << '://' << @data[:host] << port_string(@data)
       end
       reset
     end
@@ -228,7 +228,7 @@ module Excon
     #     @option params [String] :path appears after 'scheme://host:port/'
     #     @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
     def request(params={}, &block)
-      validate_params!(:request, params)
+      params = validate_params(:request, params)
       # @data has defaults, merge in new params to override
       datum = @data.merge(params)
       datum[:headers] = @data[:headers].merge(datum[:headers] || {})
@@ -354,7 +354,7 @@ module Excon
       end
     end
 
-    def validate_params!(validation, params)
+    def validate_params(validation, params)
       valid_keys = case validation
       when :connection
         VALID_CONNECTION_KEYS
@@ -364,8 +364,10 @@ module Excon
       invalid_keys = params.keys - valid_keys
       unless invalid_keys.empty?
         Excon.display_warning("Invalid Excon #{validation} keys: #{invalid_keys.map(&:inspect).join(', ')}\n#{ caller.join("\n") }")
+        params = params.dup
         invalid_keys.each {|key| params.delete(key) }
       end
+      params
     end
 
     def response(datum={})
@@ -403,7 +405,7 @@ module Excon
         {
           :host       => uri.host,
           :password   => uri.password,
-          :port       => uri.port.to_s,
+          :port       => uri.port,
           :scheme     => uri.scheme,
           :user       => uri.user
         }
@@ -413,7 +415,7 @@ module Excon
     end
 
     def port_string(datum)
-      if datum[:omit_default_port] && ((datum[:scheme].casecmp('http') == 0 && datum[:port].to_i == 80) || (datum[:scheme].casecmp('https') == 0 && datum[:port].to_i == 443))
+      if datum[:port].nil? || (datum[:omit_default_port] && ((datum[:scheme].casecmp('http') == 0 && datum[:port] == 80) || (datum[:scheme].casecmp('https') == 0 && datum[:port] == 443)))
         ''
       else
         ':' << datum[:port].to_s

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.27.2'
+  VERSION = '0.27.3'
 
   CR_NL = "\r\n"
 

data/lib/excon/middlewares/idempotent.rb

@@ -7,8 +7,8 @@ module Excon
           # reduces remaining retries, reset connection, and restart request_call
           datum[:retries_remaining] -= 1
           connection = datum.delete(:connection)
-          retry_datum = datum.reject {|key, _| !VALID_REQUEST_KEYS.include?(key) }
-          connection.request(retry_datum)
+          datum.reject! {|key, _| !VALID_REQUEST_KEYS.include?(key) }
+          connection.request(datum)
         else
           @stack.error_call(datum)
         end

data/lib/excon/middlewares/redirect_follower.rb

@@ -11,18 +11,11 @@ module Excon
             end
             uri = uri_parser.parse(location)
 
-            port_string = if datum[:omit_default_port] && ((uri.scheme.casecmp('http') == 0 && uri.port.to_i == 80) || (uri.scheme.casecmp('https') == 0 && uri.port.to_i == 443))
-              ''
-            else
-              ':' << uri.port.to_s
-            end
-
             # delete old/redirect response
             datum.delete(:response)
 
             response = datum[:connection].request(
               datum.merge!(
-                :headers    => (datum[:headers] || {}).merge({'Host' => '' << uri.host << port_string}),
                 :host       => uri.host,
                 :path       => uri.path,
                 :port       => uri.port,

data/tests/proxy_tests.rb

@@ -18,7 +18,7 @@ Shindo.tests('Excon proxy support') do
         connection.data[:proxy][:host]
       end
 
-      tests('connection.data[:proxy][:port]').returns('8080') do
+      tests('connection.data[:proxy][:port]').returns(8080) do
         connection.data[:proxy][:port]
       end
 
@@ -37,7 +37,7 @@ Shindo.tests('Excon proxy support') do
           connection.data[:proxy][:host]
         end
 
-        tests('connection.data[:proxy][:port]').returns('8080') do
+        tests('connection.data[:proxy][:port]').returns(8080) do
           connection.data[:proxy][:port]
         end
 
@@ -53,7 +53,7 @@ Shindo.tests('Excon proxy support') do
           connection.data[:proxy][:host]
         end
 
-        tests('connection.data[:proxy][:port]').returns('8081') do
+        tests('connection.data[:proxy][:port]').returns(8081) do
           connection.data[:proxy][:port]
         end
 
@@ -69,7 +69,7 @@ Shindo.tests('Excon proxy support') do
           connection.data[:proxy][:host]
         end
 
-        tests('connection.data[:proxy][:port]').returns('8080') do
+        tests('connection.data[:proxy][:port]').returns(8080) do
           connection.data[:proxy][:port]
         end
       end
@@ -125,7 +125,7 @@ Shindo.tests('Excon proxy support') do
           connection.data[:proxy][:host]
         end
 
-        tests('connection.data[:proxy][:port]').returns('8080') do
+        tests('connection.data[:proxy][:port]').returns(8080) do
           connection.data[:proxy][:port]
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1278435808778456235
+      hash: -196741291753928057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: