webmock 3.18.0 → 3.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70c0ad15601d48c3f413012ced7fde245d03fcc5d5bb7b609fd2ce89084b2589
-  data.tar.gz: 4575309d868350685b573d8929ce1836eb044b00fb862c1b9b266a73a1992e9f
+  metadata.gz: 3a7e964f28dd42787fd854c5fcc87dba4cd61ef214c3dee485d9bd0d71fc1cdd
+  data.tar.gz: f6921a9b14ccd71f18b4674aca8d4d24bf377545a4ef8c56862f95cc56b6e8a7
 SHA512:
-  metadata.gz: acba1ac0ec3d97c5eb244a84d1b8e895f13e9b3cfb1ca5ac4c0d5109eb7fcc508a3d1e51faa426bd31cb2509d61effed7c134119b5c05d128b3466ec3ee397c7
-  data.tar.gz: e8eb5385dd3d4fc9f02c541fbec1bc2c825e07445046b3bde50c471925728c08b1bb9aaf963d61fb44f5a38041f54964ab9fa89caef4cd16fd06fe6bb1ceca44
+  metadata.gz: 80e85d1bb83018bdaab80aed649134757ee8ac591b98e9ccf1b6df10c0d8930db167dd5fd3bb039dd56a955d22c0cc6b1a1227bb88e8f3e56d31d0e1c9d7708e
+  data.tar.gz: c67f1f8486d6ee932bd9d01dff2bfcec35d9c3e3ed937e50e1f56d34f664ca11db4c9399c51e82da9316245c1d4727c726b9e307646aef80477764609ecf95ee

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 3.18.1
+
+  * Reverted simplified connection handing in Net::HTTP adapter due to https://github.com/bblimke/webmock/issues/999
+
 # 3.18.0
 
   * Net::BufferedIO is not replaced anymore.

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -67,57 +67,78 @@ module WebMock
         end
 
         def request(request, body = nil, &block)
-          return super unless started?
-
           request_signature = WebMock::NetHTTPUtility.request_signature_from_request(self, request, body)
 
           WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
 
           if webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
+            @socket = Net::HTTP.socket_type.new
             WebMock::CallbackRegistry.invoke_callbacks(
               {lib: :net_http}, request_signature, webmock_response)
             build_net_http_response(webmock_response, &block)
           elsif WebMock.net_connect_allowed?(request_signature.uri)
             check_right_http_connection
-            ensure_actually_connected
-
-            response = super(request, nil, &nil)
-
-            if WebMock::CallbackRegistry.any_callbacks?
-              WebMock::CallbackRegistry.invoke_callbacks(
-                {lib: :net_http, real_request: true},
-                request_signature,
-                build_webmock_response(response)
-              )
+            after_request = lambda do |response|
+              if WebMock::CallbackRegistry.any_callbacks?
+                webmock_response = build_webmock_response(response)
+                WebMock::CallbackRegistry.invoke_callbacks(
+                  {lib: :net_http, real_request: true}, request_signature, webmock_response)
+              end
+              response.extend Net::WebMockHTTPResponse
+              block.call response if block
+              response
+            end
+            super_with_after_request = lambda {
+              response = super(request, nil, &nil)
+              after_request.call(response)
+            }
+            if started?
+              ensure_actual_connection
+              super_with_after_request.call
+            else
+              start_with_connect {
+                super_with_after_request.call
+              }
             end
-
-            response.extend Net::WebMockHTTPResponse
-            block.call response if block
-            response
           else
             raise WebMock::NetConnectNotAllowedError.new(request_signature)
           end
         end
 
-        private
-
-        alias_method :actually_connect, :connect
-
-        def connect
-          uri = Addressable::URI.parse(WebMock::NetHTTPUtility.get_uri(self))
-
-          if WebMock.net_http_connect_on_start?(uri)
-            super
-          else
-            @socket = StubSocket.new
+        def start_without_connect
+          raise IOError, 'HTTP session already opened' if @started
+          if block_given?
+            begin
+              @socket = Net::HTTP.socket_type.new
+              @started = true
+              return yield(self)
+            ensure
+              do_finish
+            end
           end
+          @socket = Net::HTTP.socket_type.new
+          @started = true
+          self
         end
 
-        def ensure_actually_connected
+
+        def ensure_actual_connection
           if @socket.is_a?(StubSocket)
             @socket&.close
             @socket = nil
-            actually_connect
+            do_start
+          end
+        end
+
+        alias_method :start_with_connect, :start
+
+        def start(&block)
+          uri = Addressable::URI.parse(WebMock::NetHTTPUtility.get_uri(self))
+
+          if WebMock.net_http_connect_on_start?(uri)
+            super(&block)
+          else
+            start_without_connect(&block)
           end
         end
 

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '3.18.0' unless defined?(::WebMock::VERSION)
+  VERSION = '3.18.1' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/net_http/net_http_spec.rb

@@ -198,14 +198,14 @@ describe "Net:HTTP" do
 
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
     it "uses the StubSocket to provide IP address" do
-      Net::HTTP.start("example.com") do |http|
+      Net::HTTP.start("http://example.com") do |http|
         expect(http.ipaddr).to eq("127.0.0.1")
       end
     end
   end
 
   it "defines common socket methods" do
-    Net::HTTP.start("example.com") do |http|
+    Net::HTTP.start("http://example.com") do |http|
       socket = http.instance_variable_get(:@socket)
       expect(socket.io.ssl_version).to eq("TLSv1.3")
       expect(socket.io.cipher).to eq(["TLS_AES_128_GCM_SHA256", "TLSv1.3", 128, 128])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.18.1
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -421,9 +421,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.18.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.18.0
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.18.0
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.18.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.18.1
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.18.1
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message:
 rdoc_options: []
@@ -440,7 +440,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.