webmock 3.26.4 → 3.34.0

data/lib/webmock/webmock.rb

@@ -87,14 +87,12 @@ module WebMock
     when Array
       allowed.any? { |allowed_item| net_connect_explicit_allowed?(allowed_item, uri) }
     when Regexp
-      (uri.to_s =~ allowed) != nil ||
-      (uri.omit(:port).to_s =~ allowed) != nil && uri.port == uri.default_port
+      allowed.match?(uri.to_s) ||
+      (uri.port == uri.default_port && allowed.match?(uri.omit(:port).to_s))
     when String
-      allowed == uri.to_s ||
       allowed == uri.host ||
       allowed == "#{uri.host}:#{uri.port}" ||
-      allowed == "#{uri.scheme}://#{uri.host}:#{uri.port}" ||
-      allowed == "#{uri.scheme}://#{uri.host}" && uri.port == uri.default_port
+      net_connect_allowed_url?(allowed, uri)
     else
       if allowed.respond_to?(:call)
         allowed.call(uri)
@@ -102,6 +100,28 @@ module WebMock
     end
   end
 
+  def self.net_connect_allowed_url?(allowed, uri)
+    return false unless allowed.match?(%r{\Ahttps?://}i)
+
+    # Normalization turns an empty path into "/", so check the original URL.
+    allowed_uri = Addressable::URI.parse(allowed)
+    allow_any_path = allowed_uri.path.empty? && allowed_uri.query.nil?
+
+    # Connection URIs have no request path to match yet.
+    return false if uri.path.empty? && !allowed_uri.path.empty?
+
+    allowed_uri = WebMock::Util::URI.normalize_uri(allowed_uri)
+    request_uri = WebMock::Util::URI.normalize_uri(uri)
+
+    return false unless allowed_uri.origin == request_uri.origin
+    return true if allow_any_path
+
+    allowed_uri.path == request_uri.path && allowed_uri.query == request_uri.query
+  rescue Addressable::URI::InvalidURIError
+    false
+  end
+  private_class_method :net_connect_allowed_url?
+
   def self.show_body_diff!
     Config.instance.show_body_diff = true
   end

data/lib/webmock.rb

@@ -13,6 +13,7 @@ require_relative 'webmock/errors'
 require_relative 'webmock/util/query_mapper'
 require_relative 'webmock/util/uri'
 require_relative 'webmock/util/headers'
+require_relative 'webmock/util/content_type'
 require_relative 'webmock/util/hash_counter'
 require_relative 'webmock/util/hash_keys_stringifier'
 require_relative 'webmock/util/values_stringifier'
@@ -36,6 +37,7 @@ require_relative 'webmock/rack_response'
 require_relative 'webmock/stub_request_snippet'
 require_relative 'webmock/request_signature_snippet'
 require_relative 'webmock/request_body_diff'
+require_relative 'webmock/json_body_hint'
 
 require_relative 'webmock/assertion_failure'
 require_relative 'webmock/request_execution_verifier'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.26.4
+  version: 3.34.0
 platform: ruby
 authors:
 - Bartosz Blimke
@@ -318,6 +318,7 @@ files:
 - lib/webmock/http_lib_adapters/net_http_response.rb
 - lib/webmock/http_lib_adapters/patron_adapter.rb
 - lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- lib/webmock/json_body_hint.rb
 - lib/webmock/matchers/any_arg_matcher.rb
 - lib/webmock/matchers/hash_argument_matcher.rb
 - lib/webmock/matchers/hash_excluding_matcher.rb
@@ -340,6 +341,7 @@ files:
 - lib/webmock/stub_registry.rb
 - lib/webmock/stub_request_snippet.rb
 - lib/webmock/test_unit.rb
+- lib/webmock/util/content_type.rb
 - lib/webmock/util/hash_counter.rb
 - lib/webmock/util/hash_keys_stringifier.rb
 - lib/webmock/util/hash_validator.rb
@@ -358,9 +360,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  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
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.34.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.34.0
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.34.0
   wiki_uri: https://github.com/bblimke/webmock/wiki
 rdoc_options: []
 require_paths:
@@ -376,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: []