vcr 1.11.3 → 2.0.0.beta1

data/spec/vcr/structs/request_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe VCR::Request do
-  describe '#matcher' do
-    it 'returns a matcher with the given request' do
-      req = VCR::Request.new
-      req.matcher([:uri]).request.should eq(req)
-    end
-
-    it 'returns a matcher with the given match_attributes' do
-      req = VCR::Request.new
-      req.matcher([:uri, :headers]).match_attributes.to_a.should =~ [:uri, :headers]
-    end
-  end
-
   describe '#method' do
     subject { VCR::Request.new(:get) }
 
@@ -31,27 +19,6 @@ describe VCR::Request do
     end
   end
 
-  describe '.from_net_http_request' do
-    let(:net_http) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http.yml") }
-    let(:request)  { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_request.yml") }
-    subject { described_class.from_net_http_request(net_http, request) }
-
-    before(:each) do
-      VCR.http_stubbing_adapter.should respond_to(:request_uri)
-      VCR.http_stubbing_adapter.stub!(:request_uri)
-    end
-
-    it            { should be_instance_of(VCR::Request) }
-    its(:method)  { should eq(:post) }
-    its(:body)    { should eq('id=7') }
-    its(:headers) { should eq({ "content-type" => ["application/x-www-form-urlencoded"] }) }
-
-    it 'sets the uri using the http_stubbing_adapter.request_uri' do
-      VCR.http_stubbing_adapter.should_receive(:request_uri).with(net_http, request).and_return('foo/bar')
-      subject.uri.should eq('foo/bar')
-    end
-  end
-
   it_performs 'uri normalization' do
     def instance(uri)
       VCR::Request.new(:get, uri, '', {})

data/spec/vcr/structs/response_spec.rb

@@ -1,30 +1,6 @@
 require 'spec_helper'
 
 describe VCR::Response do
-  describe '.from_net_http_response' do
-    let(:response) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml") }
-    subject { described_class.from_net_http_response(response) }
-
-    it                 { should be_instance_of(described_class) }
-    its(:body)         { should eq('The response from example.com') }
-    its(:http_version) { should eq('1.1') }
-    its(:headers)      { should eq({
-      "last-modified"  => ['Tue, 15 Nov 2005 13:24:10 GMT'],
-      "etag"           => ["\"24ec5-1b6-4059a80bfd280\""],
-      "content-type"   => ["text/html; charset=UTF-8"],
-      "date"           => ['Wed, 31 Mar 2010 02:43:26 GMT'],
-      "server"         => ['Apache/2.2.3 (CentOS)'],
-      "content-length" => ['438'],
-      "accept-ranges"  => ['bytes']
-    }) }
-
-    it 'assigns the status using VCR::ResponseStatus.from_net_http_response' do
-      VCR::ResponseStatus.should respond_to(:from_net_http_response)
-      VCR::ResponseStatus.should_receive(:from_net_http_response).with(response).and_return(:the_status)
-      subject.status.should eq(:the_status)
-    end
-  end
-
   it_performs 'header normalization' do
     def with_headers(headers)
       described_class.new(:status, headers, nil, '1.1')

data/spec/vcr/structs/response_status_spec.rb

@@ -1,15 +1,6 @@
 require 'spec_helper'
 
 describe VCR::ResponseStatus do
-  describe '.from_net_http_response' do
-    let(:response) { VCR::YAML.load_file("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http_response.yml") }
-    subject { described_class.from_net_http_response(response) }
-
-    it            { should be_instance_of(described_class) }
-    its(:code)    { should eq(200) }
-    its(:message) { should eq('OK') }
-  end
-
   it_performs 'status message normalization' do
     def instance(message)
       described_class.new(200, message)

data/spec/vcr/util/hooks_spec.rb

@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe VCR::Hooks do
-  class HooksClass
-    include VCR::Hooks
-  end
+  let(:hooks_class) { Class.new { include VCR::Hooks } }
 
-  subject { HooksClass.new }
+  subject { hooks_class.new }
   let(:invocations) { [] }
 
   before(:each) do
-    subject.instance_eval do
+    hooks_class.instance_eval do
       define_hook :before_foo
       define_hook :before_bar
     end

data/spec/vcr/version_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "VCR.version" do
   subject { VCR.version }
 
-  it { should =~ /\A\d+\.\d+\.\d+\z/ }
+  it { should =~ /\A\d+\.\d+\.\d+(\.\w+)?\z/ }
   its(:parts) { should be_instance_of(Array)  }
   its(:major) { should be_instance_of(Fixnum) }
   its(:minor) { should be_instance_of(Fixnum) }

data/spec/vcr_spec.rb

@@ -86,105 +86,110 @@ describe VCR do
     end
   end
 
-  describe '.config' do
-    it 'yields the configuration object' do
-      yielded_object = nil
-      VCR.config do |obj|
-        yielded_object = obj
-      end
-      yielded_object.should eq(VCR::Config)
+  describe '.http_interactions' do
+    it 'returns the current_cassette.http_interactions when there is a current cassette' do
+      cassette = VCR.insert_cassette("a cassette")
+      VCR.http_interactions.should be(cassette.http_interactions)
     end
 
-    it "sets http_stubbing_adapter.http_connections_allowed to the configured default" do
-      VCR.http_stubbing_adapter.should respond_to(:set_http_connections_allowed_to_default)
-      VCR.http_stubbing_adapter.should_receive(:set_http_connections_allowed_to_default)
-      VCR.config { }
+    it 'returns a null list when there is no current cassette' do
+      VCR.current_cassette.should be_nil
+      VCR.http_interactions.should be_a(VCR::Cassette::HTTPInteractionList::NullList)
     end
+  end
+
+  describe '.real_http_connections_allowed?' do
+    context 'when a cassette is inserted' do
+      it 'returns true if the cassette is recording' do
+        VCR.insert_cassette('foo', :record => :all)
+        VCR.current_cassette.should be_recording
+        VCR.real_http_connections_allowed?.should be_true
+      end
 
-    it "checks the adapted library's version to make sure it's compatible with VCR" do
-      VCR.http_stubbing_adapter.should respond_to(:check_version!)
-      VCR.http_stubbing_adapter.should_receive(:check_version!)
-      VCR.config { }
+      it 'returns false if the cassette is not recording' do
+        VCR.insert_cassette('foo', :record => :none)
+        VCR.current_cassette.should_not be_recording
+        VCR.real_http_connections_allowed?.should be_false
+      end
     end
 
-    it "sets http_stubbing_adapter.ignored_hosts to the configured hosts when the block completes" do
-      VCR::Config.reset!(nil)
-      VCR::HttpStubbingAdapters::FakeWeb.send(:ignored_hosts).should be_empty
+    context 'when no cassette is inserted' do
+      before(:each) { VCR.current_cassette.should be_nil }
 
-      VCR.config do |c|
-        c.stub_with :fakeweb
-        c.ignore_hosts 'example.com', 'example.org'
+      it 'returns true if the allow_http_connections_when_no_cassette option is set to true' do
+        VCR.should be_turned_on
+        VCR.configure { |c| c.allow_http_connections_when_no_cassette = true }
+        VCR.real_http_connections_allowed?.should be_true
       end
 
-      VCR::HttpStubbingAdapters::FakeWeb.send(:ignored_hosts).should eq(%w[example.com example.org])
-    end
-  end
+      it 'returns true if VCR is turned off' do
+        VCR.turn_off!
+        VCR.configure { |c| c.allow_http_connections_when_no_cassette = false }
+        VCR.real_http_connections_allowed?.should be_true
+      end
 
-  describe '.cucumber_tags' do
-    it 'yields a cucumber tags object' do
-      yielded_object = nil
-      VCR.cucumber_tags do |obj|
-        yielded_object = obj
+      it 'returns false if the allow_http_connections_when_no_cassette option is set to false and VCR is turned on' do
+        VCR.should be_turned_on
+        VCR.configure { |c| c.allow_http_connections_when_no_cassette = false }
+        VCR.real_http_connections_allowed?.should be_false
       end
-      yielded_object.should be_instance_of(VCR::CucumberTags)
     end
   end
 
-  describe '.http_stubbing_adapter' do
-    subject { VCR.http_stubbing_adapter }
-    before(:each) do
-      VCR.instance_variable_set(:@http_stubbing_adapter, nil)
-    end
-
-    it 'returns a multi object proxy for the configured stubbing libraries when multiple libs are configured', :unless => RUBY_PLATFORM == 'java' do
-      VCR::Config.stub_with :fakeweb, :typhoeus
-      VCR.http_stubbing_adapter.proxied_objects.should eq([
-        VCR::HttpStubbingAdapters::FakeWeb,
-        VCR::HttpStubbingAdapters::Typhoeus
-      ])
-    end
-
-    {
-      :fakeweb  => VCR::HttpStubbingAdapters::FakeWeb,
-      :webmock  => VCR::HttpStubbingAdapters::WebMock,
-      :faraday  => VCR::HttpStubbingAdapters::Faraday,
-      :excon    => VCR::HttpStubbingAdapters::Excon
-    }.each do |symbol, klass|
-      it "returns #{klass} for :#{symbol}" do
-        VCR::Config.stub_with symbol
-        VCR.http_stubbing_adapter.should eq(klass)
-      end
+  describe '.request_matchers' do
+    it 'always returns the same memoized request matcher registry instance' do
+      VCR.request_matchers.should be_a(VCR::RequestMatcherRegistry)
+      VCR.request_matchers.should be(VCR.request_matchers)
     end
+  end
 
-    it 'calls #after_adapters_loaded on the configured stubbing adapter' do
-      VCR::HttpStubbingAdapters::FakeWeb.should_receive(:after_adapters_loaded)
-      VCR::Config.stub_with :fakeweb
-      VCR.http_stubbing_adapter
+  describe '.request_ignorer' do
+    it 'always returns the same memoized request ignorer instance' do
+      VCR.request_ignorer.should be_a(VCR::RequestIgnorer)
+      VCR.request_ignorer.should be(VCR.request_ignorer)
     end
+  end
 
-    it 'raises an error if both :fakeweb and :webmock are configured' do
-      VCR::Config.stub_with :fakeweb, :webmock
-
-      expect { VCR.http_stubbing_adapter }.to raise_error(ArgumentError, /cannot use both/)
+  describe '.library_hooks' do
+    it 'always returns the same memoized LibraryHooks instance' do
+      VCR.library_hooks.should be_a(VCR::LibraryHooks)
+      VCR.library_hooks.should be(VCR.library_hooks)
     end
+  end
 
-    it 'raises an error for unsupported stubbing libraries' do
-      VCR::Config.stub_with :unsupported_library
+  describe '.configuration' do
+    it 'returns the configuration object' do
+      VCR.configuration.should be_a(VCR::Configuration)
+    end
 
-      expect { VCR.http_stubbing_adapter }.to raise_error(ArgumentError, /unsupported_library is not a supported HTTP stubbing library/i)
+    it 'memoizes the instance' do
+      VCR.configuration.should be(VCR.configuration)
     end
+  end
 
-    it 'raises an error when no stubbing libraries are configured' do
-      VCR::Config.stub_with
+  describe '.configure' do
+    it 'yields the configuration object' do
+      yielded_object = nil
+      VCR.configure do |obj|
+        yielded_object = obj
+      end
+      yielded_object.should eq(VCR.configuration)
+    end
+  end
 
-      expect { VCR.http_stubbing_adapter }.to raise_error(ArgumentError, /the http stubbing library is not configured/i)
+  describe '.cucumber_tags' do
+    it 'yields a cucumber tags object' do
+      yielded_object = nil
+      VCR.cucumber_tags do |obj|
+        yielded_object = obj
+      end
+      yielded_object.should be_instance_of(VCR::CucumberTags)
     end
   end
 
   describe '.record_http_interaction' do
     before(:each) { VCR.stub(:current_cassette => current_cassette) }
-    let(:uri) { 'http://some-host.com/' }
-    let(:interaction) { stub(:uri => uri) }
+    let(:interaction) { stub(:request => stub) }
 
     context 'when there is not a current cassette' do
       let(:current_cassette) { nil }
@@ -192,7 +197,6 @@ describe VCR do
       it 'does not record a request' do
         # we can't set a message expectation on nil, but there is no place to record it to...
         # this mostly tests that there is no error.
-        VCR::Config.stub(:uri_should_be_ignored? => false)
         VCR.record_http_interaction(interaction)
       end
     end
@@ -200,14 +204,14 @@ describe VCR do
     context 'when there is a current cassette' do
       let(:current_cassette) { mock('current cassette') }
 
-      it 'records the request when the uri should not be ignored' do
-        VCR::Config.stub(:uri_should_be_ignored?).with(uri).and_return(false)
+      it 'records the request when it should not be ignored' do
+        VCR.request_ignorer.stub(:ignore?).with(interaction.request).and_return(false)
         current_cassette.should_receive(:record_http_interaction).with(interaction)
         VCR.record_http_interaction(interaction)
       end
 
-      it 'does not record the request when the uri should be ignored' do
-        VCR::Config.stub(:uri_should_be_ignored?).with(uri).and_return(true)
+      it 'does not record the request when it should be ignored' do
+        VCR.request_ignorer.stub(:ignore?).with(interaction.request).and_return(true)
         current_cassette.should_not_receive(:record_http_interaction)
         VCR.record_http_interaction(interaction)
       end
@@ -215,21 +219,11 @@ describe VCR do
   end
 
   describe '.turn_off!' do
-    before(:each) { VCR.http_stubbing_adapter.http_connections_allowed = false }
-
     it 'indicates it is turned off' do
       VCR.turn_off!
       VCR.should_not be_turned_on
     end
 
-    it 'allows http requests' do
-      expect {
-        VCR.turn_off!
-      }.to change {
-        VCR.http_stubbing_adapter.http_connections_allowed?
-      }.from(false).to(true)
-    end
-
     it 'raises an error if a cassette is in use' do
       VCR.insert_cassette('foo')
       expect {
@@ -278,12 +272,6 @@ describe VCR do
       VCR.turn_on!
       VCR.should be_turned_on
     end
-
-    it 'sets http_connections_allowed to the default' do
-      VCR.http_stubbing_adapter.should respond_to(:set_http_connections_allowed_to_default)
-      VCR.http_stubbing_adapter.should_receive(:set_http_connections_allowed_to_default)
-      VCR.turn_on!
-    end
   end
 
   describe '.turned_off' do

data/vcr.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
 
   # Cucumber 1.0.2 seems to have issues installing on 1.8.6 :(.
   {
-    'cucumber'        => '~> 1.0.2',
+    'cucumber'        => '~> 1.0.3',
     'aruba'           => '~> 0.4.6',
   }.each do |lib, version|
     s.add_development_dependency lib, version

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  hash: 62196449
+  prerelease: 6
   segments: 
+  - 2
+  - 0
+  - 0
+  - beta
   - 1
-  - 11
-  - 3
-  version: 1.11.3
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -247,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 3
+        version: 1.0.3
   name: cucumber
   type: :development
   prerelease: false
@@ -348,19 +350,19 @@ files:
 - features/about_these_examples.md
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
+- features/cassettes/exclusive.feature
 - features/cassettes/format.feature
 - features/cassettes/naming.feature
 - features/cassettes/no_cassette.feature
-- features/cassettes/request_matching.feature
 - features/cassettes/update_content_length_header.feature
 - features/configuration/allow_http_connections_when_no_cassette.feature
 - features/configuration/cassette_library_dir.feature
 - features/configuration/default_cassette_options.feature
 - features/configuration/filter_sensitive_data.feature
+- features/configuration/hook_into.feature
 - features/configuration/hooks.feature
 - features/configuration/ignore_hosts.feature
 - features/configuration/ignore_localhost.feature
-- features/configuration/stub_with.feature
 - features/getting_started.md
 - features/http_libraries/em_http_request.feature
 - features/http_libraries/net_http.feature
@@ -370,6 +372,17 @@ files:
 - features/record_modes/new_episodes.feature
 - features/record_modes/none.feature
 - features/record_modes/once.feature
+- features/request_matching/README.md
+- features/request_matching/body.feature
+- features/request_matching/custom_matcher.feature
+- features/request_matching/headers.feature
+- features/request_matching/host.feature
+- features/request_matching/identical_request_sequence.feature
+- features/request_matching/method.feature
+- features/request_matching/path.feature
+- features/request_matching/playback_repeats.feature
+- features/request_matching/uri.feature
+- features/request_matching/uri_without_param.feature
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - features/support/http_lib_filters.rb
@@ -380,27 +393,23 @@ files:
 - features/test_frameworks/test_unit.feature
 - lib/vcr.rb
 - lib/vcr/cassette.rb
+- lib/vcr/cassette/http_interaction_list.rb
 - lib/vcr/cassette/reader.rb
-- lib/vcr/config.rb
-- lib/vcr/deprecations/cassette.rb
-- lib/vcr/deprecations/config.rb
-- lib/vcr/deprecations/http_stubbing_adapters/common.rb
-- lib/vcr/deprecations/http_stubbing_adapters/fakeweb.rb
-- lib/vcr/extensions/net_http.rb
+- lib/vcr/configuration.rb
+- lib/vcr/deprecations.rb
+- lib/vcr/errors.rb
 - lib/vcr/extensions/net_http_response.rb
-- lib/vcr/http_stubbing_adapters/common.rb
-- lib/vcr/http_stubbing_adapters/excon.rb
-- lib/vcr/http_stubbing_adapters/fakeweb.rb
-- lib/vcr/http_stubbing_adapters/faraday.rb
-- lib/vcr/http_stubbing_adapters/multi_object_proxy.rb
-- lib/vcr/http_stubbing_adapters/typhoeus.rb
-- lib/vcr/http_stubbing_adapters/webmock.rb
-- lib/vcr/middleware/cassette_arguments.rb
-- lib/vcr/middleware/common.rb
+- lib/vcr/library_hooks.rb
+- lib/vcr/library_hooks/excon.rb
+- lib/vcr/library_hooks/fakeweb.rb
+- lib/vcr/library_hooks/faraday.rb
+- lib/vcr/library_hooks/typhoeus.rb
+- lib/vcr/library_hooks/webmock.rb
 - lib/vcr/middleware/faraday.rb
 - lib/vcr/middleware/rack.rb
-- lib/vcr/request_matcher.rb
-- lib/vcr/rspec.rb
+- lib/vcr/request_handler.rb
+- lib/vcr/request_ignorer.rb
+- lib/vcr/request_matcher_registry.rb
 - lib/vcr/structs/http_interaction.rb
 - lib/vcr/structs/normalizers/body.rb
 - lib/vcr/structs/normalizers/header.rb
@@ -411,67 +420,46 @@ files:
 - lib/vcr/structs/response_status.rb
 - lib/vcr/test_frameworks/cucumber.rb
 - lib/vcr/test_frameworks/rspec.rb
-- lib/vcr/util/basic_object.rb
 - lib/vcr/util/hooks.rb
 - lib/vcr/util/internet_connection.rb
-- lib/vcr/util/ping.rb
-- lib/vcr/util/regexes.rb
 - lib/vcr/util/variable_args_block_caller.rb
+- lib/vcr/util/version_checker.rb
 - lib/vcr/util/yaml.rb
 - lib/vcr/version.rb
 - script/FullBuildRakeFile
 - script/full_build
 - script/spec
 - spec/capture_warnings.rb
-- spec/fixtures/1.9.1/0_3_1_cassette.yml
-- spec/fixtures/1.9.1/cassette_spec/empty.yml
-- spec/fixtures/1.9.1/cassette_spec/example.yml
-- spec/fixtures/1.9.1/cassette_spec/with_localhost_requests.yml
-- spec/fixtures/1.9.1/example_net_http.yml
-- spec/fixtures/1.9.1/example_net_http_request.yml
-- spec/fixtures/1.9.1/example_net_http_response.yml
-- spec/fixtures/1.9.1/fake_example.com_responses.yml
-- spec/fixtures/1.9.1/match_requests_on.yml
-- spec/fixtures/not_1.9.1/0_3_1_cassette.yml
-- spec/fixtures/not_1.9.1/cassette_spec/empty.yml
-- spec/fixtures/not_1.9.1/cassette_spec/example.yml
-- spec/fixtures/not_1.9.1/cassette_spec/with_localhost_requests.yml
-- spec/fixtures/not_1.9.1/example_net_http.yml
-- spec/fixtures/not_1.9.1/example_net_http_request.yml
-- spec/fixtures/not_1.9.1/example_net_http_response.yml
-- spec/fixtures/not_1.9.1/fake_example.com_responses.yml
-- spec/fixtures/not_1.9.1/match_requests_on.yml
+- spec/fixtures/cassette_spec/empty.yml
+- spec/fixtures/cassette_spec/example.yml
+- spec/fixtures/cassette_spec/with_localhost_requests.yml
+- spec/fixtures/fake_example.com_responses.yml
+- spec/fixtures/match_requests_on.yml
 - spec/monkey_patches.rb
 - spec/spec_helper.rb
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/ruby_interpreter.rb
-- spec/support/shared_example_groups/http_library.rb
-- spec/support/shared_example_groups/http_stubbing_adapter.rb
-- spec/support/shared_example_groups/ignore_localhost_deprecation.rb
+- spec/support/shared_example_groups/hook_into_http_library.rb
 - spec/support/shared_example_groups/normalizers.rb
 - spec/support/shared_example_groups/version_checking.rb
 - spec/support/sinatra_app.rb
 - spec/support/vcr_localhost_server.rb
+- spec/vcr/cassette/http_interaction_list_spec.rb
 - spec/vcr/cassette/reader_spec.rb
 - spec/vcr/cassette_spec.rb
-- spec/vcr/config_spec.rb
-- spec/vcr/deprecations/cassette_spec.rb
-- spec/vcr/deprecations/config_spec.rb
-- spec/vcr/deprecations/http_stubbing_adapters/common_spec.rb
-- spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb
+- spec/vcr/configuration_spec.rb
+- spec/vcr/deprecations_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
-- spec/vcr/extensions/net_http_spec.rb
-- spec/vcr/http_stubbing_adapters/excon_spec.rb
-- spec/vcr/http_stubbing_adapters/fakeweb_spec.rb
-- spec/vcr/http_stubbing_adapters/faraday_spec.rb
-- spec/vcr/http_stubbing_adapters/multi_object_proxy_spec.rb
-- spec/vcr/http_stubbing_adapters/typhoeus_spec.rb
-- spec/vcr/http_stubbing_adapters/webmock_spec.rb
-- spec/vcr/middleware/cassette_arguments_spec.rb
+- spec/vcr/library_hooks/excon_spec.rb
+- spec/vcr/library_hooks/fakeweb_spec.rb
+- spec/vcr/library_hooks/typhoeus_spec.rb
+- spec/vcr/library_hooks/webmock_spec.rb
+- spec/vcr/library_hooks_spec.rb
 - spec/vcr/middleware/faraday_spec.rb
 - spec/vcr/middleware/rack_spec.rb
-- spec/vcr/request_matcher_spec.rb
+- spec/vcr/request_ignorer_spec.rb
+- spec/vcr/request_matcher_registry_spec.rb
 - spec/vcr/structs/http_interaction_spec.rb
 - spec/vcr/structs/request_spec.rb
 - spec/vcr/structs/response_spec.rb
@@ -524,19 +512,19 @@ test_files:
 - features/about_these_examples.md
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
+- features/cassettes/exclusive.feature
 - features/cassettes/format.feature
 - features/cassettes/naming.feature
 - features/cassettes/no_cassette.feature
-- features/cassettes/request_matching.feature
 - features/cassettes/update_content_length_header.feature
 - features/configuration/allow_http_connections_when_no_cassette.feature
 - features/configuration/cassette_library_dir.feature
 - features/configuration/default_cassette_options.feature
 - features/configuration/filter_sensitive_data.feature
+- features/configuration/hook_into.feature
 - features/configuration/hooks.feature
 - features/configuration/ignore_hosts.feature
 - features/configuration/ignore_localhost.feature
-- features/configuration/stub_with.feature
 - features/getting_started.md
 - features/http_libraries/em_http_request.feature
 - features/http_libraries/net_http.feature
@@ -546,6 +534,17 @@ test_files:
 - features/record_modes/new_episodes.feature
 - features/record_modes/none.feature
 - features/record_modes/once.feature
+- features/request_matching/README.md
+- features/request_matching/body.feature
+- features/request_matching/custom_matcher.feature
+- features/request_matching/headers.feature
+- features/request_matching/host.feature
+- features/request_matching/identical_request_sequence.feature
+- features/request_matching/method.feature
+- features/request_matching/path.feature
+- features/request_matching/playback_repeats.feature
+- features/request_matching/uri.feature
+- features/request_matching/uri_without_param.feature
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - features/support/http_lib_filters.rb
@@ -555,55 +554,36 @@ test_files:
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
 - spec/capture_warnings.rb
-- spec/fixtures/1.9.1/0_3_1_cassette.yml
-- spec/fixtures/1.9.1/cassette_spec/empty.yml
-- spec/fixtures/1.9.1/cassette_spec/example.yml
-- spec/fixtures/1.9.1/cassette_spec/with_localhost_requests.yml
-- spec/fixtures/1.9.1/example_net_http.yml
-- spec/fixtures/1.9.1/example_net_http_request.yml
-- spec/fixtures/1.9.1/example_net_http_response.yml
-- spec/fixtures/1.9.1/fake_example.com_responses.yml
-- spec/fixtures/1.9.1/match_requests_on.yml
-- spec/fixtures/not_1.9.1/0_3_1_cassette.yml
-- spec/fixtures/not_1.9.1/cassette_spec/empty.yml
-- spec/fixtures/not_1.9.1/cassette_spec/example.yml
-- spec/fixtures/not_1.9.1/cassette_spec/with_localhost_requests.yml
-- spec/fixtures/not_1.9.1/example_net_http.yml
-- spec/fixtures/not_1.9.1/example_net_http_request.yml
-- spec/fixtures/not_1.9.1/example_net_http_response.yml
-- spec/fixtures/not_1.9.1/fake_example.com_responses.yml
-- spec/fixtures/not_1.9.1/match_requests_on.yml
+- spec/fixtures/cassette_spec/empty.yml
+- spec/fixtures/cassette_spec/example.yml
+- spec/fixtures/cassette_spec/with_localhost_requests.yml
+- spec/fixtures/fake_example.com_responses.yml
+- spec/fixtures/match_requests_on.yml
 - spec/monkey_patches.rb
 - spec/spec_helper.rb
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/ruby_interpreter.rb
-- spec/support/shared_example_groups/http_library.rb
-- spec/support/shared_example_groups/http_stubbing_adapter.rb
-- spec/support/shared_example_groups/ignore_localhost_deprecation.rb
+- spec/support/shared_example_groups/hook_into_http_library.rb
 - spec/support/shared_example_groups/normalizers.rb
 - spec/support/shared_example_groups/version_checking.rb
 - spec/support/sinatra_app.rb
 - spec/support/vcr_localhost_server.rb
+- spec/vcr/cassette/http_interaction_list_spec.rb
 - spec/vcr/cassette/reader_spec.rb
 - spec/vcr/cassette_spec.rb
-- spec/vcr/config_spec.rb
-- spec/vcr/deprecations/cassette_spec.rb
-- spec/vcr/deprecations/config_spec.rb
-- spec/vcr/deprecations/http_stubbing_adapters/common_spec.rb
-- spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb
+- spec/vcr/configuration_spec.rb
+- spec/vcr/deprecations_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
-- spec/vcr/extensions/net_http_spec.rb
-- spec/vcr/http_stubbing_adapters/excon_spec.rb
-- spec/vcr/http_stubbing_adapters/fakeweb_spec.rb
-- spec/vcr/http_stubbing_adapters/faraday_spec.rb
-- spec/vcr/http_stubbing_adapters/multi_object_proxy_spec.rb
-- spec/vcr/http_stubbing_adapters/typhoeus_spec.rb
-- spec/vcr/http_stubbing_adapters/webmock_spec.rb
-- spec/vcr/middleware/cassette_arguments_spec.rb
+- spec/vcr/library_hooks/excon_spec.rb
+- spec/vcr/library_hooks/fakeweb_spec.rb
+- spec/vcr/library_hooks/typhoeus_spec.rb
+- spec/vcr/library_hooks/webmock_spec.rb
+- spec/vcr/library_hooks_spec.rb
 - spec/vcr/middleware/faraday_spec.rb
 - spec/vcr/middleware/rack_spec.rb
-- spec/vcr/request_matcher_spec.rb
+- spec/vcr/request_ignorer_spec.rb
+- spec/vcr/request_matcher_registry_spec.rb
 - spec/vcr/structs/http_interaction_spec.rb
 - spec/vcr/structs/request_spec.rb
 - spec/vcr/structs/response_spec.rb