excon 0.16.1 → 0.16.2

data/changelog.txt

@@ -1,3 +1,15 @@
+0.16.2 09/27/2012
+=================
+
+provide more helpful backtraces on connection requests
+provide more helpful backtraces on one-off requests
+rearrange class methods so params will pass to socket
+integrate nonblock backwards compatability fix
+rearrange excon.rb to initialize defaults sooner
+set nonblock at init time for ssl socket
+fixes around nonbleck to properly skip/warn if unavailable but selected
+
+
 0.16.1 09/15/2012
 =================
 

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.16.1'
-  s.date              = '2012-08-15'
+  s.version           = '0.16.2'
+  s.date              = '2012-08-27'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
     lib/excon/socket.rb
     lib/excon/ssl_socket.rb
     lib/excon/standard_instrumentor.rb
+    tests/authorization_header_tests.rb
     tests/bad_tests.rb
     tests/basic_tests.rb
     tests/data/xs

data/lib/excon.rb

@@ -9,14 +9,7 @@ require 'socket'
 require 'timeout'
 require 'uri'
 
-require 'excon/constants'
-require 'excon/connection'
-require 'excon/errors'
-require 'excon/response'
-require 'excon/socket'
-require 'excon/ssl_socket'
-require 'excon/standard_instrumentor'
-
+# Define defaults first so they will be available to other files
 module Excon
   class << self
 
@@ -42,6 +35,20 @@ module Excon
       @defaults = new_defaults
     end
 
+  end
+end
+
+require 'excon/constants'
+require 'excon/connection'
+require 'excon/errors'
+require 'excon/response'
+require 'excon/socket'
+require 'excon/ssl_socket'
+require 'excon/standard_instrumentor'
+
+module Excon
+  class << self
+
     # Status of mocking
     def mock
       puts("Excon#mock is deprecated, pass Excon.defaults[:mock] instead (#{caller.first})")
@@ -117,9 +124,9 @@ module Excon
 
     # Generic non-persistent HTTP methods
     HTTP_VERBS.each do |method|
-      eval <<-DEF
+      module_eval <<-DEF, __FILE__, __LINE__ + 1
         def #{method}(url, params = {}, &block)
