vcr 2.0.0.beta2 → 2.0.0.rc1

data/spec/vcr_spec.rb

@@ -94,7 +94,7 @@ describe VCR do
 
     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)
+      VCR.http_interactions.should be(VCR::Cassette::HTTPInteractionList::NullList)
     end
   end
 
@@ -157,7 +157,7 @@ describe VCR do
     end
   end
 
-  describe '.serializers' do
+  describe '.cassette_serializers' do
     it 'always returns the same memoized cassette serializers instance' do
       VCR.cassette_serializers.should be_a(VCR::Cassette::Serializers)
       VCR.cassette_serializers.should be(VCR.cassette_serializers)

data/vcr.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.version = VCR.version
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 1.8.6'
+  s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = '>= 1.3.5'
 
   {
@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
     'cucumber'        => '~> 1.0.3',
     'aruba'           => '~> 0.4.6',
 
-    'rspec'           => '~> 2.7',
+    'rspec'           => '~> 2.8.0.rc1',
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
-    'webmock'         => '~> 1.7.4',
+    'webmock'         => '~> 1.7.8',
     'addressable'     => '~> 2.2.6',
 
     'faraday'         => '~> 0.7.2',
     'httpclient'      => '~> 2.1.5.2',
-    'excon'           => '~> 0.6.5',
+    'excon'           => '~> 0.7.9',
 
     'timecop'         => '~> 0.3.5',
     'rack'            => '1.1.0',
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     'patron'          => '~> 0.4.15',
     'em-http-request' => '~> 0.3.0',
     'curb'            => '0.7.15',
-    'typhoeus'        => '~> 0.3.2'
+    'typhoeus'        => '~> 0.3.3'
   }.each do |lib, version|
     s.add_development_dependency lib, version
   end unless RUBY_PLATFORM == 'java'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 62196455
+  hash: 15424087
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
-  - beta
-  - 2
-  version: 2.0.0.beta2
+  - rc
+  - 1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Myron Marston
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -138,11 +138,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 15424215
         segments: 
         - 2
-        - 7
-        version: "2.7"
+        - 8
+        - 0
+        - rc
+        - 1
+        version: 2.8.0.rc1
   name: rspec
   type: :development
   prerelease: false
@@ -233,12 +236,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 17
         segments: 
         - 0
-        - 6
-        - 5
-        version: 0.6.5
+        - 7
+        - 9
+        version: 0.7.9
   name: excon
   type: :development
   prerelease: false
@@ -265,12 +268,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 1
         - 7
-        - 4
-        version: 1.7.4
+        - 8
+        version: 1.7.8
   name: webmock
   type: :development
   prerelease: false
@@ -329,12 +332,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 3
+        version: 0.3.3
   name: typhoeus
   type: :development
   prerelease: false
@@ -355,6 +358,7 @@ files:
 - .rspec
 - .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -377,10 +381,13 @@ files:
 - 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/ignore_request.feature
 - features/getting_started.md
+- features/hooks/after_http_request.feature
+- features/hooks/around_http_request.feature
+- features/hooks/before_http_request.feature
+- features/hooks/before_playback.feature
+- features/hooks/before_record.feature
 - features/http_libraries/em_http_request.feature
 - features/http_libraries/net_http.feature
 - features/middleware/faraday.feature
@@ -405,7 +412,8 @@ files:
 - features/support/http_lib_filters.rb
 - features/support/vcr_cucumber_helpers.rb
 - features/test_frameworks/cucumber.feature
-- features/test_frameworks/rspec.feature
+- features/test_frameworks/rspec_macro.feature
+- features/test_frameworks/rspec_metadata.feature
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
 - lib/vcr.rb
@@ -450,7 +458,7 @@ files:
 - 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/fake_example_responses.yml
 - spec/fixtures/match_requests_on.yml
 - spec/monkey_patches.rb
 - spec/spec_helper.rb
