webmock 3.24.0 → 3.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9283efd8ecb49795fe14fc5903295b0d143fbdd17f5cc1611e89d918f917c33f
-  data.tar.gz: ea556e59d242667816568c75f7c42be613e09f688c3ada07c65f0c9de0e3d05d
+  metadata.gz: a71743bb6d5f304d032ba24c918ac45b07426f28b170068c5fbd5c7c0757fcb6
+  data.tar.gz: ad25d2f20543df2419e74378c2f072824347d37587a7a8fd00dccca40aaa07e5
 SHA512:
-  metadata.gz: bcd310894ba47584609ffafcd332cbd824d3921ec938a7ca63e84e983436188dbf7f44a13137e407b3c5798fd9a02ced95e5797ac9ee3e923adf588cf04c4015
-  data.tar.gz: 617bcf11b564bf6cc2faf4a973e9882dbb9639e685ed989fe6bc11b65c1ea7e66d12a106484e2e641ff4fda4c8c7336fe83509852b2a858f94fe0a657b5aae6c
+  metadata.gz: 00f2b6475d6845de134311b47cd545c674b750f6b270579bc3124664f40ce60d7b56b26c531d0e968d72fa53d1c902f105d7e52d274330336c30c504cbcd83e3
+  data.tar.gz: 163df74a3e2c219ee42c8d591acd9042e605427433129a7c421dc4d25671ca8073757409fb105740601add8284d52b2a464ed59500829dc9a97eeceb99b2545c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+# 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,7 @@ Supported Ruby Interpreters
 * MRI 3.1
 * MRI 3.2
 * MRI 3.3
+* MRI 3.4
 * JRuby
 
 ## Installation

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

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.25.0' 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.25.0
 platform: ruby
 authors:
 - Bartosz Blimke
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -373,11 +372,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.25.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.25.0
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.25.0
   wiki_uri: https://github.com/bblimke/webmock/wiki
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -392,8 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: []