vcr 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ff7c5f67afb190b63450e117a7dbda6709340fbab8c17680c36b2bb5a8a6f6
-  data.tar.gz: a6a17620c6c63d9a596a39e2700f3f1becddb26bfa63f862e42ef0dfabb783d9
+  metadata.gz: 902881c25780fa44253365c8f5fd0bb260510d7f754287d74a70275abc2dabce
+  data.tar.gz: fe52ddaa831a711b7415c350205a2662e833de2c4a6d58b8b6539170645bd218
 SHA512:
-  metadata.gz: 9f43f626bae24850a8b5f912203dba5ee7e38ef39ecb3d325382ca2cbfb24ff789c3e630edd628588fdd59b0a8b10919bedd820675a039b5d619f1c779dc186b
-  data.tar.gz: ffc8534bbab227c6f8f4636306644c1c28d1ac8c2d29d47551d1b84c04cd5c37979acfb44803b18c54ee558e961d92826a38e6a75b93d8002af6adde5f2e7d05
+  metadata.gz: f79ffb02f15e691a1266c3421043a5ee95f3bd35715687137f139b291c490ee87a93351e0526faa0f29c73deba80ba41740f87d0fc9d50793a6b6d4101c7b116
+  data.tar.gz: 3e9276ffc9e2a2ae07f4a11054dcb484a324dc18e28a4badaa06df7454db36cfdbfbf38b95aec40c01a15a40cde56fb6cd9868780e50994fc2f554caf86e209a

data/lib/vcr/cassette/erb_renderer.rb

@@ -32,7 +32,7 @@ module VCR
       end
 
       def erb_variables
-        @erb if @erb.is_a?(Hash)
+        @erb if @erb.is_a?(Hash) && !@erb.empty?
       end
 
       def template
@@ -40,7 +40,9 @@ module VCR
       end
 
       @@struct_cache = Hash.new do |hash, attributes|
-        hash[attributes] = Struct.new(*attributes)
+        attributes = attributes.map(&:to_sym)
+        hash[attributes] = Struct.new(*attributes) unless hash.key?(attributes)
+        hash[attributes]
       end
 
       def variables_object

data/lib/vcr/cassette/migrator.rb

@@ -50,7 +50,11 @@ module VCR
       end
 
       def load_yaml(cassette)
-        ::YAML.load_file(cassette)
+        if ::YAML.respond_to?(:unsafe_load_file)
+          ::YAML.unsafe_load_file(cassette)
+        else
+          ::YAML.load_file(cassette)
+        end
       rescue *@yaml_load_errors
         return nil
       end

data/lib/vcr/cassette/serializers/json.rb

@@ -3,7 +3,7 @@ require 'json'
 module VCR
   class Cassette
     class Serializers
-      # The JSON serializer. Uses `MultiJson` under the covers.
+      # The JSON serializer.
       #
       # @see Psych
       # @see Syck
@@ -11,11 +11,15 @@ module VCR
       module JSON
         extend self
         extend EncodingErrorHandling
+        extend SyntaxErrorHandling
 
         # @private
         ENCODING_ERRORS = [ArgumentError]
         ENCODING_ERRORS << ::JSON::GeneratorError
 
+        # @private
+        SYNTAX_ERRORS = [::JSON::ParserError]
+
         # The file extension to use for this serializer.
         #
         # @return [String] "json"
@@ -29,7 +33,7 @@ module VCR
         # @return [String] the JSON string
         def serialize(hash)
           handle_encoding_errors do
-            ::JSON.generate(hash)
+            ::JSON.pretty_generate(hash)
           end
         end
 
@@ -39,7 +43,9 @@ module VCR
         # @return [Hash] the deserialized object
         def deserialize(string)
           handle_encoding_errors do
-            ::JSON.parse(string)
+            handle_syntax_errors do
+              ::JSON.parse(string)
+            end
           end
         end
       end

data/lib/vcr/cassette/serializers/psych.rb

@@ -11,10 +11,14 @@ module VCR
       module Psych
         extend self
         extend EncodingErrorHandling
+        extend SyntaxErrorHandling
 
         # @private
         ENCODING_ERRORS = [ArgumentError]
 
