webmock 1.22.3 → 1.22.5

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: f264f2ee632cba4f292af8842162b194ca3d2869455452e0b4f3a37c090991ee32a4fb8045cd341f023ed54c1aba167ead51af0cfb08e9f94dd9031feaf716d9
+  data.tar.gz: 7b2896f0007c759df21777fb3a6497efef8293d230e3356124ab786e12d768ee251163d1bfaa0bf5f653db3b845c3134b542772ba40c69f4c69cd357528b5252
+SHA1: 
+  metadata.gz: b14156b6d829103daa974ba8bf5b5c3479077cb7
+  data.tar.gz: 205f1ed9b69fd533481ebe3161bf82e33f2a134a

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.1.0
   - 2.2.1
   - 2.2.3
+  - 2.3.0
   - rbx-2
   - ruby-head
   - ree
@@ -18,7 +19,6 @@ rvm:
 matrix:
   allow_failures:
     - rvm: jruby-9.0.0.0
-    - rvm: jruby-9.0.1.0
     - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 1.22.5
+
+  * Fixes [bug](https://github.com/bblimke/webmock/issues/565) where WebMock tries
+    to alias a method that is deprecated in Ruby Versions > 1.9.2 ('sysread' for class 'StringIO')
+
+    Thanks to [Marcos Acosta](https://github.com/mmaa) for discovering this bug.
+
+## 1.22.4
+
+  * Adds support for JSONClient (a subclass of HTTPClient)
+
+    Thanks to [Andrew Kozin](https://github.com/nepalez)
+
+  * Adds support for Ruby 2.3.0
+
+    Thanks to [Charles Pence](https://github.com/cpence)
+
+  * Adds support for [http](https://github.com/httprb/http) versions >= 1.0.0
+
+    Thanks to [Alexey Zapparov](https://github.com/ixti)
+
+  * Fixes support for Ruby 1.8.7 by restrciting Addressable version < 2.4.0
+
+    Thanks to [Matthew Rudy Jacobs](https://github.com/matthewrudy)
+
 ## 1.22.3
 
   * Return "effective_url" attribute in Typhoeus::Response

data/README.md

@@ -13,7 +13,7 @@ Features
 * Smart matching of the same URIs in different representations (also encoded and non encoded forms)
 * Smart matching of the same headers in different representations.
 * Support for Test::Unit
-* Support for RSpec 1.x and RSpec 2.x
+* Support for RSpec
 * Support for MiniTest
 
 Supported HTTP libraries
@@ -39,6 +39,7 @@ Supported Ruby Interpreters
 * MRI 2.0.0
 * MRI 2.1
 * MRI 2.2
+* MRI 2.3
 * REE 1.8.7
 * JRuby
 * Rubinius
@@ -984,6 +985,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Magne Land
 * yurivm
 * Mike Knepper
+* Charles Pence
+* Alexey Zapparov
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -54,8 +54,8 @@ if defined?(Curl)
 
   module Curl
     class WebMockCurlEasy < Curl::Easy
-      def curb_or_webmock
 
+      def curb_or_webmock
         request_signature = build_request_signature
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
@@ -238,25 +238,25 @@ if defined?(Curl)
       end
 
       def body_str
-        @body_str || super
+        @body_str ||= super
       end
       alias body body_str
 
       def response_code
-        @response_code || super
+        @response_code ||= super
       end
 
       def header_str
-        @header_str || super
+        @header_str ||= super
       end
       alias head header_str
 
       def last_effective_url
-        @last_effective_url || super
+        @last_effective_url ||= super
       end
 
       def content_type
-        @content_type || super
+        @content_type ||= super
       end
 
       %w[ success failure missing header body complete progress ].each do |callback|

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -7,7 +7,6 @@ if defined?(EventMachine::HttpClient)
         OriginalHttpClient = EventMachine::HttpClient unless const_defined?(:OriginalHttpClient)
         OriginalHttpConnection = EventMachine::HttpConnection unless const_defined?(:OriginalHttpConnection)
 
-
         def self.enable!
           EventMachine.send(:remove_const, :HttpConnection)
           EventMachine.send(:const_set, :HttpConnection, EventMachine::WebMockHttpConnection)
@@ -26,7 +25,6 @@ if defined?(EventMachine::HttpClient)
   end
 
   module EventMachine
-
     if defined?(Synchrony) && HTTPMethods.instance_methods.include?(:aget)
       # have to make the callbacks fire on the next tick in order
       # to avoid the dreaded "double resume" exception
@@ -100,6 +98,7 @@ if defined?(EventMachine::HttpClient)
 
         if stubbed_webmock_response
           WebMock::CallbackRegistry.invoke_callbacks({:lib => :em_http_request}, request_signature, stubbed_webmock_response)
+          @uri ||= nil
           EM.next_tick {
             setup(make_raw_response(stubbed_webmock_response), @uri,
                   stubbed_webmock_response.should_timeout ? "WebMock timeout error" : nil)

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

@@ -10,13 +10,34 @@ module HTTP
       webmock_response
     end
 
-    def self.from_webmock(webmock_response, request_signature = nil)
-      status  = Status.new(webmock_response.status.first)
-      headers = webmock_response.headers || {}
-      body    = Body.new Streamer.new webmock_response.body
-      uri     = URI request_signature.uri.to_s if request_signature
+    class << self
+      def from_webmock(webmock_response, request_signature = nil)
+        status  = Status.new(webmock_response.status.first)
+        headers = webmock_response.headers || {}
+        body    = Body.new Streamer.new webmock_response.body
+        uri     = normalize_uri(request_signature && request_signature.uri)
 
-      new(status, "1.1", headers, body, uri)
+        return new(status, "1.1", headers, body, uri) if HTTP::VERSION < "1.0.0"
+
+        new({
+          :status   => status,
+          :version  => "1.1",
+          :headers  => headers,
+          :body     => body,
+          :uri      => uri
+        })
+      end
+
+      private
+
+      def normalize_uri(uri)
+        return unless uri
+
+        uri = URI.parse uri
+        uri.port = nil if uri.default_port && uri.port == uri.default_port
+
+        uri
+      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module HTTP
     def initialize(request, &perform)
       @request = request
       @perform = perform
+      @request_signature = nil
     end
 
     def exec
@@ -33,13 +34,18 @@ module HTTP
 
       return unless webmock_response
 
-      raise Errno::ETIMEDOUT if webmock_response.should_timeout
+      raise_timeout_error if webmock_response.should_timeout
       webmock_response.raise_error_if_any
 
       invoke_callbacks(webmock_response, :real_request => false)
       ::HTTP::Response.from_webmock webmock_response, request_signature
     end
 
+    def raise_timeout_error
+      raise Errno::ETIMEDOUT if HTTP::VERSION < "1.0.0"
+      raise HTTP::ConnectionError, "connection error: #{Errno::ETIMEDOUT.new}"
+    end
+
     def perform
       return unless ::WebMock.net_connect_allowed?(request_signature.uri)
       response = @perform.call

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -1,7 +1,9 @@
 begin
   require 'httpclient'
+  require 'jsonclient' # defined in 'httpclient' gem as well
 rescue LoadError
   # httpclient not found
+  # or jsonclient not defined (in old versions of httclient gem)
 end
 
 if defined?(::HTTPClient)
@@ -11,26 +13,36 @@ if defined?(::HTTPClient)
       class HTTPClientAdapter < HttpLibAdapter
         adapter_for :httpclient
 
-        OriginalHttpClient = ::HTTPClient unless const_defined?(:OriginalHttpClient)
+        unless const_defined?(:OriginalHttpClient)
+          OriginalHttpClient = ::HTTPClient
+        end
+
+        unless const_defined?(:OriginalJsonClient)
+          OriginalJsonClient = ::JSONClient if defined?(::JSONClient)
+        end
 
         def self.enable!
           Object.send(:remove_const, :HTTPClient)
           Object.send(:const_set, :HTTPClient, WebMockHTTPClient)
+          if defined? ::JSONClient
+            Object.send(:remove_const, :JSONClient)
+            Object.send(:const_set, :JSONClient, WebMockJSONClient)
+          end
         end
 
         def self.disable!
           Object.send(:remove_const, :HTTPClient)
           Object.send(:const_set, :HTTPClient, OriginalHttpClient)
+          if defined? ::JSONClient
+            Object.send(:remove_const, :JSONClient)
+            Object.send(:const_set, :JSONClient, OriginalJsonClient)
+          end
         end
       end
     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
-
+  module WebMockHTTPClients
     def do_get_block(req, proxy, conn, &block)
       do_get(req, proxy, conn, false, &block)
     end
@@ -105,6 +117,22 @@ if defined?(::HTTPClient)
     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
+
+    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
+
+      include WebMockHTTPClients
+    end
+  end
+
   def build_webmock_response(httpclient_response)
     webmock_response = WebMock::Response.new
     webmock_response.status = [httpclient_response.status, httpclient_response.reason]

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -210,6 +210,18 @@ module WebMock
   end
 end
 
+# patch for StringIO behavior in Ruby 2.2.3
+# https://github.com/bblimke/webmock/issues/558
+class PatchedStringIO < StringIO #:nodoc:
+
+  alias_method :orig_read_nonblock, :read_nonblock
+
+  def read_nonblock(size, *args)
+    orig_read_nonblock(size)
+  end
+
+end
+
 class StubSocket #:nodoc:
 
   attr_accessor :read_timeout, :continue_timeout
@@ -235,10 +247,12 @@ module Net  #:nodoc: all
       @debug_output = debug_output
 
       @io = case io
-      when Socket, OpenSSL::SSL::SSLSocket, IO, StringIO
+      when Socket, OpenSSL::SSL::SSLSocket, IO
         io
+      when StringIO
+        PatchedStringIO.new(io.string)
       when String
-        StringIO.new(io)
+        PatchedStringIO.new(io)
       end
       raise "Unable to create local socket" unless @io
     end

data/lib/webmock/request_execution_verifier.rb

@@ -34,26 +34,26 @@ module WebMock
     end
 
     def description
-      "request #{request_pattern.to_s} #{quantity_phrase.strip}"
+      "request #{request_pattern} #{quantity_phrase.strip}"
     end
 
     def failure_message
-      failure_message_phrase(is_negated=false)
+      failure_message_phrase(false)
     end
 
     def failure_message_when_negated
-      failure_message_phrase(is_negated=true)
+      failure_message_phrase(true)
     end
 
     def self.executed_requests_message
-      "\n\nThe following requests were made:\n\n#{RequestRegistry.instance.to_s}\n" + "="*60
+      "\n\nThe following requests were made:\n\n#{RequestRegistry.instance}\n" + "="*60
     end
 
     private
 
     def failure_message_phrase(is_negated=false)
       negation = is_negated ? "was not" : "was"
-      text = "The request #{request_pattern.to_s} #{negation} expected to execute #{quantity_phrase(is_negated)}but it executed #{times(times_executed)}"
+      text = "The request #{request_pattern} #{negation} expected to execute #{quantity_phrase(is_negated)}but it executed #{times(times_executed)}"
       text << self.class.executed_requests_message
       text
     end

data/lib/webmock/response.rb

@@ -1,8 +1,10 @@
 require "pathname"
 
 #compatibility with Ruby 1.9.2 preview1 to allow reading raw responses
-class StringIO
-  alias_method :read_nonblock, :sysread
+if RUBY_VERSION <= "1.9.2"
+  class StringIO
+    alias_method :read_nonblock, :sysread
+  end
 end
 
 module WebMock

data/lib/webmock/version.rb

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

data/spec/acceptance/curb/curb_spec.rb

@@ -82,7 +82,6 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "should call on_body for each chunk with chunked response" do
-        body = "on_body fired"
         stub_request(:any, "example.com").
           to_return(:body => ["first_chunk", "second_chunk"],
                     :headers => {"Transfer-Encoding" => "chunked"})
@@ -287,7 +286,6 @@ unless RUBY_PLATFORM =~ /java/
 
       context "when response does not include Content-Type header" do
         it "returns nil for content_type" do
-          content_type = "application/json"
 
           stub_request(:any, 'example.com').
             to_return(:body     => "abc",

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -164,7 +164,7 @@ unless RUBY_PLATFORM =~ /java/
             expect {
               EM.run do
                 fiber = Fiber.new do
-                  http = EM::HttpRequest.new("http://www.testserver.com").post :body => "foo=bar&baz=bang", :timeout => 60
+                  EM::HttpRequest.new("http://www.testserver.com").post :body => "foo=bar&baz=bang", :timeout => 60
                   EM.stop
                 end
                 fiber.resume

data/spec/acceptance/http_rb/http_rb_spec.rb

@@ -48,12 +48,26 @@ describe "HTTP.rb" do
     end
   end
 
-  it "restores request uri on replayed response object" do
-    uri = Addressable::URI.parse "http://example.com/foo"
+  context "restored request uri on replayed response object" do
+    it "keeps non-default port" do
+      stub_request :get, "example.com:1234/foo"
+      response = HTTP.get "http://example.com:1234/foo"
 
-    stub_request :get, "example.com/foo"
-    response = HTTP.get uri
+      expect(response.uri.to_s).to eq "http://example.com:1234/foo"
+    end
+
+    it "does not injects default port" do
+      stub_request :get, "example.com/foo"
+      response = HTTP.get "http://example.com/foo"
+
+      expect(response.uri.to_s).to eq "http://example.com/foo"
+    end
+
+    it "strips out default port even if it was explicitly given" do
+      stub_request :get, "example.com/foo"
+      response = HTTP.get "http://example.com:80/foo"
 
-    expect(response.uri.to_s).to eq uri.to_s
+      expect(response.uri.to_s).to eq "http://example.com/foo"
+    end
   end
 end

data/spec/acceptance/http_rb/http_rb_spec_helper.rb

@@ -13,11 +13,13 @@ module HttpRbSpecHelper
   end
 
   def client_timeout_exception_class
-    Errno::ETIMEDOUT
+    return Errno::ETIMEDOUT if HTTP::VERSION < "1.0.0"
+    HTTP::ConnectionError
   end
 
   def connection_refused_exception_class
-    Errno::ECONNREFUSED
+    return Errno::ECONNREFUSED if HTTP::VERSION < "1.0.0"
+    HTTP::ConnectionError
   end
 
   def http_library

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -47,6 +47,16 @@ describe "HTTPClient" do
     expect(str).to eq('test')
   end
 
+  it "should work via JSONClient subclass" do
+    stub_request(:get, 'www.example.com').to_return(
+      :status => 200,
+      :body => '{"test": "foo"}',
+      :headers => {'Content-Type' => 'application/json'}
+    )
+    content = JSONClient.get('www.example.com').content
+    expect(content).to eq("test" => "foo")
+  end
+
   context "multipart bodies" do
     let(:header) {{
         'Accept' => 'application/json',

data/spec/acceptance/net_http/net_http_spec.rb

@@ -228,12 +228,12 @@ describe "Net:HTTP" do
 
       it "should connect to the server if the URI matches an regex", :net_connect => true do
         WebMock.disable_net_connect!(:allow => /google.com/)
-        response = Net::HTTP.get('www.google.com','/')
+        Net::HTTP.get('www.google.com','/')
       end
 
       it "should connect to the server if the URI matches any regex the array", :net_connect => true do
         WebMock.disable_net_connect!(:allow => [/google.com/, /yahoo.com/])
-        response = Net::HTTP.get('www.google.com','/')
+        Net::HTTP.get('www.google.com','/')
       end
 
     end

data/spec/acceptance/patron/patron_spec.rb

@@ -24,14 +24,13 @@ unless RUBY_PLATFORM =~ /java/
         before(:each) do
           @dir_path = Dir.mktmpdir('webmock-')
           @file_path = File.join(@dir_path, "webmock_temp_test_file")
-          FileUtils.rm_rf(@file_path) if File.exists?(@file_path)
+          FileUtils.rm_rf(@file_path) if File.exist?(@file_path)
         end
 
         after(:each) do
           FileUtils.rm_rf(@dir_path) if File.exist?(@dir_path)
         end
 
-
         it "should work with get_file" do
           stub_request(:get, "www.example.com").to_return(:body => "abc")
           @sess.get_file("/", @file_path)
@@ -115,7 +114,6 @@ unless RUBY_PLATFORM =~ /java/
             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
 

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -11,8 +11,17 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
 
       it "should make a real https request if request is not stubbed" do
         unless http_library == :httpclient
-          expect(http_request(:get, "https://www.google.com/").
-            body).to match(/.*google.*/)
+          result = http_request(:get, "https://www.google.com/").body
+          if result.respond_to? :encode
+            result = result.encode(
+              'UTF-8',
+              'binary',
+              :invalid => :replace,
+              :undef   => :replace,
+              :replace => ''
+            )
+          end
+          expect(result).to match(/.*google.*/)
         end
       end
 

data/spec/acceptance/shared/callbacks.rb

@@ -1,6 +1,7 @@
 shared_context "callbacks" do |*adapter_info|
   describe "when after_request callback is declared" do
     before(:each) do
+      @called = nil
       WebMock.reset_callbacks
       stub_request(:get, "http://www.example.com")
     end

data/spec/support/webmock_server.rb

@@ -52,7 +52,7 @@ class WebMockServer
 
     loop do
       begin
-        s = TCPSocket.new("localhost", port)
+        TCPSocket.new("localhost", port)
         sleep 0.1
         break
       rescue Errno::ECONNREFUSED

data/spec/unit/rack_response_spec.rb

@@ -24,8 +24,8 @@ describe WebMock::RackResponse do
 
   it "should shouldn't blow up when hitting a locked resource twice" do
     @locked_rack_response = WebMock::RackResponse.new(MyLockedRackApp)
-    request   = WebMock::RequestSignature.new(:get, 'www.example.com/locked')
-    response  = @locked_rack_response.evaluate(request)
+    request = WebMock::RequestSignature.new(:get, 'www.example.com/locked')
+    @locked_rack_response.evaluate(request)
     response2 = @locked_rack_response.evaluate(request)
 
     expect(response2.body).to include('Single threaded response.')

data/webmock.gemspec

@@ -15,12 +15,14 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'webmock'
 
-  s.add_dependency 'addressable', '>= 2.3.6'
+  patron_version      = (RUBY_VERSION <= '1.8.7') ? '0.4.18'   : '>= 0.4.18'
+  addressable_version = (RUBY_VERSION) > '1.8.7'  ? '>= 2.3.6' : '< 2.4.0'
+  manticore_version   = (RUBY_VERSION) > '1.8.7'  ? '>= 0.5.1' : '<= 0.5.1'
+
+  s.add_dependency 'addressable', addressable_version
   s.add_dependency 'crack', '>=0.3.2'
   s.add_dependency 'hashdiff'
 
-  patron_version = (RUBY_VERSION <= '1.8.7') ? '0.4.18' : '>= 0.4.18'
-
   s.add_development_dependency 'rspec',           '>= 3.1.0'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
   s.add_development_dependency('patron',          patron_version) unless RUBY_PLATFORM =~ /java/
@@ -29,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
   s.add_development_dependency 'curb',            '<= 0.8.6' 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('manticore',       manticore_version) if RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'excon',           '>= 0.27.5'
   s.add_development_dependency 'minitest',        '~> 5.0.0'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 73
-  prerelease: 
-  segments: 
-  - 1
-  - 22
-  - 3
-  version: 1.22.3
+  version: 1.22.5
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,229 +9,147 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-11-02 00:00:00 +01:00
-default_executable: 
+date: 2016-01-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 3
-        - 6
-        version: 2.3.6
+        version: 2.4.0
+  name: addressable
   prerelease: false
   requirement: *id001
-  name: addressable
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
         version: 0.3.2
+  name: crack
   prerelease: false
   requirement: *id002
-  name: crack
-- !ruby/object:Gem::Dependency 
   type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - &id014 
+      - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
+  name: hashdiff
   prerelease: false
   requirement: *id003
-  name: hashdiff
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
         version: 3.1.0
+  name: rspec
   prerelease: false
   requirement: *id004
-  name: rspec
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
         version: 2.2.4
+  name: httpclient
   prerelease: false
   requirement: *id005
-  name: httpclient
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 4
-        - 18
         version: 0.4.18
+  name: patron
   prerelease: false
   requirement: *id006
-  name: patron
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
+  name: em-http-request
   prerelease: false
   requirement: *id007
-  name: em-http-request
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
         version: 0.7.3
+  name: http
   prerelease: false
   requirement: *id008
-  name: http
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 8
-        - 6
         version: 0.8.6
+  name: curb
   prerelease: false
   requirement: *id009
-  name: curb
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
+  name: typhoeus
   prerelease: false
   requirement: *id010
-  name: typhoeus
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 121
-        segments: 
-        - 0
-        - 27
-        - 5
         version: 0.27.5
+  name: excon
   prerelease: false
   requirement: *id011
-  name: excon
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 5
-        - 0
-        - 0
         version: 5.0.0
+  name: minitest
   prerelease: false
   requirement: *id012
-  name: minitest
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 5
-        - 0
         version: 3.5.0
+  name: rdoc
   prerelease: false
   requirement: *id013
-  name: rdoc
-- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id014
+    - *id014
   name: rack
+  prerelease: false
+  requirement: *id015
+  type: :development
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -380,39 +292,28 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
-has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id014
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id014
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.6.2
+rubygems_version: 2.0.17
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
 - spec/acceptance/curb/curb_spec.rb