excon 0.14.3 → 0.15.0

data/README.md

@@ -155,11 +155,11 @@ By default excon will try to verify peer certificates when using SSL for HTTPS.
 
 If you have the misfortune of running into this problem you have a couple options. If you have certificates but they aren't being auto-discovered, you can specify the path to your certificates:
 
-    Excon.ssl_ca_path = '/path/to/certs'
+    Excon.defaults[:ssl_ca_path] = '/path/to/certs'
 
 Failing that, you can turn off peer verification (less secure):
 
-    Excon.ssl_verify_peer = false
+    Excon.defaults[:ssl_verify_peer] = false
 
 Either of these should allow you to work around the socket error and continue with your work.
 

data/changelog.txt

@@ -1,3 +1,10 @@
+0.15.0 07/16/12
+===============
+
+clarifications in README
+added base error class to message for Excon::SocketError
+fixes for proxy, sets properly on http and passes auth
+
 0.14.3 07/05/12
 ===============
 

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.14.3'
-  s.date              = '2012-07-05'
+  s.version           = '0.15.0'
+  s.date              = '2012-07-16'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -52,8 +52,7 @@ module Excon
 
       # Use Basic Auth if url contains a login
       if uri.user || uri.password
-        auth = ["#{uri.user}:#{uri.password}"].pack('m').delete("\r\n")
-        @connection[:headers]['Authorization'] ||= "Basic #{auth}"
+        @connection[:headers]['Authorization'] ||= 'Basic ' << ['' << uri.user << ':' << uri.password].pack('m').delete(EXCON::CR_NL)
       end
 
       @socket_key = '' << @connection[:host] << ':' << @connection[:port].to_s
@@ -356,7 +355,13 @@ module Excon
       unless uri.host and uri.port and uri.scheme
         raise Excon::Errors::ProxyParseError, "Proxy is invalid"
       end
-      {:host => uri.host, :port => uri.port, :scheme => uri.scheme}
+      {
+        :host     => uri.host,
+        :password => uri.password,
+        :port     => uri.port,
+        :scheme   => uri.scheme,
+        :user     => uri.user
+      }
     end
 
   end

data/lib/excon/constants.rb

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

data/lib/excon/errors.rb

@@ -10,7 +10,7 @@ module Excon
         if socket_error.message =~ /certificate verify failed/
           super('Unable to verify certificate, please set `Excon.defaults[:ssl_ca_path] = path_to_certs`, `Excon.defaults[:ssl_ca_file] = path_to_file`, or `Excon.defaults[:ssl_verify_peer] = false` (less secure).')
         else
-          super(socket_error.message)
+          super("#{socket_error.message} (#{socket_error.class})")
         end
         set_backtrace(socket_error.backtrace)
         @socket_error = socket_error

data/lib/excon/socket.rb

@@ -66,6 +66,30 @@ module Excon
         # this will be our last encountered exception
         raise exception
       end
+
+      initialize_proxy
+    end
+
+    def initialize_proxy
+      if @proxy
+        request = 'CONNECT ' << @params[:host] << ':' << @params[:port] << Excon::HTTP_1_1
+        request << 'Host: ' << @params[:host] << ':' << @params[:port] << Excon::CR_NL
+
+        if @proxy[:password] || @proxy[:user]
+          auth = ['' << uri.user << ':' << uri.password].pack('m').delete(EXCON::CR_NL)
+          request << "Proxy-Authorization: Basic " << auth << Excon::CR_NL
+        end
+
+        request << Excon::CR_NL
+
+        # write out the proxy setup request
+        @socket.write(request)
+
+        # eat the proxy's connection response
+        while line = @socket.readline.strip
+          break if line.empty?
+        end
+      end
     end
 
     def read(max_length=nil)

data/lib/excon/ssl_socket.rb

@@ -60,15 +60,7 @@ module Excon
       @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
       @socket.sync_close = true
 
-      if @proxy
-        @socket << "CONNECT " << @params[:host] << ":" << @params[:port] << Excon::HTTP_1_1
-        @socket << "Host: " << @params[:host] << ":" << @params[:port] << Excon::CR_NL << Excon::CR_NL
-
-        # eat the proxy's connection response
-        while line = @socket.readline.strip
-          break if line.empty?
-        end
-      end
+      initialize_proxy
 
       # connect the new OpenSSL::SSL::SSLSocket
       @socket.connect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70300800927500 !ruby/object:Gem::Requirement
+  requirement: &70326692727560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800927500
+  version_requirements: *70326692727560
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70300800926780 !ruby/object:Gem::Requirement
+  requirement: &70326692726620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800926780
+  version_requirements: *70326692726620
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70300800925500 !ruby/object:Gem::Requirement
+  requirement: &70326692725180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800925500
+  version_requirements: *70326692725180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300800924680 !ruby/object:Gem::Requirement
+  requirement: &70326692723720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800924680
+  version_requirements: *70326692723720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70300800924060 !ruby/object:Gem::Requirement
+  requirement: &70326692722820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800924060
+  version_requirements: *70326692722820
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70300800923500 !ruby/object:Gem::Requirement
+  requirement: &70326692722200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800923500
+  version_requirements: *70326692722200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70300800922640 !ruby/object:Gem::Requirement
+  requirement: &70326692720900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300800922640
+  version_requirements: *70326692720900
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3694586687950999890
+      hash: 3388892203707027990
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: excon
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: speed, persistence, http(s)