+        # @private
+        SYNTAX_ERRORS = [::Psych::SyntaxError]
+
         # The file extension to use for this serializer.
         #
         # @return [String] "yml"
@@ -40,7 +44,9 @@ module VCR
         # @return [Hash] the deserialized object
         def deserialize(string)
           handle_encoding_errors do
-            ::Psych.load(string)
+            handle_syntax_errors do
+              ::Psych.load(string)
+            end
           end
         end
       end

data/lib/vcr/cassette/serializers/syck.rb

@@ -11,10 +11,14 @@ module VCR
       module Syck
         extend self
         extend EncodingErrorHandling
+        extend SyntaxErrorHandling
 
         # @private
         ENCODING_ERRORS = [ArgumentError]
 
+        # @private
+        SYNTAX_ERRORS = [::Psych::SyntaxError]
+
         # The file extension to use for this serializer.
         #
         # @return [String] "yml"
@@ -38,7 +42,9 @@ module VCR
         # @return [Hash] the deserialized object
         def deserialize(string)
           handle_encoding_errors do
-            using_syck { ::YAML.load(string) }
+            handle_syntax_errors do
+              using_syck { ::YAML.load(string) }
+            end
           end
         end
 

data/lib/vcr/cassette/serializers/yaml.rb

@@ -13,10 +13,14 @@ module VCR
       module YAML
         extend self
         extend EncodingErrorHandling
+        extend SyntaxErrorHandling
 
         # @private
         ENCODING_ERRORS = [ArgumentError]
 
+        # @private
+        SYNTAX_ERRORS = [::Psych::SyntaxError]
+
         # The file extension to use for this serializer.
         #
         # @return [String] "yml"
@@ -42,7 +46,13 @@ module VCR
         # @return [Hash] the deserialized object
         def deserialize(string)
           handle_encoding_errors do
-            ::YAML.load(string)
+            handle_syntax_errors do
+              if ::YAML.respond_to?(:unsafe_load)
+                ::YAML.unsafe_load(string)
+              else
+                ::YAML.load(string)
+              end
+            end
           end
         end
       end

data/lib/vcr/cassette/serializers.rb

@@ -54,6 +54,16 @@ module VCR
         raise
       end
     end
+
+    # @private
+    module SyntaxErrorHandling
+      def handle_syntax_errors
+        yield
+      rescue *self::SYNTAX_ERRORS => e
+        e.message << "\nNote: This is a VCR cassette. If it is using ERB, you may have forgotten to pass the `:erb` option to `use_cassette`."
+        raise
+      end
+    end
   end
 end
 

data/lib/vcr/cassette.rb

@@ -46,6 +46,9 @@ module VCR
     # @return [Boolean, nil] Should outdated interactions be recorded back to file
     attr_reader :clean_outdated_http_interactions
 
+    # @return [Boolean] Should unused requests be dropped from the cassette?
+    attr_reader :drop_unused_requests
+
     # @return [Array<Symbol>] If set, {VCR::Configuration#before_record} and
     #  {VCR::Configuration#before_playback} hooks with a corresponding tag will apply.
     attr_reader :tags
@@ -176,7 +179,8 @@ module VCR
         :record, :record_on_error, :erb, :match_requests_on, :re_record_interval, :tag, :tags,
         :update_content_length_header, :allow_playback_repeats, :allow_unused_http_interactions,
         :exclusive, :serialize_with, :preserve_exact_body_bytes, :decode_compressed_response,
-        :recompress_response, :persist_with, :persister_options, :clean_outdated_http_interactions
+        :recompress_response, :persist_with, :persister_options, :clean_outdated_http_interactions,
+        :drop_unused_requests
       ]
 
       if invalid_options.size > 0
@@ -186,16 +190,15 @@ module VCR
 
     def extract_options
       [:record_on_error, :erb, :match_requests_on, :re_record_interval, :clean_outdated_http_interactions,
-       :allow_playback_repeats, :allow_unused_http_interactions, :exclusive].each do |name|
+       :allow_playback_repeats, :allow_unused_http_interactions, :exclusive, :drop_unused_requests].each do |name|
         instance_variable_set("@#{name}", @options[name])
       end
 
       assign_tags
 
