vcr 2.2.5 → 2.3.0

data/gemfiles/typhoeus-old.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+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", "~> 0.4.2"
+gem "webmock", "1.8.11"
+
+gemspec :path=>"../"

data/gemfiles/typhoeus-old.gemfile.lock

@@ -0,0 +1,159 @@
+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)
+    eventmachine (1.0.0)
+    excon (0.16.7)
+    fakeweb (1.3.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    ffi (1.1.5)
+    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)
+    typhoeus (0.4.2)
+      ffi (~> 1.0)
+      mime-types (~> 1.18)
+    webmock (1.8.11)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+    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 (~> 0.4.2)
+  vcr!
+  webmock (= 1.8.11)
+  yajl-ruby (~> 1.1.0)
+  yard

data/lib/vcr/cassette/migrator.rb

@@ -75,7 +75,7 @@ module VCR
       end
 
       def remove_unnecessary_standard_port(interaction)
-        uri = URI(interaction.request.uri)
+        uri = VCR.configuration.uri_parser.parse(interaction.request.uri)
         if uri.scheme == 'http'  && uri.port == 80 ||
            uri.scheme == 'https' && uri.port == 443
           uri.port = nil

data/lib/vcr/configuration.rb

@@ -1,4 +1,5 @@
 require 'vcr/util/hooks'
+require 'uri'
 
 module VCR
   # Stores the VCR configuration.
@@ -123,6 +124,32 @@ module VCR
       !!@allow_http_connections_when_no_cassette
     end
 
+    # Sets a parser for VCR to use when parsing URIs. The new parser
+    # must implement a method `parse` that returns an instance of the
+    # URI object. This URI object must implement the following
+    # interface:
+    #
+    # * `scheme # => String`
+    # * `host   # => String`
+    # * `port   # => Fixnum`
+    # * `path   # => String`
+    # * `query  # => String`
+    # * `#port=`
+    # * `#query=`
+    # * `#to_s  # => String`
+    # * `#==    # => Boolean`
+    #
+    # The `#==` method must return true if both URI objects represent the
+    # same URI.
+    #
+    # This defaults to `URI` from the ruby standard library.
+    #
+    # @overload uri_parser
+    #  @return [#parse] the current URI parser object
+    # @overload uri_parser=
+    #  @param value [#parse] sets the uri_parser
+    attr_accessor :uri_parser
+
     # Registers a request matcher for later use.
     #
     # @example
@@ -424,6 +451,7 @@ module VCR
         :persist_with      => :file_system
       }
 
+      self.uri_parser = URI
       self.debug_logger = NullDebugLogger
 
       register_built_in_hooks

data/lib/vcr/errors.rb

@@ -188,7 +188,7 @@ module VCR
         :try_debug_logger => [
           ["If you're surprised VCR is raising this error",
            "and want insight about how VCR attempted to handle the request,",
-           "you can use the debug_logger configuraiton option to log more details"],
+           "you can use the debug_logger configuration option to log more details"],
           "https://www.relishapp.com/myronmarston/vcr/v/%s/docs/configuration/debug-logging"
         ]
       }

data/lib/vcr/library_hooks/typhoeus.rb

@@ -2,105 +2,102 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'typhoeus'
 
-VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2', '0.4').check_version!
+if Float(Typhoeus::VERSION[/^\d+\.\d+/]) < 0.5
+  require 'vcr/library_hooks/typhoeus_0.4'
+else
+  VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.5.0', '0.5').check_version!
 
-module VCR
-  class LibraryHooks
-    # @private
-    module Typhoeus
+  module VCR
+    class LibraryHooks
       # @private
-      class RequestHandler < ::VCR::RequestHandler
-        attr_reader :request
-        def initialize(request)
-          @request = request
-        end
+      module Typhoeus
+        # @private
+        class RequestHandler < ::VCR::RequestHandler
+          attr_reader :request
+          def initialize(request)
+            @request = request
+            request.block_connection = false if VCR.turned_on?
+          end
 
