vcr 1.0.3 → 1.1.0

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 #Changelog
 
+## 1.1.0 (August 22, 2010)
+
+* Added `:match_requests_on` cassette option, which determines how VCR matches requests.
+* Removed VCR::TaskRunner and the corresponding rake task definition.  The rake task migrated cassettes from the
+  0.3.1 format to the 0.4+ format.  If you are still on 0.3.1 or earlier, I recommend you upgrade to 0.4.1 first,
+  migrate your cassettes and deal with migration warnings, then upgrade to the current release.
+* Added some code to VCR::Cassette.new to check the options passed to the cassette and raise an error if any
+  invalid options are passed.
+* Optimized ERB rendering a bit.  Rather than creating a new struct subclass for each time we render an ERB
+  cassette with locals, we keep a cache of reusable struct subclasses based on the desired attributes.
+  [Benchmarking](http://gist.github.com/512948) reveals this is about 28% faster.
+* Upgraded tests to use em-http-request 0.2.10 rather than 0.2.7.
+
 ## 1.0.3 (August 5, 2010)
 
 * Upgraded VCR specs to RSpec 2.

data/README.md

@@ -47,11 +47,15 @@ maintenance) and accurate (the response from example.com will contain the same h
   (all HTTP stubbing libraries), [Patron](http://github.com/toland/patron) (WebMock only),
   [HTTPClient](http://github.com/nahi/httpclient) (WebMock only) and
   [em-http-request](http://github.com/igrigorik/em-http-request) (WebMock only).
+* Request matching is configurable based on HTTP method, URI, host, body and headers.
 * The same request can receive different responses in different tests--just use different cassettes.
 * The recorded requests and responses are stored on disk as YAML and can easily be inspected and edited.
 * Dynamic responses are supported using ERB.
 * Disables all HTTP requests that you don't explicitly allow.
 * Simple cucumber integration is provided using tags.
+* Known to work well with many popular ruby libraries including RSpec, Cucumber, Test::Unit, Capybara, Mechanize and
+  Rest-Client.
+* Extensively tested on 5 different ruby interpretters.
 
 ## Development
 
@@ -74,6 +78,7 @@ Each cassette can be configured with a couple options:
 
 * `:record`: Specifies a record mode for this cassette.
 * `:erb`: Used for dynamic cassettes (see below for more details).
+* `:match_requests_on`: An array of request attributes to match on (see below for more details).
 
 ## Record modes
 
@@ -84,12 +89,42 @@ and a per-cassette record mode when inserting a cassette.  The record modes are:
 * `:all`: Previously recorded HTTP interactions will be ignored.  All HTTP interactions will be recorded.
 * `:none`: Previously recorded HTTP interactions will be replayed.  New HTTP interactions will result in an error.
 
+## Request Matching
+
+In order to properly replay previously recorded requests, VCR must match new HTTP requests to a previously
+recorded one.  By default, it matches on HTTP method and URI, since that is usually deterministic and
+fully identifies the resource and action for typical RESTful APIs.  In some cases (such as SOAP webservices)
+this may not work so well, and VCR allows you to customize how requests are matched.
+
+Cassettes take a `:match_requests_on` option that expects an array of request attributes to match on.
+Supported attributes are:
+
+* `:method`: The HTTP method (i.e. GET, POST, PUT or DELETE) of the request.
+* `:uri`: The full URI of the request.
+* `:host`: The host of the URI.  You can use this (alone, or in combination with `:path`) as an alternative
+  to `:uri` to cause VCR to match using a regex that matches the host.
+* `:path`: The path of the URI.  You can use this (alone, or in combination with `:host`) as an alternative
+  to `:uri` to cause VCR to match using a regex that matches the path.
+* `:body`: The body of the request.
+* `:headers`: The request headers.
+
+By default, VCR uses a `:match_requests_on` option like:
+
+    :match_requests_on => [:uri, :method]
+
+If you want to match on another attribute, just add it to the array:
+
+    :match_requests_on => [:uri, :method, :body]
+
+Note that FakeWeb cannot match on `:body` or `:headers`.  In general, it is recommended that you configure
+your cassettes to match on the most specific set of attributes that is deterministic.
+
 ## Configuration
 
     require 'vcr'
 
     VCR.config do |c|
-      c.cassette_library_dir     = File.join(Rails.root, 'features', 'fixtures', 'cassette_library')
+      c.cassette_library_dir     = 'fixtures/cassette_library'
       c.http_stubbing_library    = :fakeweb
       c.ignore_localhost         = true
       c.default_cassette_options = { :record => :none }
@@ -99,7 +134,10 @@ This can go pretty much wherever, as long as this code is run before your tests,
 to put it in `spec/support/vcr.rb`, `test/support/vcr.rb` or `features/support/vcr.rb`.  You can set the following
 configuration options:
 
-* `cassette_library_dir`: VCR will save the cassette YAML files to this directory.
+* `cassette_library_dir`: VCR will save the cassette YAML files to this directory.  If you are using Rails 3 and
+  ActiveRecord YAML fixtures, you will probably want to avoid putting VCR cassettes in a sub-directory of
+  `RAILS_ROOT/test/fixtures`.  Rails will assume your cassette YAML files are ActiveRecord fixtures and raise an
+  error when the content doesn't conform to its expectations.
 * `http_stubbing_library`: Which http stubbing library to use.  Currently `:fakeweb` and `:webmock` are supported.
   This is currently optional--VCR will try to guess based on the presence or absence of the `FakeWeb` or `WebMock`
   constants, but this is mostly done to assist users upgrading from VCR 0.3.1, which only worked with fakeweb and
@@ -166,8 +204,8 @@ Then let VCR know about this tag, in `features/support/vcr.rb` (or some similar
       t.tags '@another_scenario_tag'
     end
 
-For each of the tags you specify in your `cucumber_tags` block, VCR will set up the appropriate
-[Before and After hooks](http://wiki.github.com/aslakhellesoy/cucumber/hooks) to use a cassette
+For each of the tags you specify in your `cucumber_tags` block, VCR will set up an appropriate
+[After hook](http://wiki.github.com/aslakhellesoy/cucumber/hooks) to use a cassette
 for the entire scenario.  The tag (minus the '@') will be used as the cassette name, and it'll
 go in the `cucumber_tags` subdirectory of the configured cassette library directory.
 
@@ -202,6 +240,10 @@ Edit your cassette file:
       body: 
       headers: 
 
+Note that it may be simpler (and better!) to use the `:match_requests_on` cassette option with `:host` and/or `:path`,
+as that gives you a a URL regex without the need to manually edit the cassette file.  If you do change a url to a regex
+in a cassette file, VCR will use it, regardless of the `:match_requests_on` setting.
+
 ## Dynamic Cassettes
 
 VCR's default recording and replaying is static.  The exact response that is initially recorded will
@@ -235,7 +277,7 @@ In your cassette:
 ## FakeWeb or WebMock?
 
 VCR works fine with either FakeWeb or WebMock.  Overall, WebMock has more features, and you'll need to use
-WebMock if you want to use VCR with an HTTP library besides `Net::HTTP`.  However, FakeWeb is currently
+WebMock if you want to use VCR with an HTTP library besides Net::HTTP.  However, FakeWeb is currently
 about three times faster than WebMock, so you may want to stick with FakeWeb if you don't need WebMock's
 additional features.  You can see the
 [benchmarks](http://github.com/myronmarston/vcr/blob/master/benchmarks/http_stubbing_libraries.rb) for
@@ -289,10 +331,10 @@ blocks of code in `VCR.use_cassette` and record logically grouped sets of reques
 
 VCR has been tested on the following ruby interpreters:
 
-* MRI 1.8.6
-* MRI 1.8.7
-* MRI 1.9.1
-* MRI 1.9.2 preview 3
+* MRI 1.8.6-p399
+* MRI 1.8.7-p302
+* MRI 1.9.1-p378
+* MRI 1.9.2
 * JRuby 1.5.1
 
 ## Notes, etc.

data/lib/vcr.rb

@@ -2,6 +2,7 @@ require 'vcr/cassette'
 require 'vcr/config'
 require 'vcr/cucumber_tags'
 require 'vcr/deprecations'
+require 'vcr/request_matcher'
 require 'vcr/structs'
 require 'vcr/version'
 

data/lib/vcr/cassette.rb

@@ -8,14 +8,17 @@ module VCR
 
     VALID_RECORD_MODES = [:all, :none, :new_episodes].freeze
 
-    attr_reader :name, :record_mode
+    attr_reader :name, :record_mode, :match_requests_on
 
     def initialize(name, options = {})
       options = VCR::Config.default_cassette_options.merge(options)
+      invalid_options = options.keys - [:record, :erb, :allow_real_http, :match_requests_on]
 
-      @name = name
-      @record_mode = options[:record]
-      @erb = options[:erb]
+      if invalid_options.size > 0
+        raise ArgumentError.new("You passed the following invalid options to VCR::Cassette.new: #{invalid_options.inspect}.")
+      end
+
+      @name, @record_mode, @erb, @match_requests_on = name, options[:record], options[:erb], options[:match_requests_on]
 
       deprecate_old_cassette_options(options)
       raise_error_unless_valid_record_mode(record_mode)
@@ -96,7 +99,11 @@ module VCR
         recorded_interactions.replace(@original_recorded_interactions)
       end
 
-      VCR.http_stubbing_adapter.stub_requests(recorded_interactions)
+      VCR.http_stubbing_adapter.stub_requests(recorded_interactions, match_requests_on)
+    end
+
+    @@struct_cache = Hash.new do |hash, attributes|
+      hash[attributes] = Struct.new(*attributes)
     end
 
     def raw_yaml_content
@@ -109,7 +116,7 @@ module VCR
         return template.result unless @erb.is_a?(Hash)
 
         # create an object with methods for each desired local variable...
-        local_variables = Struct.new(*@erb.keys).new(*@erb.values)
+        local_variables = @@struct_cache[@erb.keys].new(*@erb.values)
 
         # instance_eval seems to be the only way to get the binding for ruby 1.9: http://redmine.ruby-lang.org/issues/show/2161
         template.result(local_variables.instance_eval { binding })
@@ -132,4 +139,4 @@ module VCR
       end
     end
   end
-end
+end

data/lib/vcr/config.rb

@@ -12,6 +12,8 @@ module VCR
       attr_writer :default_cassette_options
       def default_cassette_options
         @default_cassette_options ||= {}
+        @default_cassette_options.merge!(:match_requests_on => RequestMatcher::DEFAULT_MATCH_ATTRIBUTES) unless @default_cassette_options.has_key?(:match_requests_on)
+        @default_cassette_options
       end
 
       attr_writer :http_stubbing_library

data/lib/vcr/extensions/net_http.rb

@@ -2,7 +2,9 @@ require 'net/http'
 
 module Net
   class HTTP
-    def request_with_vcr(request, body = nil, &block)
+    alias_method :request_without_vcr, :request
+
+    def request(request, body = nil, &block)
       uri = URI.parse(VCR.http_stubbing_adapter.request_uri(self, request))
 
       if VCR::LOCALHOST_ALIASES.include?(uri.host) && VCR.http_stubbing_adapter.ignore_localhost?
@@ -11,19 +13,17 @@ module Net
         end
       end
 
+      vcr_request = VCR::Request.from_net_http_request(self, request)
       response = request_without_vcr(request, body)
 
-      if started? && !VCR.http_stubbing_adapter.request_stubbed?(request.method.downcase.to_sym, uri)
-        http_interaction = VCR::HTTPInteraction.from_net_http_objects(self, request, response)
+      match_attributes = (cass = VCR.current_cassette) ? cass.match_requests_on : VCR::RequestMatcher::DEFAULT_MATCH_ATTRIBUTES
+      if started? && !VCR.http_stubbing_adapter.request_stubbed?(vcr_request, match_attributes)
+        VCR.record_http_interaction VCR::HTTPInteraction.new(vcr_request, VCR::Response.from_net_http_response(response))
         response.extend VCR::Net::HTTPResponse # "unwind" the response
-
-        VCR.record_http_interaction(http_interaction)
       end
 
       yield response if block_given?
       response
     end
-    alias_method :request_without_vcr, :request
-    alias_method :request, :request_with_vcr
   end
 end

data/lib/vcr/http_stubbing_adapters/base.rb

@@ -3,6 +3,8 @@ module VCR
     autoload :FakeWeb, 'vcr/http_stubbing_adapters/fakeweb'
     autoload :WebMock, 'vcr/http_stubbing_adapters/webmock'
 
+    class UnsupportedRequestMatchAttributeError < ArgumentError; end
+
     class Base
       class << self
         def with_http_connections_allowed_set_to(value)

data/lib/vcr/http_stubbing_adapters/fakeweb.rb

@@ -5,6 +5,8 @@ module VCR
   module HttpStubbingAdapters
     class FakeWeb < Base
       class << self
+        UNSUPPORTED_REQUEST_MATCH_ATTRIBUTES = [:body, :headers].freeze
+
         def check_version!
           unless meets_version_requirement?(::FakeWeb::VERSION, '1.2.8')
             raise "You are using FakeWeb #{::FakeWeb::VERSION}.  VCR requires version 1.2.8 or greater."
@@ -19,15 +21,20 @@ module VCR
           ::FakeWeb.allow_net_connect = value
         end
 
-        def stub_requests(http_interactions)
+        def stub_requests(http_interactions, match_attributes = RequestMatcher::DEFAULT_MATCH_ATTRIBUTES)
+          validate_match_attributes(match_attributes)
           requests = Hash.new([])
 
           http_interactions.each do |i|
-            requests[[i.request.method, i.request.uri]] += [i.response]
+            requests[i.request.matcher(match_attributes)] += [i.response]
           end
 
-          requests.each do |request, responses|
-            ::FakeWeb.register_uri(request.first, request.last, responses.map{ |r| response_hash(r) })
+          requests.each do |request_matcher, responses|
+            ::FakeWeb.register_uri(
+              request_matcher.method || :any,
+              request_matcher.uri,
+              responses.map{ |r| response_hash(r) }
+            )
           end
         end
 
@@ -39,8 +46,9 @@ module VCR
           ::FakeWeb::Registry.instance.uri_map = checkpoints.delete(checkpoint_name)
         end
 
-        def request_stubbed?(method, uri)
-          ::FakeWeb.registered_uri?(method, uri)
+        def request_stubbed?(request, match_attributes)
+          validate_match_attributes(match_attributes)
+          ::FakeWeb.registered_uri?(request.method, request.uri)
         end
 
         def request_uri(net_http, request)
@@ -77,6 +85,13 @@ module VCR
             :status => [response.status.code.to_s, response.status.message]
           )
         end
+
+        def validate_match_attributes(match_attributes)
+          invalid_attributes = match_attributes & UNSUPPORTED_REQUEST_MATCH_ATTRIBUTES
+          if invalid_attributes.size > 0
+            raise UnsupportedRequestMatchAttributeError.new("FakeWeb does not support matching requests on #{invalid_attributes.join(' or ')}")
+          end
+        end
       end
     end
   end

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -21,17 +21,20 @@ module VCR
           ::WebMock::Config.instance.allow_net_connect = value
         end
 
-        def stub_requests(recorded_responses)
+        def stub_requests(http_interactions, match_attributes = RequestMatcher::DEFAULT_MATCH_ATTRIBUTES)
           requests = Hash.new([])
 
-          # TODO: use the entire request signature, but make it configurable.
-          recorded_responses.each do |rr|
-            requests[[rr.method, rr.uri]] += [rr.response]
+          http_interactions.each do |i|
+            requests[i.request.matcher(match_attributes)] += [i.response]
           end
 
-          requests.each do |request, responses|
-            ::WebMock.stub_request(request.first, request.last).
-              to_return(responses.map{ |r| response_hash(r) })
+          requests.each do |request_matcher, responses|
+            stub = ::WebMock.stub_request(request_matcher.method || :any, request_matcher.uri)
+
+            with_hash = request_signature_hash(request_matcher)
+            stub = stub.with(with_hash) if with_hash.size > 0
+
+            stub.to_return(responses.map{ |r| response_hash(r) })
           end
         end
 
@@ -43,8 +46,9 @@ module VCR
           ::WebMock::RequestRegistry.instance.request_stubs = checkpoints.delete(checkpoint_name)
         end
 
-        def request_stubbed?(method, uri)
-          !!::WebMock.registered_request?(::WebMock::RequestSignature.new(method, uri.to_s))
+        def request_stubbed?(request, match_attributes)
+          matcher = request.matcher(match_attributes)
+          !!::WebMock.registered_request?(::WebMock::RequestSignature.new(matcher.method || :any, request.uri, request_signature_hash(matcher)))
         end
 
         def request_uri(net_http, request)
@@ -61,6 +65,13 @@ module VCR
 
         private
 
+        def request_signature_hash(request_matcher)
+          signature = {}
+          signature[:body]    = request_matcher.body    if request_matcher.match_requests_on?(:body)
+          signature[:headers] = request_matcher.headers if request_matcher.match_requests_on?(:headers)
+          signature
+        end
+
         def response_hash(response)
           {
             :body    => response.body,

data/lib/vcr/request_matcher.rb

@@ -0,0 +1,75 @@
+require 'set'
+
+module VCR
+  class RequestMatcher
+    VALID_MATCH_ATTRIBUTES = [:method, :uri, :host, :path, :headers, :body].freeze
+    DEFAULT_MATCH_ATTRIBUTES = [:method, :uri].freeze
+
+    attr_reader :request, :match_attributes
+
+    def initialize(request = nil, match_attributes = [])
+      if (match_attributes - VALID_MATCH_ATTRIBUTES).size > 0
+        raise ArgumentError.new("The only valid match_attributes options are: #{VALID_MATCH_ATTRIBUTES.inspect}.  You passed: #{match_attributes.inspect}.")
+      end
+
+      @request, self.match_attributes = request, match_attributes
+    end
+
+    def match_attributes=(attributes)
+      # Unfortunately, 1.9.2 doesn't give the same hash code
+      # for two sets of the same elements unless they are ordered
+      # the same, so we sort the attributes here.
+      attributes = attributes.sort { |a, b| a.to_s <=> b.to_s }
+      @match_attributes = Set.new(attributes)
+    end
+
+    def uri
+      return request.uri unless request.uri.is_a?(String)
+      uri_matchers = match_attributes.to_a & [:uri, :host, :path]
+
+      case Set.new(uri_matchers)
+        when Set.new then /.*/
+        when Set.new([:uri]) then request.uri
+        when Set.new([:host]) then %r{\Ahttps?://((\w+:)?\w+@)?#{Regexp.escape(URI(request.uri).host)}(:\d+)?/}i
+        when Set.new([:path]) then %r{\Ahttps?://[^/]+#{Regexp.escape(URI(request.uri).path)}/?(\?.*)?\z}i
+        when Set.new([:host, :path])
+          uri = URI(request.uri)
+          %r{\Ahttps?://((\w+:)?\w+@)?#{Regexp.escape(uri.host)}(:\d+)?#{Regexp.escape(uri.path)}/?(\?.*)?\z}i
+        else raise ArgumentError.new("match_attributes cannot include #{uri_matchers.join(' and ')}")
+      end
+    end
+
+    def method
+      request.method if match_requests_on?(:method)
+    end
+
+    def headers
+      request.headers if match_requests_on?(:headers)
+    end
+
+    def body
+      request.body if match_requests_on?(:body)
+    end
+
+    def match_requests_on?(attribute)
+      match_attributes.include?(attribute)
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def ==(other)
+      %w( class match_attributes method uri headers body ).all? do |attr|
+        send(attr) == other.send(attr)
+      end
+    end
+
+    def hash
+      # on Ruby 1.8.6, identical sets have different hash values,
+      # but identical arrays have the same hash values,
+      # so we convert match_attributes to an array here.
+      [match_attributes.to_a, method, uri, headers, body].hash
+    end
+  end
+end

data/lib/vcr/structs.rb

@@ -35,6 +35,10 @@ module VCR
         request.to_hash
       )
     end
+
+    def matcher(match_attributes)
+      RequestMatcher.new(self, match_attributes)
+    end
   end
 
   class ResponseStatus < Struct.new(:code, :message)
@@ -69,14 +73,6 @@ module VCR
 
   class HTTPInteraction < Struct.new(:request, :response)
     extend ::Forwardable
-
     def_delegators :request, :uri, :method
-
-    def self.from_net_http_objects(net_http, request, response)
-      new(
-        Request.from_net_http_request(net_http, request),
-        Response.from_net_http_response(response)
-      )
-    end
   end
 end

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = [1, 0, 3].join('.')
+      string = [1, 1, 0].join('.')
 
       def string.parts; VCR.version.split('.').map { |p| p.to_i }; end
       def string.major; parts[0]; end

data/lib/vcr/version.rbc

@@ -115,16 +115,17 @@ x
 7
 version
 i
-73
+74
 39
 0
 13
 10
-72
+73
 15
 79
 78
-80
+4
+3
 35
 3
 7
@@ -501,27 +502,27 @@ I
 I
 6
 I
-14
+15
 I
 8
 I
-20
+21
 I
 9
 I
-2c
+2d
 I
 a
 I
-38
+39
 I
 b
 I
-44
+45
 I
 d
 I
-49
+4a
 x
 43
 /Users/mmarston/code/vcr/lib/vcr/version.rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,13 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,11 +33,39 @@ dependencies:
         - 19
         version: 2.0.0.beta.19
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rspec
   prerelease: false
-  name: cucumber
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :development
+  name: rspec-core
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :development
+  name: rspec-expectations
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,12 +76,12 @@ dependencies:
         - 8
         - 5
         version: 0.8.5
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: *id004
   type: :development
+  name: cucumber
   prerelease: false
-  name: fakeweb
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,12 +92,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  requirement: *id005
   type: :development
+  name: fakeweb
   prerelease: false
-  name: webmock
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,12 +108,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  requirement: *id006
   type: :development
+  name: webmock
   prerelease: false
-  name: httpclient
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,12 +125,12 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: *id007
   type: :development
+  name: httpclient
   prerelease: false
-  name: capybara
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -116,12 +141,12 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  requirement: *id008
   type: :development
+  name: capybara
   prerelease: false
-  name: rack
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -132,12 +157,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  requirement: *id009
   type: :development
+  name: rack
   prerelease: false
-  name: rake
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -148,12 +173,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  requirement: *id010
   type: :development
+  name: rake
   prerelease: false
-  name: patron
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -164,15 +189,15 @@ dependencies:
         - 4
         - 6
         version: 0.4.6
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  requirement: *id011
   type: :development
+  name: patron
   prerelease: false
-  name: em-http-request
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 25
         segments: 
@@ -180,7 +205,10 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  requirement: *id010
+  requirement: *id012
+  type: :development
+  name: em-http-request
+  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: []
@@ -199,9 +227,8 @@ files:
 - lib/vcr/http_stubbing_adapters/base.rb
 - lib/vcr/http_stubbing_adapters/fakeweb.rb
 - lib/vcr/http_stubbing_adapters/webmock.rb
+- lib/vcr/request_matcher.rb
 - lib/vcr/structs.rb
-- lib/vcr/task_runner.rb
-- lib/vcr/tasks/vcr.rake
 - lib/vcr/version.rb
 - lib/vcr/version.rbc
 - lib/vcr.rb

data/lib/vcr/task_runner.rb

@@ -1,47 +0,0 @@
-require 'vcr'
-
-module VCR
-  module TaskRunner
-    extend self
-
-    def migrate_cassettes(dir)
-      with_recorded_response_defined do
-        FileUtils.cp_r(dir, "#{dir}-backup")
-
-        Dir.glob(dir + '/**/*.yml').each do |cassette_file|
-          recorded_responses = YAML.load(File.read(cassette_file))
-          next unless recorded_responses.is_a?(Enumerable) && recorded_responses.all? { |rr| rr.is_a?(VCR::RecordedResponse) }
-
-          interactions = recorded_responses.map do |recorded_response|
-            http_interaction(recorded_response)
-          end
-
-          File.open(cassette_file, 'w') { |f| f.write(interactions.to_yaml) }
-        end
-      end
-    end
-
-    private
-
-    def http_interaction(recorded_response)
-      VCR::HTTPInteraction.new(
-        request(recorded_response),
-        VCR::Response.from_net_http_response(recorded_response.response)
-      )
-    end
-
-    def request(recorded_response)
-      VCR::Request.new(recorded_response.method, recorded_response.uri)
-    end
-
-    def with_recorded_response_defined
-      VCR.const_set(:RecordedResponse, Class.new(Struct.new(:method, :uri, :response, :request_body, :request_headers)))
-
-      begin
-        yield
-      ensure
-        VCR.send(:remove_const, :RecordedResponse)
-      end
-    end
-  end
-end

data/lib/vcr/tasks/vcr.rake

@@ -1,9 +0,0 @@
-require 'vcr/task_runner'
-
-namespace :vcr do
-  desc 'Migrates your VCR cassettes in DIR from the 0.3.1 format to the 0.4+ format'
-  task :migrate_cassettes do
-    raise "You must pass the cassette library directory as DIR" if ENV['DIR'].to_s == ''
-    VCR::TaskRunner.migrate_cassettes(ENV['DIR'])
-  end
-end