vcr 2.2.5 → 2.3.0

data/.gitignore

@@ -36,6 +36,11 @@ features/LICENSE.md
 features/Upgrade.md
 features/CONTRIBUTING.md
 
+## PROJECT::TOOLS
+
 .rvmrc
 .yardoc
 doc
+
+## PROJECT::EDITORS
+.idea/

data/.travis.yml

@@ -12,11 +12,6 @@ rvm:
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
-branches:
-  only:
-    - master
-    - 1-x-stable
-    - travis-testing
 matrix:
   allow_failures:
     - rvm: jruby-18mode

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "typhoeus-new" do
+  gem 'typhoeus', :git => "https://github.com/typhoeus/typhoeus.git"
+end
+
+appraise "typhoeus-old" do
+  gem 'typhoeus', '~> 0.4.2'
+  gem 'webmock',  '1.8.11'
+end
+

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2.3.0 (October 29, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.5...v2.3.0)
+
+Enhancements:
+
+* Add `uri_parser` configuration option. It defaults to `URI` but can
+  be set to something like `Addressable::URI` to handle non-standard
+  URIs that stdlib `URI` doesn't handle. Thanks to [Ryan
+  Burrows](https://github.com/rhburrows) for contributing this feature.
+* Add support for Typhoeus 0.5. Thanks to [Hans
+  Hasselberg](https://github.com/i0rek) for making the needed changes.
+
+Bug Fixes:
+
+* Fix `:use_scenario_name` cucumber tag option so that it only uses the
+  first line of the scenario name. Scenarios can include a long preamble
+  that Cucumber includes as part of the scenario name. Thanks to
+  [Pascal Van Hecke](https://github.com/pascalvanhecke) for providing
+  this fix.
+
 ## 2.2.5 (September 7, 2012)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.4...v2.2.5)

data/Gemfile

@@ -1,29 +1,25 @@
 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
 
-group :development do
-  platforms :jruby do
-    gem 'jruby-openssl'
-  end
-end
+gem 'jruby-openssl', :platforms => :jruby
 
 gem 'yard'
 
 # Additional gems that are useful, but not required for development.
-group :extras do
-  gem 'relish', '~> 0.6'
-  gem 'fuubar'
-  gem 'fuubar-cucumber'
-
-  gem 'redcarpet', '~> 1.17.2'
-  gem 'github-markup'
-
-  platforms :mri_18, :jruby do
-    gem 'ruby-debug'
-  end
-
-  platforms :mri_19 do
-    gem 'ruby-debug19'
-  end unless RUBY_VERSION == '1.9.3'
-end
+gem 'relish', '~> 0.6'
+gem 'fuubar'
+gem 'fuubar-cucumber'
+
+gem 'redcarpet', '~> 1.17.2'
+gem 'github-markup'
+
+gem 'ruby-debug', :platforms => [:mri_18, :jruby]
+
+gem 'debugger', :platforms => :mri_19
 

data/README.md

@@ -128,8 +128,8 @@ yard server --reload
 * [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/typhoeus/typhoeus)
-  support.
+* [David Balatero](https://github.com/dbalatero) and [Hans Hasselberg](https://github.com/i0rek)
+  for help with [Typhoeus](https://github.com/typhoeus/typhoeus) support.
 * [Wesley Beary](https://github.com/geemus) for help with [Excon](https://github.com/geemus/excon)
   support.
 * [Jacob Green](https://github.com/Jacobkg) for help with ongoing VCR
@@ -150,6 +150,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Ezekiel Templin](https://github.com/ezkl)
 * [Flaviu Simihaian](https://github.com/closedbracket)
 * [Gordon Wilson](https://github.com/gordoncww)
+* [Hans Hasselberg](https://github.com/i0rek)
 * [Ingemar](https://github.com/ingemar)
 * [Jacob Green](https://github.com/Jacobkg)
 * [Jeff Pollard](https://github.com/Fluxx)
@@ -157,6 +158,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)
+* [Mark Burns](https://github.com/markburns)
 * [Michael Lavrisha](https://github.com/vrish88)
 * [Mislav Marohnić](https://github.com/mislav)
 * [Nathaniel Bibler](https://github.com/nbibler)
@@ -165,6 +167,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Paco Guzmán](https://github.com/pacoguzman)
 * [playupchris](https://github.com/playupchris)
 * [Ryan Bates](https://github.com/ryanb)
+* [Ryan Burrows](https://github.com/rhburrows)
 * [Sathya Sekaran](https://github.com/sfsekaran)
 * [Steven Anderson](https://github.com/bendycode)
 * [Tyler Hunt](https://github.com/tylerhunt)

data/Rakefile

@@ -4,6 +4,7 @@ if using_git
   require 'bundler'
   require 'bundler/setup'
   Bundler::GemHelper.install_tasks
+  require 'appraisal'
 end
 
 require 'rake'

data/features/configuration/hook_into.feature

@@ -88,7 +88,7 @@ Feature: hook_into
       | c.hook_into :faraday  | faraday (w/ net_http) |
       | c.hook_into :faraday  | faraday (w/ typhoeus) |
 
-  @exclude-jruby
+  @exclude-jruby @exclude-18
   Scenario Outline: Use Typhoeus, Excon and Faraday in combination with FakeWeb or WebMock
     Given a file named "hook_into_multiple.rb" with:
       """ruby
@@ -96,6 +96,7 @@ Feature: hook_into
       require 'excon'
       require 'faraday'
       require 'vcr'
+      <extra_require>
 
       VCR.configure { |c| c.ignore_localhost = true }
 
@@ -167,8 +168,8 @@ Feature: hook_into
       | Faraday 2: Hello faraday      |
 
     Examples:
-      | hook_into | faraday_adapter |
-      | :fakeweb  | net_http        |
-      | :webmock  | net_http        |
-      | :fakeweb  | typhoeus        |
-      | :webmock  | typhoeus        |
+      | hook_into | faraday_adapter | extra_require                       |
+      | :fakeweb  | net_http        |                                     |
+      | :webmock  | net_http        |                                     |
+      | :fakeweb  | typhoeus        | require 'typhoeus/adapters/faraday' |
+      | :webmock  | typhoeus        | require 'typhoeus/adapters/faraday' |

data/features/configuration/uri_parser.feature

@@ -0,0 +1,91 @@
+Feature: uri_parser
+
+  By default, VCR will parse URIs using `URI` from the Ruby standard
+  library. There are some URIs seen out in the wild that `URI` cannot
+  parse properly. You can set the `uri_parser` configuration option
+  to use a different parser (such as `Addressable::URI`) to work with
+  these URIs.
+
+  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:
+
+    * `#scheme` => a string
+    * `#host`   => a string
+    * `#port`   => a fixnum
+    * `#path`   => a string
+    * `#query`  => a string
+    * `#to_s`   => a string
+    * `#port=`
+    * `#query=`
+    * `#==`     => boolean
+
+  Background:
+    Given a file named "cassettes/example.yml" with:
+      """
+      ---
+      http_interactions:
+      - request:
+          method: get
+          uri: http://bad_url.example.com/
+          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 uri parser gets its value from `uri_parser`
+    Given a file named "uri_parser.rb" with:
+      """ruby
+      require 'vcr'
+      require 'addressable/uri'
+
+      VCR.configure do |c|
+        c.uri_parser = Addressable::URI
+        c.hook_into :webmock
+        c.cassette_library_dir = 'cassettes'
+      end
+
+      uri = Addressable::URI.parse('http://bad_url.example.com')
+      VCR.use_cassette('example') do
+        puts Net::HTTP.get_response(uri).body
+      end
+      """
+     When I run `ruby uri_parser.rb`
+     Then it should pass with "Hello"
+
+  Scenario: the `uri_parser` defaults to the standard library's `URI`
+    Given a file named "uri_parser_default.rb" with:
+      """ruby
+      require 'vcr'
+      require 'addressable/uri'
+
+      VCR.configure do |c|
+        c.hook_into :webmock
+        c.cassette_library_dir = 'cassettes'
+      end
+
+      uri = Addressable::URI.parse('http://bad_url.example.com')
+      VCR.use_cassette('example') do
+        puts Net::HTTP.get_response(uri).body
+      end
+      """
+     When I run `ruby uri_parser_default.rb`
+     Then it should fail with an error like:
+     """
+     URI::InvalidURIError
+     """
+

data/features/middleware/faraday.feature

@@ -21,6 +21,7 @@ Feature: Faraday middleware
 
       require 'faraday'
       require 'vcr'
+      <extra_require>
 
       VCR.configure do |c|
         c.default_cassette_options = { :serialize_with => :syck }
@@ -49,7 +50,7 @@ Feature: Faraday middleware
     And the file "cassettes/example.yml" should contain "Hello foo 1"
 
     Examples:
-      | adapter  |
-      | net_http |
-      | typhoeus |
+      | adapter  | extra_require                       |
+      | net_http |                                     |
+      | typhoeus | require 'typhoeus/adapters/faraday' |
 

data/features/support/http_lib_filters.rb

@@ -5,9 +5,8 @@ Cucumber::Ast::OutlineTable::ExampleRow.class_eval do
   end
 end
 
-if RUBY_VERSION == '1.9.2'
-  # For some reason, the local sinatra server locks up and never exits
-  # when using patron on 1.9.2, even though it exits fine during the specs.
+if RUBY_VERSION == '1.8.7'
+  # We get timeouts on 1.8.7 w/ Patron for some reason.
   UNSUPPORTED_HTTP_LIBS = %w[ patron ]
 elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   # Patron is freezing up the cukes (as it does on 1.9.2)

data/features/support/vcr_cucumber_helpers.rb

@@ -23,8 +23,9 @@ if ENV['DATE_STRING']
 end
 
 def include_http_adapter_for(lib)
-  require 'support/http_library_adapters'
   require (lib =~ /faraday/ ? 'faraday' : lib)
+  require 'typhoeus' if lib.include?('typhoeus') # for faraday-typhoeus
+  require 'support/http_library_adapters'
   include HTTP_LIBRARY_ADAPTERS[lib]
 end
 

data/features/test_frameworks/cucumber.feature

@@ -92,6 +92,12 @@ Feature: Usage with Cucumber
 
         @vcr
         Scenario: tagged scenario
+
+        Note: Like the feature pre-amble, Cucumber treats the scenario pre-amble
+        as part of the scenario name. When using the :use_scenario_name option,
+        VCR will only use the first line of the feature name as the directory
+        for the cassette.
+
           When a request is made to "http://localhost:7777/localhost_request_1"
           Then the response should be "Hello localhost_request_1"
 

data/gemfiles/typhoeus-new.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "webmock", :git=>"https://github.com/i0rek/webmock.git", :branch=>"typhoeus_0.5.0"
+gem "jruby-openssl", :platforms=>:jruby
+gem "yard"
+gem "relish", "~> 0.6"
+gem "fuubar"
+gem "fuubar-cucumber"
+gem "redcarpet", "~> 1.17.2"
+gem "github-markup"
+gem "ruby-debug", :platforms=>[:mri_18, :jruby]
+gem "debugger", :platforms=>:mri_19
+gem "typhoeus", :git=>"https://github.com/typhoeus/typhoeus.git"
+
+gemspec :path=>"../"

data/gemfiles/typhoeus-new.gemfile.lock

@@ -0,0 +1,172 @@
+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
+  specs:
+    vcr (2.2.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    appraisal (0.4.1)
+      bundler
+      rake
+    archive-tar-minitar (0.5.2)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    columnize (0.3.6)
+    cookiejar (0.3.0)
+    crack (0.3.1)
+    cucumber (1.1.9)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    curb (0.8.1)
+    debugger (1.2.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.4)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.4)
+    diff-lcs (1.1.3)
+    em-http-request (1.0.3)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      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)
+      mime-types (~> 1.18)
+    eventmachine (1.0.0)
+    excon (0.16.7)
+    fakeweb (1.3.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    ffi (1.0.11)
+    fuubar (1.0.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 0.0.10)
+    fuubar-cucumber (0.0.15)
+      cucumber (>= 1.0.2)
+      ruby-progressbar (~> 0.0.10)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
+    github-markup (0.7.4)
+    http_parser.rb (0.5.3)
+    httpclient (2.3.0.1)
+    json (1.6.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mime-types (1.19)
+    multi_json (1.0.4)
+    multipart-post (1.1.5)
+    patron (0.4.18)
+    rack (1.3.6)
+    rack-protection (1.2.0)
+      rack
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
+    redcarpet (1.17.2)
+    redis (2.2.2)
+    relish (0.6)
+      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.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)
+      diff-lcs (~> 1.1.3)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.11.3)
+    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 (0.0.10)
+    shoulda (2.9.2)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    term-ansicolor (1.0.7)
+    tilt (1.3.3)
+    timecop (0.3.5)
+    yajl-ruby (1.1.0)
+    yard (0.8.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  aruba (~> 0.4.11)
+  bundler (>= 1.0.7)
+  cucumber (~> 1.1.4)
+  curb (~> 0.8.0)
+  debugger
+  em-http-request (~> 1.0.2)
+  excon (>= 0.11.0, < 1.0)
+  fakeweb (~> 1.3.0)
+  faraday (~> 0.8)
+  fuubar
+  fuubar-cucumber
+  github-markup
+  httpclient (~> 2.2)
+  jruby-openssl
+  json (~> 1.6.5)
+  multi_json (~> 1.0.3)
+  patron (~> 0.4.15)
+  rack (~> 1.3.6)
+  rake (~> 0.9.2)
+  redcarpet (~> 1.17.2)
+  redis (~> 2.2.2)
+  relish (~> 0.6)
+  rspec (~> 2.11)
+  ruby-debug
+  shoulda (~> 2.9.2)
+  simplecov (~> 0.5.3)
+  sinatra (~> 1.3.2)
+  timecop (~> 0.3.5)
+  typhoeus!
+  vcr!
+  webmock!
+  yajl-ruby (~> 1.1.0)
+  yard