webmock 1.24.1 → 1.24.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.24.2
+
+  * Improve parsing of params on request
+
+    Thanks to [Cedric Pimenta](https://github.com/cedricpim)
+
 ## 1.24.1
 
   * HTTPClient adapter supports reading basic authentication credentials directly from Authorization header.

data/README.md

@@ -538,7 +538,7 @@ so when there is no request, `Net::HTTP.start` doesn't do anything.
 **This means that WebMock breaks the Net::HTTP behaviour by default!**
 
 To workaround this issue, WebMock offers `:net_http_connect_on_start` option,
-which can be passed to `WebMock.allow_net_connect!` and `WebMock#disable_net_connect!` methods, i.e.
+which can be passed to `WebMock.allow_net_connect!` and `WebMock.disable_net_connect!` methods, i.e.
 
 ```ruby
 WebMock.allow_net_connect!(:net_http_connect_on_start => true)

data/lib/webmock/util/query_mapper.rb

@@ -143,12 +143,12 @@ module WebMock::Util
         array_value = !!(last_key =~ /\[\]$/)
         last_key = last_key.gsub(/[\[\]]/, '')
         if current_node.is_a? Array
-          container = current_node.find { |n| n.is_a?(Hash) && n.has_key?(last_key) }
-          if container
+          last_container = current_node.select { |n| n.is_a?(Hash) }.last
+          if last_container && !last_container.has_key?(last_key)
             if array_value
-              container[last_key] << value
+              last_container[last_key] << value
             else
-              container[last_key] = value
+              last_container[last_key] = value
             end
           else
             if array_value

data/lib/webmock/version.rb

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

data/spec/unit/request_pattern_spec.rb

@@ -391,6 +391,24 @@ describe WebMock::RequestPattern do
             expect(WebMock::RequestPattern.new(:post, "www.example.com", :body => {:a => /^\d+$/, :b => {:c => /^\d{3}$/}})).
               not_to match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'a=abcde&b[c]=123'))
           end
+
+          context 'body is an hash with an array of hashes' do
+            let(:body_hash) { {:a => [{'b' => '1'}, {'b' => '2'}]} }
+
+            it "should match when hash matches body" do
+              expect(WebMock::RequestPattern.new(:post, 'www.example.com', :body => body_hash)).
+                to match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'a[][b]=1&a[][b]=2'))
+            end
+          end
+
+          context 'body is an hash with an array of hashes with multiple keys' do
+            let(:body_hash) { {:a => [{'b' => '1', 'a' => '2'}, {'b' => '3'}]} }
+
+            it "should match when hash matches body" do
+              expect(WebMock::RequestPattern.new(:post, 'www.example.com', :body => body_hash)).
+                to match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'a[][b]=1&a[][a]=2&a[][b]=3'))
+            end
+          end
         end
 
         describe "for request with json body and content type is set to json" do

data/spec/unit/util/query_mapper_spec.rb

@@ -106,9 +106,16 @@ describe WebMock::Util::QueryMapper do
     expect(subject.query_to_values query).to eq values
   end
 
-  it 'converts complex nested values, vice versa' do
+  it 'converts complex nested hashes, vice versa' do
     query = "one%5B%5D[foo]=bar&one%5B%5D[zoo]=car" # one[][foo]=bar&one[][zoo]=car
-    values = {"one" => [{"foo" => "bar"}, {"zoo" => "car"}]}
+    values = {"one" => [{"foo" => "bar", "zoo" => "car"}]}
+    expect(subject.values_to_query values).to eq query
+    expect(subject.query_to_values query).to eq values
+  end
+
+  it 'converts complex nested array of hashes, vice versa' do
+    query = "one%5B%5D[foo]=bar&one%5B%5D[foo]=bar&one%5B%5D[zoo]=car" # one[][foo]=bar&one[][foo]=bar&one[][zoo]=car
+    values = {"one" => [{"foo" => "bar"}, {"foo" => "bar", "zoo" => "car"}]}
     expect(subject.values_to_query values).to eq query
     expect(subject.query_to_values query).to eq values
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 115
   prerelease: 
   segments: 
   - 1
   - 24
-  - 1
-  version: 1.24.1
+  - 2
+  version: 1.24.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-23 00:00:00 +01:00
+date: 2016-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency