vcr 2.2.5 → 2.3.0

data/lib/vcr/middleware/faraday.rb

@@ -2,7 +2,7 @@ require 'faraday'
 require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 
-VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0', '0.8').check_version!
+VCR::VersionChecker.new('Faraday', Faraday::VERSION, '0.7.0', '0.9').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.

data/lib/vcr/request_ignorer.rb

@@ -1,4 +1,3 @@
-require 'uri'
 require 'set'
 require 'vcr/util/hooks'
 
@@ -13,7 +12,8 @@ module VCR
 
     def initialize
       ignore_request do |request|
-        ignored_hosts.include?(URI(request.uri).host)
+        host = request.parsed_uri.host
+        ignored_hosts.include?(host)
       end
     end
 

data/lib/vcr/request_matcher_registry.rb

@@ -18,7 +18,7 @@ module VCR
     # @private
     class URIWithoutParamsMatcher < Struct.new(:params_to_ignore)
       def partial_uri_from(request)
-        URI(request.uri).tap do |uri|
+        request.parsed_uri.tap do |uri|
           return request.uri unless uri.query # ignore uris without params, e.g. "http://example.com/"
 
           uri.query = uri.query.split('&').tap { |params|
@@ -109,10 +109,15 @@ module VCR
     def register_built_ins
       register(:method)  { |r1, r2| r1.method == r2.method }
       register(:uri)     { |r1, r2| r1.uri == r2.uri }
-      register(:host)    { |r1, r2| URI(r1.uri).host == URI(r2.uri).host }
-      register(:path)    { |r1, r2| URI(r1.uri).path == URI(r2.uri).path }
       register(:body)    { |r1, r2| r1.body == r2.body }
       register(:headers) { |r1, r2| r1.headers == r2.headers }
+
+      register(:host) do |r1, r2|
+        r1.parsed_uri.host == r2.parsed_uri.host
+      end
+      register(:path) do |r1, r2|
+        r1.parsed_uri.path == r2.parsed_uri.path
+      end
     end
   end
 end

data/lib/vcr/structs.rb

@@ -231,6 +231,13 @@ module VCR
           :skip_port_stripping
     end
 
+    # Parses the URI using the configured `uri_parser`.
+    #
+    # @return [#schema, #host, #port, #path, #query] A parsed URI object.
+    def parsed_uri
+      VCR.configuration.uri_parser.parse(uri)
+    end
+
     @@object_method = Object.instance_method(:method)
     def method(*args)
       return super if args.empty?
@@ -321,7 +328,7 @@ module VCR
 
     def without_standard_port(uri)
       return uri if uri.nil?
-      u = URI(uri)
+      u = parsed_uri
       return uri unless [['http', 80], ['https', 443]].include?([u.scheme, u.port])
       u.port = nil
       u.to_s

data/lib/vcr/test_frameworks/cucumber.rb

@@ -43,7 +43,7 @@ module VCR
             feature = scenario.respond_to?(:scenario_outline) ? scenario.scenario_outline.feature : scenario.feature
             name = feature.name.split("\n").first
             name << "/#{scenario.scenario_outline.name}" if scenario.respond_to?(:scenario_outline)
-            name << "/#{scenario.name}"
+            name << "/#{scenario.name.split("\n").first}"
             name
           else
             "cucumber_tags/#{tag_name.gsub(/\A@/, '')}"

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '2.2.5'
+      string = '2.3.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/script/ci.sh

@@ -1,14 +1,21 @@
 # Kill the whole script on error
-set -e
+set -e -x
+
+echo "-------- Running Typhoeus 0.4 Specs ---------"
+bundle install --gemfile=gemfiles/typhoeus-old.gemfile
+BUNDLE_GEMFILE=gemfiles/typhoeus-old.gemfile bundle exec rspec spec/vcr/library_hooks/typhoeus_0.4_spec.rb --format progress --backtrace
 
 # Setup vendored rspec-1
 git submodule init
 git submodule update
 
+echo "-------- Running Specs ---------"
 bundle exec ruby -w -I./spec -r./spec/capture_warnings -rspec_helper -S rspec spec --format progress --backtrace
 
+echo "-------- Running Cukes ---------"
 bundle exec cucumber
 
+echo "-------- Checking Coverage ---------"
 bundle exec rake yard_coverage
 
 bundle exec rake check_code_coverage

data/spec/capture_warnings.rb

@@ -31,6 +31,16 @@ RSpec.configure do |config|
       end
     end
 
+    # For some reason, I get a strange warning on 1.9.2 on Travis-CI but
+    # I can't repro locally:
+    # from /home/travis/builds/myronmarston/vcr/spec/monkey_pnet/http:
+    # warning: Content-Type did not set; using application/x-www-form-urlencoded
+    if RUBY_VERSION == '1.9.2' && ENV['CI']
+      vcr_warnings.reject! do |line|
+        line.include?('monkey_pnet')
+      end
+    end
+
     if vcr_warnings.any?
       puts
       puts "-" * 30 + " VCR Warnings: " + "-" * 30

data/spec/monkey_patches.rb

@@ -1,4 +1,4 @@
-require 'typhoeus' unless RUBY_INTERPRETER == :jruby
+require 'typhoeus' if RUBY_INTERPRETER == :mri
 
 module MonkeyPatches
   extend self
@@ -28,6 +28,14 @@ module MonkeyPatches
           ::WebMock::CallbackRegistry.add_callback(cb[:options], cb[:block])
         end
       when :typhoeus
+        $original_typhoeus_global_hooks.each do |hook|
+          ::Typhoeus.on_complete << hook
+        end
+        ::Typhoeus.before.clear
+        $original_typhoeus_before_hooks.each do |hook|
+          ::Typhoeus.before << hook
+        end
+      when :typhoeus_0_4
         ::Typhoeus::Hydra.global_hooks = $original_typhoeus_global_hooks
         ::Typhoeus::Hydra.stub_finders.clear
         $original_typhoeus_stub_finders.each do |finder|
@@ -55,7 +63,10 @@ module MonkeyPatches
       ::WebMock::StubRegistry.instance.request_stubs = []
     end
 
-    if defined?(::Typhoeus)
+    if defined?(::Typhoeus.before)
+      ::Typhoeus.on_complete.clear
+      ::Typhoeus.before.clear
+    elsif defined?(::Typhoeus::Hydra)
       ::Typhoeus::Hydra.clear_global_hooks
       ::Typhoeus::Hydra.stub_finders.clear
     end
@@ -130,7 +141,14 @@ unless RUBY_INTERPRETER == :jruby
   require 'patron'
   require 'em-http-request'
   require 'curb'
+end
 
+if defined?(::Typhoeus.before)
+  require 'vcr/library_hooks/typhoeus'
+  $typhoeus_after_loaded_hook = VCR.configuration.hooks[:after_library_hooks_loaded].last
+  $original_typhoeus_global_hooks = Typhoeus.on_complete.dup
+  $original_typhoeus_before_hooks = Typhoeus.before.dup
+elsif defined?(::Typhoeus::Hydra.global_hooks)
   require 'vcr/library_hooks/typhoeus'
   $typhoeus_after_loaded_hook = VCR.configuration.hooks[:after_library_hooks_loaded].last
   $original_typhoeus_global_hooks = Typhoeus::Hydra.global_hooks.dup
@@ -159,7 +177,7 @@ $original_excon_stubs = ::Excon.stubs.dup
 MonkeyPatches.disable_all!
 
 RSpec.configure do |config|
-  [:fakeweb, :webmock, :vcr, :typhoeus, :excon].each do |scope|
+  [:fakeweb, :webmock, :vcr, :typhoeus, :typhoeus_0_4, :excon].each do |scope|
     config.before(:all, :with_monkey_patches => scope) { MonkeyPatches.enable!(scope) }
     config.after(:all,  :with_monkey_patches => scope) { MonkeyPatches.disable_all!   }
   end

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ end
 require 'rspec'
 
 require "support/fixnum_extension.rb"
+require "support/limited_uri.rb"
 require "support/http_library_adapters.rb"
 require "support/ruby_interpreter.rb"
 require "support/shared_example_groups/hook_into_http_library.rb"
@@ -62,6 +63,7 @@ RSpec.configure do |config|
     unless example.metadata[:skip_vcr_reset]
       VCR.reset!
       VCR.configuration.cassette_library_dir = tmp_dir
+      VCR.configuration.uri_parser = LimitedURI
     end
   end
 

data/spec/support/http_library_adapters.rb

@@ -159,6 +159,29 @@ HTTP_LIBRARY_ADAPTERS['typhoeus'] = Module.new do
   end
   alias get_body_object get_body_string
 
+  def get_header(header_key, response)
+    response.headers[header_key]
+  end
+
+  def make_http_request(method, url, body = nil, headers = {})
+    request = Typhoeus::Request.new(url, :method => method, :body => body, :headers => headers)
+    request.run
+    request.response
+  end
+
+  def normalize_request_headers(headers)
+    headers.merge("User-Agent"=>["Typhoeus - https://github.com/typhoeus/typhoeus"])
+  end
+end
+
+HTTP_LIBRARY_ADAPTERS['typhoeus 0.4'] = Module.new do
+  def self.http_library_name; "Typhoeus"; end
+
+  def get_body_string(response)
+    response.body
+  end
+  alias get_body_object get_body_string
+
   def get_header(header_key, response)
     response.headers_hash[header_key]
   end
@@ -196,6 +219,12 @@ HTTP_LIBRARY_ADAPTERS['excon'] = Module.new do
 end
 
 %w[ net_http typhoeus patron ].each do |_faraday_adapter|
+  if _faraday_adapter == 'typhoeus' &&
+     defined?(::Typhoeus::VERSION) &&
+     ::Typhoeus::VERSION.to_f >= 0.5
+    require 'typhoeus/adapters/faraday'
+  end
+
   HTTP_LIBRARY_ADAPTERS["faraday (w/ #{_faraday_adapter})"] = Module.new do
     class << self; self; end.class_eval do
       define_method(:http_library_name) do

data/spec/support/limited_uri.rb

@@ -0,0 +1,30 @@
+require 'forwardable'
+
+class LimitedURI
+  extend Forwardable
+
+  def_delegators :@uri, :scheme,
+                        :host,
+                        :port,
+                        :port=,
+                        :path,
+                        :query,
+                        :query=,
+                        :to_s
+
+  def initialize(uri)
+    @uri = uri
+  end
+
+  def ==(other)
+    to_s == other.to_s
+  end
+
+  def self.parse(uri)
+    return uri if uri.is_a? LimitedURI
+    return new(uri) if uri.is_a? URI
+    return new(URI.parse(uri)) if uri.is_a? String
+
+    raise URI::InvalidURIError
+  end
+end

data/spec/support/vcr_localhost_server.rb

@@ -81,10 +81,7 @@ module VCR
     end
 
     def should_use_subprocess?
-      # Patron times out when the server is running in a separate thread in the same process,
-      # so use a separate process.
-      # In all other cases, we can use a thread (it's faster!)
-      defined?(Patron)
+      false
     end
 
     def wait_until(timeout, error_message, &block)

data/spec/vcr/cassette/http_interaction_list_spec.rb

@@ -2,7 +2,6 @@ require 'vcr/util/logger'
 require 'vcr/cassette/http_interaction_list'
 require 'vcr/request_matcher_registry'
 require 'vcr/structs'
-require 'uri'
 
 module VCR
   class Cassette

data/spec/vcr/configuration_spec.rb

@@ -102,10 +102,12 @@ describe VCR::Configuration do
   end
 
   describe '#ignore_request' do
+    let(:uri){ URI('http://foo.com') }
+
     it 'registers the given block with the request ignorer' do
       block_called = false
       subject.ignore_request { |r| block_called = true }
-      VCR.request_ignorer.ignore?(stub(:uri => 'http://foo.com/'))
+      VCR.request_ignorer.ignore?(stub(:parsed_uri => uri))
       block_called.should be_true
     end
   end
@@ -250,6 +252,18 @@ describe VCR::Configuration do
     end
   end
 
+  describe "#uri_parser=" do
+    let(:custom_parser) { stub }
+    it 'allows a custom uri parser to be set' do
+      subject.uri_parser = custom_parser
+      subject.uri_parser.should eq(custom_parser)
+    end
+
+    it "uses Ruby's standard library `URI` as a default" do
+      subject.uri_parser.should eq(URI)
+    end
+  end
+
   describe "#preserve_exact_body_bytes_for?" do
     def message_for(body)
       stub(:body => body)

data/spec/vcr/library_hooks/typhoeus_0.4_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Typhoeus 0.4 hook", :with_monkey_patches => :typhoeus_0_4 do
+  after(:each) do
+    ::Typhoeus::Hydra.clear_stubs
+  end
+
+  def disable_real_connections
+    ::Typhoeus::Hydra.allow_net_connect = false
+    ::Typhoeus::Hydra::NetConnectNotAllowedError
+  end
+
+  def enable_real_connections
+    ::Typhoeus::Hydra.allow_net_connect = true
+  end
+
+  def directly_stub_request(method, url, response_body)
+    response = ::Typhoeus::Response.new(:code => 200, :body => response_body)
+    ::Typhoeus::Hydra.stub(method, url).and_return(response)
+  end
+
+  it_behaves_like 'a hook into an HTTP library', :typhoeus, 'typhoeus 0.4'
+
+  describe "VCR.configuration.after_library_hooks_loaded hook" do
+    it 'disables the webmock typhoeus adapter so it does not conflict with our typhoeus hook' do
+      ::WebMock::HttpLibAdapters::TyphoeusAdapter.should_receive(:disable!)
+      $typhoeus_after_loaded_hook.conditionally_invoke
+    end
+  end
+end if RUBY_INTERPRETER == :mri && ::Typhoeus::VERSION.to_f < 0.5
+

data/spec/vcr/library_hooks/typhoeus_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 
 describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
   after(:each) do
-    ::Typhoeus::Hydra.clear_stubs
+    ::Typhoeus::Expectation.clear
   end
 
   def disable_real_connections
-    ::Typhoeus::Hydra.allow_net_connect = false
-    ::Typhoeus::Hydra::NetConnectNotAllowedError
+    ::Typhoeus::Config.block_connection = true
+    ::Typhoeus::Errors::NoStub
   end
 
   def enable_real_connections
-    ::Typhoeus::Hydra.allow_net_connect = true
+    ::Typhoeus::Config.block_connection = false
   end
 
   def directly_stub_request(method, url, response_body)
     response = ::Typhoeus::Response.new(:code => 200, :body => response_body)
-    ::Typhoeus::Hydra.stub(method, url).and_return(response)
+    ::Typhoeus.stub(url, :method => method).and_return(response)
   end
 
   it_behaves_like 'a hook into an HTTP library', :typhoeus, 'typhoeus'
@@ -27,5 +27,5 @@ describe "Typhoeus hook", :with_monkey_patches => :typhoeus do
       $typhoeus_after_loaded_hook.conditionally_invoke
     end
   end
-end unless RUBY_PLATFORM == 'java'
+end
 

data/spec/vcr/library_hooks/webmock_spec.rb

@@ -69,7 +69,9 @@ describe "WebMock hook", :with_monkey_patches => :webmock do
     end
   end
 
-  %w[net/http patron httpclient em-http-request curb typhoeus excon].each do |lib|
+  http_libs = %w[net/http patron httpclient em-http-request curb typhoeus excon]
+  http_libs.delete('patron') if RUBY_VERSION == '1.8.7'
+  http_libs.each do |lib|
     other = []
     other << :status_message_not_exposed if lib == 'excon'
     it_behaves_like 'a hook into an HTTP library', :webmock, lib, *other do

data/spec/vcr/middleware/faraday_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'vcr/library_hooks/faraday'
 
 describe VCR::Middleware::Faraday do
-  %w[ typhoeus net_http patron ].each do |lib|
+  http_libs = %w[ typhoeus net_http patron ]
+  http_libs.delete('patron') if RUBY_VERSION == '1.8.7'
+  http_libs.each do |lib|
     it_behaves_like 'a hook into an HTTP library', :faraday, "faraday (w/ #{lib})",
       :status_message_not_exposed,
       :does_not_support_rotating_responses,

data/spec/vcr/request_matcher_registry_spec.rb

@@ -1,9 +1,11 @@
 require 'vcr/request_matcher_registry'
 require 'vcr/structs'
-require 'uri'
+require 'support/limited_uri'
 
 module VCR
   describe RequestMatcherRegistry do
+    before { VCR.stub_chain(:configuration, :uri_parser) { LimitedURI } }
+
     def request_with(values)
       VCR::Request.new.tap do |request|
         values.each do |name, value|

data/spec/vcr/structs_spec.rb

@@ -7,7 +7,7 @@ require 'vcr/structs'
 require 'vcr/errors'
 require 'zlib'
 require 'stringio'
-require 'uri'
+require 'support/limited_uri'
 
 shared_examples_for "a header normalizer" do
   let(:instance) do
@@ -61,6 +61,8 @@ end
 
 module VCR
   describe HTTPInteraction do
+    before { VCR.stub_chain(:configuration, :uri_parser) { LimitedURI } }
+
     if ''.respond_to?(:encoding)
       def body_hash(key, value)
         { key => value, 'encoding' => 'UTF-8' }
@@ -235,6 +237,7 @@ module VCR
     describe "#to_hash" do
       before(:each) do
         VCR.stub_chain(:configuration, :preserve_exact_body_bytes_for?).and_return(false)
+        VCR.stub_chain(:configuration, :uri_parser).and_return(URI)
       end
 
       let(:hash) { interaction.to_hash }
@@ -289,9 +292,30 @@ module VCR
         assert_yielded_keys hash['response']['status'], 'code', 'message'
       end
     end
+
+    describe "#parsed_uri" do
+      before :each do
+        uri_parser.stub(:parse).and_return(uri)
+        VCR.stub_chain(:configuration, :uri_parser).and_return(uri_parser)
+      end
+
+      let(:uri_parser){ mock('parser') }
+      let(:uri){ mock('uri').as_null_object }
+
+      it "parses the uri using the current uri_parser" do
+        uri_parser.should_receive(:parse).with(request.uri)
+        request.parsed_uri
+      end
+
+      it "returns the parsed uri" do
+        request.parsed_uri.should == uri
+      end
+    end
   end
 
   describe HTTPInteraction::HookAware do
+    before { VCR.stub_chain(:configuration, :uri_parser) { LimitedURI } }
+
     let(:response_status) { VCR::ResponseStatus.new(200, "OK foo") }
     let(:body) { "The body foo this is (foo-Foo)" }
     let(:headers) do {
@@ -431,6 +455,8 @@ module VCR
   end
 
   describe Request do
+    before { VCR.stub_chain(:configuration, :uri_parser) { LimitedURI } }
+
     describe '#method' do
       subject { VCR::Request.new(:get) }