vcr 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c75512238b9fd8f2774a2508b2ad27698bdf4a6b80fc01abed306602ffa6530
-  data.tar.gz: 0ca858aeb73f9ff198ef0be4e0cdfd563758a54c75c6dcb17bdfc9d98325b21d
+  metadata.gz: '029f040c2799268426ac716845881b02d589948a361736e8448eac26b15da750'
+  data.tar.gz: 33334bf1404877fbbe62172c2f1f18ca54849c4e5b4ed8fa9e5f5ca0f1defce5
 SHA512:
-  metadata.gz: 7d6d31a3c3c26c74602812e6c822605acaa43548af427fd62f1f6d5f9e42390b09cb5d54f78fa593851dcf9db103624309450d933bde7ae5868ac1d2b0c1e8b2
-  data.tar.gz: a62754daf2fc0c57b950c60874870844692770e911a9ff8f8b7d770576ebc2c64f9043962192526c1d00d9c4bfa4417bc85237f2a07cb67f01eda2efbdc687b0
+  metadata.gz: 417c8864eb697e8009d16941ddceb796e4ebb36b8d4163ff6f8ff94be40a188f4d70a27091c1a6d4ef9972cd73baa9aed24aaa12fcc71d2abb7c8c8d50613bbb
+  data.tar.gz: 327d05ab66eac55749a5e455cb80e2d953277fc557bb1a47bb0d707b734c82149fb59060eafce34373586755b58a9af9aa6a591cecfa646429344b9e1a98d0dd

data/lib/vcr/configuration.rb

@@ -1,6 +1,5 @@
 require 'vcr/util/hooks'
 require 'uri'
-require 'cgi'
 
 module VCR
   # Stores the VCR configuration.
@@ -142,7 +141,7 @@ module VCR
     # The `#==` method must return true if both objects represent the
     # same query string.
     #
-    # This defaults to `CGI.parse` from the ruby standard library.
+    # This defaults to `URI.decode_www_form` from the ruby standard library.
     #
     # @overload query_parser
     #  @return [#call] the current query string parser object
@@ -502,7 +501,13 @@ module VCR
       }
 
       self.uri_parser = URI
-      self.query_parser = CGI.method(:parse)
+      # Use URI.decode_www_form instead of CGI.parse for Ruby 3.5+ compatibility
+      # Convert the array of pairs format to CGI.parse's hash of arrays format
+      self.query_parser = lambda do |query_string|
+        result = Hash.new { |h, k| h[k] = [] }
+        URI.decode_www_form(query_string.to_s).each { |k, v| result[k] << v }
+        result
+      end
       self.debug_logger = nil
 
       register_built_in_hooks

data/lib/vcr/structs.rb

@@ -1,4 +1,3 @@
-require 'base64'
 require 'delegate'
 require 'time'
 
@@ -18,46 +17,36 @@ module VCR
           hash = hash_or_string
 
           if hash.has_key?('base64_string')
-            string = Base64.decode64(hash['base64_string'])
-            force_encode_string(string, hash['encoding'])
+            base64_decoded = hash['base64_string'].unpack1('m')
+            force_encode_string(base64_decoded, hash['encoding'])
           else
             try_encode_string(hash['string'], hash['encoding'])
           end
         end
 
-        if "".respond_to?(:encoding)
-          def force_encode_string(string, encoding)
-            return string unless encoding
-            string.force_encoding(encoding)
-          end
-
-          def try_encode_string(string, encoding_name)
-            return string if encoding_name.nil?
+        def force_encode_string(string, encoding)
+          return string unless encoding
+          string.force_encoding(encoding)
+        end
 
-            encoding = Encoding.find(encoding_name)
-            return string if string.encoding == encoding
+        def try_encode_string(string, encoding_name)
+          return string if encoding_name.nil? || string.nil?
 
-            # ASCII-8BIT just means binary, so encoding to it is nonsensical
-            # and yet "\u00f6".encode("ASCII-8BIT") raises an error.
-            # Instead, we'll force encode it (essentially just tagging it as binary)
-            return string.force_encoding(encoding) if encoding == Encoding::BINARY
+          encoding = Encoding.find(encoding_name)
+          return string if string.encoding == encoding
 
-            string.encode(encoding)
-          rescue EncodingError => e
-            struct_type = name.split('::').last.downcase
-            warn "VCR: got `#{e.class.name}: #{e.message}` while trying to encode the #{string.encoding.name} " +
-                 "#{struct_type} body to the original body encoding (#{encoding}). Consider using the " +
-                 "`:preserve_exact_body_bytes` option to work around this."
-            return string
-          end
-        else
-          def force_encode_string(string, encoding)
-            string
-          end
+          # ASCII-8BIT just means binary, so encoding to it is nonsensical
+          # and yet "\u00f6".encode("ASCII-8BIT") raises an error.
+          # Instead, we'll force encode it (essentially just tagging it as binary)
+          return string.force_encoding(encoding) if encoding == Encoding::BINARY
 
-          def try_encode_string(string, encoding)
-            string
-          end
+          string.encode(encoding)
+        rescue EncodingError => e
+          struct_type = name.split('::').last.downcase
+          warn "VCR: got `#{e.class.name}: #{e.message}` while trying to encode the #{string.encoding.name} " +
+                "#{struct_type} body to the original body encoding (#{encoding}). Consider using the " +
+                "`:preserve_exact_body_bytes` option to work around this."
+          return string
         end
       end
 
@@ -85,20 +74,15 @@ module VCR
         body = String.new(self.body.to_s)
 
         if VCR.configuration.preserve_exact_body_bytes_for?(self)
-          base_body_hash(body).merge('base64_string' => Base64.encode64(body))
+          base64_encoded = [body].pack('m')
+          base_body_hash(body).merge('base64_string' => base64_encoded)
         else
           base_body_hash(body).merge('string' => body)
         end
       end
 
-      if ''.respond_to?(:encoding)
-        def base_body_hash(body)
-          { 'encoding' => body.encoding.name }
-        end
-      else
-        def base_body_hash(body)
-          { }
-        end
+      def base_body_hash(body)
+        { 'encoding' => body.encoding.name }
       end
     end
 
@@ -416,9 +400,7 @@ module VCR
         case type
         when 'gzip'
           body_str = ''
-          args = [StringIO.new(body_str)]
-          args << { :encoding => 'ASCII-8BIT' } if ''.respond_to?(:encoding)
-          writer = Zlib::GzipWriter.new(*args)
+          writer = Zlib::GzipWriter.new(StringIO.new(body_str), encoding: 'ASCII-8BIT')
           writer.write(body)
           writer.close
           body_str
@@ -457,10 +439,7 @@ module VCR
 
       case type
       when 'gzip'
-        gzip_reader_options = {}
-        gzip_reader_options[:encoding] = 'ASCII-8BIT' if ''.respond_to?(:encoding)
-        yield Zlib::GzipReader.new(StringIO.new(body),
-                                   **gzip_reader_options).read
+        yield Zlib::GzipReader.new(StringIO.new(body), encoding: 'ASCII-8BIT').read
       when 'deflate'
         yield Zlib::Inflate.inflate(body)
       when 'identity', NilClass

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.3.1'
+      string = +'6.4.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

metadata

@@ -1,31 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Myron Marston
 - Kurtis Rainbolt-Greene
 - Olle Jonsson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: Record your test suite's HTTP interactions and replay them during future
   test runs for fast, deterministic, accurate tests.
 email:
@@ -77,8 +62,9 @@ homepage: https://benoittgt.github.io/vcr
 licenses:
 - Hippocratic-2.1
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/vcr/vcr/blob/v6.4.0/CHANGELOG.md
+  funding_uri: https://opencollective.com/vcr
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.0.1
 specification_version: 4
 summary: Record your test suite's HTTP interactions and replay them during future
   test runs for fast, deterministic, accurate tests.