vcr 2.7.0 → 2.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWRhMTJmODMwZTRlMWQ4YzFiMGRlZmY4ZTE5NmM4OWQyZDNlYzM0ZQ==
+    YmQ3MGMzZTMzMjRhODljMzAzMWYzZGMzMDVhNzc3ZjU4YjE1ZWNjMw==
   data.tar.gz: !binary |-
-    MjU3OGExMjk0NWI2MjVhYTM2NGEzNTRhOGJlMWJlMzFiNzBkMjRkYg==
+    NzcwMGUwMWJjY2JjMGVkZTNmMDE0ZDdjODlhNDFhMzFlNGZlMGEyOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTI5ZDI3NDdmNmI4ZTY1NTFmNTBkN2Q1NGViYTc5MTkzNzhmNDY3MDJkMmQ1
-    ZTVjNTk0YzVkOTM0MjVkN2U0ZTVmNTIzZGViYTFiYzVlYmM0MjM2NWFiNThl
-    MGI1YTg3ZDc3MTcwMjJiMmY1MzA1YWMzNzBhMWJmMThhZGE5YmU=
+    OTcyOWYyM2RkNzU0NDc3NDQ4NmZjYWQ1NjFhYTBiYjM0YTA4MGJjNDBhZDk5
+    MGUxZmNlMzg1MDQ5NWRjMDZkZDliOGNiYWE2YzBlYTM3NzU5NmFhMGU1OGQ5
+    MGZjMDM0NGZjZjZhZGI3MTM2MjZmM2MzNjA1ODU5MmUyMWFmYzU=
   data.tar.gz: !binary |-
-    MTIwY2QzNmRkOTczOGNmYmQxNzg2N2E0NjI4YjgyMTRiYzMzMTFmODA3ZGZm
-    ZDdlNGFmNjg5NmY4YWQ4YzM0ZjA4YzIwZGIwYjdlZjViZmFkMDM1NTZmOTJi
-    ZWFiNDhmMzllZjI5OTgwOTM0OWI2ZjgxNmM3ZmYxMzFlMGQwZmM=
+    YzI4MzRmZjM5MTA2ZjRkZDhlZjAxYWE4ZmFlMzkzYzRiNzgyZjc1Nzg2Mjk5
+    ZjdlYzhiYWVlNDczMjdiMzcwZDI4NjBlOWE4ZTRjNzZjNWViNjM1OGExMTI2
+    OGQ2YjM5NjNkZjRlZDZiMGJhZGJlNWEyNjMxMmM5ZjI3MjE0MmQ=

data/.rspec

@@ -1,2 +1,2 @@
---format Fuubar
+--format progress
 --color

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 env: CUCUMBER_FORMAT=progress
 bundler_args: --without extras
 script: "script/ci.sh"
+services:
+  - redis-server
 rvm:
   - 1.8.7
   - 1.9.2
@@ -16,6 +18,8 @@ matrix:
   allow_failures:
     - rvm: jruby-18mode
     - rvm: jruby-19mode
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
 branches:
   except:
     - gh-pages

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 2.8.0 (November 23, 2013)
+
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.7.0...v2.8.0)
+
+Enhancements:
+
+* Explicitly support the latest Excon release (0.29). (Myron Marston)
+* Add `:body_as_json` request matcher. (Mike Dalton)
+* Include the body in the `UnhandledHTTPRequestError` message when
+  matching on `:body` to help identify the request. (Chris Gunther)
+
+Bug Fixes:
+
+* Fix Excon adapter so that it properly records responses even when
+  a middleware raises an error (such as via the `:expects` Excon
+  option). Previously, the order `response_call` was invoked on
+  Excon middleware caused VCR's recording ot be skipped when an
+  error was raised by another middleware. To fix this, we have
+  split up VCR Excon middleware into two middlewares that we can
+  insert into the stack at the appropriate spots. Note that to get
+  this to work, Excon < 0.25.2 is no longer supported.
+  (Myron Marston)
+* Fix Excon adapter so that we pass it a dup of the body string
+  rather than the body string itself, since Excon has code paths
+  that will mutate the stubbed response string we give it, wreaking
+  confusing havoc. (Myron Marston)
+* Fix rspec metadata implementation so that it does not emit warnings
+  on RSpec 2.99. (Herman Verschooten)
+
 ## 2.7.0 (October 31, 2013)
 
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.6.0...v2.7.0)

data/CONTRIBUTING.md

@@ -7,19 +7,6 @@ gem install bundler
 bundle install
 ```
 
-Next setup the Git submodules:
-
-```console
-git submodule init
-git submodule update
-```
-
-or using the single command form
-
-```console
-git submodule update --init
-```
-
 You should be able to run the tests now:
 
 ```console

data/Gemfile

