webmock 1.8.10 → 1.8.11

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.8.11
+
+* Fix excon adapter to handle `:body => some_file_object`
+
+  Thanks to [Myron Marston](https://github.com/myronmarston)
+
 ## 1.8.10
 
 * em-http-request fix. After request callbacks are correctly invoked for 3xx responses,

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -43,7 +43,16 @@ if defined?(Excon)
           method  = (params.delete(:method) || :get).to_s.downcase.to_sym
           params[:query] = to_query(params[:query]) if params[:query].is_a?(Hash)
           uri = Addressable::URI.new(params).to_s
-          WebMock::RequestSignature.new method, uri, :body => params[:body], :headers => params[:headers]
+          WebMock::RequestSignature.new method, uri, :body => body_from(params), :headers => params[:headers]
+        end
+
+        def self.body_from(params)
+          body = params[:body]
+          return body unless body.respond_to?(:read)
+
+          contents = body.read
+          body.rewind if body.respond_to?(:rewind)
+          contents
         end
 
         def self.real_response(mock)

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -33,8 +33,10 @@ module WebMock
         #in case any constants were added to @webMockNetHTTP instead of Net::HTTP
         #after WebMock was enabled.
         #i.e Net::HTTP::DigestAuth
-        (@webMockNetHTTP.constants - OriginalNetHTTP.constants).each do |constant|
-          OriginalNetHTTP.send(:const_set, constant, @webMockNetHTTP.const_get(constant))
+        @webMockNetHTTP.constants.each do |constant|
+          if !OriginalNetHTTP.constants.map(&:to_s).include?(constant.to_s)
+            OriginalNetHTTP.send(:const_set, constant, @webMockNetHTTP.const_get(constant))
+          end
         end
       end
 
@@ -64,7 +66,7 @@ module WebMock
 
           if Module.method(:constants).arity != 0
             def constants(inherit=true)
-              super + self.superclass.constants(inherit)
+              (super + self.superclass.constants(inherit)).uniq
             end
           end
         end

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.8.10' unless defined?(::WebMock::VERSION)
+  VERSION = '1.8.11' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/excon/excon_spec.rb

@@ -11,5 +11,20 @@ describe "Excon" do
     Excon.get('http://example.com', :path => "resource/", :query => {:a => 1, :b => 2}).body.should == "abc"
   end
 
+  let(:file) { File.new(__FILE__) }
+  let(:file_contents) { File.new(__FILE__).read }
+
+  it 'handles file uploads correctly' do
+    stub_request(:put, "http://example.com/upload").with(:body => file_contents)
+
+    yielded_request_body = nil
+    WebMock.after_request do |req, res|
+      yielded_request_body = req.body
+    end
+
+    Excon.put("http://example.com", :path => "upload", :body => file)
+
+    yielded_request_body.should eq(file_contents)
+  end
 end
 

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -7,7 +7,7 @@ module ExconSpecHelper
     uri      = Addressable::URI.heuristic_parse(uri)
     uri      = uri.omit(:userinfo).to_s.gsub(' ', '+')
 
-    options  = options.merge(:method => method) # Dup and merge
+    options  = options.merge(:method => method, :nonblock => false) # Dup and merge
     response = Excon.new(uri).request(options, &block)
 
     headers  = WebMock::Util::Headers.normalize_headers(response.headers)

data/spec/acceptance/net_http/net_http_spec.rb

@@ -92,7 +92,7 @@ describe "Net:HTTP" do
         WebMock.enable!
       end
       it "Net::HTTP should have the same constants" do
-        orig_consts_number = Net::HTTP.constants.size
+        orig_consts_number = WebMock::HttpLibAdapters::NetHttpAdapter::OriginalNetHTTP.constants.size
         Net::HTTP.send(:const_set, "TEST_CONST", 10)
         Net::HTTP.constants.size.should == orig_consts_number + 1
         WebMock.disable!

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 8
-  - 10
-  version: 1.8.10
+  - 11
+  version: 1.8.11
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,183 +14,162 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-09 00:00:00 Z
+date: 2012-09-29 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 2
         - 7
         version: 2.2.7
-  type: :runtime
-  prerelease: false
+  name: addressable
   requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: crack
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 1
         - 7
         version: 0.1.7
-  type: :runtime
-  prerelease: false
+  name: crack
   requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 10
         version: "2.10"
-  type: :development
-  prerelease: false
+  name: rspec
   requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 2
         - 4
         version: 2.2.4
-  type: :development
-  prerelease: false
+  name: httpclient
   requirement: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: patron
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 4
         - 18
         version: 0.4.18
-  type: :development
-  prerelease: false
+  name: patron
   requirement: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 0
         - 2
         version: 1.0.2
-  type: :development
-  prerelease: false
+  name: em-http-request
   requirement: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: curb
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 8
         - 0
         version: 0.8.0
-  type: :development
-  prerelease: false
+  name: curb
   requirement: *id007
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: typhoeus
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 3
         - 3
         version: 0.3.3
-  type: :development
-  prerelease: false
+  name: typhoeus
   requirement: *id008
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: excon
+  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 11
         - 0
         version: 0.11.0
-  type: :development
-  prerelease: false
+  name: excon
   requirement: *id009
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  type: :development
   version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 2
         - 2
         version: 2.2.2
-  type: :development
-  prerelease: false
+  name: minitest
   requirement: *id010
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  type: :development
   version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 3
         - 5
         - 0
         version: 3.5.0
-  type: :development
-  prerelease: false
+  name: rdoc
   requirement: *id011
+  prerelease: false
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -317,6 +295,7 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
+has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
 
@@ -326,27 +305,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.8.19
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.