-        def vcr_request
-          @vcr_request ||= VCR::Request.new \
-            request.method,
-            request.url,
-            request.body,
-            request.headers
-        end
+          def vcr_request
+            @vcr_request ||= VCR::Request.new \
+              request.options.fetch(:method, :get),
+              request.url,
+              request.options.fetch(:body, ""),
+              request.options.fetch(:headers, {})
+          end
 
-      private
+        private
 
-        def externally_stubbed?
-          ::Typhoeus::Hydra.stubs.detect { |stub| stub.matches?(request) }
-        end
+          def externally_stubbed?
+            ::Typhoeus::Expectation.find_by(request)
+          end
 
-        def set_typed_request_for_after_hook(*args)
-          super
-          request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
-        end
+          def set_typed_request_for_after_hook(*args)
+            super
+            request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
+          end
 
-        def on_unhandled_request
-          invoke_after_request_hook(nil)
-          super
-        end
+          def on_unhandled_request
+            invoke_after_request_hook(nil)
+            super
+          end
 
-        def on_stubbed_by_vcr_request
-          ::Typhoeus::Response.new \
-            :http_version   => stubbed_response.http_version,
-            :code           => stubbed_response.status.code,
-            :status_message => stubbed_response.status.message,
-            :headers_hash   => stubbed_response_headers,
-            :body           => stubbed_response.body
-        end
+          def on_stubbed_by_vcr_request
+            ::Typhoeus::Response.new \
+              :http_version   => stubbed_response.http_version,
+              :code           => stubbed_response.status.code,
+              :status_message => stubbed_response.status.message,
+              :headers        => stubbed_response_headers,
+              :body           => stubbed_response.body,
+              :mock           => true
+          end
 
-        def stubbed_response_headers
-          @stubbed_response_headers ||= {}.tap do |hash|
-            stubbed_response.headers.each do |key, values|
-              hash[key] = values.size == 1 ? values.first : values
-            end if stubbed_response.headers
+          def stubbed_response_headers
+            @stubbed_response_headers ||= {}.tap do |hash|
+              stubbed_response.headers.each do |key, values|
+                hash[key] = values.size == 1 ? values.first : values
+              end if stubbed_response.headers
+            end
           end
         end
-      end
 
-      # @private
-      def self.vcr_response_from(response)
-        VCR::Response.new \
-          VCR::ResponseStatus.new(response.code, response.status_message),
-          response.headers_hash,
-          response.body,
-          response.http_version
-      end
+        # @private
+        def self.vcr_response_from(response)
+          VCR::Response.new \
+            VCR::ResponseStatus.new(response.code, response.status_message),
+            response.headers,
+            response.body,
+            response.http_version
+        end
 
-      ::Typhoeus::Hydra.after_request_before_on_complete do |request|
-        unless VCR.library_hooks.disabled?(:typhoeus)
-          vcr_response = vcr_response_from(request.response)
-          typed_vcr_request = request.send(:remove_instance_variable, :@__typed_vcr_request)
+        ::Typhoeus.on_complete do |response|
+          request = response.request
+          unless VCR.library_hooks.disabled?(:typhoeus)
+            vcr_response = vcr_response_from(response)
+            typed_vcr_request = request.send(:remove_instance_variable, :@__typed_vcr_request)
 
-          unless request.response.mock?
-            http_interaction = VCR::HTTPInteraction.new(typed_vcr_request, vcr_response)
-            VCR.record_http_interaction(http_interaction)
-          end
+            unless request.response.mock
+              http_interaction = VCR::HTTPInteraction.new(typed_vcr_request, vcr_response)
+              VCR.record_http_interaction(http_interaction)
+            end
 
-          VCR.configuration.invoke_hook(:after_http_request, typed_vcr_request, vcr_response)
+            VCR.configuration.invoke_hook(:after_http_request, typed_vcr_request, vcr_response)
+          end
         end
-      end
 
