webmock 1.10.0 → 1.10.1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.10.1
+
+* '+' in request body is still treated as a space. This fixes a bug introduced in previous version.
+
+  Thanks to [Erik Michaels-Ober](https://github.com/sferik) for reporting this problem.
+
+* Fixed issue: response body declared as Proc was not evaluated again on subsequent requests.
+
+  Thanks to [Rick Fletcher](https://github.com/rfletcher) for reporting this issue.
+
 ## 1.10.0
 
 * '+' in query params is not treated as space anymore and is encoded as %2B

data/lib/webmock/request_pattern.rb

@@ -201,7 +201,7 @@ module WebMock
       when :xml then
         Crack::XML.parse(body)
       else
-        WebMock::Util::QueryMapper.query_to_values(body)
+        WebMock::Util::QueryMapper.query_to_values(body, :form_url_encoded => true)
       end
     end
 

data/lib/webmock/request_stub.rb

@@ -81,7 +81,7 @@ module WebMock
 
       if signature.body.to_s != ''
         body = if signature.url_encoded?
-          WebMock::Util::QueryMapper.query_to_values(signature.body)
+          WebMock::Util::QueryMapper.query_to_values(signature.body, :form_url_encoded => true)
         else
           signature.body
         end

data/lib/webmock/stub_registry.rb

@@ -60,7 +60,7 @@ module WebMock
     end
 
     def evaluate_response_for_request(response, request_signature)
-      response.evaluate(request_signature)
+      response.dup.evaluate(request_signature)
     end
 
   end

data/lib/webmock/util/query_mapper.rb

@@ -66,6 +66,7 @@ module WebMock::Util
                 value = true if value.nil?
                 key = Addressable::URI.unencode_component(key)
                 if value != true
+                  value.gsub!(/\+/, " ") if options[:form_url_encoded]
                   value = Addressable::URI.unencode_component(value)
                 end
                 if options[:notation] == :flat

data/lib/webmock/version.rb

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

data/spec/acceptance/shared/returning_declared_responses.rb

@@ -117,6 +117,13 @@ shared_context "declared responses" do |*adapter_info|
       it "should return evaluated response headers" do
         stub_request(:post, "www.example.com").to_return(:headers => lambda { |request| request.headers })
         http_request(:post, "http://www.example.com/", :body => "abc", :headers => {'A' => 'B'}).headers['A'].should == 'B'
+        http_request(:post, "http://www.example.com/", :body => "abc", :headers => {'A' => 'C'}).headers['A'].should == 'C'
+      end
+
+      it "should evaluate response body for each request" do
+        stub_request(:post, "www.example.com").to_return(:body => lambda { |request| request.body })
+        http_request(:post, "http://www.example.com/", :body => "echo").body.should == "echo"
+        http_request(:post, "http://www.example.com/", :body => "foxtrot").body.should == "foxtrot"
       end
     end
 
@@ -132,6 +139,7 @@ shared_context "declared responses" do |*adapter_info|
                                                                 {:body => request.body}
         })
         http_request(:post, "http://www.example.com/", :body => "echo").body.should == "echo"
+        http_request(:post, "http://www.example.com/", :body => "foxtrot").body.should == "foxtrot"
       end
 
       it "should return evaluated response headers" do

data/spec/acceptance/shared/stubbing_requests.rb

@@ -105,20 +105,20 @@ shared_examples_for "stubbing requests" do |*adapter_info|
       describe "when body is declared as a hash" do
         before(:each) do
           stub_request(:post, "www.example.com").
-            with(:body => {:a => '1', :b => 'five', 'c' => {'d' => ['e', 'f']} })
+            with(:body => {:a => '1', :b => 'five x', 'c' => {'d' => ['e', 'f']} })
         end
 
         describe "for request with url encoded body" do
           it "should match request if hash matches body" do
             http_request(
               :post, "http://www.example.com/",
-            :body => 'a=1&c[d][]=e&c[d][]=f&b=five').status.should == "200"
+            :body => 'a=1&c[d][]=e&c[d][]=f&b=five+x').status.should == "200"
           end
 
           it "should match request if hash matches body in different order of params" do
             http_request(
               :post, "http://www.example.com/",
-            :body => 'a=1&c[d][]=e&b=five&c[d][]=f').status.should == "200"
+            :body => 'a=1&c[d][]=e&b=five+x&c[d][]=f').status.should == "200"
           end
 
           it "should not match if hash doesn't match url encoded body" do
@@ -152,6 +152,14 @@ shared_examples_for "stubbing requests" do |*adapter_info|
               :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
             :body => "{\"foo\":\"2010-01-01\"}").status.should == "200"
           end
+
+          it "should match if any of the strings have spaces" do
+            WebMock.reset!
+            stub_request(:post, "www.example.com").with(:body => {"foo" => "a b c"})
+            http_request(
+              :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
+            :body => "{\"foo\":\"a b c\"}").status.should == "200"
+          end
         end
 
         describe "for request with xml body and content type is set to xml" do

data/spec/unit/stub_registry_spec.rb

@@ -64,7 +64,15 @@ describe WebMock::StubRegistry do
       response1.should == WebMock::Response.new(:body => "get")
     end
 
-    it "should report clone of theresponse" do
+    it "should report clone of the response" do
+      @request_stub.to_return(:body => lambda{|r| r.method.to_s})
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
+      response2 = WebMock::StubRegistry.instance.response_for_request(@request_signature)
+      response1.should_not be(response2)
+    end
+
+    it "should report clone of the dynamic response" do
       @request_stub.to_return {|request| {:body => request.method.to_s} }
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)
       response1 = WebMock::StubRegistry.instance.response_for_request(@request_signature)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 1
   - 10
-  - 0
-  version: 1.10.0
+  - 1
+  version: 1.10.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-28 00:00:00 Z
+date: 2013-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable