webmock 3.19.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ade97b45c0a5c72d60b74f83afd38ff397fd878c43e02de7e7d148e1d1ace8
-  data.tar.gz: b8c6e112eb3eec3d0f5bcaff76c6c8209d84eeb71f625bedfebc63b1fe6756f2
+  metadata.gz: ffda5916fee8f80d1d0a725b7de314652a588658189bb28ad7a984551d406a3a
+  data.tar.gz: f2aa5c1f78094f72f9c7310dfbb3e866be2acc6910bd3c3a1a4e562744e0fa65
 SHA512:
-  metadata.gz: de9230ccdbfaa25cc814d9ffa1091edf85d279e1982728e64d7c721355897d8eb2a0bd3ad94eff36917f0d696287edc8218d3882255bcc6234393f90c084c28b
-  data.tar.gz: 58d85aeb70b455fc02322c0f868e4937cc4d93b9db0c0a3dd9fede8b08bebf8adf2a7d9a0aebb3e1e40a52b079d8841530075ecef203ff16a937a20954b50861
+  metadata.gz: e3fbfb98e4a6d090abd630ccfea78f5b06038e3f6d4683bd1f651f6c8b07b31698f71f9588df1a8d90066ab0d38a088a604204b4f710bfd9249235a9f2664453
+  data.tar.gz: ffcaf10bc3cd523f6c12c2209fc4e48fb34813e520789ca78ee0cb65b3285f7bf1534ef36faafbd61a49d82ca547f2ecfb3ea74b33b5ba3b4294493f0683942d

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+# 3.20.0
+
+  * Optimised EmHttpRequestAdapter performance.
+
+    Thanks to [Ricardo Trindade](https://github.com/RicardoTrindade)
+
+  * Removed runtime dependency on base64.
+
+    Thanks to [Earlopain](https://github.com/Earlopain)
+
+  * Typhoeus::Response objects constructed from stubbed responses now have all timing attributes set to 0.0.
+
+    Thanks to [James Brown](https://github.com/Roguelazer)
+
+  * Optimised WebMock::Util::Headers by removing redundant freeze invocations.
+
+    Thanks to [Kazuhiro NISHIYAMA](https://github.com/znz)
+
+  * The default stubbed response body, which is an empty String, is unfrozen.
+
+  * When building signatures of requests made by http.rb, the request body encoding is now preserved.
+
+# 3.19.1
+
+  * When passing a Proc or lambda as response body to `to_return_json`, the body is evaluated at the time of request and not at the time of `to_return_json` method invocation.
+
+      Thanks to [Jason Karns](https://github.com/jasonkarns) for reporting.
+
 # 3.19.0
 
   * Do not alter real (non-stubbed) request headers when handling em-http-request requests.

data/README.md

@@ -1189,6 +1189,10 @@ People who submitted patches and new features or suggested improvements. Many th
 * Yuki Inoue
 * Brandon Weaver
 * Josh Nichols
+* Ricardo Trindade
+* Earlopain
+* James Brown
+* Kazuhiro NISHIYAMA
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/em_http_request_adapter.rb

@@ -156,7 +156,7 @@ if defined?(EventMachine::HttpClient)
         raw_cookie = response_header.cookie
         raw_cookie = [raw_cookie] if raw_cookie.is_a? String
 
-        cookie = raw_cookie.select { |c| c.start_with? name }.first
+        cookie = raw_cookie.detect { |c| c.start_with? name }
         cookie and cookie.split('=', 2)[1]
       end
 

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

@@ -3,11 +3,21 @@
 module HTTP
   class Request
     def webmock_signature
-      request_body = if defined?(HTTP::Request::Body)
-                       String.new.tap { |string| body.each { |part| string << part } }
-                     else
-                       body
-                     end
+      request_body = nil
+
+      if defined?(HTTP::Request::Body)
+        request_body = String.new
+        first_chunk_encoding = nil
+        body.each do |part|
+          request_body << part
+          first_chunk_encoding ||= part.encoding
+        end
+
+        request_body.force_encoding(first_chunk_encoding) if first_chunk_encoding
+        request_body
+      else
+        request_body = body
+      end
 
       ::WebMock::RequestSignature.new(verb, uri.to_s, {
         headers: headers.to_h,

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -96,7 +96,14 @@ if defined?(Typhoeus)
               status_message: "",
               body: "",
               headers: {},
-              return_code: :operation_timedout
+              return_code: :operation_timedout,
+              total_time: 0.0,
+              starttransfer_time: 0.0,
+              appconnect_time: 0.0,
+              pretransfer_time: 0.0,
+              connect_time: 0.0,
+              namelookup_time: 0.0,
+              redirect_time: 0.0
             )
           else
             ::Typhoeus::Response.new(
@@ -104,7 +111,14 @@ if defined?(Typhoeus)
               status_message: webmock_response.status[1],
               body: webmock_response.body,
               headers: webmock_response.headers,
-              effective_url: request_signature.uri
+              effective_url: request_signature.uri,
+              total_time: 0.0,
+              starttransfer_time: 0.0,
+              appconnect_time: 0.0,
+              pretransfer_time: 0.0,
+              connect_time: 0.0,
+              namelookup_time: 0.0,
+              redirect_time: 0.0
             )
           end
           response.mock = :webmock

data/lib/webmock/request_stub.rb

@@ -32,12 +32,25 @@ module WebMock
       json_response_hashes = [*response_hashes].flatten.map do |resp_h|
         headers, body = resp_h.values_at(:headers, :body)
 
-        body = body.call if body.respond_to?(:call)
-        body = body.to_json unless body.is_a?(String)
+        json_body = if body.respond_to?(:call)
+          ->(request_signature) {
+            b = if body.respond_to?(:arity) && body.arity == 1
+              body.call(request_signature)
+            else
+              body.call
+            end
+            b = b.to_json unless b.is_a?(String)
+            b
+          }
+        elsif !body.is_a?(String)
+          body.to_json
+        else
+          body
+        end
 
         resp_h.merge(
           headers: {content_type: 'application/json'}.merge(headers.to_h),
-          body: body
+          body: json_body
         )
       end
 

data/lib/webmock/response.rb

@@ -38,7 +38,7 @@ module WebMock
     end
 
     def body
-      @body || ''
+      @body || String.new("")
     end
 
     def body=(body)

data/lib/webmock/util/headers.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'base64'
-
 module WebMock
 
   module Util
 
     class Headers
 
-      STANDARD_HEADER_DELIMITER = '-'.freeze
-      NONSTANDARD_HEADER_DELIMITER = '_'.freeze
-      JOIN = ', '.freeze
+      STANDARD_HEADER_DELIMITER = '-'
+      NONSTANDARD_HEADER_DELIMITER = '_'
+      JOIN = ', '
 
       def self.normalize_headers(headers)
         return nil unless headers
@@ -59,7 +57,8 @@ module WebMock
       end
 
       def self.basic_auth_header(*credentials)
-        "Basic #{Base64.strict_encode64(credentials.join(':')).chomp}"
+        strict_base64_encoded = [credentials.join(':')].pack("m0")
+        "Basic #{strict_base64_encoded.chomp}"
       end
 
       def self.normalize_name(name)

data/lib/webmock/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,6 +198,20 @@ 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
@@ -357,9 +371,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.19.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.19.0
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.19.0
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.20.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.20.0
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.20.0
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message:
 rdoc_options: []
@@ -376,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.