-      @record_mode = @options[:record]
       @serializer  = VCR.cassette_serializers[@options[:serialize_with]]
       @persister   = VCR.cassette_persisters[@options[:persist_with]]
-      @record_mode = :all if should_re_record?
+      @record_mode = should_re_record?(@options[:record]) ? :all : @options[:record]
       @parent_list = @exclusive ? HTTPInteractionList::NullList : VCR.http_interactions
     end
 
@@ -231,9 +234,10 @@ module VCR
       end
     end
 
-    def should_re_record?
+    def should_re_record?(record_mode)
       return false unless @re_record_interval
       return false unless originally_recorded_at
+      return false if record_mode == :none
 
       now = Time.now
 
@@ -259,6 +263,10 @@ module VCR
       record_mode == :all
     end
 
+    def should_remove_unused_interactions?
+      @drop_unused_requests
+    end
+
     def should_assert_no_unused_interactions?
       !(@allow_unused_http_interactions || $!)
     end
@@ -277,7 +285,11 @@ module VCR
         end
       end
 
-      up_to_date_interactions(old_interactions) + new_recorded_interactions
+        if should_remove_unused_interactions?
+          new_recorded_interactions
+        else
+          up_to_date_interactions(old_interactions) + new_recorded_interactions
+        end
     end
 
     def up_to_date_interactions(interactions)

data/lib/vcr/configuration.rb

@@ -495,6 +495,7 @@ module VCR
         :record_on_error   => true,
         :match_requests_on => RequestMatcherRegistry::DEFAULT_MATCHERS,
         :allow_unused_http_interactions => true,
+        :drop_unused_requests => false,
         :serialize_with    => :yaml,
         :persist_with      => :file_system,
         :persister_options => {}

data/lib/vcr/library_hooks/typhoeus.rb

@@ -2,137 +2,121 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'typhoeus'
 
-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').check_version!
-
-  module VCR
-    class LibraryHooks
+module VCR
+  class LibraryHooks
+    # @private
+    module Typhoeus
       # @private
-      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.options.fetch(:method, :get),
-              request.url,
-              request_body,
-              request.options.fetch(:headers, {})
-          end
-
-        private
+      class RequestHandler < ::VCR::RequestHandler
+        attr_reader :request
+        def initialize(request)
+          @request = request
+          request.block_connection = false if VCR.turned_on?
+        end
 
-          def externally_stubbed?
-            ::Typhoeus::Expectation.find_by(request)
-          end
+        def vcr_request
+          @vcr_request ||= VCR::Request.new \
+            request.options.fetch(:method, :get),
+            request.url,
+            request.encoded_body,
+            request.options.fetch(:headers, {})
+        end
 
-          def set_typed_request_for_after_hook(*args)
-            super
-            request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
-          end
+      private
 
-          def on_unhandled_request
-            invoke_after_request_hook(nil)
-            super
-          end
+        def externally_stubbed?
+          ::Typhoeus::Expectation.find_by(request)
+        end
 
-          def on_stubbed_by_vcr_request
-            response = ::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,
-              :effective_url  => stubbed_response.adapter_metadata.fetch('effective_url', request.url),
-              :mock           => true
-
-            first_header_line = "HTTP/#{stubbed_response.http_version} #{response.code} #{response.status_message}\r\n"
-            response.instance_variable_set(:@first_header_line, first_header_line)
-            response.instance_variable_get(:@options)[:response_headers] =
-              first_header_line + response.headers.map { |k,v| "#{k}: #{v}"}.join("\r\n")
-
-            response
-          end
+        def set_typed_request_for_after_hook(*args)
+          super
+          request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
+        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
+        def on_unhandled_request
+          invoke_after_request_hook(nil)
+          super
+        end
 
-          if ::Typhoeus::Request.method_defined?(:encoded_body)
-            def request_body
-              request.encoded_body
-            end
-          else
-            def request_body
-              request.options.fetch(:body, "")
-            end
-          end
+        def on_stubbed_by_vcr_request
+          response = ::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,
+            :effective_url  => stubbed_response.adapter_metadata.fetch('effective_url', request.url),
+            :mock           => true
+
+          first_header_line = "HTTP/#{stubbed_response.http_version} #{response.code} #{response.status_message}\r\n"
+          response.instance_variable_set(:@first_header_line, first_header_line)
+          response.instance_variable_get(:@options)[:response_headers] =
+            first_header_line + response.headers.map { |k,v| "#{k}: #{v}"}.join("\r\n")
+
+          response
         end
 