@@ -458,9 +466,11 @@ files:
 - spec/support/http_library_adapters.rb
 - spec/support/ruby_interpreter.rb
 - spec/support/shared_example_groups/hook_into_http_library.rb
+- spec/support/shared_example_groups/request_hooks.rb
 - spec/support/shared_example_groups/version_checking.rb
 - spec/support/sinatra_app.rb
 - spec/support/vcr_localhost_server.rb
+- spec/support/vcr_stub_helpers.rb
 - spec/vcr/cassette/http_interaction_list_spec.rb
 - spec/vcr/cassette/migrator_spec.rb
 - spec/vcr/cassette/reader_spec.rb
@@ -468,9 +478,11 @@ files:
 - spec/vcr/cassette_spec.rb
 - spec/vcr/configuration_spec.rb
 - spec/vcr/deprecations_spec.rb
+- spec/vcr/errors_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
 - spec/vcr/library_hooks/excon_spec.rb
 - spec/vcr/library_hooks/fakeweb_spec.rb
+- spec/vcr/library_hooks/faraday_spec.rb
 - spec/vcr/library_hooks/typhoeus_spec.rb
 - spec/vcr/library_hooks/webmock_spec.rb
 - spec/vcr/library_hooks_spec.rb
@@ -499,12 +511,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
+      hash: 57
       segments: 
       - 1
       - 8
-      - 6
-      version: 1.8.6
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -537,10 +549,13 @@ test_files:
 - 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/ignore_request.feature
 - features/getting_started.md
+- features/hooks/after_http_request.feature
+- features/hooks/around_http_request.feature
+- features/hooks/before_http_request.feature
+- features/hooks/before_playback.feature
+- features/hooks/before_record.feature
 - features/http_libraries/em_http_request.feature
 - features/http_libraries/net_http.feature
 - features/middleware/faraday.feature
@@ -565,7 +580,8 @@ test_files:
 - features/support/http_lib_filters.rb
 - features/support/vcr_cucumber_helpers.rb
 - features/test_frameworks/cucumber.feature
-- features/test_frameworks/rspec.feature
+- features/test_frameworks/rspec_macro.feature
+- features/test_frameworks/rspec_metadata.feature
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
 - spec/capture_warnings.rb
@@ -573,7 +589,7 @@ test_files:
 - 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/fake_example_responses.yml
 - spec/fixtures/match_requests_on.yml
 - spec/monkey_patches.rb
 - spec/spec_helper.rb
@@ -581,9 +597,11 @@ test_files:
 - spec/support/http_library_adapters.rb
 - spec/support/ruby_interpreter.rb
 - spec/support/shared_example_groups/hook_into_http_library.rb
+- spec/support/shared_example_groups/request_hooks.rb
 - spec/support/shared_example_groups/version_checking.rb
 - spec/support/sinatra_app.rb
 - spec/support/vcr_localhost_server.rb
+- spec/support/vcr_stub_helpers.rb
 - spec/vcr/cassette/http_interaction_list_spec.rb
 - spec/vcr/cassette/migrator_spec.rb
 - spec/vcr/cassette/reader_spec.rb
@@ -591,9 +609,11 @@ test_files:
 - spec/vcr/cassette_spec.rb
 - spec/vcr/configuration_spec.rb
 - spec/vcr/deprecations_spec.rb
+- spec/vcr/errors_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
 - spec/vcr/library_hooks/excon_spec.rb
 - spec/vcr/library_hooks/fakeweb_spec.rb
+- spec/vcr/library_hooks/faraday_spec.rb
 - spec/vcr/library_hooks/typhoeus_spec.rb
 - spec/vcr/library_hooks/webmock_spec.rb
 - spec/vcr/library_hooks_spec.rb

data/features/configuration/hooks.feature

