vcr 1.9.0 → 1.10.0

data/.travis.yml

@@ -1,9 +1,11 @@
-script: "rake ci:build"
+script: "bundle exec rake ci:build"
 rvm:
   - 1.8.6
   - 1.8.7
   - 1.9.1
   - 1.9.2
   - ree
-  - rbx
   - jruby
+  - rbx
+env:
+  - CI=true

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.9.0...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.10.0...master)
+
+## 1.10.0 (May 18, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.9.0...v1.10.0)
+
+* Fix header normalization so that it properly handles nested arrays and
+  non-string values.
+* Add cucumber scenario documenting how VCR sanitizes cassette names
+  to "normal" file names (i.e. only alphanumerics, no spaces).
+* Add `:ignore_cassettes` option to `VCR.turn_off!`.  This causes
+  cassette insertions to be ignored rather than to trigger an error.
+  Patch provided by [Justin Smestad](https://github.com/jsmestad).
+* Fix rack middleware to make it threadsafe.
+* Update to latest RSpec (rspec 2.6).
 
 ## 1.9.0 (April 14, 2011)
 

data/README.md

@@ -4,28 +4,30 @@ Record your test suite's HTTP interactions and replay them during future test ru
 
 ## Synopsis
 
-    require 'rubygems'
-    require 'test/unit'
-    require 'vcr'
-
-    VCR.config do |c|
-      c.cassette_library_dir = 'fixtures/vcr_cassettes'
-      c.stub_with :webmock # or :fakeweb
-    end
-
-    class VCRTest < Test::Unit::TestCase
-      def test_example_dot_com
-        VCR.use_cassette('synopsis') do
-          response = Net::HTTP.get_response(URI('http://www.iana.org/domains/example/'))
-          assert_match /Example Domains/, response.body
-        end
-      end
+``` ruby
+require 'rubygems'
+require 'test/unit'
+require 'vcr'
+
+VCR.config do |c|
+  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  c.stub_with :webmock # or :fakeweb
+end
+
+class VCRTest < Test::Unit::TestCase
+  def test_example_dot_com
+    VCR.use_cassette('synopsis') do
+      response = Net::HTTP.get_response(URI('http://www.iana.org/domains/example/'))
+      assert_match /Example Domains/, response.body
     end
+  end
+end
+```
 
 Run this test once, and VCR will record the http request to `fixtures/vcr_cassettes/synopsis.yml`.  Run it again, and VCR
-will replay the response from example.com when the http request is made.  This test is now fast (no real HTTP requests are
-made anymore), deterministic (the test will continue to pass, even if you are offline, or example.com goes down for
-maintenance) and accurate (the response from example.com will contain the same headers and body you get from a real request).
+will replay the response from iana.org when the http request is made.  This test is now fast (no real HTTP requests are
+made anymore), deterministic (the test will continue to pass, even if you are offline, or iana.org goes down for
+maintenance) and accurate (the response will contain the same headers and body you get from a real request).
 
 ## Features
 
@@ -39,7 +41,7 @@ maintenance) and accurate (the response from example.com will contain the same h
   * [Excon](https://github.com/geemus/excon)
 * Supports multiple HTTP libraries:
   * [Patron](http://github.com/toland/patron) (when using WebMock)
-  * [Curb](http://github.com/taf2/curb) (when using WebMock -- only supports Curb::Easy at the moment)
+  * [Curb](http://github.com/taf2/curb) (when using WebMock -- only supports Curl::Easy at the moment)
   * [HTTPClient](http://github.com/nahi/httpclient) (when using WebMock)
   * [em-http-request](http://github.com/igrigorik/em-http-request) (when using WebMock)
   * [Net::HTTP](http://www.ruby-doc.org/stdlib/libdoc/net/http/rdoc/index.html) (when using FakeWeb and WebMock)
@@ -136,6 +138,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Bartosz Blimke](http://github.com/bblimke)
 * [Ben Hutton](http://github.com/benhutton)
 * [Eric Allam](http://github.com/rubymaverick)
+* [Justin Smestad](https://github.com/jsmestad)
 * [Karl Baum](https://github.com/kbaum)
 * [Nathaniel Bibler](https://github.com/nbibler)
 * [Oliver Searle-Barnes](https://github.com/opsb)

data/features/.nav

@@ -4,6 +4,7 @@
 - LICENSE.md (License)
 - cassettes:
   - format.feature
+  - naming.feature
   - no_cassette.feature
   - request_matching.feature
   - dynamic_erb.feature

data/features/cassettes/naming.feature

@@ -0,0 +1,29 @@
+Feature: Naming
+
+  When inserting or using a cassette, the first argument is the cassette name.
+  You can use any string for the name.  VCR will sanitize the string before
+  using it as a file name, so that it is a file-system friendly file name.
+
+  Scenario: Name sanitizing
+    Given a file named "name_sanitizing.rb" with:
+      """
+      require 'vcr_cucumber_helpers'
+
+      start_sinatra_app(:port => 7777) do
+        get('/') { "Hello" }
+      end
+
+      require 'vcr'
+
+      VCR.config do |c|
+        c.cassette_library_dir = 'cassettes'
+        c.stub_with :fakeweb
+      end
+
+      VCR.use_cassette('Fee, Fi Fo Fum', :record => :new_episodes) do
+        Net::HTTP.get_response('localhost', '/', 7777)
+      end
+      """
+     And the directory "cassettes" does not exist
+    When I run "ruby name_sanitizing.rb"
+    Then the file "cassettes/Fee_Fi_Fo_Fum.yml" should contain "body: Hello"

data/features/cassettes/no_cassette.feature

@@ -11,7 +11,10 @@ Feature: Error for HTTP request made when no cassette is in use
   (see configuration/allow_http_connections_when_no_cassette.feature) or
   you can temporarily turn VCR off:
 
-    - `VCR.turn_off!` => turn VCR off so HTTP requests are allowed
+    - `VCR.turn_off!` => turn VCR off so HTTP requests are allowed.
+      Cassette insertions will trigger an error.
+    - `VCR.turn_off!(:ignore_cassettes => true)` => turn
+      VCR off and ignore cassette insertions (so that no error is raised).
     - `VCR.turn_on!` => turn VCR back on
     - `VCR.turned_off { ... }` => turn VCR off for the duration of the
       provided block.
@@ -104,3 +107,45 @@ Feature: Error for HTTP request made when no cassette is in use
       Error: Real HTTP connections are disabled.
       """
 
+  Scenario: Turning VCR off prevents cassettes from being inserted
+    Given a file named "turn_off_vcr_and_insert_cassette.rb" with:
+      """
+      require 'vcr'
+
+      VCR.config do |c|
+        c.stub_with :fakeweb
+      end
+
+      VCR.turn_off!
+      VCR.insert_cassette('example')
+      """
+    When I run "ruby turn_off_vcr_and_insert_cassette.rb"
+    Then it should fail with "VCR is turned off.  You must turn it on before you can insert a cassette."
+
+  Scenario: Turning VCR off with `:ignore_cassettes => true` ignores cassettes
+    Given a file named "turn_off_vcr_and_insert_cassette.rb" with:
+      """
+      require 'vcr_cucumber_helpers'
+
+      start_sinatra_app(:port => 7777) do
+        get('/') { 'Hello' }
+      end
+
+      require 'vcr'
+
+      VCR.config do |c|
+        c.cassette_library_dir = 'cassettes'
+        c.stub_with :fakeweb
+      end
+
+      VCR.turn_off!(:ignore_cassettes => true)
+
+      VCR.use_cassette('example') do
+        response = Net::HTTP.get_response('localhost', '/', 7777).body
+        puts "Response: #{response}"
+      end
+      """
+    When I run "ruby turn_off_vcr_and_insert_cassette.rb"
+    Then it should pass with "Response: Hello"
+     And the file "cassettes/example.yml" should not exist
+

data/features/configuration/stub_with.feature

@@ -9,7 +9,7 @@ Feature: stub_with
       - Net::HTTP
       - HTTPClient
       - Patron
-      - Curb (Curb::Easy, but not Curb::Multi)
+      - Curb (Curl::Easy, but not Curl::Multi)
       - EM HTTP Request
     - Typhoeus can be used to stub itself (as long as you use Typhoeus::Hydra,
       but not Typhoeus::Easy or Typhoeus::Multi).

data/features/test_frameworks/cucumber.feature

@@ -22,16 +22,20 @@ Feature: Usage with Cucumber
   last argument to `#tag` or `#tags`.
 
   Scenario: Record HTTP interactions in a scenario by tagging it
-    Given a file named "features/support/vcr.rb" with:
+    Given a file named "lib/server.rb" with:
       """
-      require 'vcr_cucumber_helpers.rb'
+      require 'vcr_cucumber_helpers'
 
       if ENV['WITH_SERVER'] == 'true'
         start_sinatra_app(:port => 7777) do
           get('/:path') { "Hello #{params[:path]}" }
         end
       end
+      """
 
+    Given a file named "features/support/vcr.rb" with:
+      """
+      require "lib/server"
       require 'vcr'
 
       VCR.config do |c|

data/lib/vcr.rb

@@ -48,17 +48,19 @@ module VCR
   end
 
   def insert_cassette(name, options = {})
-    unless turned_on?
-      raise TurnedOffError.new("VCR is turned off.  You must turn it on before you can insert a cassette.")
-    end
+    if turned_on?
+      if cassettes.any? { |c| c.name == name }
+        raise ArgumentError.new("There is already a cassette with the same name (#{name}).  You cannot nest multiple cassettes with the same name.")
+      end
 
-    if cassettes.any? { |c| c.name == name }
-      raise ArgumentError.new("There is already a cassette with the same name (#{name}).  You cannot nest multiple cassettes with the same name.")
+      cassette = Cassette.new(name, options)
+      cassettes.push(cassette)
+      cassette
+    elsif !ignore_cassettes?
+      message = "VCR is turned off.  You must turn it on before you can insert a cassette.  " +
+                "Or you can use the `:ignore_cassette => true` option to completely ignore cassette insertions."
+      raise TurnedOffError.new(message)
     end
-
-    cassette = Cassette.new(name, options)
-    cassettes.push(cassette)
-    cassette
   end
 
   def eject_cassette
@@ -108,8 +110,8 @@ module VCR
     cassette.record_http_interaction(interaction)
   end
 
-  def turned_off
-    turn_off!
+  def turned_off(options = {})
+    turn_off!(options)
 
     begin
       yield
@@ -118,11 +120,17 @@ module VCR
     end
   end
 
-  def turn_off!
+  def turn_off!(options = {})
     if VCR.current_cassette
       raise CassetteInUseError.new("A VCR cassette is currently in use.  You must eject it before you can turn VCR off.")
     end
 
+    @ignore_cassettes = options[:ignore_cassettes]
+    invalid_options = options.keys - [:ignore_cassettes]
+    if invalid_options.any?
+      raise ArgumentError.new("You passed some invalid options: #{invalid_options.inspect}")
+    end
+
     VCR.http_stubbing_adapter.http_connections_allowed = true
     @turned_off = true
   end
@@ -136,6 +144,10 @@ module VCR
     !@turned_off
   end
 
+  def ignore_cassettes?
+    @ignore_cassettes
+  end
+
   private
 
   def adapter_for(lib)

data/lib/vcr/middleware/rack.rb

@@ -3,9 +3,16 @@ module VCR
     class Rack
       include Common
 
+      def initialize(*args)
+        @mutex = Mutex.new
+        super
+      end
+
       def call(env)
-        VCR.use_cassette(*cassette_arguments(env)) do
-          @app.call(env)
+        @mutex.synchronize do
+          VCR.use_cassette(*cassette_arguments(env)) do
+            @app.call(env)
+          end
         end
       end
     end

data/lib/vcr/structs/normalizers/header.rb

@@ -39,18 +39,26 @@ module VCR
           important_vals = important_header_values(k, val_array)
           next unless important_vals.size > 0
 
-          # Ensure the values are raw strings.
-          # Apparently for Paperclip uploads to S3, headers
-          # get serialized with some extra stuff which leads
-          # to a seg fault. See this issue for more info:
-          # https://github.com/myronmarston/vcr/issues#issue/39
-          string_vals = important_vals.map { |v| String.new(v) }
-
-          new_headers[k] = string_vals
+          new_headers[k] = convert_to_raw_strings(important_vals)
         end if headers
 
         self.headers = new_headers.empty? ? nil : new_headers
       end
+
+      def convert_to_raw_strings(array)
+        # Ensure the values are raw strings.
+        # Apparently for Paperclip uploads to S3, headers
+        # get serialized with some extra stuff which leads
+        # to a seg fault. See this issue for more info:
+        # https://github.com/myronmarston/vcr/issues#issue/39
+        array.map do |v|
+          case v
+            when String; String.new(v)
+            when Array; convert_to_raw_strings(v)
+            else v
+          end
+        end
+      end
     end
   end
 end

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.9.0'
+      string = '1.10.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/spec_helper.rb

@@ -41,7 +41,8 @@ end
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.debug = (using_git && RUBY_INTERPRETER == :mri)
+  config.debug = (using_git && RUBY_INTERPRETER == :mri && RUBY_VERSION != '1.9.1')
+  config.treat_symbols_as_metadata_keys_with_true_values = true
 
   tmp_dir = File.expand_path('../../tmp/cassette_library_dir', __FILE__)
   config.before(:each) do

data/spec/support/http_library_adapters.rb

@@ -40,7 +40,8 @@ HTTP_LIBRARY_ADAPTERS['httpclient'] = Module.new do
   def self.http_library_name; 'HTTP Client'; end
 
   def get_body_string(response)
-    string = response.body.content
+    body = response.body
+    string = body.is_a?(String) ? body : body.content
     string.respond_to?(:read) ? string.read : string
   end
 

data/spec/support/shared_example_groups/normalizers.rb

@@ -37,6 +37,18 @@ shared_examples_for "header normalization" do
     instance = with_headers('my-key' => [value])
     VCR::YAML.dump(instance.headers).should == VCR::YAML.dump('my-key' => ['my-value'])
   end
+
+  it 'handles nested arrays' do
+    accept_encoding = [["gzip", "1.0"], ["deflate", "1.0"], ["sdch", "1.0"]]
+    instance = with_headers('accept-encoding' => accept_encoding)
+    instance.headers['accept-encoding'].should == accept_encoding
+  end
+
+  it 'handles nested arrays with floats' do
+    accept_encoding = [["gzip", 1.0], ["deflate", 1.0], ["sdch", 1.0]]
+    instance = with_headers('accept-encoding' => accept_encoding)
+    instance.headers['accept-encoding'].should == accept_encoding
+  end
 end
 
 shared_examples_for "body normalization" do

data/spec/support/sinatra_app.rb

@@ -29,7 +29,13 @@ module VCR
     end
 
     def self.server
-      @server ||= VCR::LocalhostServer.new(new)
+      raise "Sinatra app failed to boot." if @_boot_failed
+      @server ||= begin
+        VCR::LocalhostServer.new(new)
+      rescue
+        @_boot_failed = true
+        raise
+      end
     end
   end
 end

data/spec/support/vcr_localhost_server.rb

@@ -13,7 +13,7 @@ module VCR
 
       def call(env)
         if env["PATH_INFO"] == "/__identify__"
-          [200, {}, @app.object_id.to_s]
+          [200, {}, [@app.object_id.to_s]]
         else
           @app.call(env)
         end
@@ -40,7 +40,9 @@ module VCR
 
     def boot
       # Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
-      Rack::Handler::WEBrick.run(Identify.new(@rack_app), :Port => port, :AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new))
+      options = { :Port => port }
+      options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['CI']
+      Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
     end
 
     def booted?

data/spec/vcr/cassette_spec.rb

@@ -449,7 +449,7 @@ describe VCR::Cassette do
             end
 
             it "matches old requests to new ones using the cassette's match attributes" do
-              pending("Need to fix this to work with Psych", :if => defined?(::Psych)) do
+              pending("Need to fix this to work with Psych", :if => defined?(::Psych) && !ENV['CI']) do
                 [
                   old_interaction_1, old_interaction_2, old_interaction_3,
                   new_interaction_1, new_interaction_2, new_interaction_3

data/spec/vcr/middleware/rack_spec.rb

@@ -51,4 +51,24 @@ describe VCR::Middleware::Rack do
       instance.call(env_hash)
     end
   end
+
+  let(:threaded_app) do
+    lambda do |env|
+      sleep 0.15
+      VCR.send(:cassettes).should have(1).cassette
+      [200, {}, ['OK']]
+    end
+  end
+
+  it 'is thread safe' do
+    stack = described_class.new(threaded_app) do |cassette|
+      cassette.name 'c'
+    end
+
+    thread = Thread.new { stack.call({}) }
+    stack.call({})
+    thread.join
+
+    VCR.current_cassette.should be_nil
+  end
 end

data/spec/vcr_spec.rb

@@ -237,6 +237,32 @@ describe VCR do
         VCR.insert_cassette('foo')
       }.to raise_error(VCR::TurnedOffError)
     end
+
+    it 'raises an ArgumentError when given an invalid option' do
+      expect {
+        VCR.turn_off!(:invalid_option => true)
+      }.to raise_error(ArgumentError)
+    end
+
+    context 'when `:ignore_cassettes => true` is passed' do
+      before(:each) { VCR.turn_off!(:ignore_cassettes => true) }
+
+      it 'ignores cassette insertions' do
+        VCR.insert_cassette('foo')
+        VCR.current_cassette.should be_nil
+      end
+
+      it 'still runs a block passed to use_cassette' do
+        yielded = false
+
+        VCR.use_cassette('foo') do
+          yielded = true
+          VCR.current_cassette.should be_nil
+        end
+
+        yielded.should be_true
+      end
+    end
   end
 
   describe '.turn_on!' do
@@ -267,6 +293,11 @@ describe VCR do
       yielded.should == true
       VCR.should be_turned_on
     end
+
+    it 'passes options through to .turn_off!' do
+      VCR.should_receive(:turn_off!).with(:ignore_cassettes => true)
+      VCR.turned_off(:ignore_cassettes => true) { }
+    end
   end
 
   describe '.turned_on?' do

data/vcr.gemspec

@@ -21,13 +21,14 @@ Gem::Specification.new do |s|
     'bundler'         => '~> 1.0.7',
     'rake'            => '~> 0.8.7',
 
-    'rspec'           => '~> 2.5',
+    'rspec'           => '~> 2.6',
     'cucumber'        => '~> 0.9.4',
     'aruba'           => '0.2.4',
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
-    'webmock'         => '~> 1.6.0',
+    'webmock'         => '~> 1.6.4',
+    'addressable'     => '~> 2.2.6',
 
     'faraday'         => '~> 0.6.0',
     'httpclient'      => '~> 2.1.5.2',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 63
   prerelease: 
   segments: 
   - 1
-  - 9
+  - 10
   - 0
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,14 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -07:00
-default_executable: 
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: faraday
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +30,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
+  name: faraday
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: fakeweb
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +46,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
+  name: fakeweb
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: httpclient
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +63,12 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
+  name: httpclient
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,12 +79,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id004
+  name: rake
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: timecop
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,12 +95,28 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  requirement: *id005
+  version_requirements: *id005
+  name: timecop
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 2
+        - 6
+        version: 2.2.6
+  version_requirements: *id006
+  name: addressable
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: shoulda
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -114,27 +127,27 @@ dependencies:
         - 9
         - 2
         version: 2.9.2
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id007
+  name: shoulda
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 2
-        - 5
-        version: "2.5"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+        - 6
+        version: "2.6"
+  version_requirements: *id008
+  name: rspec
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rack
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -145,12 +158,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id009
+  name: rack
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: aruba
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -161,12 +174,12 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id010
+  name: aruba
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: sinatra
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -177,12 +190,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id011
+  name: sinatra
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -193,12 +206,12 @@ dependencies:
         - 0
         - 7
         version: 1.0.7
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id012
+  name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: excon
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -209,12 +222,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id013
+  name: excon
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: cucumber
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -225,28 +238,28 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id014
+  name: cucumber
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: webmock
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
         - 1
         - 6
-        - 0
-        version: 1.6.0
-  requirement: *id014
-- !ruby/object:Gem::Dependency 
+        - 4
+        version: 1.6.4
+  version_requirements: *id015
+  name: webmock
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: curb
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -257,12 +270,12 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
-  requirement: *id015
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id016
+  name: curb
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: patron
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -273,12 +286,12 @@ dependencies:
         - 4
         - 9
         version: 0.4.9
-  requirement: *id016
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id017
+  name: patron
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: em-http-request
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -289,12 +302,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id017
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id018
+  name: em-http-request
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: typhoeus
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -305,7 +318,9 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  requirement: *id018
+  version_requirements: *id019
+  name: typhoeus
+  prerelease: false
 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: []
@@ -334,6 +349,7 @@ files:
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
 - features/cassettes/format.feature
+- features/cassettes/naming.feature
 - features/cassettes/no_cassette.feature
 - features/cassettes/request_matching.feature
 - features/cassettes/update_content_length_header.feature
@@ -468,7 +484,6 @@ files:
 - spec/vcr/version_spec.rb
 - spec/vcr_spec.rb
 - vcr.gemspec
-has_rdoc: true
 homepage: http://github.com/myronmarston/vcr
 licenses: []
 
@@ -502,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
@@ -511,6 +526,7 @@ test_files:
 - features/cassettes/automatic_re_recording.feature
 - features/cassettes/dynamic_erb.feature
 - features/cassettes/format.feature
+- features/cassettes/naming.feature
 - features/cassettes/no_cassette.feature
 - features/cassettes/request_matching.feature
 - features/cassettes/update_content_length_header.feature