vcr 2.0.0.beta1 → 2.0.0.beta2

data/spec/vcr_spec.rb

@@ -157,6 +157,13 @@ describe VCR do
     end
   end
 
+  describe '.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)
+    end
+  end
+
   describe '.configuration' do
     it 'returns the configuration object' do
       VCR.configuration.should be_a(VCR::Configuration)

data/vcr.gemspec

@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
     'bundler'         => '~> 1.0.7',
     'rake'            => '~> 0.9.2',
 
-    'rspec'           => '~> 2.6',
+    'cucumber'        => '~> 1.0.3',
+    'aruba'           => '~> 0.4.6',
+
+    'rspec'           => '~> 2.7',
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
@@ -34,24 +37,18 @@ Gem::Specification.new do |s|
 
     'timecop'         => '~> 0.3.5',
     'rack'            => '1.1.0',
-    'sinatra'         => '~> 1.1.0'
-  }.each do |lib, version|
-    s.add_development_dependency lib, version
-  end
+    'sinatra'         => '~> 1.1.0',
 
-  # Cucumber 1.0.2 seems to have issues installing on 1.8.6 :(.
-  {
-    'cucumber'        => '~> 1.0.3',
-    'aruba'           => '~> 0.4.6',
+    'multi_json'      => '~> 1.0.3'
   }.each do |lib, version|
     s.add_development_dependency lib, version
-  end unless RUBY_VERSION == '1.8.6'
+  end
 
   {
     'patron'          => '~> 0.4.15',
     'em-http-request' => '~> 0.3.0',
-    'curb'            => '~> 0.7.15',
-    'typhoeus'        => '~> 0.2.1'
+    'curb'            => '0.7.15',
+    'typhoeus'        => '~> 0.3.2'
   }.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: 62196449
+  hash: 62196455
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 1
-  version: 2.0.0.beta1
+  - 2
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
 - Myron Marston
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -138,11 +138,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 2
-        - 6
-        version: "2.6"
+        - 7
+        version: "2.7"
   name: rspec
   type: :development
   prerelease: false
@@ -151,15 +151,15 @@ dependencies:
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
-        - 1
         - 0
-        version: 1.1.0
-  name: rack
+        - 3
+        version: 1.0.3
+  name: multi_json
   type: :development
   prerelease: false
   requirement: *id009
@@ -167,7 +167,7 @@ dependencies:
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
@@ -175,7 +175,7 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  name: sinatra
+  name: rack
   type: :development
   prerelease: false
   requirement: *id010
@@ -185,13 +185,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 7
-        version: 1.0.7
-  name: bundler
+        - 4
+        - 6
+        version: 0.4.6
+  name: aruba
   type: :development
   prerelease: false
   requirement: *id011
@@ -201,13 +201,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 6
-        - 5
-        version: 0.6.5
-  name: excon
+        version: 1.1.0
+  name: sinatra
   type: :development
   prerelease: false
   requirement: *id012
@@ -217,13 +217,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 1
+        - 0
         - 7
-        - 4
-        version: 1.7.4
-  name: webmock
+        version: 1.0.7
+  name: bundler
   type: :development
   prerelease: false
   requirement: *id013
@@ -233,13 +233,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        - 4
         - 6
-        version: 0.4.6
-  name: aruba
+        - 5
+        version: 0.6.5
+  name: excon
   type: :development
   prerelease: false
   requirement: *id014
@@ -264,6 +264,22 @@ dependencies:
     none: false
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 7
+        - 4
+        version: 1.7.4
+  name: webmock
+  type: :development
+  prerelease: false
+  requirement: *id016
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 29
         segments: 
@@ -274,9 +290,9 @@ dependencies:
   name: curb
   type: :development
   prerelease: false
-  requirement: *id016
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -290,9 +306,9 @@ dependencies:
   name: patron
   type: :development
   prerelease: false
-  requirement: *id017
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -306,23 +322,23 @@ dependencies:
   name: em-http-request
   type: :development
   prerelease: false
-  requirement: *id018
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 23
         segments: 
         - 0
+        - 3
         - 2
-        - 1
-        version: 0.2.1
+        version: 0.3.2
   name: typhoeus
   type: :development
   prerelease: false
-  requirement: *id019
+  requirement: *id020
 description: VCR provides a simple API to record and replay your test suite's HTTP interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries and testing frameworks.
 email: myron.marston@gmail.com
 executables: []
@@ -344,6 +360,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Upgrade.md
 - benchmarks/http_stubbing_libraries.rb
 - cucumber.yml
 - features/.nav
@@ -394,7 +411,13 @@ files:
 - lib/vcr.rb
 - lib/vcr/cassette.rb
 - lib/vcr/cassette/http_interaction_list.rb
