webmock 3.24.0 → 3.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9283efd8ecb49795fe14fc5903295b0d143fbdd17f5cc1611e89d918f917c33f
-  data.tar.gz: ea556e59d242667816568c75f7c42be613e09f688c3ada07c65f0c9de0e3d05d
+  metadata.gz: d61b9a1ba2457ef06a173ec71523bedaaecdac935b59611abeff105679da7cb3
+  data.tar.gz: 1d78e1c3b493bd1fc2af0961a6bebae5a273e1937b6cad6aaa7ef501e4b70778
 SHA512:
-  metadata.gz: bcd310894ba47584609ffafcd332cbd824d3921ec938a7ca63e84e983436188dbf7f44a13137e407b3c5798fd9a02ced95e5797ac9ee3e923adf588cf04c4015
-  data.tar.gz: 617bcf11b564bf6cc2faf4a973e9882dbb9639e685ed989fe6bc11b65c1ea7e66d12a106484e2e641ff4fda4c8c7336fe83509852b2a858f94fe0a657b5aae6c
+  metadata.gz: 4e56c8868b81ac1465e6b28b96041f9ea0a3cda7ef3728d0bc6715215d84baa44af5b5e1f4ba48597f34e6fd2e6f00f86cb5d61c194fb2eebd0a58caf92f615b
+  data.tar.gz: ea6072e9d1dbba86925558f31e10df790c5979f470806b92be7cfa483d47b1158ba55b1453981d696751ca2b2c98a1847f50cb635779a7eef7e7a377598777b4

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+# 3.26.2
+
+* Add support to parse http/2 request on curb adapter
+
+    Thanks to [Christoph Rieß](https://github.com/criess)
+
+* CurbAdapter alias `code` from `response_code`
+
+    Thanks to [Christoph Rieß](https://github.com/criess)
+
+* Add HTTP.rb v6.0.0 compatibility to http_rb adapter
+
+    Thanks to [Erik Berlin](https://github.com/sferik)
+
+# 3.26.1
+
+* Fix compatibility with recent async-http versions
+
+    Thanks to [Mikhail Doronin](https://github.com/misdoro)
+
+# 3.26.0
+
+* Support Addressable::URI in request patterns
+
+    Thanks to [Alexey Zapparov](https://github.com/ixti)
+
+# 3.25.2
+
+* Return support for `em_http_request`
+
+    Thanks to [Oleg](https://github.com/Koilanetroc)
+
+# 3.25.1
+
+* Fix FrozenError in Typhoeus streaming response body
+
+    Thanks to [Patrick Jaberg](https://github.com/patrickjaberg)
+
+# 3.25.0
+
+* Resolve net-http adapter deprecation Ruby 3.4
+
+    Thanks to [Earlopain](https://github.com/Earlopain)
+
 # 3.24.0
 
 * Ignore parsing errors when parsing invalid JSON or XML body to match against body pattern #1066

data/README.md

@@ -44,6 +44,8 @@ Supported Ruby Interpreters
 * MRI 3.1
 * MRI 3.2
 * MRI 3.3
+* MRI 3.4
+* MRI 4.0
 * JRuby
 
 ## Installation
@@ -1206,6 +1208,11 @@ People who submitted patches and new features or suggested improvements. Many th
 * Jacob Frautschi
 * Christian Schmidt
 * Rodrigo Argumedo
+* Patrick Jaberg
+* Oleg
+* Mikhail Doronin
+* Christoph Rieß
+* Erik Berlin
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/async_http_client_adapter.rb

@@ -211,7 +211,7 @@ if defined?(Async::HTTP)
           def build_response(webmock_response)
             headers = (webmock_response.headers || {}).each_with_object([]) do |(k, value), o|
               Array(value).each do |v|
-                o.push [k, v]
+                o.push [k, v] unless k.downcase == 'content-length' # async-http appends the exact content-length automatically
               end
             end
 

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 if defined?(Curl)
-  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '1.0.1', ['0.8.7']).check_version!
+  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '1.2.2', ['0.8.7']).check_version!
 
   module WebMock
     module HttpLibAdapters
@@ -32,8 +32,8 @@ if defined?(Curl)
           status, headers = nil, {}
 
           header_string.split(/\r\n/).each do |header|
-            if header =~ %r|^HTTP/1.[01] \d\d\d (.*)|
-              status = $1
+            if header =~ %r{\AHTTP/(1\.[01]|2) (\d{3})\s*(.*)}
+              status = $3
             else
               parts = header.split(':', 2)
               unless parts.empty?
@@ -313,6 +313,7 @@ if defined?(Curl)
       def response_code
         @response_code ||= super
       end
+      alias code response_code
 
       def header_str
         @header_str ||= super

data/lib/webmock/http_lib_adapters/em_http_request_adapter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
-
 begin
   require 'em-http-request'
 rescue LoadError

data/lib/webmock/http_lib_adapters/http_rb/response.rb

@@ -28,9 +28,6 @@ module HTTP
         headers = webmock_response.headers || {}
         uri     = normalize_uri(request_signature && request_signature.uri)
 
-        # HTTP.rb 3.0+ uses a keyword argument to pass the encoding, but 1.x
-        # and 2.x use a positional argument, and 0.x don't support supplying
-        # the encoding.
         body = build_http_rb_response_body_from_webmock_response(webmock_response)
 
         return new(status, "1.1", headers, body, uri) if HTTP::VERSION < "1.0.0"
@@ -46,6 +43,17 @@ module HTTP
           })
         end
 
+        # 6.0.0 changed Response.new from a positional hash to keyword arguments.
+        if HTTP::VERSION >= '6.0.0'
+          return new(
+            status: status,
+            version: "1.1",
+            headers: headers,
+            body: body,
+            request: request,
+          )
+        end
+
         new({
           status: status,
           version: "1.1",

data/lib/webmock/http_lib_adapters/http_rb/streamer.rb

@@ -10,15 +10,22 @@ module HTTP
 
       def readpartial(size = nil, outbuf = nil)
         unless size
-          if defined?(HTTP::Client::BUFFER_SIZE)
-            size = HTTP::Client::BUFFER_SIZE
-          elsif defined?(HTTP::Connection::BUFFER_SIZE)
+          if defined?(HTTP::Connection::BUFFER_SIZE)
             size = HTTP::Connection::BUFFER_SIZE
+          elsif defined?(HTTP::Client::BUFFER_SIZE)
+            size = HTTP::Client::BUFFER_SIZE
           end
         end
 
-        chunk = @io.read size, outbuf
-        chunk.force_encoding(@encoding) if chunk
+        chunk = @io.read(size, outbuf)
+
+        # HTTP.rb 6.0+ expects EOFError at end-of-stream instead of nil
+        if chunk.nil?
+          raise EOFError if HTTP::VERSION >= "6.0.0"
+          return nil
+        end
+
+        chunk.force_encoding(@encoding)
       end
 
       def close

data/lib/webmock/http_lib_adapters/http_rb/webmock.rb

@@ -43,7 +43,10 @@ module HTTP
       invoke_callbacks(webmock_response, real_request: false)
       response = ::HTTP::Response.from_webmock @request, webmock_response, request_signature
 
-      @options.features.each { |_name, feature| response = feature.wrap_response(response) }
+      # HTTP.rb 6.0+ wraps responses in reverse feature order
+      features = @options.features.values
+      features = features.reverse if HTTP::VERSION >= "6.0.0"
+      features.each { |feature| response = feature.wrap_response(response) }
       response
     end
 

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -12,19 +12,25 @@ module WebMock
       adapter_for :net_http
 
       OriginalNetHTTP = Net::HTTP unless const_defined?(:OriginalNetHTTP)
+      # This will be removed in Ruby 3.5. In Ruby 3.4, const_remove will warn.
+      HAS_LEGACY_CONSTANT = Net.const_defined?(:HTTPSession)
 
       def self.enable!
         Net.send(:remove_const, :HTTP)
-        Net.send(:remove_const, :HTTPSession)
         Net.send(:const_set, :HTTP, @webMockNetHTTP)
-        Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
+        if HAS_LEGACY_CONSTANT
+          remove_silently(Net, :HTTPSession)
+          Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
+        end
       end
 
       def self.disable!
         Net.send(:remove_const, :HTTP)
-        Net.send(:remove_const, :HTTPSession)
         Net.send(:const_set, :HTTP, OriginalNetHTTP)
-        Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
+        if HAS_LEGACY_CONSTANT
+          remove_silently(Net, :HTTPSession)
+          Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
+        end
 
         #copy all constants from @webMockNetHTTP to original Net::HTTP
         #in case any constants were added to @webMockNetHTTP instead of Net::HTTP
@@ -37,6 +43,14 @@ module WebMock
         end
       end
 
+      def self.remove_silently(mod, const) #:nodoc:
+        # Don't warn on removing the deprecated constant
+        verbose, $VERBOSE = $VERBOSE, nil
+        mod.send(:remove_const, const)
+      ensure
+        $VERBOSE = verbose
+      end
+
       @webMockNetHTTP = Class.new(Net::HTTP) do
         class << self
           def socket_type
@@ -186,9 +200,9 @@ module WebMock
 
 
         def check_right_http_connection
-          unless @@alredy_checked_for_right_http_connection ||= false
+          unless @@already_checked_for_right_http_connection ||= false
             WebMock::NetHTTPUtility.puts_warning_for_right_http_if_needed
-            @@alredy_checked_for_right_http_connection = true
+            @@already_checked_for_right_http_connection = true
           end
         end
       end

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -172,7 +172,7 @@ if defined?(Typhoeus)
                 request.execute_headers_callbacks(response)
               end
               if request.respond_to?(:streaming?) && request.streaming?
-                response.options[:response_body] = ""
+                response.options[:response_body] = "".dup
                 request.on_body.each { |callback| callback.call(webmock_response.body, response) }
               end
               request.finish(response)

data/lib/webmock/request_pattern.rb

@@ -86,10 +86,10 @@ module WebMock
         URICallablePattern.new(uri)
       elsif uri.is_a?(::URI::Generic)
         URIStringPattern.new(uri.to_s)
-      elsif uri.is_a?(String)
-        URIStringPattern.new(uri)
+      elsif uri.respond_to?(:to_str)
+        URIStringPattern.new(uri.to_str)
       else
-        raise ArgumentError.new("URI should be a String, Regexp, Addressable::Template or a callable object. Got: #{uri.class}")
+        raise ArgumentError.new("URI should be a String, Regexp, Addressable::Template, a callable object, or respond to #to_str. Got: #{uri.class}")
       end
     end
   end

data/lib/webmock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebMock
-  VERSION = '3.24.0' unless defined?(::WebMock::VERSION)
+  VERSION = '3.26.2' unless defined?(::WebMock::VERSION)
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.26.2
 platform: ruby
 authors:
 - Bartosz Blimke
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,20 +197,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
-- !ruby/object:Gem::Dependency
-  name: mutex_m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -373,11 +358,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.24.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.24.0
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.24.0
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.26.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.26.2
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.26.2
   wiki_uri: https://github.com/bblimke/webmock/wiki
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -385,15 +369,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: []