vcr 1.5.1 → 1.6.0

data/spec/vcr/http_stubbing_adapters/multi_object_proxy_spec.rb

@@ -20,7 +20,7 @@ module VCR
         inst_methods.should_not include(:send, :object_id, :__id__)
       end
 
-      describe '#proxies_objects' do
+      describe '#proxied_objects' do
         it 'returns the proxied objects' do
           subject.proxied_objects.should == [mock1, mock2]
         end

data/spec/vcr/http_stubbing_adapters/typhoeus_spec.rb

@@ -11,8 +11,8 @@ describe VCR::HttpStubbingAdapters::Typhoeus do
   it_behaves_like 'an http stubbing adapter', ['typhoeus'], [:method, :uri, :host, :path, :body, :headers]
 
   it_performs('version checking',
-    :valid    => %w[ 0.2.0 0.2.99 ],
-    :too_low  => %w[ 0.1.0 0.1.31 ],
+    :valid    => %w[ 0.2.1 0.2.99 ],
+    :too_low  => %w[ 0.1.0 0.1.31 0.2.0 ],
     :too_high => %w[ 0.3.0 1.0.0 ]
   ) do
     disable_warnings

data/spec/vcr/middleware/faraday_spec.rb

@@ -13,7 +13,7 @@ describe VCR::Middleware::Faraday do
     let(:env_hash) { { :url => 'http://localhost:3000/' } }
 
     before(:each) do
-      VCR::HttpStubbingAdapters::Faraday.ignore_localhost = true
+      VCR::HttpStubbingAdapters::Faraday.ignored_hosts = ['localhost']
     end
 
     it 'uses a cassette when the app is called' do

data/spec/vcr/structs/http_interaction_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe VCR::HTTPInteraction do
+  %w( uri method ).each do |attr|
+    it "delegates :#{attr} to the request signature" do
+      sig = mock('request signature')
+      sig.should_receive(attr).and_return(:the_value)
+      instance = described_class.new(sig, nil)
+      instance.send(attr).should == :the_value
+    end
+  end
+
+  describe '#ignored?' do
+    it 'returns false by default' do
+      should_not be_ignored
+    end
+
+    it 'returns true when #ignore! has been called' do
+      subject.ignore!
+      should be_ignored
+    end
+  end
+end

data/spec/vcr/structs/request_spec.rb