-        # @private
-        class << self
-          def vcr_response_from(response)
-            VCR::Response.new \
-              VCR::ResponseStatus.new(response.code, response.status_message),
-              response.headers,
-              response.body,
-              response.http_version,
-              { "effective_url" => response.effective_url }
+        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
 
-          def collect_chunks(request)
-            chunks = ''
-            request.on_body.unshift(
-              Proc.new do |body, response|
-                chunks += body
-                request.instance_variable_set(:@chunked_body, chunks)
-              end
-            )
-          end
+      # @private
+      class << self
+        def vcr_response_from(response)
+          VCR::Response.new \
+            VCR::ResponseStatus.new(response.code, response.status_message),
+            response.headers,
+            response.body,
+            response.http_version,
+            { "effective_url" => response.effective_url }
+        end
 
-          def restore_body_from_chunks(response, request)
-            response.options[:response_body] = request.instance_variable_get(:@chunked_body)
-          end
+        def collect_chunks(request)
+          chunks = ''
+          request.on_body.unshift(
+            Proc.new do |body, response|
+              chunks += body
+              request.instance_variable_set(:@chunked_body, chunks)
+            end
+          )
         end
 
-        ::Typhoeus.on_complete do |response|
-          request = response.request
+        def restore_body_from_chunks(response, request)
+          response.options[:response_body] = request.instance_variable_get(:@chunked_body)
+        end
+      end
 
-          restore_body_from_chunks(response, request) if request.streaming?
+      ::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)
+        restore_body_from_chunks(response, request) if request.streaming?
 
-            unless request.response.mock
-              http_interaction = VCR::HTTPInteraction.new(typed_vcr_request, vcr_response)
-              VCR.record_http_interaction(http_interaction)
-            end
+        unless VCR.library_hooks.disabled?(:typhoeus)
+          vcr_response = vcr_response_from(response)
+          typed_vcr_request = request.send(:remove_instance_variable, :@__typed_vcr_request)
 
-            VCR.configuration.invoke_hook(:after_http_request, typed_vcr_request, vcr_response)
+          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.before do |request|
-          collect_chunks(request) if request.streaming?
-          if response = VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
-            request.on_headers.each { |cb| cb.call(response) }
-            request.on_body.each { |cb| cb.call(response.body, response) }
-            request.finish(response)
-          else
-            true
-          end
+      ::Typhoeus.before do |request|
+        collect_chunks(request) if request.streaming?
+        if response = VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
+          request.on_headers.each { |cb| cb.call(response) }
+          request.on_body.each { |cb| cb.call(response.body, response) }
+          request.finish(response)
+        else
+          true
         end
       end
     end
@@ -146,4 +130,3 @@ VCR.configuration.after_library_hooks_loaded do
     WebMock::HttpLibAdapters::TyphoeusAdapter.disable!
   end
 end
-

data/lib/vcr/library_hooks/webmock.rb

@@ -12,8 +12,6 @@ module VCR
     module WebMock
       extend self
 
-      @global_hook_disabled_requests = {}
-
       def with_global_hook_disabled(request)
         global_hook_disabled_requests << request
 
@@ -25,19 +23,12 @@ module VCR
       end
 
       def global_hook_disabled?(request)
-        requests = @global_hook_disabled_requests[Thread.current.object_id]
+        requests = Thread.current[:_vcr_webmock_disabled_requests]
         requests && requests.include?(request)
       end
 
       def global_hook_disabled_requests
-        requests = @global_hook_disabled_requests[Thread.current.object_id]
-        return requests if requests
-
-        ObjectSpace.define_finalizer(Thread.current, lambda {
-          @global_hook_disabled_requests.delete(Thread.current.object_id)
-        })
-
-        @global_hook_disabled_requests[Thread.current.object_id] = []
+        Thread.current[:_vcr_webmock_disabled_requests] ||= []
       end
 
       # @private

data/lib/vcr/middleware/excon.rb

