webmock 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e5ecaf79b30d292fbfa32412eb165fc1c2202e3c
-  data.tar.gz: 14f612738af09ebfd6ec02688da87e748d2886e3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDA0NGYxYjJmZGI0OTNjMjhlNDhjMWRkNTMwZWZlNTQ4ZjhkZDljOQ==
+  data.tar.gz: !binary |-
+    MjgyODBlOWY3ODE1MmM0OTk4NDE5NzU1NjhkYzRiN2QwN2Q5MzZiNA==
 SHA512:
-  metadata.gz: 8784b972e18a3906ea6ce8a359bcdc9ea88fbc386753791770ef21d550b985dbcbe60e5758ccd330b840d49ef9b126b41389ac8b6a32062478ffb6a215817142
-  data.tar.gz: 0f35a48a6a7e3705a35b6ab546e45805dfb268448f959cbf4b99ebf0f9d65e1d05c7f96a8b13cdb6c83c8909bac0fd2f6eb82ecfa833c8b3d5d20ca1f1bacd69
+  metadata.gz: !binary |-
+    ZjZiYWFmOTJjMDc3Yzk3Y2M1M2UxNzMyYWVkOWNiNTYyMWQzZTJhZDNmMjA3
+    ZjcxMjI5N2QzNTBhNTVlYzI4OTFlNjMyYTZlNjNiNjNkNmUxYThlYjQ1MzNm
+    YjlhMWI5YTE5OTZmYThiYTJhNTllOGRjNTkzYWEwY2U1M2M5ZmE=
+  data.tar.gz: !binary |-
+    NjI2YzNjODk0ZDBmNTM4N2NkMmU1NGZkNDVlOWFiZTUwYmQ3NGE0ZDJmYWRj
+    OTNjYmE3MWQxMTdmMzMwYTY5NmI1MWE5ODQ4YWY5MGQ2YWIzYTQ0NWVjMmJk
+    NGFiZjYzZTc4MzM4MWNlYWFjOGMzMTIwODY1M2NlZjFmYmRmNzU=

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.2.1
   - 2.2.3
   - 2.3.0