@@ -0,0 +1,54 @@
+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 == 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 '.from_net_http_request' do
+    let(:net_http) { YAML.load(File.read("#{VCR::SPEC_ROOT}/fixtures/#{YAML_SERIALIZATION_VERSION}/example_net_http.yml")) }
+    let(:request)  { YAML.load(File.read("#{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 == :post  }
+    its(:body)    { should == 'id=7'  }
+    its(:headers) { should == { "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 == 'foo/bar'
+    end
+  end
+
+  it_performs 'uri normalization' do
+    def instance(uri)
+      VCR::Request.new(:get, uri, '', {})
+    end
+  end
+
+  it_performs 'header normalization' do
+    def with_headers(headers)
+      described_class.new(:get, 'http://example.com/', nil, headers)
+    end
+  end
+
+  it_performs 'body normalization' do
+    def instance(body)
+      described_class.new(:get, 'http://example.com/', body, {})
+    end
+  end
+end

data/spec/vcr/structs/response_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe VCR::Response do
+  describe '.from_net_http_response' do
+    let(:response) { YAML.load(File.read("#{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 == 'The response from example.com' }
+    its(:http_version) { should == '1.1' }
+    its(:headers)      { should == {
+      "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 == :the_status
+    end
+  end
+
+  it_performs 'header normalization' do
+    def with_headers(headers)
+      described_class.new(:status, headers, nil, '1.1')
+    end
+  end
+
+  it_performs 'body normalization' do
+    def instance(body)
+      described_class.new(:status, {}, body, '1.1')
+    end
+  end
+end

data/spec/vcr/structs/response_status_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe VCR::ResponseStatus do
+  describe '.from_net_http_response' do
+    let(:response) { YAML.load(File.read("#{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 == 200 }
+    its(:message) { should == 'OK' }
+  end
+
+  it_performs 'status message normalization' do
+    def instance(message)
+      described_class.new(200, message)
+    end
+  end
+end

data/spec/vcr_spec.rb

@@ -107,15 +107,16 @@ describe VCR do
       VCR.config { }
     end
 
-    [true, false].each do |val|
-      it "sets http_stubbing_adapter.ignore_localhost to #{val} when so configured" do
-        VCR.config do |c|
-          c.ignore_localhost = val
+    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
 
-          # this is mocked at this point since it should be set when the block completes.
-          VCR.http_stubbing_adapter.should_receive(:ignore_localhost=).with(val)
-        end
+      VCR.config do |c|
+        c.stub_with :fakeweb
+        c.ignore_hosts 'example.com', 'example.org'
       end
+
+      VCR::HttpStubbingAdapters::FakeWeb.send(:ignored_hosts).should == %w[example.com example.org]
     end
   end
 
@@ -174,63 +175,34 @@ describe VCR do
   end
 
   describe '.record_http_interaction' do
-    before(:each) { VCR.stub!(:current_cassette).and_return(current_cassette) }
+    before(:each) { VCR.stub(:current_cassette => current_cassette) }
+    let(:uri) { 'http://some-host.com/' }
+    let(:interaction) { stub(:uri => uri) }
 
-    def self.with_ignore_localhost_set_to(value, &block)
-      context "when http_stubbing_adapter.ignore_localhost is #{value}" do
-        before(:each) { VCR.http_stubbing_adapter.stub!(:ignore_localhost?).and_return(value) }
-
-        instance_eval(&block)
-      end
-    end
-
-    def self.it_records_requests_to(host)
-      it "records requests to #{host}" do
-        interaction = stub(:uri => "http://#{host}/")
-        current_cassette.should_receive(:record_http_interaction).with(interaction).once
-        VCR.record_http_interaction(interaction)
-      end
-    end
+    context 'when there is not a current cassette' do
+      let(:current_cassette) { nil }
 
-    def self.it_does_not_record_requests_to(host)
-      it "does not record requests to #{host}" do
-        interaction = stub(:uri => "http://#{host}/")
-        current_cassette.should_receive(:record_http_interaction).never unless current_cassette.nil?
+      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
 
     context 'when there is a current cassette' do
-      let(:current_cassette) { mock('current casette') }
-
-      with_ignore_localhost_set_to(true) do
-        it_records_requests_to "example.com"
-
-        VCR::LOCALHOST_ALIASES.each do |host|
-          it_does_not_record_requests_to host
-        end
-      end
+      let(:current_cassette) { mock('current cassette') }
 
-      with_ignore_localhost_set_to(false) do
-        (VCR::LOCALHOST_ALIASES + ['example.com']).each do |host|
-          it_records_requests_to host
-        end
-      end
-    end
-
-    context 'when there is not a current cassette' do
-      let(:current_cassette) { nil }
-
-      with_ignore_localhost_set_to(true) do
-        (VCR::LOCALHOST_ALIASES + ['example.com']).each do |host|
-          it_does_not_record_requests_to host
-        end
+      it 'records the request when the uri should not be ignored' do
+        VCR::Config.stub(:uri_should_be_ignored?).with(uri).and_return(false)
+        current_cassette.should_receive(:record_http_interaction).with(interaction)
+        VCR.record_http_interaction(interaction)
       end
 
-      with_ignore_localhost_set_to(false) do
-        (VCR::LOCALHOST_ALIASES + ['example.com']).each do |host|
-          it_does_not_record_requests_to host
-        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)
+        current_cassette.should_not_receive(:record_http_interaction)
+        VCR.record_http_interaction(interaction)
       end
     end
   end

data/vcr.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     'patron'          => '~> 0.4.6',
     'em-http-request' => '~> 0.2.7',
     'curb'            => '~> 0.7.8',
-    'typhoeus'        => '~> 0.2.0'
+    'typhoeus'        => '~> 0.2.1'
   }.each do |lib, version|
     s.add_development_dependency lib, version
   end unless RUBY_PLATFORM == 'java'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 1
-  - 5
-  - 1
-  version: 1.5.1
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
         - 5
         - 3
         version: 0.5.3
+  type: :development
   name: faraday
   prerelease: false
   version_requirements: *id001
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +46,10 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  type: :development
   name: fakeweb
   prerelease: false
   version_requirements: *id002
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,10 +63,10 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
+  type: :development
   name: httpclient
   prerelease: false
   version_requirements: *id003
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,10 +79,10 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  type: :development
   name: rake
   prerelease: false
   version_requirements: *id004
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -95,10 +95,10 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
+  type: :development
   name: timecop
   prerelease: false
   version_requirements: *id005
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -111,10 +111,10 @@ dependencies:
         - 9
         - 2
         version: 2.9.2
+  type: :development
   name: shoulda
   prerelease: false
   version_requirements: *id006
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -127,10 +127,10 @@ dependencies:
         - 4
         - 0
         version: 2.4.0
+  type: :development
   name: rspec
   prerelease: false
   version_requirements: *id007
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -143,10 +143,10 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+  type: :development
   name: rack
   prerelease: false
   version_requirements: *id008
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -159,10 +159,10 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
+  type: :development
   name: aruba
   prerelease: false
   version_requirements: *id009
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -175,10 +175,10 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
+  type: :development
   name: sinatra
   prerelease: false
   version_requirements: *id010
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -191,10 +191,10 @@ dependencies:
         - 0
         - 7
         version: 1.0.7
+  type: :development
   name: bundler
   prerelease: false
   version_requirements: *id011
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -207,10 +207,10 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
+  type: :development
   name: cucumber
   prerelease: false
   version_requirements: *id012
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -223,10 +223,10 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
+  type: :development
   name: webmock
   prerelease: false
   version_requirements: *id013
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -239,10 +239,10 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
+  type: :development
   name: curb
   prerelease: false
   version_requirements: *id014
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -255,10 +255,10 @@ dependencies:
         - 4
         - 6
         version: 0.4.6
+  type: :development
   name: patron
   prerelease: false
   version_requirements: *id015
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -271,26 +271,26 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
+  type: :development
   name: em-http-request
   prerelease: false
   version_requirements: *id016
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
+  type: :development
   name: typhoeus
   prerelease: false
   version_requirements: *id017
-  type: :development
 description: VCR provides helpers to record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.  It works with any ruby testing framework, and provides built-in support for cucumber.
 email: myron.marston@gmail.com
 executables: []
@@ -311,7 +311,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- TODO.md
 - benchmarks/http_stubbing_libraries.rb
 - cucumber.yml
 - features/.nav
@@ -325,6 +324,7 @@ files:
 - features/configuration/cassette_library_dir.feature
 - features/configuration/default_cassette_options.feature
 - features/configuration/hooks.feature
+- features/configuration/ignore_hosts.feature
 - features/configuration/ignore_localhost.feature
 - features/configuration/stub_with.feature
 - features/http_libraries/em_http_request.feature
@@ -365,10 +365,18 @@ files:
 - lib/vcr/middleware/rack.rb
 - lib/vcr/request_matcher.rb
 - lib/vcr/rspec.rb
-- lib/vcr/structs.rb
+- lib/vcr/structs/http_interaction.rb
+- lib/vcr/structs/normalizers/body.rb
+- lib/vcr/structs/normalizers/header.rb
+- lib/vcr/structs/normalizers/status_message.rb
+- lib/vcr/structs/normalizers/uri.rb
+- lib/vcr/structs/request.rb
+- lib/vcr/structs/response.rb
+- lib/vcr/structs/response_status.rb
 - lib/vcr/util/basic_object.rb
 - lib/vcr/util/internet_connection.rb
 - lib/vcr/util/ping.rb
+- lib/vcr/util/regexes.rb
 - lib/vcr/version.rb
 - script/FullBuildRakeFile
 - script/full_build
@@ -397,6 +405,7 @@ files:
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/http_stubbing_adapter.rb
+- spec/support/normalizers.rb
 - spec/support/ruby_interpreter.rb
 - spec/support/sinatra_app.rb
 - spec/support/temp_cassette_library_dir.rb
@@ -421,7 +430,10 @@ files:
 - spec/vcr/middleware/rack_spec.rb
 - spec/vcr/request_matcher_spec.rb
 - spec/vcr/rspec_spec.rb
-- spec/vcr/structs_spec.rb
+- spec/vcr/structs/http_interaction_spec.rb
+- spec/vcr/structs/request_spec.rb
+- spec/vcr/structs/response_spec.rb
+- spec/vcr/structs/response_status_spec.rb
 - spec/vcr/util/internet_connection_spec.rb
 - spec/vcr/version_spec.rb
 - spec/vcr_spec.rb
@@ -460,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
@@ -475,6 +487,7 @@ test_files:
 - features/configuration/cassette_library_dir.feature
 - features/configuration/default_cassette_options.feature
 - features/configuration/hooks.feature
+- features/configuration/ignore_hosts.feature
 - features/configuration/ignore_localhost.feature
 - features/configuration/stub_with.feature
 - features/http_libraries/em_http_request.feature
@@ -518,6 +531,7 @@ test_files:
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/http_stubbing_adapter.rb
+- spec/support/normalizers.rb
 - spec/support/ruby_interpreter.rb
 - spec/support/sinatra_app.rb
 - spec/support/temp_cassette_library_dir.rb
@@ -542,7 +556,10 @@ test_files:
 - spec/vcr/middleware/rack_spec.rb
 - spec/vcr/request_matcher_spec.rb
 - spec/vcr/rspec_spec.rb
-- spec/vcr/structs_spec.rb
+- spec/vcr/structs/http_interaction_spec.rb
+- spec/vcr/structs/request_spec.rb
+- spec/vcr/structs/response_spec.rb
+- spec/vcr/structs/response_status_spec.rb
 - spec/vcr/util/internet_connection_spec.rb
 - spec/vcr/version_spec.rb
 - spec/vcr_spec.rb