+- lib/vcr/cassette/migrator.rb
 - lib/vcr/cassette/reader.rb
+- lib/vcr/cassette/serializers.rb
+- lib/vcr/cassette/serializers/json.rb
+- lib/vcr/cassette/serializers/psych.rb
+- lib/vcr/cassette/serializers/syck.rb
+- lib/vcr/cassette/serializers/yaml.rb
 - lib/vcr/configuration.rb
 - lib/vcr/deprecations.rb
 - lib/vcr/errors.rb
@@ -410,26 +433,20 @@ files:
 - 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
-- 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/structs.rb
+- lib/vcr/tasks/vcr.rake
 - lib/vcr/test_frameworks/cucumber.rb
 - lib/vcr/test_frameworks/rspec.rb
 - lib/vcr/util/hooks.rb
 - lib/vcr/util/internet_connection.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/cassette_spec/1_x_cassette.yml
 - spec/fixtures/cassette_spec/empty.yml
 - spec/fixtures/cassette_spec/example.yml
 - spec/fixtures/cassette_spec/with_localhost_requests.yml
@@ -441,12 +458,13 @@ 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/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/migrator_spec.rb
 - spec/vcr/cassette/reader_spec.rb
+- spec/vcr/cassette/serializers_spec.rb
 - spec/vcr/cassette_spec.rb
 - spec/vcr/configuration_spec.rb
 - spec/vcr/deprecations_spec.rb
@@ -460,10 +478,7 @@ files:
 - spec/vcr/middleware/rack_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
-- spec/vcr/structs/response_status_spec.rb
+- spec/vcr/structs_spec.rb
 - spec/vcr/test_frameworks/cucumber_spec.rb
 - spec/vcr/test_frameworks/rspec_spec.rb
 - spec/vcr/util/hooks_spec.rb
@@ -554,6 +569,7 @@ test_files:
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
 - spec/capture_warnings.rb
+- spec/fixtures/cassette_spec/1_x_cassette.yml
 - spec/fixtures/cassette_spec/empty.yml
 - spec/fixtures/cassette_spec/example.yml
 - spec/fixtures/cassette_spec/with_localhost_requests.yml
@@ -565,12 +581,13 @@ 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/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/migrator_spec.rb
 - spec/vcr/cassette/reader_spec.rb
+- spec/vcr/cassette/serializers_spec.rb
 - spec/vcr/cassette_spec.rb
 - spec/vcr/configuration_spec.rb
 - spec/vcr/deprecations_spec.rb
@@ -584,10 +601,7 @@ test_files:
 - spec/vcr/middleware/rack_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
-- spec/vcr/structs/response_status_spec.rb
+- spec/vcr/structs_spec.rb
 - spec/vcr/test_frameworks/cucumber_spec.rb
 - spec/vcr/test_frameworks/rspec_spec.rb
 - spec/vcr/util/hooks_spec.rb

data/lib/vcr/structs/http_interaction.rb

@@ -1,58 +0,0 @@
-require 'forwardable'
-require 'vcr/structs/normalizers/body'
-require 'vcr/structs/normalizers/header'
-require 'vcr/structs/normalizers/status_message'
-require 'vcr/structs/normalizers/uri'
-require 'vcr/structs/request'
-require 'vcr/structs/response'
-
-module VCR
-  class HTTPInteraction < Struct.new(:request, :response)
-    extend ::Forwardable
-    def_delegators :request, :uri, :method
-
-    def ignore!
-      # we don't want to store any additional
-      # ivars on this object because that would get
-      # serialized with the object...so we redefine
-      # `ignored?` instead.
-      (class << self; self; end).class_eval do
-        undef ignored?
-        def ignored?; true; end
-      end
-    end
-
-    def ignored?
-      false
-    end
-
-    def filter!(text, replacement_text)
-      return self if [text, replacement_text].any? { |t| t.to_s.empty? }
-      filter_object!(self, text, replacement_text)
-    end
-
-  private
-
-    def filter_object!(object, text, replacement_text)
-      if object.respond_to?(:gsub)
-        object.gsub!(text, replacement_text) if object.include?(text)
-      elsif Hash === object
-        filter_hash!(object, text, replacement_text)
-      elsif object.respond_to?(:each)
-        # This handles nested arrays and structs
-        object.each { |o| filter_object!(o, text, replacement_text) }
-      end
-
-      object
-    end
-
-    def filter_hash!(hash, text, replacement_text)
-      filter_object!(hash.values, text, replacement_text)
-
-      hash.keys.each do |k|
-        new_key = filter_object!(k.dup, text, replacement_text)
-        hash[new_key] = hash.delete(k) unless k == new_key
-      end
-    end
-  end
-end