-      ::Typhoeus::Hydra.register_stub_finder do |request|
-        VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
+        ::Typhoeus.before do |request|
+          if response = VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
+            request.finish(response)
+          else
+            true
+          end
+        end
       end
     end
   end
 end
 
-# @private
-module Typhoeus
-  class << Hydra
-    # ensure HTTP requests are always allowed; VCR takes care of disallowing
-    # them at the appropriate times in its hook
-    def allow_net_connect_with_vcr?(*args)
-      VCR.turned_on? ? true : allow_net_connect_without_vcr?
-    end
-
-    alias allow_net_connect_without_vcr? allow_net_connect?
-    alias allow_net_connect? allow_net_connect_with_vcr?
-  end unless Hydra.respond_to?(:allow_net_connect_with_vcr?)
-end
-
 VCR.configuration.after_library_hooks_loaded do
   # ensure WebMock's Typhoeus adapter does not conflict with us here
   # (i.e. to double record requests or whatever).

data/lib/vcr/library_hooks/typhoeus_0.4.rb

@@ -0,0 +1,99 @@
+VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2', '0.4').check_version!
+
+module VCR
+  class LibraryHooks
+    # @private
+    module Typhoeus
+      # @private
+      class RequestHandler < ::VCR::RequestHandler
+        attr_reader :request
+        def initialize(request)
+          @request = request
+        end
+
+        def vcr_request
+          @vcr_request ||= VCR::Request.new \
+            request.method,
+            request.url,
+            request.body,
+            request.headers
+        end
+
+      private
+
+        def externally_stubbed?
+          ::Typhoeus::Hydra.stubs.detect { |stub| stub.matches?(request) }
+        end
+
+        def set_typed_request_for_after_hook(*args)
+          super
+          request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
+        end
+
+        def on_unhandled_request
+          invoke_after_request_hook(nil)
+          super
+        end
+
+        def on_stubbed_by_vcr_request
+          ::Typhoeus::Response.new \
+            :http_version   => stubbed_response.http_version,
+            :code           => stubbed_response.status.code,
+            :status_message => stubbed_response.status.message,
+            :headers_hash   => stubbed_response_headers,
+            :body           => stubbed_response.body
+        end
+
+        def stubbed_response_headers
+          @stubbed_response_headers ||= {}.tap do |hash|
+            stubbed_response.headers.each do |key, values|
+              hash[key] = values.size == 1 ? values.first : values
+            end if stubbed_response.headers
+          end
+        end
+      end
+
+      # @private
+      def self.vcr_response_from(response)
+        VCR::Response.new \
+          VCR::ResponseStatus.new(response.code, response.status_message),
+          response.headers_hash,
+          response.body,
+          response.http_version
+      end
+
+      ::Typhoeus::Hydra.after_request_before_on_complete do |request|
+        unless VCR.library_hooks.disabled?(:typhoeus)
+          vcr_response = vcr_response_from(request.response)
+          typed_vcr_request = request.send(:remove_instance_variable, :@__typed_vcr_request)
+
+          unless request.response.mock?
+            http_interaction = VCR::HTTPInteraction.new(typed_vcr_request, vcr_response)
+            VCR.record_http_interaction(http_interaction)
+          end
+
+          VCR.configuration.invoke_hook(:after_http_request, typed_vcr_request, vcr_response)
+        end
+      end
+
+      ::Typhoeus::Hydra.register_stub_finder do |request|
+        VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
+      end
+    end
+  end
+end
+
+# @private
+module Typhoeus
+  class << Hydra
+    # ensure HTTP requests are always allowed; VCR takes care of disallowing
+    # them at the appropriate times in its hook
+    def allow_net_connect_with_vcr?(*args)
+      VCR.turned_on? ? true : allow_net_connect_without_vcr?
+    end
+
+    alias allow_net_connect_without_vcr? allow_net_connect?
+    alias allow_net_connect? allow_net_connect_with_vcr?
+  end unless Hydra.respond_to?(:allow_net_connect_with_vcr?)
+end
+