vcr 1.8.0 → 1.9.0

data/.travis.yml

@@ -1,4 +1,9 @@
 script: "rake ci:build"
 rvm:
+  - 1.8.6
   - 1.8.7
+  - 1.9.1
   - 1.9.2
+  - ree
+  - rbx
+  - jruby

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.8.0...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.9.0...master)
+
+## 1.9.0 (April 14, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.8.0...v1.9.0)
+
+* Add support for [Excon](https://github.com/geemus/excon).
 
 ## 1.8.0 (March 31, 2011)
 

data/Gemfile

@@ -33,6 +33,7 @@ group :extras do
   end
 
   platforms :mri_19 do
+    gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
     gem 'ruby-debug19'
     gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
   end

data/README.md

@@ -1,4 +1,4 @@
-# VCR [![Build Status](http://travis-ci.org/myronmarston/vcr.png)](http://travis-ci.org/myronmarston/vcr)
+# VCR
 
 Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.
 
@@ -15,9 +15,9 @@ Record your test suite's HTTP interactions and replay them during future test ru
 
     class VCRTest < Test::Unit::TestCase
       def test_example_dot_com
-        VCR.use_cassette('synopsis', :record => :new_episodes) do
-          response = Net::HTTP.get_response(URI.parse('http://example.com/'))
-          assert_match /You have reached this web page by typing.*example\.com/, response.body
+        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
@@ -36,6 +36,7 @@ maintenance) and accurate (the response from example.com will contain the same h
   * [WebMock](https://github.com/bblimke/webmock)
   * [Typhoeus](https://github.com/dbalatero/typhoeus)
   * [Faraday](https://github.com/technoweenie/faraday)
+  * [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)
@@ -43,6 +44,7 @@ maintenance) and accurate (the response from example.com will contain the same h
   * [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)
   * [Typhoeus](https://github.com/dbalatero/typhoeus) (Typhoeus::Hydra, but not Typhoeus::Easy or Typhoeus::Multi)
+  * [Excon](https://github.com/geemus/excon)
   * [Faraday](https://github.com/technoweenie/faraday)
   * 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).
@@ -125,6 +127,8 @@ If you find VCR useful, please recommend me on [working with rails](http://worki
   the inspiration for VCR.
 * [David Balatero](https://github.com/dbalatero) for help with [Typhoeus](https://github.com/pauldix/typhoeus)
   support.
+* [Wesley Beary](https://github.com/geemus) for help with [Excon](https://github.com/geemus/excon)
+  support.
 
 Thanks also to the following people who have contributed patches or helpful suggestions:
 

data/Rakefile

@@ -33,6 +33,7 @@ task :default => [:spec, :cucumber]
 namespace :ci do
   desc "Sets things up for a ci build on travis-ci.org"
   task :setup do
+    ENV['TRAVIS'] = 'true'
     sh "git submodule init"
     sh "git submodule update"
   end

data/cucumber.yml

@@ -7,6 +7,10 @@ interp_opts = if defined?(RUBY_ENGINE)
 else
   ''
 end
+
+if ENV['TRAVIS'] && RUBY_VERSION == '1.8.6'
+  interp_opts << ' --tags ~@exclude-travis-186'
+end
 %>
 default: <%= std_opts %><%= interp_opts %> features
 wip: --tags @wip:30 --wip features<%= interp_opts %>

data/features/cassettes/format.feature

@@ -89,3 +89,4 @@ Feature: Cassette format
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |

data/features/cassettes/no_cassette.feature

@@ -46,6 +46,7 @@ Feature: Error for HTTP request made when no cassette is in use
       | :webmock   | patron          | Real HTTP connections are disabled |
       | :webmock   | em-http-request | Real HTTP connections are disabled |
       | :typhoeus  | typhoeus        | Real HTTP requests are not allowed |
+      | :excon     | excon           | Real HTTP connections are disabled |
 
   Scenario: Temporarily turn VCR off to allow HTTP requests to procede as normal
     Given a file named "turn_off_vcr.rb" with:

data/features/cassettes/request_matching.feature

@@ -95,6 +95,7 @@ Feature: Request matching
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 
   Scenario Outline: match on host and path (to ignore query params)
     Given a previously recorded cassette file "cassettes/example.yml" with:
@@ -164,6 +165,7 @@ Feature: Request matching
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 
   Scenario Outline: match on request body
     Given a previously recorded cassette file "cassettes/example.yml" with:
@@ -236,6 +238,7 @@ Feature: Request matching
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 
   Scenario Outline: match on request headers
     Given a previously recorded cassette file "cassettes/example.yml" with:
@@ -308,6 +311,7 @@ Feature: Request matching
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 
   Scenario Outline: Use a regex for the request URI
     Given a previously recorded cassette file "cassettes/example.yml" with:

data/features/configuration/filter_sensitive_data.feature

@@ -146,8 +146,8 @@ Feature: Filter sensitive data
     And the file "cassettes/example.yml" should contain "body: john.doe/<PASSWORD>"
     And the file "cassettes/example.yml" should contain a YAML fragment like:
       """
-            x-http-password: 
-            - <PASSWORD>
+      x-http-password:
+      - <PASSWORD>
       """
 
     When I run "ruby dynamic_filtering.rb"

data/features/configuration/ignore_hosts.feature

@@ -58,4 +58,5 @@ Feature: ignore_hosts
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 

data/features/configuration/ignore_localhost.feature

@@ -61,6 +61,8 @@ Feature: ignore_localhost
       | :webmock   | em-http-request | Real HTTP connections are disabled | c.ignore_localhost = false |
       | :typhoeus  | typhoeus        | Real HTTP requests are not allowed |                            |
       | :typhoeus  | typhoeus        | Real HTTP requests are not allowed | c.ignore_localhost = false |
+      | :excon     | excon           | Real HTTP connections are disabled |                            |
+      | :excon     | excon           | Real HTTP connections are disabled | c.ignore_localhost = false |
 
   Scenario Outline: localhost requests are allowed and not recorded when ignore_localhost = true
     Given a file named "ignore_localhost_true.rb" with:
@@ -100,4 +102,5 @@ Feature: ignore_localhost
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 

data/features/configuration/stub_with.feature

@@ -13,6 +13,7 @@ Feature: stub_with
       - EM HTTP Request
     - Typhoeus can be used to stub itself (as long as you use Typhoeus::Hydra,
       but not Typhoeus::Easy or Typhoeus::Multi).
+    - Excon can be used to stub itself.
     - Faraday can be used (in combination with the provided Faraday middleware)
       to stub requests made through Faraday (regardless of which Faraday HTTP
       adapter is used).
@@ -30,12 +31,12 @@ Feature: stub_with
       supported HTTP libraries.  No monkey patching is used for Typhoeus or
       Faraday.
     - FakeWeb and WebMock cannot both be used at the same time.
-    - Typhoeus and Faraday can be used together, and with either
+    - Typhoeus, Excon and Faraday can be used together, and with either
       FakeWeb or WebMock.
 
   Regardless of which library you use, VCR takes care of all of the configuration
   for you.  You should not need to interact directly with FakeWeb, WebMock or the
-  stubbing facilities of Typhoeus or Faraday.  If/when you decide to change stubbing
+  stubbing facilities of Typhoeus, Excon or Faraday.  If/when you decide to change stubbing
   libraries (i.e. if you initially use FakeWeb because it's faster but later need the
   additional features of WebMock) you can change the `stub_with` configuration
   option and it'll work with no other changes required.
@@ -52,6 +53,7 @@ Feature: stub_with
       puts "FakeWeb Loaded: #{!!defined?(FakeWeb)}"
       puts "WebMock Loaded: #{!!defined?(WebMock)}"
       puts "Typhoeus Loaded: #{!!defined?(Typhoeus)}"
+      puts "Excon Loaded: #{!!defined?(Excon)}"
       """
     When I run "ruby vcr_stub_with.rb"
     Then the output should contain:
@@ -59,13 +61,15 @@ Feature: stub_with
       FakeWeb Loaded: <fakeweb_loaded>
       WebMock Loaded: <webmock_loaded>
       Typhoeus Loaded: <typhoeus_loaded>
+      Excon Loaded: <excon_loaded>
       """
 
     Examples:
-      | stub_with | fakeweb_loaded | webmock_loaded | typhoeus_loaded |
-      | :fakeweb  | true           | false          | false           |
-      | :webmock  | false          | true           | false           |
-      | :typhoeus | false          | false          | true            |
+      | stub_with | fakeweb_loaded | webmock_loaded | typhoeus_loaded | excon_loaded |
+      | :fakeweb  | true           | false          | false           | false        |
+      | :webmock  | false          | true           | false           | false        |
+      | :typhoeus | false          | false          | true            | false        |
+      | :excon    | false          | false          | false           | true         |
 
   Scenario Outline: Record and replay a request using each supported stubbing/http library combination
     Given a file named "stubbing_http_lib_combo.rb" with:
@@ -111,13 +115,15 @@ Feature: stub_with
       | :webmock   | curb            |
       | :webmock   | em-http-request |
       | :typhoeus  | typhoeus        |
+      | :excon     | excon           |
 
   @exclude-jruby
-  Scenario Outline: Use Typhoeus and Faraday in combination with FakeWeb or WebMock
+  Scenario Outline: Use Typhoeus, Excon and Faraday in combination with FakeWeb or WebMock
     Given a file named "stub_with_multiple.rb" with:
       """
       require 'vcr_cucumber_helpers'
       require 'typhoeus'
+      require 'excon'
 
       start_sinatra_app(:port => 7777) do
         get('/:path') { "#{ARGV[0]} #{params[:path]}" }
@@ -131,6 +137,10 @@ Feature: stub_with
         Typhoeus::Request.get("http://localhost:7777/typhoeus").body
       end
 
+      def excon_response
+        Excon.get("http://localhost:7777/excon").body
+      end
+
       def faraday_response
         Faraday::Connection.new(:url => 'http://localhost:7777') do |builder|
           builder.use VCR::Middleware::Faraday do |cassette|
@@ -144,17 +154,19 @@ Feature: stub_with
 
       puts "Net::HTTP 1: #{net_http_response}"
       puts "Typhoeus 1: #{typhoeus_response}"
+      puts "Excon 1: #{excon_response}"
 
       require 'vcr'
 
       VCR.config do |c|
-        c.stub_with <stub_with>, :typhoeus, :faraday
+        c.stub_with <stub_with>, :typhoeus, :excon, :faraday
         c.cassette_library_dir = 'vcr_cassettes'
       end
 
       VCR.use_cassette('example', :record => :new_episodes) do
         puts "Net::HTTP 2: #{net_http_response}"
         puts "Typhoeus 2: #{typhoeus_response}"
+        puts "Excon 2: #{excon_response}"
       end
 
       puts "Faraday: #{faraday_response}"
@@ -163,20 +175,25 @@ Feature: stub_with
     Then the output should contain each of the following:
       | Net::HTTP 1: Hello net_http |
       | Typhoeus 1: Hello typhoeus  |
+      | Excon 1: Hello excon        |
       | Net::HTTP 2: Hello net_http |
       | Typhoeus 2: Hello typhoeus  |
+      | Excon 2: Hello excon        |
       | Faraday: Hello faraday      |
     And the cassette "vcr_cassettes/example.yml" should have the following response bodies:
       | Hello net_http |
       | Hello typhoeus |
+      | Hello excon    |
       | Hello faraday  |
 
     When I run "ruby stub_with_multiple.rb 'Goodbye'"
     Then the output should contain each of the following:
       | Net::HTTP 1: Goodbye net_http |
       | Typhoeus 1: Goodbye typhoeus  |
+      | Excon 1: Goodbye excon        |
       | Net::HTTP 2: Hello net_http   |
       | Typhoeus 2: Hello typhoeus    |
+      | Excon 2: Hello excon          |
       | Faraday: Hello faraday        |
 
     Examples:

data/features/http_libraries/em_http_request.feature

@@ -1,4 +1,4 @@
-@exclude-jruby @exclude-rbx
+@exclude-jruby @exclude-rbx @exclude-travis-186
 Feature: EM HTTP Request
 
   EM HTTP Request allows multiple simultaneous asynchronous requests.

data/features/step_definitions/cli_steps.rb

@@ -34,6 +34,16 @@ module VCRHelpers
       s.response.headers.reject! { |k, v| %w[ server date ].include?(k) }
     end
 
+    case $stubbing_lib_for_current_scenario
+      when ':excon'
+        # Excon does not expose the status message or http version,
+        # so we have no way to record these attributes.
+        structs.each do |s|
+          s.response.status.message = nil
+          s.response.http_version = nil
+        end
+    end
+
     structs
   end
 
@@ -100,17 +110,16 @@ Then /^the file "([^"]*)" should contain:$/ do |file_name, expected_content|
 end
 
 Then /^the file "([^"]*)" should contain a YAML fragment like:$/ do |file_name, fragment|
-  if defined?(::Psych)
-    # psych serializes things slightly differently...
-    fragment = fragment.split("\n").map { |s| s.rstrip }.join("\n")
-  end
+  in_current_dir do
+    file_content = File.read(file_name)
 
-  # JRuby serializes things a bit differently
-  if RUBY_PLATFORM == 'java'
-    fragment = fragment.gsub(/^(\s+\-)/,'  \1')
-  end
+    # Normalize by removing leading and trailing whitespace...
+    file_content = file_content.split("\n").map do |line|
+      line.strip
+    end.join("\n")
 
-  check_file_content(file_name, fragment, true)
+    file_content.should include(fragment)
+  end
 end
 
 Then /^the cassette "([^"]*)" should have the following response bodies:$/ do |file, table|

data/features/support/http_lib_filters.rb

@@ -22,6 +22,8 @@ elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
 elsif RUBY_PLATFORM == 'java'
   # These gems have C extensions and can't install on JRuby.
   UNSUPPORTED_HTTP_LIBS = %w[ typhoeus patron curb em-http-request ]
+elsif RUBY_VERSION == '1.8.6' && ENV['TRAVIS']
+  UNSUPPORTED_HTTP_LIBS = %w[ em-http-request ]
 end
 
 if defined?(UNSUPPORTED_HTTP_LIBS)
@@ -35,3 +37,19 @@ if defined?(UNSUPPORTED_HTTP_LIBS)
   end
 end
 
+stubbing_libs = %w[ :fakeweb :webmock :typhoeus :faraday :excon ]
+
+# Set a global based on the current stubbing lib so we can put special-case
+# logic in our step definitions based on the http stubbing library.
+Before do |scenario|
+  if scenario.respond_to?(:cell_values)
+    stub_with = stubbing_libs & scenario.cell_values
+    if stub_with.size == 1
+      $stubbing_lib_for_current_scenario = stub_with.first
+    else
+      $stubbing_lib_for_current_scenario = nil
+    end
+  else
+    $stubbing_lib_for_current_scenario = nil
+  end
+end

data/lib/vcr.rb

@@ -140,10 +140,11 @@ module VCR
 
   def adapter_for(lib)
     case lib
+      when :excon;    HttpStubbingAdapters::Excon
       when :fakeweb;  HttpStubbingAdapters::FakeWeb
-      when :webmock;  HttpStubbingAdapters::WebMock
-      when :typhoeus; HttpStubbingAdapters::Typhoeus
       when :faraday;  HttpStubbingAdapters::Faraday
+      when :typhoeus; HttpStubbingAdapters::Typhoeus
+      when :webmock;  HttpStubbingAdapters::WebMock
       else raise ArgumentError.new("#{lib.inspect} is not a supported HTTP stubbing library.")
     end
   end

data/lib/vcr/http_stubbing_adapters/common.rb

@@ -1,5 +1,6 @@
 module VCR
   module HttpStubbingAdapters
+    autoload :Excon,            'vcr/http_stubbing_adapters/excon'
     autoload :FakeWeb,          'vcr/http_stubbing_adapters/fakeweb'
     autoload :Faraday,          'vcr/http_stubbing_adapters/faraday'
     autoload :MultiObjectProxy, 'vcr/http_stubbing_adapters/multi_object_proxy'

data/lib/vcr/http_stubbing_adapters/excon.rb

@@ -0,0 +1,221 @@
+require 'excon'
+
+module VCR
+  module HttpStubbingAdapters
+    module Excon
+      include VCR::HttpStubbingAdapters::Common
+      extend self
+
+      class HttpConnectionNotAllowedError < StandardError; end
+
+      MINIMUM_VERSION = '0.6.2'
+      MAXIMUM_VERSION = '0.6'
+
+      attr_writer :http_connections_allowed
+
+      def http_connections_allowed?
+        !!@http_connections_allowed
+      end
+
+      def ignored_hosts=(hosts)
+        @ignored_hosts = hosts
+      end
+
+      def uri_should_be_ignored?(uri)
+        uri = URI.parse(uri) unless uri.respond_to?(:host)
+        ignored_hosts.include?(uri.host)
+      end
+
+      def stub_requests(http_interactions, match_attributes)
+        match_attributes_stack << match_attributes
+        grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
+          queue = stub_queues[request_matcher]
+          responses.each { |res| queue << res }
+        end
+      end
+
+      def create_stubs_checkpoint(cassette)
+        checkpoints[cassette] = stub_queue_dup
+      end
+
+      def restore_stubs_checkpoint(cassette)
+        match_attributes_stack.pop
+        @stub_queues = checkpoints.delete(cassette) || super
+      end
+
+      def stubbed_response_for(request)
+        return nil unless match_attributes_stack.any?
+        request_matcher = request.matcher(match_attributes_stack.last)
+        queue = stub_queues[request_matcher]
+        return queue.shift if queue.size > 1
+        queue.first
+      end
+
+      def reset!
+        instance_variables.each do |ivar|
+          remove_instance_variable(ivar)
+        end
+      end
+
+      private
+
+        def version
+          ::Excon::VERSION
+        end
+
+        def ignored_hosts
+          @ignored_hosts ||= []
+        end
+
+        def checkpoints
+          @checkpoints ||= {}
+        end
+
+        def stub_queues
+          @stub_queues ||= hash_of_arrays
+        end
+
+        def match_attributes_stack
+          @match_attributes_stack ||= []
+        end
+
+        def stub_queue_dup
+          dup = hash_of_arrays
+
+          stub_queues.each do |k, v|
+            dup[k] = v.dup
+          end
+
+          dup
+        end
+
+        def hash_of_arrays
+          Hash.new { |h, k| h[k] = [] }
+        end
+
+      class RequestHandler
+        attr_reader :params
+        def initialize(params)
+          @params = params
+        end
+
+        def handle
+          case
+            when request_should_be_ignored?
+              perform_real_request
+            when stubbed_response
+              stubbed_response
+            when http_connections_allowed?
+              record_interaction
+            else
+              raise_connections_disabled_error
+          end
+        end
+
+        private
+
+          def request_should_be_ignored?
+            VCR::HttpStubbingAdapters::Excon.uri_should_be_ignored?(uri)
+          end
+
+          def stubbed_response
+            unless defined?(@stubbed_response)
+              @stubbed_response = VCR::HttpStubbingAdapters::Excon.stubbed_response_for(vcr_request)
+
+              if @stubbed_response && @stubbed_response.headers
+                @stubbed_response.headers = normalized_headers(@stubbed_response.headers)
+              end
+            end
+
+            @stubbed_response
+          end
+
+          def http_connections_allowed?
+            VCR::HttpStubbingAdapters::Excon.http_connections_allowed?
+          end
+
+          def perform_real_request
+            connection = ::Excon.new(uri)
+            response = connection.request(params.merge(:mock => false))
+
+            yield response if block_given?
+
+            response.attributes
+          end
+
+          def record_interaction
+            perform_real_request do |response|
+              if VCR::HttpStubbingAdapters::Excon.enabled?
+                http_interaction = http_interaction_for(response)
+                VCR.record_http_interaction(http_interaction)
+              end
+            end
+          end
+
+          def uri
+            @uri ||= begin
+              uri = "#{params[:scheme]}://#{params[:host]}:#{params[:port]}#{params[:path]}"
+              uri << "?#{params[:query]}" if params[:query]
+              uri
+            end
+          end
+
+          def http_interaction_for(response)
+            VCR::HTTPInteraction.new \
+              vcr_request,
+              vcr_response(response)
+          end
+
+          def vcr_request
+            @vcr_request ||= begin
+              headers = params[:headers].dup
+              headers.delete("Host")
+
+              VCR::Request.new \
+                params[:method],
+                uri,
+                params[:body],
+                headers
+            end
+          end
+
+          def vcr_response(response)
+            VCR::Response.new \
+              VCR::ResponseStatus.new(response.status, nil),
+              response.headers,
+              response.body,
+              nil
+          end
+
+          def normalized_headers(headers)
+            normalized = {}
+            headers.each do |k, v|
+              v = v.join(', ') if v.respond_to?(:join)
+              normalized[normalize_header_key(k)] = v
+            end
+            normalized
+          end
+
+          def normalize_header_key(key)
+            key.split('-').               # 'user-agent' => %w(user agent)
+              each { |w| w.capitalize! }. # => %w(User Agent)
+              join('-')
+          end
+
+          def raise_connections_disabled_error
+            raise HttpConnectionNotAllowedError.new(
+              "Real HTTP connections are disabled. Request: #{params[:method]} #{uri}"
+            )
+          end
+
+          ::Excon.stub({}) do |params|
+            self.new(params).handle
+          end
+      end
+
+    end
+  end
+end
+
+Excon.mock = true
+VCR::HttpStubbingAdapters::Common.add_vcr_info_to_exception_message(VCR::HttpStubbingAdapters::Excon::HttpConnectionNotAllowedError)

data/lib/vcr/version.rb

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

data/script/full_build

@@ -1 +1 @@
-rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,rbx rake -f script/FullBuildRakeFile build && rvm use jruby && bundle install && rake | tee tmp/full_build.out
+rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,rbx rake -f script/FullBuildRakeFile build | tee tmp/full_build.out

data/script/spec

@@ -1 +1 @@
-rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,rbx rake -f script/FullBuildRakeFile spec && rvm use jruby && bundle install && rake spec | tee tmp/spec.out
+rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,rbx rake -f script/FullBuildRakeFile spec | tee tmp/spec.out

data/spec/spec_helper.rb

@@ -43,7 +43,9 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.debug = (using_git && RUBY_INTERPRETER == :mri)
 
+  tmp_dir = File.expand_path('../../tmp/cassette_library_dir', __FILE__)
   config.before(:each) do
+    VCR::Config.cassette_library_dir = tmp_dir
     VCR.turn_on! unless VCR.turned_on?
     VCR.eject_cassette while VCR.current_cassette
 
@@ -56,17 +58,11 @@ RSpec.configure do |config|
     FakeWeb.clean_registry
 
     VCR::HttpStubbingAdapters::Faraday.reset!
-  end
-
-  # Ensure each example uses a different cassette library to keep them isolated.
-  config.around(:each) do |example|
-    Dir.mktmpdir do |dir|
-      VCR::Config.cassette_library_dir = dir
-      example.run
-    end
+    VCR::HttpStubbingAdapters::Excon.reset!
   end
 
   config.after(:each) do
+    FileUtils.rm_rf tmp_dir
     VCR::HttpStubbingAdapters::Common.adapters.each do |a|
       a.ignored_hosts = []
     end

data/spec/support/http_library_adapters.rb

@@ -11,7 +11,14 @@ HTTP_LIBRARY_ADAPTERS['net/http'] = Module.new do
 
   def make_http_request(method, url, body = nil, headers = {})
     uri = URI.parse(url)
-    Net::HTTP.new(uri.host, uri.port).send_request(method.to_s.upcase, uri.request_uri, body, headers)
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == "https"
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+
+    http.send_request(method.to_s.upcase, uri.request_uri, body, headers)
   end
 end
 
@@ -112,6 +119,22 @@ HTTP_LIBRARY_ADAPTERS['typhoeus'] = Module.new do
   end
 end
 
+HTTP_LIBRARY_ADAPTERS['excon'] = Module.new do
+  def self.http_library_name; "Excon"; end
+
+  def get_body_string(response)
+    response.body
+  end
+
+  def get_header(header_key, response)
+    response.headers[header_key]
+  end
+
+  def make_http_request(method, url, body = nil, headers = {})
+    Excon.send(method, url, :body => body, :headers => headers)
+  end
+end
+
 %w[ net_http typhoeus patron ].each do |_faraday_adapter|
   HTTP_LIBRARY_ADAPTERS["faraday-#{_faraday_adapter}"] = Module.new do
     class << self; self; end.class_eval do

data/spec/support/shared_example_groups/http_library.rb

@@ -7,7 +7,15 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
     raise ArgumentError.new("No http library adapter module could be found for #{library}")
   end
 
-  describe "using #{adapter_module.http_library_name}", :unless => (RUBY_INTERPRETER != :mri && library =~ /(typhoeus|curb|patron|em-http)/) do
+  http_lib_unsupported = if RUBY_INTERPRETER == :mri
+    # em-http-request is causing issues on 1.8.6 on travis like:
+    # ruby: symbol lookup error: /home/travis/.rvm/gems/ruby-1.8.6-p420/gems/em-http-request-0.3.0/lib/http11_client.so: undefined symbol: rb_hash_lookup
+    library =~ /em-http/ && RUBY_VERSION == '1.8.6' && ENV['TRAVIS']
+  else
+    library =~ /(typhoeus|curb|patron|em-http)/
+  end
+
+  describe "using #{adapter_module.http_library_name}", :unless => http_lib_unsupported do
     include adapter_module
 
     # Necessary for ruby 1.9.2.  On 1.9.2 we get an error when we use super,
@@ -79,6 +87,9 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
         end
       end
 
+      test_url "using https and no explicit port", "https://example.com/foo"
+      test_url "using https and port 443", "https://example.com:443/foo"
+      test_url "using https and some other port", "https://example.com:5190/foo"
       test_url "that has query params",      "http://example.com/search?q=param"
       test_url "with spaces encoded as +",   "http://example.com/search?q=a+b"
       test_url "with spaces encoded as %20", "http://example.com/search?q=a%20b"
@@ -307,7 +318,9 @@ shared_examples_for "an http library" do |library, supported_request_match_attri
           end unless other.include?(:does_not_support_rotating_responses)
 
           it "correctly handles stubbing multiple values for the same header" do
-            get_header('Set-Cookie', make_http_request(:get, 'http://example.com/two_set_cookie_headers')).should =~ ['bar=bazz', 'foo=bar']
+            header = get_header('Set-Cookie', make_http_request(:get, 'http://example.com/two_set_cookie_headers'))
+            header = header.split(', ') if header.respond_to?(:split)
+            header.should =~ ['bar=bazz', 'foo=bar']
           end
 
           context 'when we restore our previous check point' do

data/spec/vcr/cassette_spec.rb

@@ -80,13 +80,12 @@ describe VCR::Cassette do
 
     describe "reading the file from disk" do
       before(:each) do
-        VCR::Config.cassette_library_dir = "cassette_lib"
         File.stub(:size? => true)
       end
 
       it 'reads the appropriate file from disk using a VCR::Cassette::Reader' do
         VCR::Cassette::Reader.should_receive(:new).with(
-          'cassette_lib/foo.yml', anything
+          "#{VCR::Config.cassette_library_dir}/foo.yml", anything
         ).and_return(mock('reader', :read => VCR::YAML.dump([])))
 
         VCR::Cassette.new('foo', :record => :new_episodes)

data/spec/vcr/config_spec.rb

@@ -7,11 +7,11 @@ describe VCR::Config do
   end
 
   describe '.cassette_library_dir=' do
+    let(:tmp_dir) { VCR::SPEC_ROOT + '/../tmp/cassette_library_dir/new_dir' }
+    after(:each) { FileUtils.rm_rf tmp_dir }
+
     it 'creates the directory if it does not exist' do
-      Dir.mktmpdir do |dir|
-        dir += '/cassettes'
-        expect { VCR::Config.cassette_library_dir = dir }.to change { File.exist?(dir) }.from(false).to(true)
-      end
+      expect { VCR::Config.cassette_library_dir = tmp_dir }.to change { File.exist?(tmp_dir) }.from(false).to(true)
     end
 
     it 'does not raise an error if given nil' do

data/spec/vcr/http_stubbing_adapters/excon_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe VCR::HttpStubbingAdapters::Excon, :without_monkey_patches => :vcr do
+  it_behaves_like 'an http stubbing adapter',
+    ['excon'],
+    [:method, :uri, :host, :path, :body, :headers],
+    :status_message_not_exposed
+
+  it_performs('version checking',
+    :valid    => %w[ 0.6.2 0.6.99 ],
+    :too_low  => %w[ 0.5.99 0.6.1 ],
+    :too_high => %w[ 0.7.0 1.0.0 ]
+  ) do
+    before(:each) { @orig_version = Excon::VERSION }
+    after(:each)  { Excon::VERSION = @orig_version }
+
+    # Cannot be regular method def as that raises a "dynamic constant assignment" error
+    define_method :stub_version do |version|
+      Excon::VERSION = version
+    end
+  end
+end
+

data/spec/vcr/request_matcher_spec.rb

@@ -40,7 +40,7 @@ describe VCR::RequestMatcher do
 
     for_matcher :path do
       it("matches a basic URL for the same path") { should =~ 'http://domain.tld/path/to/something?p=v&q=r' }
-      it("matches an https URL") { should =~ 'http://domain.tld/path/to/something?p=v&q=r' }
+      it("matches an https URL") { should =~ 'https://domain.tld/path/to/something?p=v&q=r' }
       it("ignores the case of the URL") { should =~ 'HTTP://DOMAIN.TLD/PATH/TO/SOMETHING?P=V&Q=R' }
       it("matches with a trailing slash") { should =~ 'http://domain.tld/path/to/something/' }
       it("matches without a trailing slash") { should =~ 'http://domain.tld/path/to/something' }

data/spec/vcr_spec.rb

@@ -147,7 +147,8 @@ describe VCR do
     {
       :fakeweb  => VCR::HttpStubbingAdapters::FakeWeb,
       :webmock  => VCR::HttpStubbingAdapters::WebMock,
-      :faraday  => VCR::HttpStubbingAdapters::Faraday
+      :faraday  => VCR::HttpStubbingAdapters::Faraday,
+      :excon    => VCR::HttpStubbingAdapters::Excon
     }.each do |symbol, klass|
       it "returns #{klass} for :#{symbol}" do
         VCR::Config.stub_with symbol

data/vcr.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
 
     'faraday'         => '~> 0.6.0',
     'httpclient'      => '~> 2.1.5.2',
+    'excon'           => '~> 0.6.2',
 
     'timecop'         => '~> 0.3.5',
     'rack'            => '1.1.0',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 1
-  - 8
+  - 9
   - 0
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,8 +197,24 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: cucumber
+  name: excon
   version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
+        version: 0.6.2
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: cucumber
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -209,12 +225,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id012
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: webmock
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -225,12 +241,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id013
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: curb
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -241,12 +257,12 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
-  requirement: *id014
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: patron
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -257,12 +273,12 @@ dependencies:
         - 4
         - 9
         version: 0.4.9
-  requirement: *id015
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: em-http-request
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -273,12 +289,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id016
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: typhoeus
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -289,7 +305,7 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  requirement: *id017
+  requirement: *id018
 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: []
@@ -359,6 +375,7 @@ files:
 - lib/vcr/extensions/net_http.rb
 - lib/vcr/extensions/net_http_response.rb
 - lib/vcr/http_stubbing_adapters/common.rb
+- lib/vcr/http_stubbing_adapters/excon.rb
 - lib/vcr/http_stubbing_adapters/fakeweb.rb
 - lib/vcr/http_stubbing_adapters/faraday.rb
 - lib/vcr/http_stubbing_adapters/multi_object_proxy.rb
@@ -430,6 +447,7 @@ files:
 - spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
 - spec/vcr/extensions/net_http_spec.rb
+- spec/vcr/http_stubbing_adapters/excon_spec.rb
 - spec/vcr/http_stubbing_adapters/fakeweb_spec.rb
 - spec/vcr/http_stubbing_adapters/faraday_spec.rb
 - spec/vcr/http_stubbing_adapters/multi_object_proxy_spec.rb
@@ -562,6 +580,7 @@ test_files:
 - spec/vcr/deprecations/http_stubbing_adapters/fakeweb_spec.rb
 - spec/vcr/extensions/net_http_response_spec.rb
 - spec/vcr/extensions/net_http_spec.rb
+- spec/vcr/http_stubbing_adapters/excon_spec.rb
 - spec/vcr/http_stubbing_adapters/fakeweb_spec.rb
 - spec/vcr/http_stubbing_adapters/faraday_spec.rb
 - spec/vcr/http_stubbing_adapters/multi_object_proxy_spec.rb