webmock 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6dc7d940f08ae334e0220100267ab6a41a58e4
-  data.tar.gz: 35dd3369af56b08b38fdf59f943c56b9552eb31e
+  metadata.gz: d21aa0e8add495ea18c8175f2933769eca451bd7
+  data.tar.gz: 1e3b282e39b2f1bbfdb1b1e5f2e3b3584dbbe4a7
 SHA512:
-  metadata.gz: f8448b8a8a176d912a448912133bc68b0edfa37c136235821f938153a7ef421ac2a2218996de115676469c781668a1b70abf0740140b2a3751419b7b267762b0
-  data.tar.gz: 389edffa68682edbf92649d0346073193abf5dd9d918249a3c6d381eecb5ae2954b01a739d803b467bbc65bf1438a82b30bb322c9796a93010b881ec28322dd1
+  metadata.gz: 604fc6873f4b8765a78f11811b344623cd7cc612843b74e38b9ad2c9b1c59ad30292fb47961669fdfe110a71143128137f66073d8075db73722e8c326ebac30c
+  data.tar.gz: 8f88979b836c0148e8c03a641246169b1bc5f9d00c8d9deee7cf603b1d94e2d9e54549d2ef4ead205a77cb13bb7b16763b75fd836d4b5ece2e501254df54fdd5

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 2.0.0
 
-  * require 'webmock' does not enable WebMock anymore. `gem 'webmock'` can be now safely added to the Gemfile without modifying http clients. Call `WebMock.enable!` to enable it.
+  * `require 'webmock'` does not enable WebMock anymore. `gem 'webmock'` can be now safely added to a Gemfile without modifying http client libs. Call `WebMock.enable!` to enable WebMock.
 
     Please note that `require 'webmock/rspec'`, `require 'webmock/test_unit'`, `require 'webmock/minitest'` and `require 'webmock/cucumber'` still do enable WebMock.
 
@@ -10,8 +10,8 @@
 
   * Dropped support for em-http-request < 1.0.0
 
-  * WebMock 2.0 does not match basic auth credentials in the userinfo part of the url, with credentials passed in `Authorization: Basic ...` header.
-  It now treats the Authorization header and credentials in userinfo in the url as completely separate attributes of the request.
+  * WebMock 2.0 does not match basic authentication credentials in the userinfo part of the url, with credentials passed in `Authorization: Basic ...` header anymore.
+  It now treats the Authorization header and credentials in the userinfo part of a url as two completely separate attributes of a request.
 
   The following stub declaration, which used to work in WebMock 1.x, is not going to work anymore
 
@@ -32,24 +32,33 @@
         stub_request(:get, "www.example.com").
           with(headers: 'Authorization' => "Basic #{ Base64.encode64('user:pass').chomp}")
 
-  In order to stub a request with basic authentication credentials provided in the url please use the following code:
+  In order to stub a request with basic authentication credentials provided in the url, please use the following code:
 
         stub_request(:get, "user:pass@www.example.com")
 
         RestClient.get('user:pass@www.example.com')    # ===> Success
 
+## 1.24.6
 
-## 1.24.3
+  * Fixed issue with RUBY_VERSION comparison using old RubyGems.
 
-  * Allow Net:HTTP headers keys to be provided as symbols if `RUBY_VERSION` >= 2.3.0
+    Thanks to [Chris Griego](https://github.com/cgriego).
 
-    Thanks to [Alex Kestner](https://github.com/akestner)
+  * Support for http.rb >= 2.0.0
+
+## 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.
 
@@ -61,7 +70,6 @@
 
     Thanks to [Gabriel Chaney](https://github.com/gabrieljoelc) for reporting the issue.
 
-
 ## 1.24.2
 
   * Improve parsing of params on request

data/README.md

@@ -1015,6 +1015,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Manfred Stienstra
 * Tim Diggins
 * Gabriel Chaney
+* Chris Griego
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/http_rb/response.rb

@@ -33,7 +33,7 @@ module HTTP
       def normalize_uri(uri)
         return unless uri
 
-        uri = URI.parse uri
+        uri = Addressable::URI.parse uri
         uri.port = nil if uri.default_port && uri.port == uri.default_port
 
         uri

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -306,7 +306,7 @@ module WebMock
       #
       # So before this point, WebMock raises an ArgumentError if any of the headers are symbols
       # instead of the cryptic NoMethodError "undefined method `split' ...` from Net::HTTP
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
+      if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')
         header_as_symbol = headers.keys.find {|header| header.is_a? Symbol}
         if header_as_symbol
           raise ArgumentError.new("Net:HTTP does not accept headers as symbols")

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 = '2.0.0.beta1' unless defined?(::WebMock::VERSION)
+  VERSION = '2.0.0.beta2' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/net_http/net_http_spec.rb

@@ -132,7 +132,7 @@ describe "Net:HTTP" do
       end
     end
 
-    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
+    if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')
       expect do
         http.request(request)
       end.to raise_error ArgumentError, "Net:HTTP does not accept headers as symbols"

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -239,9 +239,9 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
           end
 
           it "should make a real request if request is allowed by path regexp and url contains default port", :net_connect => true do
-            WebMock.disable_net_connect!(:allow => %r{github.com/bblimke/webmock})
+            WebMock.disable_net_connect!(:allow => %r{www.google.pl/webhp})
             method = http_library == :httpclient ? :head : :get
-            expect(http_request(method, 'https://github.com:443/bblimke/webmock').status).to eq('200')
+            expect(http_request(method, 'https://www.google.pl:443/webhp').status).to eq('200')
           end
         end
       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

data/webmock.gemspec

@@ -39,4 +39,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
+
+  s.post_install_message = "WebMock 2.0 has some breaking changes. Please check the CHANGELOG: https://goo.gl/piDGLu"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -364,7 +364,8 @@ homepage: http://github.com/bblimke/webmock
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'WebMock 2.0 has some breaking changes. Please check the CHANGELOG:
+  https://goo.gl/piDGLu'
 rdoc_options: []
 require_paths:
 - lib