excon 0.9.2 → 0.9.3

data/changelog.txt

@@ -1,3 +1,11 @@
+0.9.3 12/21/11
+==============
+
+* fix CONSTANTS referenced in SSL_Socket
+* fix default value for proxy in SSL_Socket
+* fix non-regexp header matching
+* return captures from regexp based params
+
 0.9.2 12/16/11
 ==============
 

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.9.2'
-  s.date              = '2011-12-16'
+  s.version           = '0.9.3'
+  s.date              = '2011-12-21'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -236,19 +236,24 @@ module Excon
     end
 
     def invoke_stub(params)
+      params[:captures] = {:headers => {}} # setup data to hold captures
       for stub, response in Excon.stubs
         headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
           case value = stub[:headers][key]
           when Regexp
-            value =~ params[:headers][key]
+            value.match(params[:headers][key]) do |match|
+              params[:captures][:headers][key] = match.captures
+            end
           else
-            value =~ params[:headers][key]
+            value == params[:headers][key]
           end
         end
         non_headers_match = (stub.keys - [:headers]).all? do |key|
           case value = stub[key]
           when Regexp
-            value =~ params[key]
+            value.match(params[key]) do |match|
+              params[:captures][key] = match.captures
+            end
           else
             value == params[key]
           end

data/lib/excon/constants.rb

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

data/lib/excon/ssl_socket.rb

@@ -17,7 +17,7 @@ module Excon
 
     end
 
-    def initialize(params = {}, proxy = {})
+    def initialize(params = {}, proxy = nil)
       super
 
       # create ssl context
@@ -49,8 +49,8 @@ module Excon
       @socket.sync_close = true
 
       if @proxy
-        @socket << "CONNECT " << @params[:host] << ":" << @params[:port] << Excon::Connection::HTTP_1_1
-        @socket << "Host: " << @params[:host] << ":" << @params[:port] << Excon::Connection::CR_NL << Excon::Connection::CR_NL
+        @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

data/tests/stub_tests.rb

@@ -48,7 +48,7 @@ Shindo.tests('Excon stubs') do
 
     Excon.stub({:path => %r{/tests/(\S+)}}) do |params|
       {
-        :body => /tests\/(\S+)/.match(params[:path]).captures.first,
+        :body => params[:captures][:path].first,
         :status => 200
       }
     end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 2
-  segments_generated: true
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - dpiddy (Dan Peterson)
@@ -17,11 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -06:00
+date: 2011-12-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -29,66 +30,61 @@ dependencies:
         - 3
         - 1
         - 3
-        segments_generated: true
         version: 3.1.3
-  requirement: *id001
-  name: activesupport
-  prerelease: false
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: delorean
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id002
-  name: delorean
-  prerelease: false
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: open4
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id003
-  name: open4
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id004
-  name: rake
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id005
-  name: rdoc
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: shindo
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -96,25 +92,21 @@ dependencies:
         - 0
         - 2
         - 0
-        segments_generated: true
         version: 0.2.0
-  requirement: *id006
-  name: shindo
-  prerelease: false
   type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: sinatra
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id007
-  name: sinatra
-  prerelease: false
   type: :development
+  version_requirements: *id007
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -187,7 +179,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -195,7 +186,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []