webmock 1.24.3 → 1.24.4

data/CHANGELOG.md

@@ -1,16 +1,18 @@
 # Changelog
 
-## 1.24.3
-
-  * Allow Net:HTTP headers keys to be provided as symbols if `RUBY_VERSION` >= 2.3.0
-
-    Thanks to [Alex Kestner](https://github.com/akestner)
+## 1.24.4
 
   * Fixed the issue with parsing query to a hash with nested array i.e. `a[][b][]=one&a[][c][]=two`
 
     Thanks to [Tim Diggins](https://github.com/timdiggins) for reporting the issue.
     Thanks to [Cedric Pimenta](https://github.com/cedricpim) for finding the solution.
 
+## 1.24.3
+
+  * Allow Net:HTTP headers keys to be provided as symbols if `RUBY_VERSION` >= 2.3.0
+
+    Thanks to [Alex Kestner](https://github.com/akestner)
+
   * Added a clear message on an attept to match a multipart encoded request body.
     WebMock does't support requests with multipart body... yet.
 

data/Gemfile

@@ -17,5 +17,3 @@ end
 platforms :jruby do
   gem 'jruby-openssl'
 end
-
-gem 'curb', '< 0.9.2'  unless RUBY_PLATFORM =~ /java/ #https://github.com/taf2/curb/issues/296

data/README.md

@@ -95,6 +95,10 @@ require 'webmock'
 include WebMock::API
 ```
 
+### Automatically enabled
+
+`require 'webmock'` loads the library AND enables `WebMock`.  Add `WebMock.disable!` after loading the gem to disable this behavior.
+
 ## Examples
 
 

data/gemfiles/ruby_1_8.gemfile

@@ -4,6 +4,8 @@ source "http://rubygems.org/"
 
 gem "addressable", ">= 2.3.6", "< 2.4.0"
 
+gem "curb", "< 0.9.2"
+
 group :development do
   gem "rake", '~> 10.5.0'
 end
@@ -17,5 +19,3 @@ platforms :jruby do
 end
 
 gemspec :path => "../"
-
-gem 'curb', '< 0.9.2'  unless RUBY_PLATFORM =~ /java/ #https://github.com/taf2/curb/issues/296

data/lib/webmock/util/query_mapper.rb

@@ -146,6 +146,7 @@ module WebMock::Util
           last_container = current_node.select { |n| n.is_a?(Hash) }.last
           if last_container && !last_container.has_key?(last_key)
             if array_value
+              last_container[last_key] ||= []
               last_container[last_key] << value
             else
               last_container[last_key] = value
@@ -159,7 +160,7 @@ module WebMock::Util
           end
         else
           if array_value
-            current_node[last_key] = [] unless current_node[last_key]
+            current_node[last_key] ||= []
             current_node[last_key] << value
           else
             current_node[last_key] = value

data/lib/webmock/version.rb

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

data/spec/unit/util/query_mapper_spec.rb

@@ -48,6 +48,22 @@ describe WebMock::Util::QueryMapper do
       expect(hsh['a'][0]['b'][0]['c'][0]['d'][0]).to eq('1')
       expect(hsh['a'][0]['b'][0]['c'][0]['d'][1]['e']).to eq('2')
     end
+
+    it "should parse nested repeated correctly" do
+      query = "a[][b][]=one&a[][b][]=two"
+      hsh = subject.query_to_values(query)
+      expect(hsh['a']).to be_a(Array)
+      expect(hsh['a'][0]).to eq({"b" => ['one']})
+      expect(hsh['a'][1]).to eq({"b" => ['two']})
+    end
+
+    it "should parse nested non-repeated correctly" do
+      query = "a[][b][]=one&a[][c][]=two"
+      hsh = subject.query_to_values(query)
+      expect(hsh['a']).to be_a(Array)
+      expect(hsh['a'][0]['b']).to eq(['one'])
+      expect(hsh['a'][0]['c']).to eq(['two'])
+    end
   end
 
   context '#to_query' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 113
+  hash: 127
   prerelease: 
   segments: 
   - 1
   - 24
-  - 3
-  version: 1.24.3
+  - 4
+  version: 1.24.4
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-13 00:00:00 +02:00
+date: 2016-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency