webmock 1.7.7 → 1.7.8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.8
+
+* Fix each adapter so that it calls a `stub.with` block only once per
+  request. Previously, the block would be called two or three times per
+  request [Myron Marston](https://github.com/myronmarston).
+
 ## 1.7.7 - RuPy 2011 release
 
 * Passing response object to a block passed to `HTTPClient#do_get_block`. This fixes `HTTPClient.get_content` failures. [issue 130](https://github.com/bblimke/webmock/pull/130)

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -56,8 +56,7 @@ if defined?(Curl)
         request_signature = build_request_signature
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-        if WebMock::StubRegistry.instance.registered_request?(request_signature)
-          webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
+        if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
           build_curb_response(webmock_response)
           WebMock::CallbackRegistry.invoke_callbacks(
             {:lib => :curb}, request_signature, webmock_response)

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

@@ -52,8 +52,7 @@ if defined?(EventMachine::HttpRequest)
 
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-        if WebMock::StubRegistry.instance.registered_request?(request_signature)
-          webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
+        if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
           WebMock::CallbackRegistry.invoke_callbacks(
           {:lib => :em_http_request}, request_signature, webmock_response)
           client = WebMockHttpClient.new(nil)

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

@@ -51,7 +51,7 @@ if defined?(EventMachine::HttpClient)
       def webmock_activate_connection(client)
         request_signature = client.request_signature
 
-        if WebMock::StubRegistry.instance.registered_request?(request_signature)
+        if client.stubbed_webmock_response
           conn = HttpStubConnection.new rand(10000)
           post_init
 
@@ -95,13 +95,12 @@ if defined?(EventMachine::HttpClient)
       def send_request_with_webmock(head, body)
         WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-        if WebMock::StubRegistry.instance.registered_request?(request_signature)
-          webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
-          on_error("WebMock timeout error") if webmock_response.should_timeout
-          WebMock::CallbackRegistry.invoke_callbacks({:lib => :em_http_request}, request_signature, webmock_response)
+        if stubbed_webmock_response
+          on_error("WebMock timeout error") if stubbed_webmock_response.should_timeout
+          WebMock::CallbackRegistry.invoke_callbacks({:lib => :em_http_request}, request_signature, stubbed_webmock_response)
           EM.next_tick {
-            setup(make_raw_response(webmock_response), @uri,
-                  webmock_response.should_timeout ? "WebMock timeout error" : nil)
+            setup(make_raw_response(stubbed_webmock_response), @uri,
+                  stubbed_webmock_response.should_timeout ? "WebMock timeout error" : nil)
           }
           self
         elsif WebMock.net_connect_allowed?(request_signature.uri)
@@ -128,6 +127,14 @@ if defined?(EventMachine::HttpClient)
         @request_signature ||= build_request_signature
       end
 
+      def stubbed_webmock_response
+        unless defined?(@stubbed_webmock_response)
+          @stubbed_webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
+        end
+
+        @stubbed_webmock_response
+      end
+
       private
 
       def build_webmock_response

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -42,8 +42,8 @@ if defined?(::HTTPClient)
 
       WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-      if WebMock::StubRegistry.instance.registered_request?(request_signature)
-        webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
+      if webmock_responses[request_signature]
+        webmock_response = webmock_responses.delete(request_signature)
         response = build_httpclient_response(webmock_response, stream, &block)
         @request_filter.each do |filter|
           filter.filter_response(req, response)
@@ -76,8 +76,7 @@ if defined?(::HTTPClient)
       req = create_request(method, uri, query, body, extheader)
       request_signature = build_request_signature(req)
 
-      if WebMock::StubRegistry.instance.registered_request?(request_signature) ||
-         WebMock.net_connect_allowed?(request_signature.uri)
+      if webmock_responses[request_signature] || WebMock.net_connect_allowed?(request_signature.uri)
         do_request_async_without_webmock(method, uri, query, body, extheader)
       else
         raise WebMock::NetConnectNotAllowedError.new(request_signature)
@@ -158,4 +157,10 @@ if defined?(::HTTPClient)
     )
   end
 
+  def webmock_responses
+    @webmock_responses ||= Hash.new do |hash, request_signature|
+      hash[request_signature] = WebMock::StubRegistry.instance.response_for_request(request_signature)
+    end
+  end
+
 end

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -68,9 +68,8 @@ module WebMock
 
           WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-          if WebMock::StubRegistry.instance.registered_request?(request_signature)
+          if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
             @socket = Net::HTTP.socket_type.new
-            webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
             WebMock::CallbackRegistry.invoke_callbacks(
               {:lib => :net_http}, request_signature, webmock_response)
             build_net_http_response(webmock_response, &block)

data/lib/webmock/http_lib_adapters/patron_adapter.rb

@@ -19,9 +19,7 @@ if defined?(::Patron)
 
             WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-            if WebMock::StubRegistry.instance.registered_request?(request_signature)
-              webmock_response =
-               WebMock::StubRegistry.instance.response_for_request(request_signature)
+            if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
               WebMock::HttpLibAdapters::PatronAdapter.
                 handle_file_name(req, webmock_response)
               res = WebMock::HttpLibAdapters::PatronAdapter.

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -140,9 +140,7 @@ if defined?(Typhoeus)
 
         ::WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
-        if ::WebMock::StubRegistry.instance.registered_request?(request_signature)
-          webmock_response =
-            ::WebMock::StubRegistry.instance.response_for_request(request_signature)
+        if webmock_response = ::WebMock::StubRegistry.instance.response_for_request(request_signature)
           ::WebMock::HttpLibAdapters::TyphoeusAdapter.
             stub_typhoeus(request_signature, webmock_response, self)
           webmock_response.raise_error_if_any

data/lib/webmock/stub_registry.rb

@@ -4,13 +4,30 @@ module WebMock
     include Singleton
 
     attr_accessor :request_stubs
+    attr_accessor :global_stub
 
     def initialize
       reset!
     end
 
     def reset!
-      self.request_stubs = []
+      self.request_stubs = global_stub ? [global_stub] : []
+    end
+
+    def global_stub_block=(block)
+      self.global_stub = ::WebMock::RequestStub.new(:any, /.*/)
+
+      # This hash contains the responses returned by the block,
+      # keyed by the exact request (using the object_id).
+      # That way, there's no race condition in case #to_return
+      # doesn't run immediately after stub.with.
+      responses = {}
+
+      self.global_stub.with { |request|
+        responses[request.object_id] = block.call(request)
+      }.to_return(lambda { |request| responses.delete(request.object_id) })
+
+      register_request_stub(self.global_stub)
     end
 
     def register_request_stub(stub)

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -88,6 +88,10 @@ module WebMock
     puts WebMock::RequestExecutionVerifier.executed_requests_message
   end
 
+  def self.globally_stub_request(&block)
+    WebMock::StubRegistry.instance.global_stub_block = block
+  end
+
   %w(
     allow_net_connect!
     disable_net_connect!

data/spec/acceptance/shared/stubbing_requests.rb

@@ -287,6 +287,56 @@ shared_examples_for "stubbing requests" do
       end
     end
 
+    describe "when stubbing request with a global hook" do
+      after(:each) do
+        WebMock::StubRegistry.instance.global_stub = nil
+      end
+
+      it 'returns the response returned by the hook' do
+        WebMock.globally_stub_request do |request|
+          { :body => "global stub body" }
+        end
+
+        http_request(:get, "http://www.example.com/").body.should == "global stub body"
+      end
+
+      it 'does not get cleared when a user calls WebMock.reset!' do
+        WebMock.globally_stub_request do |request|
+          { :body => "global stub body" }
+        end
+        WebMock.reset!
+        http_request(:get, "http://www.example.com/").body.should == "global stub body"
+      end
+
+      it "does not stub the request if the hook does not return anything" do
+        WebMock.globally_stub_request { |r| }
+        lambda {
+          http_request(:get, "http://www.example.com/")
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+      end
+
+      it "passes the request to the block" do
+        passed_request = nil
+        WebMock.globally_stub_request do |request|
+          passed_request = request
+          { :body => "global stub body" }
+        end
+
+        http_request(:get, "http://www.example.com:456/bar")
+        passed_request.uri.to_s.should == "http://www.example.com:456/bar"
+      end
+
+      it "should call the block only once per request" do
+        call_count = 0
+        WebMock.globally_stub_request do |request|
+          call_count += 1
+          { :body => "global stub body" }
+        end
+        http_request(:get, "http://www.example.com/")
+        call_count.should == 1
+      end
+    end
+
     describe "when stubbing request with a block evaluated on request" do
       it "should match if block returns true" do
         stub_request(:get, "www.example.com").with { |request| true }
@@ -309,6 +359,13 @@ shared_examples_for "stubbing requests" do
           http_request(:post, "http://www.example.com/", :body => "jander")
         }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: POST http://www.example.com/ with body 'jander'))
       end
+
+      it "should call the block only once per request" do
+        call_count = 0
+        stub_request(:get, "www.example.com").with { |request| call_count += 1; true }
+        http_request(:get, "http://www.example.com/").status.should == "200"
+        call_count.should == 1
+      end
     end
   end
 end

data/webmock.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'httpclient',      '>= 2.1.5.2'
   s.add_development_dependency 'patron',          '>= 0.4.15'
   s.add_development_dependency 'em-http-request', '~> 0.3.0'
-  s.add_development_dependency 'curb',            '>= 0.7.8'
+  s.add_development_dependency 'curb',            '0.7.15'
   s.add_development_dependency 'typhoeus',        '>= 0.2.4'
   s.add_development_dependency 'minitest',        '>= 2.2.2'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')

metadata

@@ -1,134 +1,193 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
-  version: 1.7.7
+  segments: 
+  - 1
+  - 7
+  - 8
+  version: 1.7.8
 platform: ruby
 authors: 
-  - Bartosz Blimke
+- Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-15 00:00:00 +02:00
-default_executable: 
+date: 2011-11-20 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: addressable
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.2"
-        - - ">"
-          - !ruby/object:Gem::Version 
-            version: 2.2.5
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: crack
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.1.7
-    type: :runtime
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.0.0
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: httpclient
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.1.5.2
-    type: :development
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: patron
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.4.15
-    type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: em-http-request
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.3.0
-    type: :development
-    version_requirements: *id006
-  - !ruby/object:Gem::Dependency 
-    name: curb
-    prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.7.8
-    type: :development
-    version_requirements: *id007
-  - !ruby/object:Gem::Dependency 
-    name: typhoeus
-    prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.2.4
-    type: :development
-    version_requirements: *id008
-  - !ruby/object:Gem::Dependency 
-    name: minitest
-    prerelease: false
-    requirement: &id009 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.2.2
-    type: :development
-    version_requirements: *id009
-  - !ruby/object:Gem::Dependency 
-    name: rdoc
-    prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">"
-          - !ruby/object:Gem::Version 
-            version: 3.5.0
-    type: :development
-    version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: addressable
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 2
+        - 5
+        version: 2.2.5
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: crack
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 1
+        - 7
+        version: 0.1.7
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: httpclient
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 119
+        segments: 
+        - 2
+        - 1
+        - 5
+        - 2
+        version: 2.1.5.2
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: patron
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 4
+        - 15
+        version: 0.4.15
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: em-http-request
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: curb
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 7
+        - 15
+        version: 0.7.15
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: typhoeus
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: minitest
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rdoc
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 5
+        - 0
+        version: 3.5.0
+  requirement: *id010
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
-  - bartosz.blimke@gmail.com
+- bartosz.blimke@gmail.com
 executables: []
 
 extensions: []
@@ -136,114 +195,113 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gemtest
-  - .gitignore
-  - .rspec-tm
-  - .rvmrc
-  - .travis.yml
-  - CHANGELOG.md
-  - Gemfile
-  - Guardfile
-  - LICENSE
-  - README.md
-  - Rakefile
-  - lib/webmock.rb
-  - lib/webmock/api.rb
-  - lib/webmock/assertion_failure.rb
-  - lib/webmock/callback_registry.rb
-  - lib/webmock/config.rb
-  - lib/webmock/cucumber.rb
-  - lib/webmock/deprecation.rb
-  - lib/webmock/errors.rb
-  - lib/webmock/http_lib_adapters/curb_adapter.rb
-  - lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb
-  - lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
-  - lib/webmock/http_lib_adapters/em_http_request_adapter.rb
-  - lib/webmock/http_lib_adapters/http_lib_adapter.rb
-  - lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb
-  - lib/webmock/http_lib_adapters/httpclient_adapter.rb
-  - lib/webmock/http_lib_adapters/net_http.rb
-  - lib/webmock/http_lib_adapters/net_http_response.rb
-  - lib/webmock/http_lib_adapters/patron_adapter.rb
-  - lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
-  - lib/webmock/minitest.rb
-  - lib/webmock/rack_response.rb
-  - lib/webmock/request_execution_verifier.rb
-  - lib/webmock/request_pattern.rb
-  - lib/webmock/request_registry.rb
-  - lib/webmock/request_signature.rb
-  - lib/webmock/request_stub.rb
-  - lib/webmock/response.rb
-  - lib/webmock/responses_sequence.rb
-  - lib/webmock/rspec.rb
-  - lib/webmock/rspec/matchers.rb
-  - lib/webmock/rspec/matchers/request_pattern_matcher.rb
-  - lib/webmock/rspec/matchers/webmock_matcher.rb
-  - lib/webmock/stub_registry.rb
-  - lib/webmock/stub_request_snippet.rb
-  - lib/webmock/test_unit.rb
-  - lib/webmock/util/hash_counter.rb
-  - lib/webmock/util/hash_keys_stringifier.rb
-  - lib/webmock/util/headers.rb
-  - lib/webmock/util/json.rb
-  - lib/webmock/util/uri.rb
-  - lib/webmock/version.rb
-  - lib/webmock/webmock.rb
-  - minitest/test_helper.rb
-  - minitest/test_webmock.rb
-  - minitest/webmock_spec.rb
-  - spec/acceptance/curb/curb_spec.rb
-  - spec/acceptance/curb/curb_spec_helper.rb
-  - spec/acceptance/em_http_request/em_http_request_spec.rb
-  - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
-  - spec/acceptance/httpclient/httpclient_spec.rb
-  - spec/acceptance/httpclient/httpclient_spec_helper.rb
-  - spec/acceptance/net_http/net_http_shared.rb
-  - spec/acceptance/net_http/net_http_spec.rb
-  - spec/acceptance/net_http/net_http_spec_helper.rb
-  - spec/acceptance/net_http/real_net_http_spec.rb
-  - spec/acceptance/patron/patron_spec.rb
-  - spec/acceptance/patron/patron_spec_helper.rb
-  - spec/acceptance/shared/allowing_and_disabling_net_connect.rb
-  - spec/acceptance/shared/callbacks.rb
-  - spec/acceptance/shared/enabling_and_disabling_webmock.rb
-  - spec/acceptance/shared/precedence_of_stubs.rb
-  - spec/acceptance/shared/request_expectations.rb
-  - spec/acceptance/shared/returning_declared_responses.rb
-  - spec/acceptance/shared/stubbing_requests.rb
-  - spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
-  - spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
-  - spec/acceptance/webmock_shared.rb
-  - spec/quality_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/example_curl_output.txt
-  - spec/support/my_rack_app.rb
-  - spec/support/network_connection.rb
-  - spec/support/webmock_server.rb
-  - spec/unit/errors_spec.rb
-  - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
-  - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
-  - spec/unit/rack_response_spec.rb
-  - spec/unit/request_execution_verifier_spec.rb
-  - spec/unit/request_pattern_spec.rb
-  - spec/unit/request_registry_spec.rb
-  - spec/unit/request_signature_spec.rb
-  - spec/unit/request_stub_spec.rb
-  - spec/unit/response_spec.rb
-  - spec/unit/stub_registry_spec.rb
-  - spec/unit/stub_request_snippet_spec.rb
-  - spec/unit/util/hash_counter_spec.rb
-  - spec/unit/util/hash_keys_stringifier_spec.rb
-  - spec/unit/util/headers_spec.rb
-  - spec/unit/util/json_spec.rb
-  - spec/unit/util/uri_spec.rb
-  - spec/unit/webmock_spec.rb
-  - test/http_request.rb
-  - test/shared_test.rb
-  - test/test_helper.rb
-  - test/test_webmock.rb
-  - webmock.gemspec
-has_rdoc: true
+- .gemtest
+- .gitignore
+- .rspec-tm
+- .rvmrc
+- .travis.yml
+- CHANGELOG.md
+- Gemfile
+- Guardfile
+- LICENSE
+- README.md
+- Rakefile
+- lib/webmock.rb
+- lib/webmock/api.rb
+- lib/webmock/assertion_failure.rb
+- lib/webmock/callback_registry.rb
+- lib/webmock/config.rb
+- lib/webmock/cucumber.rb
+- lib/webmock/deprecation.rb
+- lib/webmock/errors.rb
+- lib/webmock/http_lib_adapters/curb_adapter.rb
+- lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb
+- lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
+- lib/webmock/http_lib_adapters/em_http_request_adapter.rb
+- lib/webmock/http_lib_adapters/http_lib_adapter.rb
+- lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb
+- lib/webmock/http_lib_adapters/httpclient_adapter.rb
+- lib/webmock/http_lib_adapters/net_http.rb
+- lib/webmock/http_lib_adapters/net_http_response.rb
+- lib/webmock/http_lib_adapters/patron_adapter.rb
+- lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- lib/webmock/minitest.rb
+- lib/webmock/rack_response.rb
+- lib/webmock/request_execution_verifier.rb
+- lib/webmock/request_pattern.rb
+- lib/webmock/request_registry.rb
+- lib/webmock/request_signature.rb
+- lib/webmock/request_stub.rb
+- lib/webmock/response.rb
+- lib/webmock/responses_sequence.rb
+- lib/webmock/rspec.rb
+- lib/webmock/rspec/matchers.rb
+- lib/webmock/rspec/matchers/request_pattern_matcher.rb
+- lib/webmock/rspec/matchers/webmock_matcher.rb
+- lib/webmock/stub_registry.rb
+- lib/webmock/stub_request_snippet.rb
+- lib/webmock/test_unit.rb
+- lib/webmock/util/hash_counter.rb
+- lib/webmock/util/hash_keys_stringifier.rb
+- lib/webmock/util/headers.rb
+- lib/webmock/util/json.rb
+- lib/webmock/util/uri.rb
+- lib/webmock/version.rb
+- lib/webmock/webmock.rb
+- minitest/test_helper.rb
+- minitest/test_webmock.rb
+- minitest/webmock_spec.rb
+- spec/acceptance/curb/curb_spec.rb
+- spec/acceptance/curb/curb_spec_helper.rb
+- spec/acceptance/em_http_request/em_http_request_spec.rb
+- spec/acceptance/em_http_request/em_http_request_spec_helper.rb
+- spec/acceptance/httpclient/httpclient_spec.rb
+- spec/acceptance/httpclient/httpclient_spec_helper.rb
+- spec/acceptance/net_http/net_http_shared.rb
+- spec/acceptance/net_http/net_http_spec.rb
+- spec/acceptance/net_http/net_http_spec_helper.rb
+- spec/acceptance/net_http/real_net_http_spec.rb
+- spec/acceptance/patron/patron_spec.rb
+- spec/acceptance/patron/patron_spec_helper.rb
+- spec/acceptance/shared/allowing_and_disabling_net_connect.rb
+- spec/acceptance/shared/callbacks.rb
+- spec/acceptance/shared/enabling_and_disabling_webmock.rb
+- spec/acceptance/shared/precedence_of_stubs.rb
+- spec/acceptance/shared/request_expectations.rb
+- spec/acceptance/shared/returning_declared_responses.rb
+- spec/acceptance/shared/stubbing_requests.rb
+- spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
+- spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
+- spec/acceptance/webmock_shared.rb
+- spec/quality_spec.rb
+- spec/spec_helper.rb
+- spec/support/example_curl_output.txt
+- spec/support/my_rack_app.rb
+- spec/support/network_connection.rb
+- spec/support/webmock_server.rb
+- spec/unit/errors_spec.rb
+- spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
+- spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/rack_response_spec.rb
+- spec/unit/request_execution_verifier_spec.rb
+- spec/unit/request_pattern_spec.rb
+- spec/unit/request_registry_spec.rb
+- spec/unit/request_signature_spec.rb
+- spec/unit/request_stub_spec.rb
+- spec/unit/response_spec.rb
+- spec/unit/stub_registry_spec.rb
+- spec/unit/stub_request_snippet_spec.rb
+- spec/unit/util/hash_counter_spec.rb
+- spec/unit/util/hash_keys_stringifier_spec.rb
+- spec/unit/util/headers_spec.rb
+- spec/unit/util/json_spec.rb
+- spec/unit/util/uri_spec.rb
+- spec/unit/webmock_spec.rb
+- test/http_request.rb
+- test/shared_test.rb
+- test/test_helper.rb
+- test/test_webmock.rb
+- webmock.gemspec
 homepage: http://github.com/bblimke/webmock
 licenses: []
 
@@ -251,74 +309,80 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.5.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
-  - spec/acceptance/curb/curb_spec.rb
-  - spec/acceptance/curb/curb_spec_helper.rb
-  - spec/acceptance/em_http_request/em_http_request_spec.rb
-  - spec/acceptance/em_http_request/em_http_request_spec_helper.rb
-  - spec/acceptance/httpclient/httpclient_spec.rb
-  - spec/acceptance/httpclient/httpclient_spec_helper.rb
-  - spec/acceptance/net_http/net_http_shared.rb
-  - spec/acceptance/net_http/net_http_spec.rb
-  - spec/acceptance/net_http/net_http_spec_helper.rb
-  - spec/acceptance/net_http/real_net_http_spec.rb
-  - spec/acceptance/patron/patron_spec.rb
-  - spec/acceptance/patron/patron_spec_helper.rb
-  - spec/acceptance/shared/allowing_and_disabling_net_connect.rb
-  - spec/acceptance/shared/callbacks.rb
-  - spec/acceptance/shared/enabling_and_disabling_webmock.rb
-  - spec/acceptance/shared/precedence_of_stubs.rb
-  - spec/acceptance/shared/request_expectations.rb
-  - spec/acceptance/shared/returning_declared_responses.rb
-  - spec/acceptance/shared/stubbing_requests.rb
-  - spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
-  - spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
-  - spec/acceptance/webmock_shared.rb
-  - spec/quality_spec.rb
-  - spec/spec_helper.rb
-  - spec/support/example_curl_output.txt
-  - spec/support/my_rack_app.rb
-  - spec/support/network_connection.rb
-  - spec/support/webmock_server.rb
-  - spec/unit/errors_spec.rb
-  - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
-  - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
-  - spec/unit/rack_response_spec.rb
-  - spec/unit/request_execution_verifier_spec.rb
-  - spec/unit/request_pattern_spec.rb
-  - spec/unit/request_registry_spec.rb
-  - spec/unit/request_signature_spec.rb
-  - spec/unit/request_stub_spec.rb
-  - spec/unit/response_spec.rb
-  - spec/unit/stub_registry_spec.rb
-  - spec/unit/stub_request_snippet_spec.rb
-  - spec/unit/util/hash_counter_spec.rb
-  - spec/unit/util/hash_keys_stringifier_spec.rb
-  - spec/unit/util/headers_spec.rb
-  - spec/unit/util/json_spec.rb
-  - spec/unit/util/uri_spec.rb
-  - spec/unit/webmock_spec.rb
-  - test/http_request.rb
-  - test/shared_test.rb
-  - test/test_helper.rb
-  - test/test_webmock.rb
+- spec/acceptance/curb/curb_spec.rb
+- spec/acceptance/curb/curb_spec_helper.rb
+- spec/acceptance/em_http_request/em_http_request_spec.rb
+- spec/acceptance/em_http_request/em_http_request_spec_helper.rb
+- spec/acceptance/httpclient/httpclient_spec.rb
+- spec/acceptance/httpclient/httpclient_spec_helper.rb
+- spec/acceptance/net_http/net_http_shared.rb
+- spec/acceptance/net_http/net_http_spec.rb
+- spec/acceptance/net_http/net_http_spec_helper.rb
+- spec/acceptance/net_http/real_net_http_spec.rb
+- spec/acceptance/patron/patron_spec.rb
+- spec/acceptance/patron/patron_spec_helper.rb
+- spec/acceptance/shared/allowing_and_disabling_net_connect.rb
+- spec/acceptance/shared/callbacks.rb
+- spec/acceptance/shared/enabling_and_disabling_webmock.rb
+- spec/acceptance/shared/precedence_of_stubs.rb
+- spec/acceptance/shared/request_expectations.rb
+- spec/acceptance/shared/returning_declared_responses.rb
+- spec/acceptance/shared/stubbing_requests.rb
+- spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
+- spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
+- spec/acceptance/webmock_shared.rb
+- spec/quality_spec.rb
+- spec/spec_helper.rb
+- spec/support/example_curl_output.txt
+- spec/support/my_rack_app.rb
+- spec/support/network_connection.rb
+- spec/support/webmock_server.rb
+- spec/unit/errors_spec.rb
+- spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
+- spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/rack_response_spec.rb
+- spec/unit/request_execution_verifier_spec.rb
+- spec/unit/request_pattern_spec.rb
+- spec/unit/request_registry_spec.rb
+- spec/unit/request_signature_spec.rb
+- spec/unit/request_stub_spec.rb
+- spec/unit/response_spec.rb
+- spec/unit/stub_registry_spec.rb
+- spec/unit/stub_request_snippet_spec.rb
+- spec/unit/util/hash_counter_spec.rb
+- spec/unit/util/hash_keys_stringifier_spec.rb
+- spec/unit/util/headers_spec.rb
+- spec/unit/util/json_spec.rb
+- spec/unit/util/uri_spec.rb
+- spec/unit/webmock_spec.rb
+- test/http_request.rb
+- test/shared_test.rb
+- test/test_helper.rb
+- test/test_webmock.rb