+  - ruby-2.4.0-preview3
   - rbx-2
   - ruby-head
   - jruby-9.0.0.0

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2.2.0
+
+  * Added `refute_requested` as an alias for `assert_not_requested`
+
+    Thanks to [Michael Grosser](https://github.com/grosser)
+
+  * Raising `Net::OpenTimeout` instead of `Timeout::Error` if available when a request stub is declared `to_timeout`
+
+    Thanks to [Gabe Martin-Dempesy](https://github.com/gabetax)
+
+## 2.1.1
+
+  * Added support for handling status messages in Excon responses.
+
+    Thanks to [Tero Marttila](https://github.com/SpComb) for reporting the issue.
+
 ## 2.1.0
 
   * Added support for `on_debug` callback in Curb.
@@ -103,8 +119,8 @@
 
     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.
+  * Added a clear message on an attempt to match a multipart encoded request body.
+    WebMock doesn't support requests with multipart body... yet.
 
   * `WebMock.disable_net_connect` `:allow` option, provided as regexp, matches https URIs correctly.
 

data/Gemfile

@@ -3,7 +3,6 @@ source 'http://rubygems.org/'
 gemspec
 
 gem 'rake'
-gem 'curb', github: 'pavel-jurasek-bcgdv-com/curb', platforms: :ruby
 
 platforms :jruby do
   gem 'jruby-openssl'

data/README.md

@@ -218,7 +218,7 @@ Net::HTTP.start('www.example.com') do |http|
 end    # ===> Success
 ```
 
-##### Important! Since version 2.0.0, WebMock does not match credentials provided in Authorization header and credentials provided in the userinfo of a url. I.e. `stub_request(:get, "user:pass@www.example.com")` does not match a request with credentials provided in the Athoriation header.
+##### Important! Since version 2.0.0, WebMock does not match credentials provided in Authorization header and credentials provided in the userinfo of a url. I.e. `stub_request(:get, "user:pass@www.example.com")` does not match a request with credentials provided in the Authorization header.
 
 ### Request with basic authentication in the url
 
@@ -1021,6 +1021,11 @@ People who submitted patches and new features or suggested improvements. Many th
 * Jose Luis Honorato
 * Aaron Kromer
 * Pavel Jurašek
+* Jake Worth
+* Gabe Martin-Dempesy
+* Michael Grosser
+* Aleksei Maridashvili
+* Ville Lautanala
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/api.rb

@@ -34,6 +34,7 @@ module WebMock
       end
       assert_request_not_requested(*args)
     end
+    alias refute_requested assert_not_requested
 
     # Similar to RSpec::Mocks::ArgumentMatchers#hash_including()
     #

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -88,12 +88,10 @@ if defined?(Curl)
         headers = headers_as_hash(self.headers).merge(basic_auth_headers)
 
         request_body = case method
-        when :post
+        when :post, :patch
           self.post_body || @post_body
         when :put
           @put_data
-        when :patch
-          @patch_data
         else
           nil
         end
@@ -263,13 +261,6 @@ if defined?(Curl)
       end
       alias put http_put
 
-      def http_patch data = nil
-        @webmock_method = :patch
-        @patch_data = data if data
-        super
-      end
-      alias patch http_patch
-
       def http_post *data
         @webmock_method = :post
         @post_body = data.join('&') if data && !data.empty?
@@ -288,12 +279,6 @@ if defined?(Curl)
         super
       end
 
-      def patch_data= data
-        @webmock_method = :patch
-        @patch_data = data
-        super
-      end
-
       def post_body= data
         @webmock_method = :post
         super

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -130,13 +130,14 @@ if defined?(Excon)
           {
             body: mock.body,
             status: mock.status[0].to_i,
+            reason_phrase: mock.status[1],
             headers: mock.headers || {}
           }
         end
 
         def self.mock_response(real)
           mock = WebMock::Response.new
-          mock.status  = real.status
+          mock.status  = [real.status, real.reason_phrase]
           mock.headers = real.headers
           mock.body    = real.body.dup
           mock

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -121,110 +121,111 @@ if defined?(::HTTPClient)
 
       response
     end
-  end
 
-  class WebMockHTTPClient < HTTPClient
-    alias_method :do_get_block_without_webmock, :do_get_block
-    alias_method :do_get_stream_without_webmock, :do_get_stream
+    def build_webmock_response(httpclient_response, body = nil)
+      webmock_response = WebMock::Response.new
+      webmock_response.status = [httpclient_response.status, httpclient_response.reason]
 
-    include WebMockHTTPClients
-  end
-
-  if defined? ::JSONClient
-    class WebMockJSONClient < JSONClient
-      alias_method :do_get_block_without_webmock, :do_get_block
-      alias_method :do_get_stream_without_webmock, :do_get_stream
+      webmock_response.headers = {}.tap do |hash|
+        httpclient_response.header.all.each do |(key, value)|
+          if hash.has_key?(key)
+            hash[key] = Array(hash[key]) + [value]
+          else
+            hash[key] = value
+          end
+        end
+      end
 
-      include WebMockHTTPClients
+      if body
+        webmock_response.body = body
+      elsif httpclient_response.content.respond_to?(:read)
+        webmock_response.body = httpclient_response.content.read
+        body = HTTP::Message::Body.new
+        body.init_response(StringIO.new(webmock_response.body))
+        httpclient_response.body = body
+      else
+        webmock_response.body = httpclient_response.content
+      end
+      webmock_response
     end
-  end
 
-  def build_webmock_response(httpclient_response, body = nil)
-    webmock_response = WebMock::Response.new
-    webmock_response.status = [httpclient_response.status, httpclient_response.reason]
+    def build_request_signature(req, reuse_existing = false)
+      uri = WebMock::Util::URI.heuristic_parse(req.header.request_uri.to_s)
+      uri.query = WebMock::Util::QueryMapper.values_to_query(req.header.request_query, notation: WebMock::Config.instance.query_values_notation) if req.header.request_query
+      uri.port = req.header.request_uri.port
 
-    webmock_response.headers = {}.tap do |hash|
-      httpclient_response.header.all.each do |(key, value)|
-        if hash.has_key?(key)
-          hash[key] = Array(hash[key]) + [value]
-        else
-          hash[key] = value
-        end
+      @request_filter.each do |filter|
+        filter.filter_request(req)
       end
-    end
 
-    if body
-      webmock_response.body = body
-    elsif httpclient_response.content.respond_to?(:read)
-      webmock_response.body = httpclient_response.content.read
-      body = HTTP::Message::Body.new
-      body.init_response(StringIO.new(webmock_response.body))
-      httpclient_response.body = body
-    else
-      webmock_response.body = httpclient_response.content
-    end
-    webmock_response
-  end
+      headers = req.header.all.inject({}) do |hdrs, header|
+        hdrs[header[0]] ||= []
+        hdrs[header[0]] << header[1]
+        hdrs
+      end
+      headers = headers_from_session(uri).merge(headers)
+
+      signature = WebMock::RequestSignature.new(
+        req.header.request_method.downcase.to_sym,
+        uri.to_s,
+        body: req.http_body.dump,
+        headers: headers
+      )
+
+      # reuse a previous identical signature object if we stored one for later use
+      if reuse_existing && previous_signature = previous_signature_for(signature)
+        return previous_signature
+      end
 
-  def build_request_signature(req, reuse_existing = false)
-    uri = WebMock::Util::URI.heuristic_parse(req.header.request_uri.to_s)
-    uri.query = WebMock::Util::QueryMapper.values_to_query(req.header.request_query, notation: WebMock::Config.instance.query_values_notation) if req.header.request_query
-    uri.port = req.header.request_uri.port
+      signature
+    end
 
-    @request_filter.each do |filter|
-      filter.filter_request(req)
+    def webmock_responses
+      @webmock_responses ||= Hash.new do |hash, request_signature|
+        hash[request_signature] = WebMock::StubRegistry.instance.response_for_request(request_signature)
+      end
     end
 
-    headers = req.header.all.inject({}) do |hdrs, header|
-      hdrs[header[0]] ||= []
-      hdrs[header[0]] << header[1]
-      hdrs
+    def webmock_request_signatures
+      @webmock_request_signatures ||= []
     end
-    headers = headers_from_session(uri).merge(headers)
-
-    signature = WebMock::RequestSignature.new(
-      req.header.request_method.downcase.to_sym,
-      uri.to_s,
-      body: req.http_body.dump,
-      headers: headers
-    )
-
-    # reuse a previous identical signature object if we stored one for later use
-    if reuse_existing && previous_signature = previous_signature_for(signature)
-      return previous_signature
+
+    def previous_signature_for(signature)
+      return nil unless index = webmock_request_signatures.index(signature)
+      webmock_request_signatures.delete_at(index)
     end
 
-    signature
-  end
+    private
 
-  def webmock_responses
-    @webmock_responses ||= Hash.new do |hash, request_signature|
-      hash[request_signature] = WebMock::StubRegistry.instance.response_for_request(request_signature)
+    # some of the headers sent by HTTPClient are derived from
+    # the client session
+    def headers_from_session(uri)
+      session_headers = HTTP::Message::Headers.new
+      @session_manager.send(:open, uri).send(:set_header, MessageMock.new(session_headers))
+      session_headers.all.inject({}) do |hdrs, header|
+        hdrs[header[0]] = header[1]
+        hdrs
+      end
     end
   end
 
-  def webmock_request_signatures
-    @webmock_request_signatures ||= []
-  end
+  class WebMockHTTPClient < HTTPClient
+    alias_method :do_get_block_without_webmock, :do_get_block
+    alias_method :do_get_stream_without_webmock, :do_get_stream
 
-  def previous_signature_for(signature)
-    return nil unless index = webmock_request_signatures.index(signature)
-    webmock_request_signatures.delete_at(index)
+    include WebMockHTTPClients
   end
 
-  private
+  if defined? ::JSONClient
+    class WebMockJSONClient < JSONClient
+      alias_method :do_get_block_without_webmock, :do_get_block
+      alias_method :do_get_stream_without_webmock, :do_get_stream
 
-  # some of the headers sent by HTTPClient are derived from
-  # the client session
-  def headers_from_session(uri)
-    session_headers = HTTP::Message::Headers.new
-    @session_manager.send(:open, uri).send(:set_header, MessageMock.new(session_headers))
-    session_headers.all.inject({}) do |hdrs, header|
-      hdrs[header[0]] = header[1]
-      hdrs
+      include WebMockHTTPClients
     end
   end
 
+
   # Mocks a HTTPClient HTTP::Message
   class MessageMock
     attr_reader :header

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -168,7 +168,9 @@ module WebMock
 
           response.extend Net::WebMockHTTPResponse
 
-          raise Timeout::Error, "execution expired" if webmock_response.should_timeout
+          if webmock_response.should_timeout
+            raise timeout_exception, "execution expired"
+          end
 
           webmock_response.raise_error_if_any
 
@@ -177,6 +179,19 @@ module WebMock
           response
         end
 
+        def timeout_exception
+          if defined?(Net::OpenTimeout)
+            # Ruby 2.x
+            Net::OpenTimeout
+          elsif defined?(Net::HTTP::OpenTimeout)
+            # Ruby 1.9
+            Net::HTTP::OpenTimeout
+          else
+            # Fallback, if things change
+            Timeout::Error
+          end
+        end
+
         def build_webmock_response(net_http_response)
           webmock_response = WebMock::Response.new
           webmock_response.status = [

data/lib/webmock/rack_response.rb

@@ -12,7 +12,7 @@ module WebMock
       Response.new(
         body: body_from_rack_response(response),
         headers: headers,
-        status: status
+        status: [status, Rack::Utils::HTTP_STATUS_CODES[status]]
       )
     end
 

data/lib/webmock/version.rb

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

data/spec/acceptance/curb/curb_spec.rb

@@ -382,6 +382,29 @@ unless RUBY_PLATFORM =~ /java/
         c.http(:GET)
         expect(c.body).to eq("abc")
       end
+
+      describe 'match request body' do
+        it 'for post' do
+          stub_request(:post, "www.example.com").with(body: 'foo=nhe').to_return(body: "abc")
+
+          response = Curl.post("http://www.example.com", {foo: :nhe})
+          expect(response.body_str).to eq("abc")
+        end
+
+        it 'for patch' do
+          stub_request(:patch, "www.example.com").with(body: 'foo=nhe').to_return(body: "abc")
+
+          response = Curl.patch("http://www.example.com", {foo: :nhe})
+          expect(response.body_str).to eq("abc")
+        end
+
+        it 'for put' do
+          stub_request(:put, "www.example.com").with(body: 'foo=nhe').to_return(body: "abc")
+
+          response = Curl.put("http://www.example.com", {foo: :nhe})
+          expect(response.body_str).to eq("abc")
+        end
+      end
     end
 
     describe "using #http_* methods for requests" do

data/spec/acceptance/em_http_request/em_http_request_spec_helper.rb

@@ -22,7 +22,8 @@ module EMHttpRequestSpecHelper
         body: options[:body],
         file: options[:file],
         query: options[:query],
-        head: head
+        head: head,
+        compressed: false
       }, &block)
       http.errback {
         error_set = true

data/spec/acceptance/excon/excon_spec.rb

@@ -4,7 +4,7 @@ require 'acceptance/excon/excon_spec_helper'
 
 describe "Excon" do
   include ExconSpecHelper
-  include_context "with WebMock", :no_status_message, :no_url_auth
+  include_context "with WebMock", :no_url_auth
 
   it 'should allow Excon requests to use query hash paramters' do
     stub_request(:get, "http://example.com/resource/?a=1&b=2").to_return(body: "abc")

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -4,6 +4,7 @@ module ExconSpecHelper
 
   def http_request(method, uri, options = {}, &block)
     Excon.defaults[:ssl_verify_peer] = false
+    Excon.defaults[:ciphers] = 'DEFAULT'
     uri      = Addressable::URI.heuristic_parse(uri)
     uri      = uri.to_s.gsub(' ', '%20')
 
@@ -31,7 +32,7 @@ module ExconSpecHelper
       body: response.body,
       headers: headers,
       status: response.status.to_s,
-      message: ""
+      message: response.reason_phrase
   end
 
   def client_timeout_exception_class

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -125,6 +125,10 @@ describe "HTTPClient" do
     before { WebMock.allow_net_connect! }
 
     it 'invokes the global_stub_request hook for each request' do
+      # Mock time to ensure that date headers match
+      now = Time.now
+      allow(Time).to receive(:now).and_return(now)
+
       request_signatures = []
       WebMock.globally_stub_request do |request_sig|
         request_signatures << request_sig

data/spec/acceptance/net_http/net_http_spec_helper.rb

@@ -45,7 +45,13 @@ module NetHTTPSpecHelper
   end
 
   def client_timeout_exception_class
-    Timeout::Error
+    if defined?(Net::OpenTimeout)
+      Net::OpenTimeout
+    elsif defined?(Net::HTTP::OpenTimeout)
+      Net::HTTP::OpenTimeout
+    else
+      Timeout::Error
+    end
   end
 
   def connection_refused_exception_class

data/spec/acceptance/patron/patron_spec.rb

@@ -95,38 +95,22 @@ unless RUBY_PLATFORM =~ /java/
             Encoding.default_internal = @encoding
           end
 
-          it "should encode body with default encoding" do
+          it "should not encode body with default encoding" do
             stub_request(:get, "www.example.com").
               to_return(body: "Øl")
 
-            expect(@sess.get("").body.encoding).to eq(Encoding::UTF_8)
+            expect(@sess.get("").body.encoding).to eq(Encoding::ASCII_8BIT)
+            expect(@sess.get("").inspectable_body.encoding).to eq(Encoding::UTF_8)
           end
 
-          it "should encode body to default internal" do
+          it "should not encode body to default internal" do
             stub_request(:get, "www.example.com").
               to_return(headers: {'Content-Type' => 'text/html; charset=iso-8859-1'},
                         body: "Øl".encode("iso-8859-1"))
 
-            expect(@sess.get("").body.encoding).to eq(Encoding.default_internal)
+            expect(@sess.get("").body.encoding).to eq(Encoding::ASCII_8BIT)
+            expect(@sess.get("").decoded_body.encoding).to eq(Encoding.default_internal)
           end
-
-          it "should encode body based on encoding-attribute in body" do
-            stub_request(:get, "www.example.com").
-              to_return(body: "<?xml encoding=\"iso-8859-1\">Øl</xml>".encode("iso-8859-1"))
-
-            expect(@sess.get("").body.encoding).to eq(Encoding::ISO_8859_1)
-          end
-
-
-          it "should encode body based on Session#default_response_charset" do
-            stub_request(:get, "www.example.com").
-              to_return(body: "Øl".encode("iso-8859-1"))
-
-            @sess.default_response_charset = "iso-8859-1"
-
-            expect(@sess.get("").body.encoding).to eq(Encoding::ISO_8859_1)
-          end
-
         end
       end
     end

data/spec/spec_helper.rb

@@ -21,9 +21,6 @@ require 'support/webmock_server'
 require 'support/my_rack_app'
 require 'support/failures'
 
-require 'simplecov'
-SimpleCov.start
-
 CURL_EXAMPLE_OUTPUT_PATH = File.expand_path('../support/example_curl_output.txt', __FILE__)
 
 RSpec.configure do |config|

data/spec/unit/api_spec.rb

@@ -43,7 +43,7 @@ describe WebMock::API do
         end
       end
 
-      context "when args are an emtpy hash" do
+      context "when args are an empty hash" do
         subject {klass.new.hash_including({})}
 
         it "creates 'HashIncludingMatcher' with an empty hash" do
@@ -72,4 +72,4 @@ describe WebMock::API do
     end
 
   end
-end
+end

data/spec/unit/rack_response_spec.rb

@@ -14,6 +14,16 @@ describe WebMock::RackResponse do
     expect(response.body).to include('This is my root!')
   end
 
+  it "should set the reason phrase based on the status code" do
+    request = WebMock::RequestSignature.new(:get, 'www.example.com')
+    response = @rack_response.evaluate(request)
+    expect(response.status).to eq([200, "OK"])
+
+    request = WebMock::RequestSignature.new(:get, 'www.example.com/error')
+    response = @rack_response.evaluate(request)
+    expect(response.status).to eq([500, "Internal Server Error"])
+  end
+
   it "should behave correctly when the rack response is not a simple array of strings" do
     request = WebMock::RequestSignature.new(:get, 'www.example.com/non_array_response')
     response = @rack_response.evaluate(request)

data/test/shared_test.rb

@@ -22,7 +22,6 @@ module SharedTest
   end
 
   def test_error_on_non_stubbed_request
-    default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
     assert_raise_with_message(WebMock::NetConnectNotAllowedError, %r{Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers}) do
       http_request(:get, "http://www.example.net/")
     end
@@ -48,7 +47,7 @@ module SharedTest
     end
   end
 
-  def test_verification_that_expected_request_didnt_occur
+  def test_verification_that_expected_stub_didnt_occur
     expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
     assert_fail(expected_message) do
@@ -78,6 +77,14 @@ module SharedTest
     end
   end
 
+  def test_refute_requested_alias
+    expected_message = %r(The request GET http://www.example.com/ was not expected to execute but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
+    assert_fail(expected_message) do
+      http_request(:get, "http://www.example.com/")
+      refute_requested(:get, "http://www.example.com")
+    end
+  end
+
   def test_verification_that_non_expected_stub_didnt_occur
     expected_message = %r(The request ANY http://www.example.com/ was not expected to execute but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
     assert_fail(expected_message) do

data/webmock.gemspec

@@ -17,34 +17,30 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'addressable', '>= 2.3.6'
-  s.add_dependency 'crack', '>=0.3.2'
+  s.add_dependency 'addressable', '>= 2.3.6', ('<= 2.4.0' if RUBY_VERSION <= '1.9.3')
+  s.add_dependency 'crack', '>= 0.3.2'
   s.add_dependency 'hashdiff'
 
+  unless RUBY_PLATFORM =~ /java/
+    s.add_development_dependency 'patron',   '>= 0.4.18'
+    s.add_development_dependency 'curb',     '>= 0.7.16'
+    s.add_development_dependency 'typhoeus', '>= 0.5.0'
+  end
+
+  s.add_development_dependency 'http',            ((RUBY_VERSION <= '1.9.3') ? '0.7.3' : '>= 0.8.0')
+  s.add_development_dependency 'manticore',       '>= 0.5.1' if RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'rack',            ((RUBY_VERSION < '2.2.2') ? '1.6.0' : '> 1.6')
   s.add_development_dependency 'rspec',           '>= 3.1.0'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
-  s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'em-http-request', '>= 1.0.2'
-  s.add_development_dependency 'http',            ((RUBY_VERSION <= '1.9.3') ? '0.7.3' : '>= 0.8.0')
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0'
-  s.add_development_dependency 'curb',            '>= 0.7.16' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'manticore',       '>= 0.5.1' if RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'excon',           '>= 0.27.5'
   s.add_development_dependency 'minitest',        '>= 5.0.0'
   s.add_development_dependency 'test-unit',       '>= 3.0.0'
   s.add_development_dependency 'rdoc',            '>  3.5.0'
-  s.add_development_dependency 'rack'
-  s.add_development_dependency 'simplecov'
 
   s.files         = `git ls-files`.split("\n")
   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 = <<-EOM
-
-  WebMock 2.0 has some breaking changes. Please check the CHANGELOG: https://goo.gl/piDGLu
-
-  EOM
 end

metadata

@@ -1,253 +1,245 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.6
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.6
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 0.4.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 0.4.18
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 0.7.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 0.7.16
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.18
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.18
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: http
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.16
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.16
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.27.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.27.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email:
@@ -256,10 +248,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".gitignore"
-- ".rspec-tm"
-- ".travis.yml"
+- .gemtest
+- .gitignore
+- .rspec-tm
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -392,26 +384,23 @@ homepage: http://github.com/bblimke/webmock
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-    WebMock 2.0 has some breaking changes. Please check the CHANGELOG: https://goo.gl/piDGLu
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: webmock
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.