@@ -1,270 +0,0 @@
-Feature: Hooks
-
-  VCR provides two global hooks that you can use to customize recording and
-  playback:
-
-    - `before_record`: Called before a cassette is written to disk.
-    - `before_playback`: Called before a cassette sets up its stubs for playback.
-
-  To use these, call `config.before_record` or `config.before_playback` in
-  your `VCR.configure` block.  Provide a block that accepts 0, 1 or 2 arguments.
-
-  The first argument, if the block accepts it, will be an HTTP interaction.
-  Changes you make to the interaction will be reflected in the recording or
-  playback.  You can also call `#ignore!` on the interaction to cause VCR to
-  ignore it.  It will not be recorded or played back (depending on which
-  kind of hook you use).
-
-  The second argument, if the block accepts it, will be the
-  `VCR::Cassette` instance.  This may be useful for hooks that you want to
-  behave differently for different cassettes.
-
-  You can also use tagging to apply hooks to particular cassettes.  Consider
-  this code:
-
-      VCR.configure do |c|
-        c.before_record(:twitter) { ... } # modify the interactions somehow
-      end
-
-      VCR.use_cassette('cassette_1', :tag => :twitter) { ... }
-      VCR.use_cassette('cassette_2') { ... }
-
-  In this example, the hook would apply to the first cassette but not the
-  second cassette.
-
-  You can setup as many hooks as you like; each will be invoked at the
-  appropriate time.
-
-  Background:
-    Given a previously recorded cassette file "cassettes/example.yml" with:
-      """
-      ---
-      http_interactions:
-      - request:
-          method: get
-          uri: http://example.com/foo
-          body: ''
-          headers: {}
-        response:
-          status:
-            code: 200
-            message: OK
-          headers:
-            Content-Type:
-            - text/html;charset=utf-8
-            Content-Length:
-            - '20'
-          body: example.com response
-          http_version: '1.1'
-        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-      recorded_with: VCR 2.0.0
-      """
-
-  Scenario: Replace sensitive data with before_record hook
-    Given a file named "before_record_example.rb" with:
-      """ruby
-      start_sinatra_app(:port => 7777) do
-        get('/') { "Hello <secret>" }
-      end
-
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into :fakeweb
-        c.cassette_library_dir = 'cassettes'
-
-        c.before_record do |i|
-          i.response.body.sub!(/^Hello .*$/, 'Hello World')
-        end
-
-      end
-
-      VCR.use_cassette('recording_example') do
-        Net::HTTP.get_response('localhost', '/', 7777)
-      end
-      """
-    When I run `ruby before_record_example.rb`
-    Then the file "cassettes/recording_example.yml" should contain "body: Hello World"
-     And the file "cassettes/recording_example.yml" should not contain "secret"
-
-  Scenario: Prevent recording by ignoring interaction in before_record hook
-    Given a file named "before_record_ignore.rb" with:
-      """ruby
-      start_sinatra_app(:port => 7777) do
-        get('/') { "Hello World" }
-      end
-
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into :fakeweb
-        c.cassette_library_dir = 'cassettes'
-        c.before_record { |i| i.ignore! }
-      end
-
-      VCR.use_cassette('recording_example') do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
-        puts "Response: #{response.body}"
-      end
-      """
-    When I run `ruby before_record_ignore.rb`
-    Then it should pass with "Response: Hello World"
-    And the file "cassettes/recording_example.yml" should not exist
-
-  Scenario: Change playback with before_playback hook
-    Given a file named "before_playback_example.rb" with:
-      """ruby
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into                :fakeweb
-        c.cassette_library_dir     = 'cassettes'
-
-        c.before_playback do |i|
-          i.response.body = 'response from before_playback'
-        end
-      end
-
-      VCR.use_cassette('example') do
-        response = Net::HTTP.get_response('example.com', '/foo')
-        puts "Response: #{response.body}"
-      end
-      """
-    When I run `ruby before_playback_example.rb`
-    Then it should pass with "Response: response from before_playback"
-
-  Scenario: Prevent playback by ignoring interaction in before_playback hook
-    Given a previously recorded cassette file "cassettes/localhost.yml" with:
-      """
-      ---
-      http_interactions:
-      - request:
-          method: get
-          uri: http://localhost:7777/
-          body: ''
-          headers: {}
-        response:
-          status:
-            code: 200
-            message: OK
-          headers:
-            Content-Type:
-            - text/html;charset=utf-8
-            Content-Length:
-            - '20'
-          body: recorded response
-          http_version: '1.1'
-        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
-      recorded_with: VCR 2.0.0
-      """
-    And a file named "before_playback_ignore.rb" with:
-      """ruby
-      start_sinatra_app(:port => 7777) do
-        get('/') { "sinatra response" }
-      end
-
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into                :fakeweb
-        c.cassette_library_dir     = 'cassettes'
-        c.before_playback { |i| i.ignore! }
-      end
-
-      VCR.use_cassette('localhost', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
-        puts "Response: #{response.body}"
-      end
-      """
-    When I run `ruby before_playback_ignore.rb`
-    Then it should pass with "Response: sinatra response"
-
-  Scenario: Multiple hooks are run in order
-    Given a file named "multiple_hooks.rb" with:
-      """ruby
-      start_sinatra_app(:port => 7777) do
-        get('/') { "Hello World" }
-      end
-
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into :fakeweb
-        c.cassette_library_dir = 'cassettes'
-
-        c.before_record { puts "In before_record hook 1" }
-        c.before_record { puts "In before_record hook 2" }
-
-        c.before_playback { puts "In before_playback hook 1" }
-        c.before_playback { puts "In before_playback hook 2" }
-      end
-
-      VCR.use_cassette('example', :record => :new_episodes) do
-        response = Net::HTTP.get_response('localhost', '/', 7777)
-        puts "Response 1: #{response.body}"
-
-        response = Net::HTTP.get_response('example.com', '/foo')
-        puts "Response 2: #{response.body}"
-      end
-      """
-    When I run `ruby multiple_hooks.rb`
-    Then it should pass with:
-      """
-      In before_playback hook 1
-      In before_playback hook 2
-      Response 1: Hello World
-      Response 2: example.com response
-      In before_record hook 1
-      In before_record hook 2
-      """
-
-  Scenario: Use tagging to apply hooks to only certain cassettes
-    Given a file named "tagged_hooks.rb" with:
-      """ruby
-      start_sinatra_app(:port => 7777) do
-        get('/') { "Hello World" }
-      end
-
-      require 'vcr'
-
-      VCR.configure do |c|
-        c.hook_into :fakeweb
-        c.cassette_library_dir = 'cassettes'
-
-        c.before_record(:tag_1)   { |i| puts "In before_record hook for tag_1 (#{i.response.body})" }
-        c.before_playback(:tag_2) { |i| puts "In before_playback hook for tag_2 (#{i.response.body})" }
-      end
-
-      [:tag_1, :tag_2, nil].each do |tag|
-        puts
-        puts "Using tag: #{tag.inspect}"
-
-        VCR.use_cassette('example', :record => :new_episodes, :tag => tag) do
-          response = Net::HTTP.get_response('localhost', '/', 7777)
-          puts "Response 1: #{response.body}"
-
-          response = Net::HTTP.get_response('example.com', '/foo')
-          puts "Response 2: #{response.body}"
-        end
-      end
-      """
-    When I run `ruby tagged_hooks.rb`
-    Then it should pass with:
-      """
-      Using tag: :tag_1
-      Response 1: Hello World
-      Response 2: example.com response
-      In before_record hook for tag_1 (example.com response)
-      In before_record hook for tag_1 (Hello World)
-
-      Using tag: :tag_2
-      In before_playback hook for tag_2 (example.com response)
-      In before_playback hook for tag_2 (Hello World)
-      Response 1: Hello World
-      Response 2: example.com response
-
-      Using tag: nil
-      Response 1: Hello World
-      Response 2: example.com response
-      """
-