@@ -74,7 +74,7 @@ module VCR
         def after_request(response)
           vcr_response = vcr_response_for(response)
 
-          if should_record?
+          if vcr_response && should_record?
             VCR.record_http_interaction(VCR::HTTPInteraction.new(vcr_request, vcr_response))
           end
 

data/lib/vcr/middleware/faraday.rb

@@ -45,9 +45,11 @@ module VCR
         end
 
         def handle
-          # Faraday must be exlusive here in case another library hook is being used.
+          # Faraday must be exclusive here in case another library hook is being used.
           # We don't want double recording/double playback.
           VCR.library_hooks.exclusive_hook = :faraday
+          collect_chunks if env.request.stream_response?
+
           super
         ensure
           response = defined?(@vcr_response) ? @vcr_response : nil
@@ -103,6 +105,7 @@ module VCR
           @vcr_response = stubbed_response
 
           faraday_response = ::Faraday::Response.new
+          env.request.on_data.call(stubbed_response.body, stubbed_response.body.length) if env.request.stream_response?
           faraday_response.finish(env)
           env[:response] = faraday_response
         end
@@ -111,6 +114,7 @@ module VCR
           @has_on_complete_hook = true
           response = app.call(env)
           response.on_complete do
+            restore_body_from_chunks(env.request) if env.request.stream_response?
             @vcr_response = response_for(response)
             VCR.record_http_interaction(VCR::HTTPInteraction.new(vcr_request, @vcr_response))
             invoke_after_request_hook(@vcr_response) if delay_finishing?
@@ -121,6 +125,20 @@ module VCR
           super
           VCR.library_hooks.exclusive_hook = nil
         end
+
+        def collect_chunks
+          caller_on_data = env.request.on_data
+          chunks = ''
+          env.request.on_data = Proc.new do |chunk, overall_received_bytes|
+            chunks += chunk
+            env.request.instance_variable_set(:@chunked_body, chunks)
+            caller_on_data.call(chunk, overall_received_bytes)
+          end
+        end
+
+        def restore_body_from_chunks(request)
+          env[:body] = request.instance_variable_get(:@chunked_body)
+        end
       end
     end
   end

data/lib/vcr/request_ignorer.rb

@@ -25,6 +25,10 @@ module VCR
       end
     end
 
+    def localhost_ignored?
+      (LOCALHOST_ALIASES & ignore_hosts.to_a).any?
+    end
+
     def ignore_hosts(*hosts)
       ignored_hosts.merge(hosts)
     end

data/lib/vcr/request_matcher_registry.rb

@@ -110,12 +110,12 @@ module VCR
 
     def register_built_ins
       register(:method)  { |r1, r2| r1.method == r2.method }
-      register(:uri)     { |r1, r2| r1.uri == r2.uri }
+      register(:uri)     { |r1, r2| r1.parsed_uri == r2.parsed_uri }
       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
+        r1.parsed_uri.host.chomp('.') == r2.parsed_uri.host.chomp('.')
       end
       register(:path) do |r1, r2|
         r1.parsed_uri.path == r2.parsed_uri.path

data/lib/vcr/test_frameworks/cucumber.rb

@@ -47,10 +47,21 @@ module VCR
                 scenario.scenario_outline.name,
                 scenario.name.split("\n").first
               ].join("/")
-            else
+            elsif scenario.respond_to?(:feature)
               [ scenario.feature.name.split("\n").first,
                 scenario.name.split("\n").first
               ].join("/")
+            elsif scenario.location.lines.min == scenario.location.lines.max
+              # test case from a regular scenario in cucumber version 4
+              [ scenario.location.file.split("/").last.split(".").first,
+                scenario.name.split("\n").first
+              ].join("/")
+            else
+              # test case from a scenario with examples ("scenario outline") in cucumber version 4
+              [ scenario.location.file.split("/").last.split(".").first,
+                scenario.name.split("\n").first,
+                "Example at line #{scenario.location.lines.max}"
+              ].join("/")
             end
           else
             "cucumber_tags/#{tag_name.gsub(/\A@/, '')}"

data/lib/vcr/test_frameworks/rspec.rb

@@ -5,27 +5,30 @@ module VCR
     module Metadata
       extend self
 
