vcr 1.2.0 → 1.3.0

data/spec/support/version_checker.rb

@@ -0,0 +1,29 @@
+shared_examples_for "version checking" do |options|
+  library = described_class.library_name
+
+  describe '#check_version!' do
+    options[:valid].each do |version|
+      it "does nothing when #{library}'s version is #{version}" do
+        stub_version(version)
+        described_class.should_not_receive(:warn)
+        expect { described_class.check_version! }.to_not raise_error
+      end
+    end
+
+    options[:too_low].each do |version|
+      it "raises an error when #{library}'s version is #{version}" do
+        stub_version(version)
+        described_class.should_not_receive(:warn)
+        expect { described_class.check_version! }.to raise_error(/You are using #{library} #{version}.  VCR requires version/)
+      end
+    end
+
+    options[:too_high].each do |version|
+      it "does nothing when #{library}'s version is #{version}" do
+        stub_version(version)
+        described_class.should_receive(:warn).with(/VCR is known to work with #{library}/)
+        expect { described_class.check_version! }.to_not raise_error
+      end
+    end
+  end
+end

data/spec/vcr_spec.rb

@@ -115,22 +115,40 @@ describe VCR 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 == [
+        VCR::HttpStubbingAdapters::FakeWeb,
+        VCR::HttpStubbingAdapters::Typhoeus
+      ]
+    end
+
     {
-      :fakeweb => VCR::HttpStubbingAdapters::FakeWeb,
-      :webmock => VCR::HttpStubbingAdapters::WebMock
-    }.each do |setting, adapter|
-      context "when config http_stubbing_library = :#{setting.to_s}" do
-        before(:each) { VCR::Config.http_stubbing_library = setting }
-
-        it "returns #{adapter}" do
-          subject.should == adapter
-        end
+      :fakeweb  => VCR::HttpStubbingAdapters::FakeWeb,
+      :webmock  => VCR::HttpStubbingAdapters::WebMock
+    }.each do |symbol, klass|
+      it "returns #{klass} for :#{symbol}" do
+        VCR::Config.stub_with symbol
+        VCR.http_stubbing_adapter.should == klass
       end
     end
 
-    it 'raises an error when library is not set' do
-      VCR::Config.http_stubbing_library = nil
-      lambda { subject }.should raise_error(/The http stubbing library is not configured correctly/)
+    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/)
+    end
+
+    it 'raises an error for unsupported stubbing libraries' do
+      VCR::Config.stub_with :unsupported_library
+
+      expect { VCR.http_stubbing_adapter }.to raise_error(ArgumentError, /unsupported_library is not a supported HTTP stubbing library/i)
+    end
+
+    it 'raises an error when no stubbing libraries are configured' do
+      VCR::Config.stub_with
+
+      expect { VCR.http_stubbing_adapter }.to raise_error(ArgumentError, /the http stubbing library is not configured/i)
     end
   end
 

data/vcr.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
     'bundler'         => '~> 1.0.0',
     'rake'            => '~> 0.8.7',
 
-    'rspec'           => '~> 2.0.0',
-    'cucumber'        => '~> 0.8.5',
+    'rspec'           => '~> 2.1.0',
+    'cucumber'        => '~> 0.9.4',
     'aruba'           => '~> 0.2.1',
 
     'fakeweb'         => '~> 1.3.0',
-    'webmock'         => '~> 1.4.0',
+    'webmock'         => '>= 1.5.0',
 
     'httpclient'      => '~> 2.1.5.2',
 
@@ -40,7 +40,8 @@ Gem::Specification.new do |s|
   {
     'patron'          => '~> 0.4.6',
     'em-http-request' => '~> 0.2.7',
-    'curb'            => '~> 0.7.8'
+    'curb'            => '~> 0.7.8',
+    'typhoeus'        => '~> 0.2.0'
   }.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: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.1.0
   requirement: *id005
   type: :development
   name: rspec
@@ -153,12 +153,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 51
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 9
+        - 4
+        version: 0.9.4
   requirement: *id009
   type: :development
   name: cucumber
@@ -167,14 +167,14 @@ dependencies:
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 1
-        - 4
+        - 5
         - 0
-        version: 1.4.0
+        version: 1.5.0
   requirement: *id010
   type: :development
   name: webmock
@@ -227,6 +227,22 @@ dependencies:
   type: :development
   name: em-http-request
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  requirement: *id014
+  type: :development
+  name: typhoeus
+  prerelease: false
 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: []
@@ -240,11 +256,14 @@ files:
 - .gitignore
 - .gitmodules
 - CHANGELOG.md
+- FullBuildRakeFile
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - benchmarks/http_stubbing_libraries.rb
 - features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/regex_cassette.yml
 - features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette1.yml
@@ -276,7 +295,9 @@ files:
 - features/step_definitions/vcr_steps.rb
 - features/support/env.rb
 - features/webmock.feature
+- full_build
 - lib/vcr.rb
+- lib/vcr/basic_object.rb
 - lib/vcr/cassette.rb
 - lib/vcr/config.rb
 - lib/vcr/cucumber_tags.rb
@@ -285,6 +306,8 @@ files:
 - lib/vcr/extensions/net_http_response.rb
 - lib/vcr/http_stubbing_adapters/common.rb
 - lib/vcr/http_stubbing_adapters/fakeweb.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/internet_connection.rb
 - lib/vcr/ping.rb
@@ -319,6 +342,8 @@ files:
 - spec/fixtures/not_1.9.1/fake_example.com_responses.yml
 - spec/fixtures/not_1.9.1/match_requests_on.yml
 - spec/http_stubbing_adapters/fakeweb_spec.rb
+- spec/http_stubbing_adapters/multi_object_proxy_spec.rb
+- spec/http_stubbing_adapters/typhoeus_spec.rb
 - spec/http_stubbing_adapters/webmock_spec.rb
 - spec/internet_connection_spec.rb
 - spec/monkey_patches.rb
@@ -334,6 +359,7 @@ files:
 - spec/support/ruby_interpreter.rb
 - spec/support/temp_cassette_library_dir.rb
 - spec/support/vcr_localhost_server.rb
+- spec/support/version_checker.rb
 - spec/support/webmock_macros.rb
 - spec/vcr_spec.rb
 - spec/version_spec.rb
@@ -434,6 +460,8 @@ test_files:
 - spec/fixtures/not_1.9.1/fake_example.com_responses.yml
 - spec/fixtures/not_1.9.1/match_requests_on.yml
 - spec/http_stubbing_adapters/fakeweb_spec.rb
+- spec/http_stubbing_adapters/multi_object_proxy_spec.rb
+- spec/http_stubbing_adapters/typhoeus_spec.rb
 - spec/http_stubbing_adapters/webmock_spec.rb
 - spec/internet_connection_spec.rb
 - spec/monkey_patches.rb
@@ -449,6 +477,7 @@ test_files:
 - spec/support/ruby_interpreter.rb
 - spec/support/temp_cassette_library_dir.rb
 - spec/support/vcr_localhost_server.rb
+- spec/support/version_checker.rb
 - spec/support/webmock_macros.rb
 - spec/vcr_spec.rb
 - spec/version_spec.rb