webmock 1.24.5 → 1.24.6

data/CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
-## 1.24.5
+## 1.24.6
 
   * Fixed issue with RUBY_VERSION comparison using old RubyGems.
 
     Thanks to [Chris Griego](https://github.com/cgriego).
 
+  * 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`

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

@@ -314,7 +314,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/version.rb

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

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: 
   segments: 
   - 1
   - 24
-  - 5
-  version: 1.24.5
+  - 6
+  version: 1.24.6
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-21 00:00:00 +02:00
+date: 2016-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency