vcr 2.3.0 → 2.4.0

data/Gemfile

@@ -2,9 +2,6 @@ source :rubygems
 
 gem 'appraisal'
 
-gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git"
-gem 'webmock',  :git => "https://github.com/i0rek/webmock.git", :branch => "typhoeus_0.5.0"
-
 gemspec
 
 gem 'jruby-openssl', :platforms => :jruby
@@ -16,10 +13,13 @@ gem 'relish', '~> 0.6'
 gem 'fuubar'
 gem 'fuubar-cucumber'
 
-gem 'redcarpet', '~> 1.17.2'
+gem 'redcarpet', '~> 1.17.2', :platforms => :ruby
 gem 'github-markup'
 
-gem 'ruby-debug', :platforms => [:mri_18, :jruby]
+group :extras do
+  gem 'ruby-debug', :platforms => [:mri_18, :jruby]
 
-gem 'debugger', :platforms => :mri_19
+  gem 'debugger', :platforms => :mri_19
+  gem 'pry'
+end
 

data/{gemfiles/typhoeus-new.gemfile.lock → Gemfile.lock}

@@ -1,29 +1,13 @@
-GIT
-  remote: https://github.com/i0rek/webmock.git
-  revision: aeac5cc6a1ac7a313c138514d66cd536802b9dc4
-  branch: typhoeus_0.5.0
-  specs:
-    webmock (1.8.9)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-
-GIT
-  remote: https://github.com/typhoeus/typhoeus.git
-  revision: 6f4e9079ade2f90c20341dddd022ab1d153400ec
-  specs:
-    typhoeus (0.5.0.rc)
-      ethon (= 0.5.1)
-
 PATH
-  remote: /Users/myron/code/vcr
+  remote: .
   specs:
-    vcr (2.2.5)
+    vcr (2.4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
     archive-tar-minitar (0.5.2)
@@ -35,6 +19,7 @@ GEM
     builder (3.1.4)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
     columnize (0.3.6)
     cookiejar (0.3.0)
     crack (0.3.1)
@@ -44,14 +29,14 @@ GEM
       gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    curb (0.8.1)
-    debugger (1.2.1)
+    curb (0.8.3)
+    debugger (1.2.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.4)
+      debugger-ruby_core_source (~> 1.1.5)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
+    debugger-ruby_core_source (1.1.5)
     diff-lcs (1.1.3)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
@@ -61,15 +46,15 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    ethon (0.5.1)
-      ffi (~> 1.0.11)
+    ethon (0.5.6)
+      ffi (~> 1.1.5)
       mime-types (~> 1.18)
     eventmachine (1.0.0)
-    excon (0.16.7)
+    excon (0.16.10)
     fakeweb (1.3.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    ffi (1.0.11)
+    ffi (1.1.5)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -85,14 +70,19 @@ GEM
     json (1.6.7)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.0.4)
     multipart-post (1.1.5)
     patron (0.4.18)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.3.6)
     rack-protection (1.2.0)
       rack
-    rake (0.9.2.2)
+    rake (0.9.5)
     rbx-require-relative (0.0.9)
     redcarpet (1.17.2)
     redis (2.2.2)
@@ -102,15 +92,15 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.11.3)
+    rspec-mocks (2.12.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -126,9 +116,15 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    slop (3.3.3)
     term-ansicolor (1.0.7)
     tilt (1.3.3)
     timecop (0.3.5)
+    typhoeus (0.5.3)
+      ethon (~> 0.5.3)
+    webmock (1.9.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
     yajl-ruby (1.1.0)
     yard (0.8.3)
 
@@ -154,6 +150,7 @@ DEPENDENCIES
   json (~> 1.6.5)
   multi_json (~> 1.0.3)
   patron (~> 0.4.15)
+  pry
   rack (~> 1.3.6)
   rake (~> 0.9.2)
   redcarpet (~> 1.17.2)
@@ -165,8 +162,8 @@ DEPENDENCIES
   simplecov (~> 0.5.3)
   sinatra (~> 1.3.2)
   timecop (~> 0.3.5)
-  typhoeus!
+  typhoeus (~> 0.5.3)
   vcr!
-  webmock!
+  webmock (~> 1.9)
   yajl-ruby (~> 1.1.0)
   yard

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Myron Marston
+Copyright (c) 2010-2013 Myron Marston
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,7 +2,7 @@
 
 Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
 
-[![Build Status](https://secure.travis-ci.org/myronmarston/vcr.png?branch=master)](http://travis-ci.org/myronmarston/vcr)
+[![Build Status](https://secure.travis-ci.org/vcr/vcr.png?branch=master)](http://travis-ci.org/vcr/vcr)
 
 ## Synopsis
 
@@ -79,7 +79,7 @@ The docs come in two flavors:
   API documentation. The API docs contain detailed info about all of VCR's
   public API.
 
-See the [Upgrade](https://github.com/myronmarston/vcr/blob/master/Upgrade.md) doc
+See the [Upgrade](https://github.com/vcr/vcr/blob/master/Upgrade.md) doc
 for info about what's new and changed in VCR 2.0.
 
 ## Release Policy
@@ -105,13 +105,13 @@ Note that as of VCR 2, 1.8.6 and 1.9.1 are not supported.
 
 ## Development
 
-* Source hosted on [GitHub](http://github.com/myronmarston/vcr).
+* Source hosted on [GitHub](http://github.com/vcr/vcr).
 * Direct questions and discussions to the [IRC channel](irc://irc.freenode.net/vcr) or
   the [mailing list](http://groups.google.com/group/vcr-ruby).
-* Report issues on [GitHub Issues](http://github.com/myronmarston/vcr/issues).
+* Report issues on [GitHub Issues](http://github.com/vcr/vcr/issues).
 * 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.
-* See the [Contributing](https://github.com/myronmarston/vcr/blob/master/CONTRIBUTING.md)
+* See the [Contributing](https://github.com/vcr/vcr/blob/master/CONTRIBUTING.md)
   guide for instructions on running the specs and features.
 * Code quality metrics are checked by [Code Climate](https://codeclimate.com/github/myronmarston/vcr).
 * Documentation is generated with [YARD](http://yardoc.org/) ([cheat sheet](http://cheat.errtheblog.com/s/yard/)).
@@ -138,6 +138,7 @@ yard server --reload
 Thanks also to the following people who have contributed patches or helpful suggestions:
 
 * [Aaron Brethorst](http://github.com/aaronbrethorst)
+* [Austen Ito](https://github.com/austenito)
 * [Avdi Grimm](https://github.com/avdi)
 * [Bartosz Blimke](http://github.com/bblimke)
 * [Benjamin Oakes](https://github.com/benjaminoakes)
@@ -158,6 +159,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Jonathan Tron](https://github.com/JonathanTron)
 * [Justin Smestad](https://github.com/jsmestad)
 * [Karl Baum](https://github.com/kbaum)
+* [Luke van der Hoeven](https://github.com/plukevdh)
 * [Mark Burns](https://github.com/markburns)
 * [Michael Lavrisha](https://github.com/vrish88)
 * [Mislav Marohnić](https://github.com/mislav)
@@ -168,7 +170,11 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [playupchris](https://github.com/playupchris)
 * [Ryan Bates](https://github.com/ryanb)
 * [Ryan Burrows](https://github.com/rhburrows)
+* [Ryan Castillo](https://github.com/rmcastil)
 * [Sathya Sekaran](https://github.com/sfsekaran)
+* [Scott Carleton](https://github.com/ScotterC)
+* [Shay Frendt](https://github.com/shayfrendt)
+* [Steve Faulkner](https://github.com/southpolesteve)
 * [Steven Anderson](https://github.com/bendycode)
 * [Tyler Hunt](https://github.com/tylerhunt)
 * [Wesley Beary](https://github.com/geemus)
@@ -178,10 +184,11 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Betamax](https://github.com/robfletcher/betamax) (Groovy)
 * [Mimic](https://github.com/acoulton/mimic) (PHP/Kohana)
 * [Nock](https://github.com/flatiron/nock) (JavaScript/Node)
-* [NSURLConnectionVCR](https://bitbucket.org/martijnthe/nsurlconnectionvcr) (Objective C)
+* [NSURLConnectionVCR](https://bitbucket.org/martijnthe/nsurlconnectionvcr) (Objective-C)
 * [TapeDeck.js](https://github.com/EndangeredMassa/TapeDeck.js) (JavaScript)
 * [VCR.js](https://github.com/elcuervo/vcr.js) (JavaScript)
 * [VCR.py](https://github.com/kevin1024/vcrpy) (Python)
+* [VCRURLConnection](https://github.com/dstnbrkr/VCRURLConnection) (Objective-C)
 * [vcr-clj](https://github.com/ifesdjeen/vcr-clj) (Clojure)
 
 ## Similar Libraries in Ruby
@@ -195,5 +202,5 @@ Thanks also to the following people who have contributed patches or helpful sugg
 
 ## Copyright
 
-Copyright (c) 2010-2012 Myron Marston. Released under the terms of the
+Copyright (c) 2010-2013 Myron Marston. Released under the terms of the
 MIT license. See LICENSE for details.

data/Rakefile

@@ -88,13 +88,15 @@ end
 
 desc "Push cukes to relishapp using the relish-client-gem"
 task :relish do
-  %w[ README.md CHANGELOG.md Upgrade.md LICENSE CONTRIBUTING.md].each do |file|
-    ensure_relish_doc_symlinked(file)
-  end
+  unless ENV['SKIP_RELISH']
+    %w[ README.md CHANGELOG.md Upgrade.md LICENSE CONTRIBUTING.md].each do |file|
+      ensure_relish_doc_symlinked(file)
+    end
 
-  require 'vcr/version'
-  sh "relish versions:add myronmarston/vcr:#{VCR.version}" if ENV['NEW_RELISH_RELEASE']
-  sh "relish push vcr:#{VCR.version}"
+    require 'vcr/version'
+    sh "relish versions:add vcr/vcr:#{VCR.version}" if ENV['NEW_RELISH_RELEASE']
+    sh "relish push vcr/vcr:#{VCR.version}"
+  end
 end
 
 task :prep_relish_release do

data/cucumber.yml

@@ -1,13 +1,16 @@
 <%
+base_opts = '--require features/step_definitions --require features/support'
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} --strict"
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} --strict"
 
-exclusions = ["--tags ~@exclude-#{RUBY_VERSION.split('.').first(2).join}"].tap do |a|
-  a << "--tags ~@exclude-#{RUBY_ENGINE}" if defined?(RUBY_ENGINE)
-end.join(' ')
+exclusions = []
+exclusions << "--tags ~@exclude-#{RUBY_VERSION.split('.').first(2).join}"
+exclusions << "--tags ~@exclude-#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+exclusions << "--tags ~@exclude-#{RUBY_ENGINE}" if defined?(RUBY_ENGINE)
+exclusions = exclusions.join(' ')
 %>
-default: <%= std_opts %> --tags ~@wip <%= exclusions %> features
-wip: --tags @wip <%= exclusions %> features
-rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip <%= exclusions %>
+default: <%= base_opts %> <%= std_opts %> --tags ~@wip <%= exclusions %> features
+wip:     <%= base_opts %> --tags @wip <%= exclusions %> features
+rerun:   <%= base_opts %> <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip <%= exclusions %>
 

data/features/.nav

@@ -29,6 +29,8 @@
   - allow_http_connections_when_no_cassette.feature
   - debug_logging.feature
   - preserve_exact_body_bytes.feature
+  - uri_parser.feature
+  - query_parser.feature
 - hooks:
   - before_record.feature
   - before_playback.feature
@@ -40,6 +42,7 @@
   - uri.feature
   - host.feature
   - path.feature
+  - query.feature
   - body.feature
   - headers.feature
   - identical_request_sequence.feature

data/features/configuration/preserve_exact_body_bytes.feature

@@ -32,7 +32,7 @@ Feature: Preserve Exact Body Bytes
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.preserve_exact_body_bytes do |http_message|
           http_message.body.encoding.name == 'ASCII-8BIT' ||
           !http_message.body.valid_encoding?
@@ -79,7 +79,7 @@ Feature: Preserve Exact Body Bytes
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.default_cassette_options = { :serialize_with => :json }
       end
 

data/features/configuration/query_parser.feature

@@ -0,0 +1,84 @@
+Feature: query_parser
+
+  By default, VCR will parse query strings using `CGI.parse` from the Ruby
+  standard library. This may not be the most optimal or performant library
+  available.  You can set the `query_parser` configuration option to use a
+  different parser (such as `Rack::Utils.method(:parse_query)`) to decode,
+  normalize, and/or provide a comparison object for query strings.
+
+  The configured query parser needs to expose a `.call` method that returns an
+  object which is comparable. This instance needs to implement the following
+  API:
+
+    * `#==`     => boolean
+
+  Background:
+    Given a file named "cassettes/example.yml" with:
+      """
+      ---
+      http_interactions:
+      - request:
+          method: get
+          uri: http://url.example.com/?bravo=2&alpha=1
+          body:
+            encoding: UTF-8
+            string: ""
+          headers: {}
+        response:
+          status:
+            code: 200
+            message: OK
+          headers:
+            Content-Length:
+            - "5"
+          body:
+            encoding: UTF-8
+            string: Hello
+          http_version: "1.1"
+        recorded_at: Tue, 25 Sep 2012 04:58:44 GMT
+      recorded_with: VCR 2.2.5
+      """
+
+  Scenario: the VCR query parser gets its value from `query_parser`
+    Given a file named "query_parser.rb" with:
+      """ruby
+      require 'vcr'
+      require 'rack'
+
+      VCR.configure do |c|
+        c.query_parser = lambda { |query| raise query.inspect }
+        c.default_cassette_options = {:match_requests_on => [:query]}
+        c.hook_into :webmock
+        c.cassette_library_dir = 'cassettes'
+      end
+
+      uri = URI.parse('http://other-url.example.com/?bravo=2&alpha=1')
+      VCR.use_cassette('example') do
+        puts Net::HTTP.get_response(uri).body
+      end
+      """
+     When I run `ruby query_parser.rb`
+     Then it should fail with an error like:
+     """
+     "alpha=1&bravo=2"
+     """
+
+
+  Scenario: the `query_parser` defaults to the standard library's `CGI.parse`
+    Given a file named "query_parser_default.rb" with:
+      """ruby
+      require 'vcr'
+
+      VCR.configure do |c|
+        c.hook_into :webmock
+        c.default_cassette_options = {:match_requests_on => [:query]}
+        c.cassette_library_dir = 'cassettes'
+      end
+
+      uri = URI.parse('http://other-url.example.com/?bravo=2&alpha=1')
+      VCR.use_cassette('example') do
+        puts Net::HTTP.get_response(uri).body
+      end
+      """
+     When I run `ruby query_parser_default.rb`
+     Then it should pass with "Hello"

data/features/configuration/uri_parser.feature

@@ -8,7 +8,7 @@ Feature: uri_parser
 
   The configured URI parser needs to expose a `.parse` class method
   that returns an instance of the uri. This uri instance needs to
-  implement the folllowing API:
+  implement the following API:
 
     * `#scheme` => a string
     * `#host`   => a string

data/features/hooks/around_http_request.feature

@@ -1,4 +1,4 @@
-@exclude-18
+@exclude-18 @exclude-1.9.3p327
 Feature: around_http_request hook
 
   The `around_http_request` hook wraps each HTTP request. It can be used