+      def vcr_cassette_name_for(metadata)
+        description = 
+          if metadata[:description].empty?
+            # we have an "it { is_expected.to be something }" block
+            metadata[:scoped_id]
+          else
+            metadata[:description]
+          end
+        example_group = 
+          if metadata.key?(:example_group)
+            metadata[:example_group]
+          else
+            metadata[:parent_example_group]
+          end
+
+        if example_group
+          [vcr_cassette_name_for(example_group), description].join('/')
+        else
+          description
+        end
+      end
+
       def configure!
         ::RSpec.configure do |config|
-          vcr_cassette_name_for = lambda do |metadata|
-            description = if metadata[:description].empty?
-                            # we have an "it { is_expected.to be something }" block
-                            metadata[:scoped_id]
-                          else
-                            metadata[:description]
-                          end
-            example_group = if metadata.key?(:example_group)
-                              metadata[:example_group]
-                            else
-                              metadata[:parent_example_group]
-                            end
-
-            if example_group
-              [vcr_cassette_name_for[example_group], description].join('/')
-            else
-              description
-            end
-          end
 
           when_tagged_with_vcr = { :vcr => lambda { |v| !!v } }
 
@@ -45,7 +48,7 @@ module VCR
                       end
 
             cassette_name ||= options.delete(:cassette_name) ||
-                            vcr_cassette_name_for[example.metadata]
+                              VCR::RSpec::Metadata.vcr_cassette_name_for(example.metadata)
             VCR.insert_cassette(cassette_name, options)
           end
 

data/lib/vcr/version.rb

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

data/lib/vcr.rb

@@ -52,7 +52,7 @@ module VCR
   # Inserts the named cassette using the given cassette options.
   # New HTTP interactions, if allowed by the cassette's `:record` option, will
   # be recorded to the cassette. The cassette's existing HTTP interactions
-  # will be used to stub requests, unless prevented by the cassete's
+  # will be used to stub requests, unless prevented by the cassette's
   # `:record` option.
   #
   # @example
@@ -266,6 +266,7 @@ module VCR
   # @see #turn_off!
   # @see #turn_on!
   # @see #turned_on?
+  # @see #turned_on
   def turned_off(options = {})
     turn_off!(options)
 
@@ -301,11 +302,28 @@ module VCR
     set_context_value(:turned_off, true)
   end
 
+  # Turns on VCR, for the duration of a block.
+  # @param (see #turn_off!)
+  # @return [void]
+  # @see #turn_off!
+  # @see #turned_off
+  # @see #turned_on?
+  def turned_on(options = {})
+    turn_on!
+
+    begin
+      yield
+    ensure
+      turn_off!(options)
+    end
+  end
+
   # Turns on VCR, if it has previously been turned off.
   # @return [void]
   # @see #turn_off!
   # @see #turned_off
   # @see #turned_on?
+  # @see #turned_on
   def turn_on!
     set_context_value(:turned_off, false)
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Myron Marston
 - Kurtis Rainbolt-Greene
 - Olle Jonsson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -178,14 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +346,6 @@ files:
 - lib/vcr/library_hooks/excon.rb
 - lib/vcr/library_hooks/faraday.rb
 - lib/vcr/library_hooks/typhoeus.rb
-- lib/vcr/library_hooks/typhoeus_0.4.rb
 - lib/vcr/library_hooks/webmock.rb
 - lib/vcr/linked_cassette.rb
 - lib/vcr/middleware/excon.rb
@@ -366,12 +365,12 @@ files:
 - lib/vcr/util/variable_args_block_caller.rb
 - lib/vcr/util/version_checker.rb
 - lib/vcr/version.rb
-homepage: https://relishapp.com/vcr/vcr/docs
+homepage: https://benoittgt.github.io/vcr
 licenses:
 - Hippocratic-2.1
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -379,15 +378,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: Record your test suite's HTTP interactions and replay them during future
   test runs for fast, deterministic, accurate tests.

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

@@ -1,103 +0,0 @@
-VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2').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
-
-VCR.configuration.after_library_hooks_loaded do
-  ::Kernel.warn "WARNING: VCR's Typhoeus 0.4 integration is deprecated and will be removed in VCR 3.0."
-end
-