excon 0.14.1 → 0.14.2

data/changelog.txt

@@ -1,4 +1,9 @@
-0.14.1 07/19/12
+0.14.2 06/26/12
+===============
+
+fix invoke_stub to convert files into strings before comparing
+
+0.14.1 06/19/12
 ===============
 
 accept port as a separate option

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.1'
-  s.date              = '2012-06-19'
+  s.version           = '0.14.2'
+  s.date              = '2012-06-26'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -242,7 +242,9 @@ module Excon
                 socket.write(params[:body])
               end
             else
-              params[:body].binmode if params[:body].respond_to?(:binmode)
+              if params[:body].respond_to?(:binmode)
+                params[:body].binmode
+              end
               while chunk = params[:body].read(CHUNK_SIZE)
                 socket.write(chunk)
               end
@@ -274,6 +276,18 @@ module Excon
     end
 
     def invoke_stub(params)
+
+      # convert File/Tempfile body to string before matching:
+      unless params[:body].nil? || params[:body].is_a?(String)
+       if params[:body].respond_to?(:binmode)
+         params[:body].binmode
+       end
+       if params[:body].respond_to?(:rewind)
+         params[:body].rewind
+       end
+       params[:body] = params[:body].read
+      end
+
       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|

data/lib/excon/constants.rb

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

data/tests/stub_tests.rb

@@ -105,6 +105,26 @@ Shindo.tests('Excon stubs') do
 
   end
 
+  tests("stub({:body => File.open(...), :method => :get}, { :status => 200 })") do
+
+    file_path = File.join(File.dirname(__FILE__), 'data', 'xs')
+
+    Excon.stub(
+      { :body => File.read(file_path), :method => :get },
+      { :status => 200 }
+    )
+
+    connection = Excon.new('http://127.0.0.1:9292', :mock => true)
+    response = connection.request(:body => File.open(file_path), :method => :get, :path => '/')
+
+    tests('response.status') do
+      response.status
+    end
+
+    Excon.stubs.clear
+
+  end
+
   tests("mismatched stub").raises(Excon::Errors::StubNotFound) do
     Excon.stub({:method => :post}, {:body => 'body'})
     Excon.get('http://127.0.0.1:9292/', :mock => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70270728323400 !ruby/object:Gem::Requirement
+  requirement: &70178391272380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728323400
+  version_requirements: *70178391272380
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70270728322580 !ruby/object:Gem::Requirement
+  requirement: &70178391271720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728322580
+  version_requirements: *70178391271720
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70270728321900 !ruby/object:Gem::Requirement
+  requirement: &70178391271100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728321900
+  version_requirements: *70178391271100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70270728321100 !ruby/object:Gem::Requirement
+  requirement: &70178391270640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728321100
+  version_requirements: *70178391270640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70270728320640 !ruby/object:Gem::Requirement
+  requirement: &70178391270200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728320640
+  version_requirements: *70178391270200
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70270728320160 !ruby/object:Gem::Requirement
+  requirement: &70178391269500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728320160
+  version_requirements: *70178391269500
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70270728319720 !ruby/object:Gem::Requirement
+  requirement: &70178391268720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270728319720
+  version_requirements: *70178391268720
 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: -419476000002150185
+      hash: 1386473486061410305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: