vcr 1.2.0 → 1.3.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.3.0 (November 11, 2010)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.2.0...v.1.3.0)
+
+* Moved documentation from README to [Wiki](http://github.com/myronmarston/vcr/wiki).
+* Refactoring and code cleanup.
+* Fix InternetConnection.available? so that it memoizes correctly when a connection is not available.
+* Fix WebMock version checking to allow newly released 1.5.0 to be used without a warning.
+* Add support for [Typhoeus](https://github.com/pauldix/typhoeus).  Thanks to
+  [David Balatero](https://github.com/dbalatero) for making the necessary changes in Typhoeus
+  to support VCR.
+
 ## 1.2.0 (October 13, 2010)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v1.1.2...v1.2.0)

data/FullBuildRakeFile

@@ -0,0 +1,22 @@
+# this is in a separate rakefile because our main one depends on the bundled gems
+# already being installed.  This must be able to run w/o bundled gems installed.
+
+desc "Run a full build: install necessary gems with bundler, runs specs, run cukes"
+task :build => :ensure_bundler_installed do
+  sh "bundle install"
+  sh "rake"
+end
+
+task :ensure_bundler_installed do
+  installed = begin
+    require 'rubygems'
+    require 'bundler'
+    true
+  rescue LoadError
+    false
+  end
+
+  unless installed
+    sh "gem install bundler"
+  end
+end

data/Gemfile

@@ -7,13 +7,21 @@ group :development do
     gem 'patron',           '~> 0.4.6'
     gem 'em-http-request',  '~> 0.2.7'
     gem 'curb',             '~> 0.7.8'
+    gem 'typhoeus',         '~> 0.2.0'
+  end
+
+  platforms :jruby do
+    gem 'jruby-openssl'
   end
 end
 
 # Additional gems that are useful, but not required for development.
 group :extras do
+  gem 'guard-rspec'
+
   platforms :mri do
     gem 'rcov'
+    gem 'rb-fsevent'
   end
 
   platforms :mri_18 do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (1.2.0)
+    vcr (1.3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -9,15 +9,17 @@ GEM
     addressable (2.2.2)
     archive-tar-minitar (0.5.2)
     aruba (0.2.1)
+    bouncy-castle-java (1.5.0145.2)
     builder (2.1.2)
     columnize (0.3.1)
+    configuration (1.1.0)
     crack (0.1.8)
-    cucumber (0.8.5)
+    cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     curb (0.7.8)
     diff-lcs (1.1.2)
     em-http-request (0.2.12)
@@ -25,29 +27,43 @@ GEM
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
     fakeweb (1.3.0)
-    gherkin (2.1.5)
-      trollop (~> 1.16.2)
-    gherkin (2.1.5-java)
-      trollop (~> 1.16.2)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    gherkin (2.2.9-java)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    guard (0.2.2)
+      open_gem (~> 1.4.2)
+      thor (~> 0.14.3)
+    guard-rspec (0.1.5)
+      guard (>= 0.2.0)
     httpclient (2.1.5.2)
-    json_pure (1.4.6)
+    jruby-openssl (0.7.2)
+      bouncy-castle-java
+    json (1.4.6)
+    json (1.4.6-java)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     linecache (0.43)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
+    open_gem (1.4.2)
+      launchy (~> 0.3.5)
     patron (0.4.9)
     rack (1.1.0)
     rake (0.8.7)
+    rb-fsevent (0.3.6)
     rcov (0.9.9)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -64,9 +80,10 @@ GEM
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
     term-ansicolor (1.0.5)
+    thor (0.14.4)
     timecop (0.3.5)
-    trollop (1.16.2)
-    webmock (1.4.0)
+    typhoeus (0.2.0)
+    webmock (1.5.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
 
@@ -77,19 +94,23 @@ PLATFORMS
 DEPENDENCIES
   aruba (~> 0.2.1)
   bundler (~> 1.0.0)
-  cucumber (~> 0.8.5)
+  cucumber (~> 0.9.4)
   curb (~> 0.7.8)
   em-http-request (~> 0.2.7)
   fakeweb (~> 1.3.0)
+  guard-rspec
   httpclient (~> 2.1.5.2)
+  jruby-openssl
   patron (~> 0.4.6)
   rack (= 1.1.0)
   rake (~> 0.8.7)
+  rb-fsevent
   rcov
-  rspec (~> 2.0.0)
+  rspec (~> 2.1.0)
   ruby-debug
   ruby-debug-base19 (= 0.11.23)
   ruby-debug19
   timecop (~> 0.3.5)
+  typhoeus (~> 0.2.0)
   vcr!
-  webmock (~> 1.4.0)
+  webmock (>= 1.5.0)

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at http://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch('^spec/(.*)_spec.rb')
+  watch('^lib/vcr.rb')                                { "spec/vcr_spec.rb" }
+  watch('^lib/vcr/(.*)\.rb')                          { |m| "spec/#{m[1]}_spec.rb" }
+  watch('^spec/spec_helper.rb')                       { "spec" }
+end

data/README.md

@@ -2,18 +2,6 @@
 
 Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
 
-## Installation
-
-    gem install vcr
-
-You'll also need either [FakeWeb](http://github.com/chrisk/fakeweb) or [WebMock](http://github.com/bblimke/webmock):
-
-    gem install fakeweb
-
-or
-
-    gem install webmock
-
 ## Synopsis
 
     require 'test/unit'
@@ -21,7 +9,7 @@ or
 
     VCR.config do |c|
       c.cassette_library_dir = 'fixtures/vcr_cassettes'
-      c.http_stubbing_library = :fakeweb # or :webmock
+      c.stub_with :webmock # or :fakeweb
     end
 
     class VCRTest < Test::Unit::TestCase
@@ -49,6 +37,7 @@ maintenance) and accurate (the response from example.com will contain the same h
   * [HTTPClient](http://github.com/nahi/httpclient) (WebMock)
   * [em-http-request](http://github.com/igrigorik/em-http-request) (WebMock)
   * [Net::HTTP](http://www.ruby-doc.org/stdlib/libdoc/net/http/rdoc/index.html) (FakeWeb and WebMock)
+  * [Typhoeus](https://github.com/pauldix/typhoeus)
   * And of course any library built on Net::HTTP, such as [Mechanize](http://github.com/tenderlove/mechanize),
     [HTTParty](http://github.com/jnunemaker/httparty) or [Rest Client](http://github.com/archiloque/rest-client).
 * Request matching is configurable based on HTTP method, URI, host, path, body and headers.
@@ -59,9 +48,13 @@ maintenance) and accurate (the response from example.com will contain the same h
 * 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 1 & 2, Cucumber, Test::Unit,
-  Capybara, Mechanize and Rest-Client.
+  Capybara, Mechanize, Rest-Client and HTTParty.
 * Extensively tested on 7 different ruby interpretters.
 
+## Usage
+
+Visit the [wiki](http://github.com/myronmarston/vcr/wiki) for usage info and documentation.
+
 ## Development
 
 * Source hosted on [GitHub](http://github.com/myronmarston/vcr).
@@ -70,352 +63,7 @@ maintenance) and accurate (the response from example.com will contain the same h
 * Pull requests are very welcome! Please include spec and/or feature coverage for every patch,
   and create a topic branch for every separate change you make.
 
-## Cassettes
-
-Cassettes are the medium to which VCR records HTTP interactions, and the medium from which it replays them.
-While a cassette is in use, new HTTP requests (or "new episodes", as VCR calls them) either get
-recorded, or an error will be raised, depending on the cassette's `:record` mode (see below).  When you use
-a cassette that contains previously recorded HTTP interactions, it registers them with the http stubbing
-library of your choice (fakeweb or webmock) so that HTTP requests get the recorded response.  Between test
-runs, cassettes are stored on disk as YAML files in your configured cassette library directory.
-
-Each cassette acts a bit like a sandbox: it has an effect on HTTP requests during the current test while it
-is inserted, but has no effect on the rest of your test suite.
-
-Cassettes can be configured with a few 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).
-* `:re_record_interval`: Controls automatic re-recording of the cassette (see below for more details).
-
-## Record modes
-
-VCR supports 3 record modes.  You can set a default record mode in your configuration (see below) 
-and a per-cassette record mode when inserting a cassette.  The record modes are:
-
-* `:new_episodes`: Previously recorded HTTP interactions will be replayed.  New HTTP interactions will be recorded.
-  This is generally the most useful mode.  VCR will automatically record and replay new HTTP requests as your
-  codebase evolves to make new requests.
-* `:all`: Previously recorded HTTP interactions will be ignored.  All HTTP interactions will be recorded.
-  This is useful if you're interested in using VCR to log your HTTP interactions but don't care to ever replay
-  them.  Alternately, you can temporarily change your record mode to `:all` to force it to re-record all requests.
-* `:none`: Previously recorded HTTP interactions will be replayed.  New HTTP interactions will result in an error.
-  This mode is useful when your code makes potentially dangerous HTTP requests (i.e. it hits a production
-  server rather than a sandbox/staging server), as it will prevent any new requests from completing, raising
-  an error instead.  Generally, you will temporarily use the `:new_episodes` or `:all` record modes
-  to perform the initial recording before changing it to `:none`.
-
-When no cassette is inserted, all HTTP requests will result in a `Real HTTP connections are disabled` 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     = 'fixtures/cassette_library'
-      c.http_stubbing_library    = :fakeweb
-      c.ignore_localhost         = true
-      c.default_cassette_options = { :record => :none }
-    end
-
-This can go pretty much wherever, as long as this code is run before your tests, specs or scenarios.  I tend
-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.  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.
-  VCR will automatically configure FakeWeb/WebMock for you; you do not need to reference either one at all.
-* `ignore_localhost`: Defaults to false.  Setting it true does the following:
-    * Localhost requests will proceed as normal.  The "Real HTTP connections are disabled" error will not occur.
-    * Localhost requests will not be recorded.
-    * Previously recorded localhost requests will not be replayed.
-* `default_cassette_options`: The default options for your cassettes.  These will be overridden by any options you
-  set on each individual cassette.
-
-## Usage with your favorite ruby test/spec framework
-
-VCR can easily be used with any ruby test or spec framework.  Usually, you'll want to use `VCR.use_cassette`:
-
-    VCR.use_cassette('geocoding/Seattle, WA', :record => :new_episodes) do
-      # do something that makes an HTTP request
-    end
-
-Alternately, with a framework like [shoulda](http://github.com/thoughtbot/shoulda), you can insert and eject a
-cassette with individual method calls from setup and teardown:
-
-    context "Some object that makes an HTTP request" do
-      setup do
-        VCR.insert_cassette('geocoding/Seattle, WA', :record => :new_episodes)
-      end
-
-      should "make an HTTP request" do
-        # ...
-      end
-
-      should "make another HTTP request" do
-        # ...
-      end
-
-      teardown do
-        VCR.eject_cassette
-      end
-    end
-
-## Usage with RSpec
-
-If you're using RSpec, you can use a special macro provided by VCR:
-
-    describe MyApiClient do
-      context "create" do
-        # Pass use_vcr_cassette the same args you would pass VCR.use_cassette.
-        use_vcr_cassette "my_api_client/create", :record => :new_episodes
-
-        it "makes an HTTP request"
-        it "makes another HTTP request"
-      end
-
-      context "destroy" do
-        # You can leave off the cassette name and it will be inferred from the example group
-        # descriptions--in this case "MyApiClient/destroy".
-        # You can also leave off the options hash--the configured default options will be used.
-        use_vcr_cassette :record => :new_episodes, :match_requests_on => [:uri, :method, :body]
-
-        it "makes an HTTP request"
-        it "makes another HTTP request"
-      end
-    end
-
-To use this, you need to configure RSpec to make the `use_vcr_cassette` available as a macro.
-Here's how to do that for RSpec 1:
-
-    require 'vcr'
-
-    Spec::Runner.configure do |c|
-      c.extend VCR::RSpec::Macros
-    end
-
-Or for RSpec 2:
-
-    require 'vcr'
-
-    RSpec.configure do |c|
-      c.extend VCR::RSpec::Macros
-    end
-
-## Usage with Cucumber
-
-VCR provides additional support for cucumber.  You can of course use `VCR.use_cassette` within a step definition,
-and that's the recommended way for any of your custom step definitions.  But many times I find myself using generic
-step definitions provided by another library (such as the webrat/capybara web steps generated by cucumber-rails),
-and you don't want to modify these.  VCR provides cucumber tagging support to help in these cases.
-
-First, tag your scenario with something descriptive:
-
-    @facebook_http_request
-    Scenario: Sign up with facebook connect
-
-Then let VCR know about this tag, in `features/support/vcr.rb` (or some similar support file):
-
-    VCR.cucumber_tags do |t|
-      t.tags '@facebook_http_request', '@twitter_status_update', :record => :none
-      t.tags '@another_scenario_tag'
-    end
-
-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.
-
-If the last argument to `#tags` is a hash, VCR will use it as the options for the named cassettes.
-
-## Usage with Capybara
-
-When you use any of the javascript-enabled drivers (selenium, celerity, culerity) with
-[capybara](http://github.com/jnicklas/capybara), it'll need to ping the app running on localhost.
-Set the `ignore_localhost` option to true to allow this.
-
-## Cassette Customization
-
-Cassettes are stored as simple plain text YAML files and can easily be edited to suit your needs.  One common need
-is for a particular request to be stubbed using a regex rather than the raw URL.  This is handy for URLs that contain
-non-deterministic portions (such as timestamps)--since the URL will be a bit different each time, the URL from the
-recorded request will not match the URL for future requests.  You can simply change the URL to the YAML of the
-appropriate regex.
-
-Figure out the yaml in irb:
-
-    >> require 'yaml'
-    => true
-    >> puts /example\.com\/\d+/.to_yaml
-    --- !ruby/regexp /example\.com\/\d+/
-
-Edit your cassette file:
-
-    request: !ruby/struct:VCR::Request 
-      method: :get
-      uri: !ruby/regexp /example\.com\/\d+/
-      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
-be replayed for all future requests.  Usually this is fine, but in some cases you need something more
-dynamic.  You can use [ERB](http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/) for this.
-
-Enable ERB evaluation of a cassette using the `:erb` option:
-
-    VCR.use_cassette('user-subscription', :erb => true) do
-      # do something that makes an HTTP request
-    end
-
-You can use variables in your cassette's ERB by passing a hash:
-
-    VCR.use_cassette('user-subscription', :erb => { :user => User.last }) do
-      # do something that makes an HTTP request
-    end
-
-In your cassette:
-
-    request: !ruby/struct:VCR::Request 
-      method: :get
-      uri: http://some-domain.com:80/users/<%= user.id %>
-      body: 
-      headers: 
-      ...
-    response: !ruby/struct:VCR::Response 
-      ...
-      body: Hello, <%= user.name %>!
-
-## Automatic cassette re-recording
-
-Over time, your cassettes may get out-of-date.  APIs change and sites you scrape get updated.  VCR provides
-a facility to automatically re-record your cassettes.  You enable re-recording using the
-`:re_record_interval` option:
-
-    A_WEEK = 7 * 24 * 60 * 60 # or use 7.days if you're using ActiveSupport
-
-    VCR.use_cassette('my_cassette', :re_record_interval => A_WEEK) { ... }
-
-If the cassette file was last modified more than 7 days ago, VCR will use the `:all` record mode (regardless
-of the configured record mode) to allow new HTTP requests and record them.  VCR will check to make sure you
-have an internet connection before doing this, so if you are running the tests without one, the automatic
-re-recording will not kick in.
-
-## 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
-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
-more details.
-
-You should not need to directly interact with either FakeWeb or WebMock.  VCR will take care of disallowing
-http connections when no cassette is inserted, and it will clean up all stubs/registrations when a cassette
-is ejected.  If you ever decide to switch HTTP stubbing libraries, you'll just have to update the VCR config
-setting.
-
-## Suggested Workflow
-
-First, configure VCR as I have above.  I like setting the default record mode to `:none` 
-so that no new HTTP requests are made without me explicitly allowing it, but if you may prefer to
-set it to `:new_episodes`.
-
-When an HTTP request is made, you'll get an error such as:
-
-    Real HTTP connections are disabled. Unregistered request: get http://example.com
-
-Find the place that is making the HTTP request (the backtrace should help here).  If you've already recorded this HTTP
-request to a cassette from a different test, you can simply re-use the cassette.  Use `VCR.use_cassette`, as
-shown above.  You may also want to refactor this into a helper method that sets up the VCR cassette and does whatever
-makes the HTTP request:
-
-    def set_user_address(user, address, city, state)
-      VCR.use_cassette("geocoding/#{address}, #{city}, #{state}", :record => :new_episodes) do
-        user.address.update_attributes!(:address => address, :city => city, :state => state)
-      end
-    end
-
-In this case, I've used a dynamic cassette name based on the address being geocoded.  That way, each separate address
-gets a different cassette, and tests that set the same user address will reuse the same cassette.  I've also set
-the record mode to `:new_episodes` so that VCR will automatically record geocoding requests for a new address
-to a new cassette, without me having to change any code.
-
-If the HTTP request that triggered the error is new, you'll have to record it for the first time.  Simply use 
-`VCR.use_cassette` with the record mode set to `:new_episodes` or `:all`.  Run the test again, and VCR will 
-record the HTTP interaction.  I usually remove the record mode at this point so that it uses the default
-of `:none` in the future.  Future test runs will get the recorded response, and if your code changes so 
-that it is making a new HTTP request, you'll be notified by an error as shown above.
-
-VCR is designed to be used very granularly.  Rather than inserting a global cassette, I recommend you wrap individual
-blocks of code in `VCR.use_cassette` and record logically grouped sets of requests.
-
-## Ruby Interpreter Compatibility
-
-VCR has been tested on the following ruby interpreters:
-
-* MRI 1.8.6-p399
-* MRI 1.8.7-p302
-* MRI 1.9.1-p378
-* MRI 1.9.2-p0
-* REE 1.8.7-2010.02
-* JRuby 1.5.1
-* Rubinius 1.1
-
-## Notes, etc.
-
-* The objects serialized to the cassette YAML files changed with the 0.4 release.  Cassettes recorded with
-  older versions of VCR will not work with VCR 0.4.0 and later.  However, VCR provides a rake task to migrate
-  your old cassettes to the new format--see the [changelog](http://github.com/myronmarston/vcr/blob/master/CHANGELOG.md)
-  for more info.
-* The cassette name determines the name of the library file for the given cassette.  Strings or symbols are fine,
-  and you can include any characters, but spaces and invalid file name characters will be removed
-  before the cassette reads or writes to its library file.
-* You can use a directory separator (i.e. '/') in your cassette names to cause it to use a subdirectory
-  of the cassette library directory.  The cucumber tagging support uses this.
-* VCR maintains a simple stack of cassettes.  This allows you to nest them as deeply as you want.
-  This is particularly useful when you have a cucumber step definition that uses a cassette, and
-  you also want to use a cassette for the entire scenario using the tagging support.
-* If you find VCR useful, please recommend me on [working with rails](http://workingwithrails.com/person/16590-myron-marston).
+If you find VCR useful, please recommend me on [working with rails](http://workingwithrails.com/person/16590-myron-marston).
 
 ## Thanks
 
@@ -424,6 +72,8 @@ VCR has been tested on the following ruby interpreters:
 * [Chris Kampmeier](http://github.com/chrisk) for [FakeWeb](http://github.com/chrisk/fakeweb).
 * [Chris Young](http://github.com/chrisyoung) for [NetRecorder](http://github.com/chrisyoung/netrecorder),
   the inspiration for VCR.
+* [David Balatero](https://github.com/dbalatero) for help with [Typhoeus](https://github.com/pauldix/typhoeus)
+  support.
 
 Thanks also to the following people who have contributed patches or helpful suggestions:
 
@@ -432,17 +82,6 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Ben Hutton](http://github.com/benhutton)
 * [Eric Allam](http://github.com/rubymaverick)
 
-## Similar Libraries
-
-If VCR doesn't meet your needs, please [open an issue](http://github.com/myronmarston/vcr/issues) and let me know
-how VCR could be improved.  You may also want to try one of these similar libraries:
-
-* [Stale Fish](http://github.com/jsmestad/stale_fish)
-* [NetRecorder](http://github.com/chrisyoung/netrecorder)
-* [Ephemeral Response](http://github.com/sandro/ephemeral_response)
-* [Net::HTTP Spy](http://github.com/martinbtt/net-http-spy)
-* [WebFixtures](http://github.com/trydionel/web_fixtures)
-
 ## Copyright
 
 Copyright (c) 2010 Myron Marston. See LICENSE for details.