@@ -10,8 +10,6 @@ gem 'yard'
 
 # Additional gems that are useful, but not required for development.
 gem 'relish', '~> 0.6'
-gem 'fuubar'
-gem 'fuubar-cucumber'
 
 gem 'redcarpet', '~> 1.17.2', :platforms => :ruby
 gem 'github-markup'
@@ -28,7 +26,7 @@ gem 'rake', '>= 0.9.2'
 gem 'cucumber', '>= 1.1.4'
 gem 'aruba', '>= 0.5'
 
-gem 'rspec', '>= 2.11'
+gem 'rspec', '>= 3.0.0.beta1'
 
 gem 'fakeweb', '>= 1.3.0'
 gem 'webmock', '>= 1.14'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (2.7.0)
+    vcr (2.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -36,7 +36,7 @@ GEM
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     em-http-request (1.1.1)
       addressable (>= 2.3.4)
       cookiejar
@@ -49,18 +49,11 @@ GEM
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
     eventmachine (1.0.3)
-    excon (0.28.0)
+    excon (0.29.0)
     fakeweb (1.3.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     ffi (1.9.3)
-    fuubar (1.2.1)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 1.0)
-    fuubar-cucumber (0.0.20)
-      cucumber (~> 1.3.0)
-      ruby-progressbar (~> 1.0.0)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     github-markup (0.7.5)
@@ -92,21 +85,21 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
+    rspec (3.0.0.beta1)
+      rspec-core (= 3.0.0.beta1)
+      rspec-expectations (= 3.0.0.beta1)
+      rspec-mocks (= 3.0.0.beta1)
+    rspec-core (3.0.0.beta1)
+    rspec-expectations (3.0.0.beta1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-instafail (0.2.4)
-    rspec-mocks (2.14.4)
+      rspec-support (= 3.0.0.beta1)
+    rspec-mocks (3.0.0.beta1)
+    rspec-support (3.0.0.beta1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-progressbar (1.0.2)
     safe_yaml (0.9.7)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -140,8 +133,6 @@ DEPENDENCIES
   excon (>= 0.22)
   fakeweb (>= 1.3.0)
   faraday (>= 0.8)
-  fuubar
-  fuubar-cucumber
   github-markup
   httpclient (>= 2.2)
   jruby-openssl
@@ -154,7 +145,7 @@ DEPENDENCIES
   redcarpet (~> 1.17.2)
   redis (>= 2.2.2)
   relish (~> 0.6)
-  rspec (>= 2.11)
+  rspec (>= 3.0.0.beta1)
   ruby-debug
   simplecov (>= 0.5.3)
   sinatra (>= 1.3.2)

data/README.md

@@ -97,6 +97,7 @@ VCR has been tested on the following ruby interpreters:
 * MRI 1.8.7
 * MRI 1.9.2
 * MRI 1.9.3
+* MRI 2.0.0
 * REE 1.8.7
 * JRuby
 * Rubinius
@@ -148,12 +149,14 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Carlos Kirkconnell](https://github.com/kirkconnell)
 * [Chad Jolly](https://github.com/cjolly)
 * [Chris Le](https://github.com/chrisle)
+* [Chris Gunther](https://github.com/cgunther)
 * [Eduardo Maia](https://github.com/emaiax)
 * [Eric Allam](http://github.com/rubymaverick)
 * [Ezekiel Templin](https://github.com/ezkl)
 * [Flaviu Simihaian](https://github.com/closedbracket)
 * [Gordon Wilson](https://github.com/gordoncww)
 * [Hans Hasselberg](https://github.com/i0rek)
+* [Herman Verschooten](https://github.com/Hermanverschooten)
 * [Ian Cordasco](https://github.com/sigmavirus24)
 * [Ingemar](https://github.com/ingemar)
 * [Jacob Green](https://github.com/Jacobkg)
@@ -164,17 +167,20 @@ 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)
+* [Kris Luminar](https://github.com/kris-luminar)
 * [Kurt Funai](https://github.com/kurtfunai)
 * [Luke van der Hoeven](https://github.com/plukevdh)
 * [Mark Burns](https://github.com/markburns)
 * [Max Riveiro](https://github.com/kavu)
 * [Michael Lavrisha](https://github.com/vrish88)
+* [Mike Dalton](https://github.com/kcdragon)
 * [Mislav Marohnić](https://github.com/mislav)
 * [Nathaniel Bibler](https://github.com/nbibler)
 * [Noah Davis](https://github.com/noahd1)
 * [Oliver Searle-Barnes](https://github.com/opsb)
 * [Omer Rauchwerger](https://github.com/rauchy)
 * [Paco Guzmán](https://github.com/pacoguzman)
+* [Paul Morgan](https://github.com/jumanjiman)
 * [playupchris](https://github.com/playupchris)
 * [Ron Smith](https://github.com/ronwsmith)
 * [Ryan Bates](https://github.com/ryanb)
@@ -200,7 +206,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Mimic](https://github.com/acoulton/mimic) (PHP/Kohana)
 * [Nock-VCR](https://github.com/carbonfive/nock-vcr) (JavaScript/Node)
 * [NSURLConnectionVCR](https://bitbucket.org/martijnthe/nsurlconnectionvcr) (Objective-C)
-* [PHP-VCR](https://github.com/adri/php-vcr) (PHP)
+* [PHP-VCR](https://github.com/php-vcr/php-vcr) (PHP)
 * [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)

data/Rakefile

@@ -22,7 +22,7 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new
 
-task :default => [:spec, :cucumber]
+task :default => [:submodules, :spec, :cucumber]
 
 desc "Ensures we keep up 100% YARD coverage"
 task :yard_coverage do
@@ -49,12 +49,16 @@ task :check_code_coverage do
   end
 end
 
+desc "Checkout git submodules"
+task :submodules do
+  sh "git submodule sync"
+  sh "git submodule update --init --recursive"
+end
+
 namespace :ci do
   desc "Sets things up for a ci build on travis-ci.org"
-  task :setup do
+  task :setup => :submodules do
     ENV['TRAVIS'] = 'true'
-    sh "git submodule init"
-    sh "git submodule update"
   end
 
   RSpec::Core::RakeTask.new(:spec) do |t|
@@ -94,13 +98,13 @@ task :relish do
     end
 
     require 'vcr/version'
-    sh "relish versions:add vcr/vcr:#{VCR.version}" if ENV['NEW_RELISH_RELEASE']
+    sh "relish versions:add vcr/vcr:#{VCR.version}" if ENV['NEW_RELISH_RELEASE'] == 'true'
     sh "relish push vcr/vcr:#{VCR.version}"
   end
 end
 
 task :prep_relish_release do
-  ENV['NEW_RELISH_RELEASE'] = 'true'
+  ENV['NEW_RELISH_RELEASE'] ||= 'true'
 end
 
 task :release => [:prep_relish_release, :relish]

data/cucumber.yml

@@ -1,8 +1,8 @@
 <%
 base_opts = '--require features/step_definitions --require features/support'
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} --strict"
+std_opts = "--format progress --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}"
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
 
 exclusions = []
 exclusions << "--tags ~@exclude-#{RUBY_VERSION.split('.').first(2).join}"

data/features/request_matching/body_as_json.feature

@@ -0,0 +1,90 @@
+Feature: Matching on Body
+
+  Use the `:body_as_json` request matcher to match requests on the request body where the body is JSON.
+
+  Background:
+    Given a previously recorded cassette file "cassettes/example.yml" with:
+      """
+      ---
+      http_interactions:
+      - request:
+          method: post
+          uri: http://example.net/some/long/path
+          body:
+            encoding: UTF-8
+            string: '{ "a" : "1" }'
+          headers: {}
+        response:
+          status:
+            code: 200
+            message: OK
+          headers:
+            Content-Length:
+            - "14"
+          body:
+            encoding: UTF-8
+            string: body1 response
+          http_version: "1.1"
+        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+      - request:
+          method: post
+          uri: http://example.net/some/long/path
+          body:
+            encoding: UTF-8
+            string: '{ "a" : "1", "b" : "2" }'
+          headers: {}
+        response:
+          status:
+            code: 200
+            message: OK
+          headers:
+            Content-Length:
+            - "14"
+          body:
+            encoding: UTF-8
+            string: body2 response
+          http_version: "1.1"
+        recorded_at: Tue, 01 Nov 2011 04:58:44 GMT
+      recorded_with: VCR 2.0.0
+      """
+
+  Scenario Outline: Replay interaction that matches the body as JSON
+    And a file named "body_as_json_matching.rb" with:
+      """ruby
+      include_http_adapter_for("<http_lib>")
+
+      require 'vcr'
+
+      VCR.configure do |c|
+        <configuration>
+        c.cassette_library_dir = 'cassettes'
+      end
+
+      VCR.use_cassette('example', :match_requests_on => [:body_as_json]) do
+        puts "Response for body as json 2: " + response_body_for(:put, "http://example.com/", '{ "a" : "1", "b" : "2" }')
+      end
+
+      VCR.use_cassette('example', :match_requests_on => [:body_as_json]) do
+        puts "Response for body as json 1: " + response_body_for(:put, "http://example.com/", '{ "a" : "1" }')
+      end
+      """
+    When I run `ruby body_as_json_matching.rb`
+    Then it should pass with:
+      """
+      Response for body as json 2: body2 response
+      Response for body as json 1: body1 response
+      """
+
+    Examples:
+      | configuration         | http_lib              |
+      | c.hook_into :fakeweb  | net/http              |
+      | c.hook_into :webmock  | net/http              |
+      | c.hook_into :webmock  | httpclient            |
+      | c.hook_into :webmock  | curb                  |
+      | c.hook_into :webmock  | patron                |
+      | c.hook_into :webmock  | em-http-request       |
+      | c.hook_into :webmock  | typhoeus              |
+      | c.hook_into :typhoeus | typhoeus              |
+      | c.hook_into :excon    | excon                 |
+      | c.hook_into :faraday  | faraday (w/ net_http) |
+      | c.hook_into :faraday  | faraday (w/ typhoeus) |

data/features/support/env.rb

@@ -36,6 +36,6 @@ Before do
     set_env('PATH', (additional_paths + existing_paths).join(':'))
   end
 
-  @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 60 : 20
+  @aruba_timeout_seconds = 60
 end
 

data/gemfiles/typhoeus_old.gemfile

@@ -6,14 +6,13 @@ gem "appraisal"
 gem "jruby-openssl", :platforms=>:jruby
 gem "yard"
 gem "relish", "~> 0.6"
-gem "fuubar"
-gem "fuubar-cucumber"
 gem "redcarpet", "~> 1.17.2", :platforms=>:ruby
 gem "github-markup"
+gem "bundler"
 gem "rake", ">= 0.9.2"
 gem "cucumber", ">= 1.1.4"
 gem "aruba", ">= 0.5"
-gem "rspec", ">= 2.11"
+gem "rspec", ">= 3.0.0.beta1"
 gem "fakeweb", ">= 1.3.0"
 gem "faraday", ">= 0.8"
 gem "httpclient", ">= 2.2"

data/gemfiles/typhoeus_old.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/myron/code/vcr
   specs:
-    vcr (2.5.0)
+    vcr (2.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,15 +21,16 @@ GEM
     cookiejar (0.3.0)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    cucumber (1.3.8)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.1)
+      gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
-    curb (0.8.4)
-    diff-lcs (1.2.4)
-    em-http-request (1.1.0)
+    curb (0.8.5)
+    diff-lcs (1.2.5)
+    docile (1.1.0)
+    em-http-request (1.1.1)
       addressable (>= 2.3.4)
       cookiejar
       em-socksify (>= 0.3)
@@ -38,57 +39,51 @@ GEM
     em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
     eventmachine (1.0.3)
-    excon (0.25.3)
+    excon (0.29.0)
     fakeweb (1.3.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    ffi (1.9.0)
-    fuubar (1.2.1)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 1.0)
-    fuubar-cucumber (0.0.20)
-      cucumber (~> 1.3.0)
-      ruby-progressbar (~> 1.0.0)
-    gherkin (2.12.1)
+    ffi (1.9.3)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     github-markup (0.7.5)
     http_parser.rb (0.6.0.beta.2)
     httpclient (2.3.4.1)
-    json (1.8.0)
+    json (1.8.1)
     mime-types (1.25)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     multi_test (0.0.2)
     multipart-post (1.2.0)
     patron (0.4.18)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rake (10.1.0)
     redcarpet (1.17.2)
-    redis (3.0.4)
+    redis (3.0.6)
     relish (0.7)
       archive-tar-minitar (>= 0.5.2)
       json (>= 1.4.6)
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec (3.0.0.beta1)
+      rspec-core (= 3.0.0.beta1)
+      rspec-expectations (= 3.0.0.beta1)
+      rspec-mocks (= 3.0.0.beta1)
+    rspec-core (3.0.0.beta1)
+    rspec-expectations (3.0.0.beta1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-instafail (0.2.4)
-    rspec-mocks (2.14.3)
-    ruby-progressbar (1.0.2)
+      rspec-support (= 3.0.0.beta1)
+    rspec-mocks (3.0.0.beta1)
+    rspec-support (3.0.0.beta1)
     safe_yaml (0.9.7)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.4.3)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -101,7 +96,7 @@ GEM
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yajl-ruby (1.1.0)
-    yard (0.8.7.2)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
@@ -109,14 +104,13 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   aruba (>= 0.5)
+  bundler
   cucumber (>= 1.1.4)
   curb (>= 0.8.0)
   em-http-request (>= 1.0.2)
   excon (>= 0.22)
   fakeweb (>= 1.3.0)
   faraday (>= 0.8)
-  fuubar
-  fuubar-cucumber
   github-markup
   httpclient (>= 2.2)
   jruby-openssl
@@ -128,7 +122,7 @@ DEPENDENCIES
   redcarpet (~> 1.17.2)
   redis (>= 2.2.2)
   relish (~> 0.6)
-  rspec (>= 2.11)
+  rspec (>= 3.0.0.beta1)
   simplecov (>= 0.5.3)
   sinatra (>= 1.3.2)
   timecop (= 0.6.1)