-          new(url).request(params.merge!(:method => :#{method}), &block)
+          new(url, params).request(:method => :#{method}, &block)
         end
       DEF
     end

data/lib/excon/connection.rb

@@ -130,7 +130,7 @@ module Excon
 
     # Generate HTTP request verb methods
     Excon::HTTP_VERBS.each do |method|
-      eval <<-DEF
+      class_eval <<-DEF, __FILE__, __LINE__ + 1
         def #{method}(params={}, &block)
           request(params.merge!(:method => :#{method}), &block)
         end
@@ -147,7 +147,20 @@ module Excon
       @connection[:retry_limit] ||= DEFAULT_RETRY_LIMIT
     end
 
-  private
+    def inspect
+      c_clean = @connection.dup
+      c_clean[:headers] = @connection[:headers].dup
+      if ! @connection[:headers]['Authorization'].nil?
+        c_clean[:headers]['Authorization'] = 'REDACTED'
+      end
+      vars = instance_variables.map do |x|
+        vals = x.to_s.eql?("@connection") ? c_clean : instance_variable_get(x)
+        "#{x}=#{vals.inspect}"
+      end
+      "#{self.to_s}".gsub(/>\z/, " " + vars.join(", ") + '>')
+    end
+
+    private
 
     def detect_content_length(body)
       if body.is_a?(String)

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.16.1'
+    VERSION = '0.16.2'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/ssl_socket.rb

@@ -1,33 +1,10 @@
 module Excon
   class SSLSocket < Socket
 
-    # backwards compatability for things lacking connect_nonblock
-    unless OpenSSL::SSL::SSLSocket.public_method_defined?(:connect_nonblock)
-
-      undef_method :connect
-      def connect
-        @socket = TCPSocket.new(@params[:host], @params[:port])
-      end
-
-    end
-
-    # backwards compatability for things lacking read_nonblock
-    unless OpenSSL::SSL::SSLSocket.public_method_defined?(:read_nonblock)
-
-      undef_method :read
-      def_delegators(:@socket, :read, :read)
-
-    end
-
-    # backwards compatability for things lacking write_nonblock
-    unless OpenSSL::SSL::SSLSocket.public_method_defined?(:write_nonblock)
-
-      undef_method :write
-      def_delegators(:@socket, :write, :write)
-
-    end
-
     def initialize(params = {}, proxy = nil)
+      @params, @proxy = params, proxy
+      check_nonblock_support
+
       super
 
       # create ssl context
@@ -95,5 +72,34 @@ module Excon
       @socket
     end
 
+    def connect
+      check_nonblock_support
+      super
+    end
+
+    def read(max_length=nil)
+      check_nonblock_support
+      super
+    end
+
+    def write(data)
+      check_nonblock_support
+      super
+    end
+
+    private
+
+    def check_nonblock_support
+      # backwards compatability for things lacking nonblock
+      unless OpenSSL::SSL::SSLSocket.public_method_defined?(:connect_nonblock) &&
+             OpenSSL::SSL::SSLSocket.public_method_defined?(:read_nonblock) &&
+             OpenSSL::SSL::SSLSocket.public_method_defined?(:write_nonblock)
+        unless params[:nonblock] == false
+          puts("Excon nonblock is not supported by your OpenSSL::SSL::SSLSocket")
+          params[:nonblock] = false
+        end
+      end
+    end
+
   end
 end

data/tests/authorization_header_tests.rb

@@ -0,0 +1,20 @@
+with_rackup('basic_auth.ru') do
+  Shindo.tests('Excon basics (Authorization data redacted)') do
+    cases = [
+             ['user & pass', 'http://user1:pass1@foo.com/', 'Basic dXNlcjE6cGFzczE='],
+             ['user no pass', 'http://three_user@foo.com/', 'Basic dGhyZWVfdXNlcjo='],
+             ['pass no user', 'http://:derppass@foo.com/', 'Basic OmRlcnBwYXNz']
+            ]
+    cases.each do |desc,url,auth_header|
+      conn = Excon.new(url)
+      test("authorization header concealed for #{desc}") do
+        ! conn.inspect.to_s.include? auth_header
+      end
+
+      tests("authorization header correct for #{desc}").returns(auth_header) do
+        conn.connection[:headers]['Authorization']
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70211533557160 !ruby/object:Gem::Requirement
+  requirement: &70244964150240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533557160
+  version_requirements: *70244964150240
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70211533567560 !ruby/object:Gem::Requirement
+  requirement: &70244964163380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533567560
+  version_requirements: *70244964163380
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70211533587600 !ruby/object:Gem::Requirement
+  requirement: &70244964162220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533587600
+  version_requirements: *70244964162220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70211533593780 !ruby/object:Gem::Requirement
+  requirement: &70244964160980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533593780
+  version_requirements: *70244964160980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70211533616060 !ruby/object:Gem::Requirement
+  requirement: &70244964159980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533616060
+  version_requirements: *70244964159980
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70211533612080 !ruby/object:Gem::Requirement
+  requirement: &70244964159080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533612080
+  version_requirements: *70244964159080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70211533609780 !ruby/object:Gem::Requirement
+  requirement: &70244964157680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211533609780
+  version_requirements: *70244964157680
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -129,6 +129,7 @@ files:
 - lib/excon/socket.rb
 - lib/excon/ssl_socket.rb
 - lib/excon/standard_instrumentor.rb
+- tests/authorization_header_tests.rb
 - tests/bad_tests.rb
 - tests/basic_tests.rb
 - tests/data/xs
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3004924058887715914
+      hash: -3145610774015695237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: