webmock 1.8.7 → 1.8.8

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 1.8.8
+
+* Fixed Net::HTTP adapter so that it returns `nil` for an empty body response.
+
+    Thanks to [Myron Marston](https://github.com/myronmarston)
+
+* Gemspec defines compatibility with Addressable ~> 2.2.8, not >= 2.3.0
+
+* Specs compatibility with Typhoeus 0.4.0
+
+    Thanks to [Hans Hasselberg](https://github.com/i0rek)
+
+* Handling content types that specify a charset
+
+    Thanks to [Kevin Glowacz](https://github.com/kjg)
+
+* Fixed em-http-request adapter to correctly fetch authorization header from a request
+
+    Thanks to [Julien Boyer](https://github.com/chatgris)
+
+* Fixing travis-ci image to report master's status
+
+    Thanks to [Ryan Schlesinger](https://github.com/ryansch)
+
+* Fixed problem with em-http-request callback triggering if there were other EM::Deferred callbacks registered
+
+    Thanks to [Jon Leighton](https://github.com/jonleighton)
+
+* Fixed problem with em-http-request appending the query to the URI a second time, and
+the parameters are repeated.
+
+    Thanks to [Jon Leighton](https://github.com/jonleighton)
+
 ## 1.8.7
 
 * Compatibility with RSpec >= 2.10

data/README.md

@@ -1,4 +1,4 @@
-WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock)
+WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png?branch=master)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock)
 =======
 
 Library for stubbing and setting expectations on HTTP requests in Ruby.
@@ -707,6 +707,11 @@ People who submitted patches and new features or suggested improvements. Many th
 * Eric Oestrich
 * erwanlr
 * Ben Bleything
+* Jon Leighton
+* Ryan Schlesinger
+* Julien Boyer
+* Kevin Glowacz
+* Hans Hasselberg
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -105,16 +105,6 @@ if defined?(EventMachine::HttpClient)
           self
         elsif WebMock.net_connect_allowed?(request_signature.uri)
           send_request_without_webmock(head, body)
-          callback {
-            if WebMock::CallbackRegistry.any_callbacks?
-              webmock_response = build_webmock_response
-              WebMock::CallbackRegistry.invoke_callbacks(
-                {:lib => :em_http_request, :real_request => true},
-                request_signature,
-                webmock_response)
-            end
-          }
-          self
         else
           raise WebMock::NetConnectNotAllowedError.new(request_signature)
         end
@@ -123,6 +113,18 @@ if defined?(EventMachine::HttpClient)
       alias_method :send_request_without_webmock, :send_request
       alias_method :send_request, :send_request_with_webmock
 
+      def set_deferred_status(status, *args)
+        if status == :succeeded && !stubbed_webmock_response && WebMock::CallbackRegistry.any_callbacks?
+          webmock_response = build_webmock_response
+          WebMock::CallbackRegistry.invoke_callbacks(
+            {:lib => :em_http_request, :real_request => true},
+            request_signature,
+            webmock_response)
+        end
+
+        super
+      end
+
       def request_signature
         @request_signature ||= build_request_signature
       end
@@ -153,8 +155,8 @@ if defined?(EventMachine::HttpClient)
         end
 
         method = @req.method
-        uri = @req.uri
-        auth = @req.proxy[:authorization] if @req.proxy
+        uri = @req.uri.clone
+        auth = @req.headers[:'proxy-authorization']
         query = @req.query
 
         if auth

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -128,7 +128,10 @@ module WebMock
 
         def build_net_http_response(webmock_response, &block)
           response = Net::HTTPResponse.send(:response_class, webmock_response.status[0].to_s).new("1.0", webmock_response.status[0].to_s, webmock_response.status[1])
-          response.instance_variable_set(:@body, webmock_response.body)
+          body = webmock_response.body
+          body = nil if body.to_s == ''
+
+          response.instance_variable_set(:@body, body)
           webmock_response.headers.to_a.each do |name, values|
             values = [values] unless values.is_a?(Array)
             values.each do |value|

data/lib/webmock/request_pattern.rb

@@ -27,6 +27,7 @@ module WebMock
 
     def matches?(request_signature)
       content_type = request_signature.headers['Content-Type'] if request_signature.headers
+      content_type = content_type.split(';').first if content_type
       @method_pattern.matches?(request_signature.method) &&
         @uri_pattern.matches?(request_signature.uri) &&
         (@body_pattern.nil? || @body_pattern.matches?(request_signature.body, content_type || "")) &&

data/lib/webmock/version.rb

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

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -141,26 +141,41 @@ unless RUBY_PLATFORM =~ /java/
     end
 
     describe "mocking EM::HttpClient API" do
+      let(:uri) { "http://www.example.com/" }
+
       before do
-        stub_request(:get, "www.example.com/")
+        stub_request(:get, uri)
         WebMock::HttpLibAdapters::EmHttpRequestAdapter.enable!
       end
-      subject do
+
+      def client(uri, options = {})
         client = nil
         EM.run do
-          client = EventMachine::HttpRequest.new('http://www.example.com/').get
+          client = EventMachine::HttpRequest.new(uri).get(options)
           client.callback { EM.stop }
           client.errback { failed }
         end
         client
       end
 
+      subject { client(uri) }
+
       it 'should support #uri' do
-        subject.uri.should == Addressable::URI.parse('http://www.example.com/')
+        subject.uri.should == Addressable::URI.parse(uri)
       end
 
       it 'should support #last_effective_url' do
-        subject.last_effective_url.should == Addressable::URI.parse('http://www.example.com/')
+        subject.last_effective_url.should == Addressable::URI.parse(uri)
+      end
+
+      context "with a query" do
+        let(:uri) { "http://www.example.com/?a=1&b=2" }
+        subject { client("http://www.example.com/?a=1", :query => { 'b' => 2 }) }
+
+        it "#request_signature doesn't mutate the original uri" do
+          subject.uri.should == Addressable::URI.parse("http://www.example.com/?a=1")
+          subject.request_signature.uri.should == Addressable::URI.parse(uri)
+        end
       end
     end
 

data/spec/acceptance/em_http_request/em_http_request_spec_helper.rb

@@ -49,7 +49,7 @@ module EMHttpRequestSpecHelper
   end
 
   def connection_refused_exception_class
-    ""
+    RuntimeError
   end
 
   def http_library

data/spec/acceptance/shared/complex_cross_concern_behaviors.rb

@@ -17,5 +17,20 @@ shared_context "complex cross-concern behaviors" do |*adapter_info|
     played_back_response.headers.keys.should include('Set-Cookie')
     played_back_response.should == real_response
   end
+
+  let(:no_content_url) { 'http://httpstat.us/204' }
+  [nil, ''].each do |stub_val|
+    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has" do
+      unless http_library == :curb
+        WebMock.allow_net_connect!
+
+        real_response = http_request(:get, no_content_url)
+        stub_request(:get, no_content_url).to_return(:status => 204, :body => stub_val)
+        stubbed_response = http_request(:get, no_content_url)
+
+        stubbed_response.body.should eq(real_response.body)
+      end
+    end
+  end
 end
 

data/spec/acceptance/shared/request_expectations.rb

@@ -190,10 +190,10 @@ shared_context "request expectations" do |*adapter_info|
 
       it "should fail if request was executed with different body" do
         lambda {
-          http_request(:get, "http://www.example.com/", :body => "abc")
-          a_request(:get, "www.example.com").
+          http_request(:post, "http://www.example.com/", :body => "abc")
+          a_request(:post, "www.example.com").
           with(:body => "def").should have_been_made
-        }.should fail_with(%r(The request GET http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times))
+        }.should fail_with(%r(The request POST http://www.example.com/ with body "def" was expected to execute 1 time but it executed 0 times))
       end
 
       describe "when expected request body is declared as a regexp" do
@@ -206,10 +206,10 @@ shared_context "request expectations" do |*adapter_info|
 
         it "should fail if request was executed with body not matching regexp" do
           lambda {
-            http_request(:get, "http://www.example.com/", :body => "abc")
-            a_request(:get, "www.example.com").
+            http_request(:post, "http://www.example.com/", :body => "abc")
+            a_request(:post, "www.example.com").
             with(:body => /^xabc/).should have_been_made
-          }.should fail_with(%r(The request GET http://www.example.com/ with body /\^xabc/ was expected to execute 1 time but it executed 0 times))
+          }.should fail_with(%r(The request POST http://www.example.com/ with body /\^xabc/ was expected to execute 1 time but it executed 0 times))
         end
 
       end
@@ -389,11 +389,11 @@ shared_context "request expectations" do |*adapter_info|
 
         it "should satisfy expectation if request was executed with body and headers but they were not specified in expectantion" do
           lambda {
-            http_request(:get, "http://www.example.com/",
+            http_request(:post, "http://www.example.com/",
                          :body => "abc",
                          :headers => SAMPLE_HEADERS
                          )
-            a_request(:get, "www.example.com").should have_been_made
+            a_request(:post, "www.example.com").should have_been_made
           }.should_not raise_error
         end
 

data/spec/unit/request_pattern_spec.rb

@@ -358,6 +358,13 @@ describe WebMock::RequestPattern do
               should_not match(WebMock::RequestSignature.new(:post, "www.example.com",
                                                              :headers => {:content_type => 'application/xml'}, :body => "foo bar"))
               end
+
+          it "matches when the content type include a charset" do
+            WebMock::RequestPattern.new(:post, 'www.example.com', :body => body_hash).
+              should match(WebMock::RequestSignature.new(:post, "www.example.com", :headers => {:content_type => 'application/xml;charset=UTF-8'},
+                                                         :body => "<opt a=\"1\" b=\"five\">\n  <c>\n    <d>e</d>\n    <d>f</d>\n  </c>\n</opt>\n"))
+
+          end
         end
       end
 

data/webmock.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'webmock'
 
-  s.add_dependency 'addressable', '>= 2.2.7'
+  s.add_dependency 'addressable', '~> 2.2.8'
   s.add_dependency 'crack', '>=0.1.7'
 
   s.add_development_dependency 'rspec',           '~> 2.10'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 39
   prerelease: 
   segments: 
   - 1
   - 8
-  - 7
-  version: 1.8.7
+  - 8
+  version: 1.8.8
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,28 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-12 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 23
         segments: 
         - 2
         - 2
-        - 7
-        version: 2.2.7
+        - 8
+        version: 2.2.8
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: crack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +47,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +62,11 @@ dependencies:
         - 10
         version: "2.10"
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +78,11 @@ dependencies:
         - 4
         version: 2.2.4
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: patron
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,11 +94,11 @@ dependencies:
         - 18
         version: 0.4.18
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: em-http-request
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +110,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: curb
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,11 +126,11 @@ dependencies:
         - 0
         version: 0.8.0
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: typhoeus
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,11 +142,11 @@ dependencies:
         - 3
         version: 0.3.3
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: excon
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,11 +158,11 @@ dependencies:
         - 0
         version: 0.11.0
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: minitest
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,11 +174,11 @@ dependencies:
         - 2
         version: 2.2.2
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -191,7 +190,8 @@ dependencies:
         - 0
         version: 3.5.0
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  requirement: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com