excon 0.27.4 → 0.27.5

data/Gemfile.lock

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

data/changelog.txt

@@ -1,3 +1,8 @@
+0.27.5 10/14/2013
+=================
+
+extract validations/port_string to utils module
+
 0.27.4 10/14/2013
 =================
 

data/excon.gemspec

@@ -13,7 +13,7 @@ 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.4'
+  s.version           = '0.27.5'
   s.date              = '2013-10-14'
   s.rubyforge_project = 'excon'
 
@@ -110,6 +110,7 @@ Gem::Specification.new do |s|
     lib/excon/ssl_socket.rb
     lib/excon/standard_instrumentor.rb
     lib/excon/unix_socket.rb
+    lib/excon/utils.rb
     tests/authorization_header_tests.rb
     tests/bad_tests.rb
     tests/basic_tests.rb

data/lib/excon.rb

@@ -56,6 +56,7 @@ module Excon
   end
 end
 
+require 'excon/utils'
 require 'excon/constants'
 require 'excon/connection'
 require 'excon/errors'

data/lib/excon/connection.rb

@@ -1,5 +1,6 @@
 module Excon
   class Connection
+    include Utils
 
     attr_reader :data
 
@@ -46,7 +47,6 @@ 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 = {})
-      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
@@ -54,6 +54,7 @@ module Excon
       # the same goes for :middlewares
       @data[:middlewares] = @data[:middlewares].dup
 
+      params = validate_params(:connection, params)
       @data.merge!(params)
 
       unless @data[:scheme] == UNIX
@@ -357,9 +358,9 @@ module Excon
     def validate_params(validation, params)
       valid_keys = case validation
       when :connection
-        VALID_CONNECTION_KEYS
+        valid_connection_keys(@data, params)
       when :request
-        VALID_REQUEST_KEYS
+        valid_request_keys(@data, params)
       end
       invalid_keys = params.keys - valid_keys
       unless invalid_keys.empty?
@@ -413,13 +414,5 @@ module Excon
         proxy
       end
     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)))
-        ''
-      else
-        ':' << datum[:port].to_s
-      end
-    end
   end
 end

data/lib/excon/constants.rb

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

data/lib/excon/middlewares/idempotent.rb

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

data/lib/excon/socket.rb

@@ -1,5 +1,6 @@
 module Excon
   class Socket
+    include Utils
 
     extend Forwardable
 

data/lib/excon/ssl_socket.rb

@@ -51,8 +51,8 @@ module Excon
       end
 
       if @data[:proxy]
-        request = 'CONNECT ' << @data[:host] << @data[:connection].send(:port_string, @data) << Excon::HTTP_1_1
-        request << 'Host: ' << @data[:host] << @data[:connection].send(:port_string, @data) << Excon::CR_NL
+        request = 'CONNECT ' << @data[:host] << port_string(@data) << Excon::HTTP_1_1
+        request << 'Host: ' << @data[:host] << port_string(@data) << Excon::CR_NL
 
         if @data[:proxy][:password] || @data[:proxy][:user]
           auth = ['' << @data[:proxy][:user].to_s << ':' << @data[:proxy][:password].to_s].pack('m').delete(Excon::CR_NL)

data/lib/excon/utils.rb

@@ -0,0 +1,21 @@
+module Excon
+  module Utils
+    extend self
+
+    def valid_connection_keys(datum, params = {})
+      Excon::VALID_CONNECTION_KEYS
+    end
+
+    def valid_request_keys(datum, params = {})
+      Excon::VALID_REQUEST_KEYS
+    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)))
+        ''
+      else
+        ':' << datum[:port].to_s
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.5
   prerelease: 
 platform: ruby
 authors:
@@ -190,6 +190,7 @@ files:
 - lib/excon/ssl_socket.rb
 - lib/excon/standard_instrumentor.rb
 - lib/excon/unix_socket.rb
+- lib/excon/utils.rb
 - tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb
@@ -243,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4082744813762939124
+      hash: -4165202606789570429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: