webmock 3.26.2 → 3.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d61b9a1ba2457ef06a173ec71523bedaaecdac935b59611abeff105679da7cb3
-  data.tar.gz: 1d78e1c3b493bd1fc2af0961a6bebae5a273e1937b6cad6aaa7ef501e4b70778
+  metadata.gz: eb0293b4433bbf3342d1f81abb5a1c773382f6f1a7fef6b44eb83fc0a38544a7
+  data.tar.gz: 00fbb149216fae39f04b689fc02c0f561e59e47843011fd8aaab36b35e86ba67
 SHA512:
-  metadata.gz: 4e56c8868b81ac1465e6b28b96041f9ea0a3cda7ef3728d0bc6715215d84baa44af5b5e1f4ba48597f34e6fd2e6f00f86cb5d61c194fb2eebd0a58caf92f615b
-  data.tar.gz: ea6072e9d1dbba86925558f31e10df790c5979f470806b92be7cfa483d47b1158ba55b1453981d696751ca2b2c98a1847f50cb635779a7eef7e7a377598777b4
+  metadata.gz: 664302057fd929d144d09bb739c0cc581f4b80b40b67093989a4df01a21337f12594b765d9da0bc980ba981cfbe8db451cf0d23ce4ed10fa5d57eb2ddd98de79
+  data.tar.gz: bad8a582bd3b717e11182aef243b7167021187d63bd40b2dc1f0f54f13928e898e45ecf1cb598419e8dfc643d5b270db0d3a5408ab871ffb0725d5560dbd556b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+# 3.26.4
+
+* Fix race condition in `HTTPClient` adapter async requests by @koic in #1131
+
+# 3.26.3
+
+* Confirm to work with curb 1.3.7
+
+    Thanks to [Josch Bockler](https://github.com/jbockler)
+
+* Fix NameError in async-http adapter on protocol-http1 >= 0.40
+
+    Thanks to [Leslie Hoare](https://github.com/lesleh)
+
 # 3.26.2
 
 * Add support to parse http/2 request on curb adapter

data/README.md

@@ -1213,6 +1213,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Mikhail Doronin
 * Christoph Rieß
 * Erik Berlin
+* Josch Bockler
+* Leslie Hoare
 
 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

@@ -16,6 +16,17 @@ if defined?(Async::HTTP)
         OriginalAsyncHttpClient = Async::HTTP::Client unless const_defined?(:OriginalAsyncHttpClient)
 
         class << self
+          # protocol-http1 0.40.0 removed Protocol::HTTP1::Reason in favour of
+          # Protocol::HTTP::Status. Resolved on first use, rather than at load,
+          # so it does not depend on which of the two is required by then.
+          def status_descriptions
+            @status_descriptions ||= if defined?(::Protocol::HTTP1::Reason)
+                                       ::Protocol::HTTP1::Reason::DESCRIPTIONS
+                                     else
+                                       ::Protocol::HTTP::Status::DESCRIPTIONS
+                                     end
+          end
+
           def enable!
             Async::HTTP.send(:remove_const, :Client)
             Async::HTTP.send(:const_set, :Client, Async::HTTP::WebMockClientWrapper)
@@ -112,7 +123,7 @@ if defined?(Async::HTTP)
           webmock_response = WebMock::Response.new
           webmock_response.status = [
             response.status,
-            ::Protocol::HTTP1::Reason::DESCRIPTIONS[response.status]
+            WebMock::HttpLibAdapters::AsyncHttpClientAdapter.status_descriptions[response.status]
           ]
           webmock_response.headers = build_webmock_response_headers(response)
           webmock_response.body = body

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -7,7 +7,13 @@ rescue LoadError
 end
 
 if defined?(Curl)
-  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '1.2.2', ['0.8.7']).check_version!
+  unsupported_curb_versions = ['0.8.7']
+
+  # Curl::Easy#perform raises "cannot define finalizer for TrueClass" on Ruby 2.6
+  # in curb 1.3.0 through 1.3.5. Fixed in curb 1.3.6. See https://github.com/taf2/curb/issues/478
+  unsupported_curb_versions += %w[1.3.0 1.3.1 1.3.2 1.3.3 1.3.4 1.3.5] if RUBY_VERSION < '2.7'
+
+  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16', '1.3.7', unsupported_curb_versions).check_version!
 
   module WebMock
     module HttpLibAdapters

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -112,7 +112,10 @@ if defined?(::HTTPClient)
       request_signature = build_request_signature(req)
       webmock_request_signatures << request_signature
 
-      if webmock_responses[request_signature] || WebMock.net_connect_allowed?(request_signature.uri)
+      if webmock_responses[request_signature]
+        webmock_response = webmock_responses.delete(request_signature)
+        async_conn_for_stubbed_request(req, request_signature, webmock_response)
+      elsif WebMock.net_connect_allowed?(request_signature.uri)
         conn = super
         conn.async_thread[WEBMOCK_HTTPCLIENT_REQUEST_SIGNATURES] = Thread.current[WEBMOCK_HTTPCLIENT_REQUEST_SIGNATURES]
         conn.async_thread[WEBMOCK_HTTPCLIENT_RESPONSES] = Thread.current[WEBMOCK_HTTPCLIENT_RESPONSES]
@@ -227,6 +230,30 @@ if defined?(::HTTPClient)
       Thread.current[WEBMOCK_HTTPCLIENT_REQUEST_SIGNATURES] = nil
       Thread.current[WEBMOCK_HTTPCLIENT_RESPONSES] = nil
     end
+
+    # The async thread must not go through do_get, which would rebuild the request signature.
+    # Rebuilding calls headers_from_session again, and the session sets a Date header with
+    # 1 second resolution, so a signature built later can differ from the one the response was
+    # cached under, which makes the thread evaluate the stub registry again and consume
+    # an extra response from the stub sequence. The thread only delivers what the caller
+    # already evaluated, mirroring do_get's stubbed branch.
+    def async_conn_for_stubbed_request(req, request_signature, webmock_response)
+      conn = HTTPClient::Connection.new
+      conn.async_thread = Thread.new do
+        begin
+          WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
+          response = build_httpclient_response(webmock_response, true, req.header)
+          @request_filter.each do |filter|
+            filter.filter_response(req, response)
+          end
+          conn.push(response)
+          WebMock::CallbackRegistry.invoke_callbacks({lib: :httpclient}, request_signature, webmock_response)
+        rescue Exception => e
+          conn.push e
+        end
+      end
+      conn
+    end
   end
 
   class WebMockHTTPClient < HTTPClient

data/lib/webmock/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.26.2
+  version: 3.26.4
 platform: ruby
 authors:
 - Bartosz Blimke
@@ -358,9 +358,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  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
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.26.4/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.26.4
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.26.4
   wiki_uri: https://github.com/bblimke/webmock/wiki
 rdoc_options: []
 require_paths:
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.1.0.dev
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: []