webmock 3.18.1 → 3.19.0

data/lib/webmock/util/headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module WebMock
@@ -6,18 +8,21 @@ module WebMock
 
     class Headers
 
+      STANDARD_HEADER_DELIMITER = '-'.freeze
+      NONSTANDARD_HEADER_DELIMITER = '_'.freeze
+      JOIN = ', '.freeze
+
       def self.normalize_headers(headers)
         return nil unless headers
-        array = headers.map { |name, value|
-          [name.to_s.split(/_|-/).map { |segment| segment.capitalize }.join("-"),
-           case value
+
+        headers.each_with_object({}) do |(name, value), new_headers|
+          new_headers[normalize_name(name)] =
+            case value
             when Regexp then value
-            when Array then (value.size == 1) ? value.first.to_s : value.map {|v| v.to_s}.sort
+            when Array then (value.size == 1) ? value.first.to_s : value.map(&:to_s).sort
             else value.to_s
-           end
-          ]
-        }
-        Hash[*array.inject([]) {|r,x| r + x}]
+            end
+        end
       end
 
       def self.sorted_headers_string(headers)
@@ -57,6 +62,15 @@ module WebMock
         "Basic #{Base64.strict_encode64(credentials.join(':')).chomp}"
       end
 
+      def self.normalize_name(name)
+        name
+          .to_s
+          .tr(NONSTANDARD_HEADER_DELIMITER, STANDARD_HEADER_DELIMITER)
+          .split(STANDARD_HEADER_DELIMITER)
+          .map!(&:capitalize)
+          .join(STANDARD_HEADER_DELIMITER)
+      end
+
     end
 
   end

data/lib/webmock/util/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This is a copy of https://github.com/jnunemaker/crack/blob/master/lib/crack/json.rb
 # with date parsing removed
 # Copyright (c) 2004-2008 David Heinemeier Hansson

data/lib/webmock/util/query_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebMock::Util
   class QueryMapper
     class << self

data/lib/webmock/util/uri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebMock
 
   module Util
@@ -68,7 +70,7 @@ module WebMock
 
       def self.is_uri_localhost?(uri)
         uri.is_a?(Addressable::URI) &&
-        %w(localhost 127.0.0.1 0.0.0.0).include?(uri.host)
+        %w(localhost 127.0.0.1 0.0.0.0 [::1]).include?(uri.host)
       end
 
       private

data/lib/webmock/util/values_stringifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class WebMock::Util::ValuesStringifier
   def self.stringify_values(value)
     case value

data/lib/webmock/util/version_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This code was created based on https://github.com/myronmarston/vcr/blob/master/lib/vcr/util/version_checker.rb
 # Thanks to @myronmarston
 
@@ -84,12 +86,12 @@ module WebMock
     def compare_version
       case
         when @major < @min_major then :too_low
+        when @major == @min_major && @minor < @min_minor then :too_low
+        when @major == @min_major && @minor == @min_minor && @patch < @min_patch then :too_low
         when @max_major && @major > @max_major then :too_high
-        when @major > @min_major then :ok
-        when @minor < @min_minor then :too_low
-        when @max_minor && @minor > @max_minor then :too_high
-        when @minor > @min_minor then :ok
-        when @patch < @min_patch then :too_low
+        when @max_major && @major == @max_major && @max_minor && @minor > @max_minor then :too_high
+
+        else :ok
       end
     end
 

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebMock
 
   def self.included(clazz)

data/lib/webmock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 require 'addressable/uri'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.18.1
+  version: 3.19.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: async-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.48.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.27.5
-- !ruby/object:Gem::Dependency
-  name: async-http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.48.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +268,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  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'
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email:
@@ -276,15 +290,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".github/workflows/CI.yml"
-- ".gitignore"
-- ".rspec-tm"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/webmock.rb
 - lib/webmock/api.rb
 - lib/webmock/assertion_failure.rb
@@ -344,86 +352,14 @@ files:
 - lib/webmock/util/version_checker.rb
 - lib/webmock/version.rb
 - lib/webmock/webmock.rb
-- minitest/test_helper.rb
-- minitest/test_webmock.rb
-- minitest/webmock_spec.rb
-- spec/acceptance/async_http_client/async_http_client_spec.rb
-- spec/acceptance/async_http_client/async_http_client_spec_helper.rb
-- spec/acceptance/curb/curb_spec.rb
-- spec/acceptance/curb/curb_spec_helper.rb
-- spec/acceptance/em_http_request/em_http_request_spec.rb
-- spec/acceptance/em_http_request/em_http_request_spec_helper.rb
-- spec/acceptance/excon/excon_spec.rb
-- spec/acceptance/excon/excon_spec_helper.rb
-- spec/acceptance/http_rb/http_rb_spec.rb
-- spec/acceptance/http_rb/http_rb_spec_helper.rb
-- spec/acceptance/httpclient/httpclient_spec.rb
-- spec/acceptance/httpclient/httpclient_spec_helper.rb
-- spec/acceptance/manticore/manticore_spec.rb
-- spec/acceptance/manticore/manticore_spec_helper.rb
-- spec/acceptance/net_http/net_http_shared.rb
-- spec/acceptance/net_http/net_http_spec.rb
-- spec/acceptance/net_http/net_http_spec_helper.rb
-- spec/acceptance/net_http/real_net_http_spec.rb
-- spec/acceptance/patron/patron_spec.rb
-- spec/acceptance/patron/patron_spec_helper.rb
-- spec/acceptance/shared/allowing_and_disabling_net_connect.rb
-- spec/acceptance/shared/callbacks.rb
-- spec/acceptance/shared/complex_cross_concern_behaviors.rb
-- spec/acceptance/shared/enabling_and_disabling_webmock.rb
-- spec/acceptance/shared/precedence_of_stubs.rb
-- spec/acceptance/shared/request_expectations.rb
-- spec/acceptance/shared/returning_declared_responses.rb
-- spec/acceptance/shared/stubbing_requests.rb
-- spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
-- spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
-- spec/acceptance/webmock_shared.rb
-- spec/fixtures/test.txt
-- spec/quality_spec.rb
-- spec/spec_helper.rb
-- spec/support/example_curl_output.txt
-- spec/support/failures.rb
-- spec/support/my_rack_app.rb
-- spec/support/network_connection.rb
-- spec/support/webmock_server.rb
-- spec/unit/api_spec.rb
-- spec/unit/errors_spec.rb
-- spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
-- spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
-- spec/unit/matchers/hash_excluding_matcher_spec.rb
-- spec/unit/matchers/hash_including_matcher_spec.rb
-- spec/unit/rack_response_spec.rb
-- spec/unit/request_body_diff_spec.rb
-- spec/unit/request_execution_verifier_spec.rb
-- spec/unit/request_pattern_spec.rb
-- spec/unit/request_registry_spec.rb
-- spec/unit/request_signature_snippet_spec.rb
-- spec/unit/request_signature_spec.rb
-- spec/unit/request_stub_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/stub_registry_spec.rb
-- spec/unit/stub_request_snippet_spec.rb
-- spec/unit/util/hash_counter_spec.rb
-- spec/unit/util/hash_keys_stringifier_spec.rb
-- spec/unit/util/headers_spec.rb
-- spec/unit/util/json_spec.rb
-- spec/unit/util/query_mapper_spec.rb
-- spec/unit/util/uri_spec.rb
-- spec/unit/util/version_checker_spec.rb
-- spec/unit/webmock_spec.rb
-- test/http_request.rb
-- test/shared_test.rb
-- test/test_helper.rb
-- test/test_webmock.rb
-- webmock.gemspec
 homepage: https://github.com/bblimke/webmock
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  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
+  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
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message:
 rdoc_options: []
@@ -433,83 +369,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
-test_files:
-- spec/acceptance/async_http_client/async_http_client_spec.rb
-- spec/acceptance/async_http_client/async_http_client_spec_helper.rb
-- spec/acceptance/curb/curb_spec.rb
-- spec/acceptance/curb/curb_spec_helper.rb
-- spec/acceptance/em_http_request/em_http_request_spec.rb
-- spec/acceptance/em_http_request/em_http_request_spec_helper.rb
-- spec/acceptance/excon/excon_spec.rb
-- spec/acceptance/excon/excon_spec_helper.rb
-- spec/acceptance/http_rb/http_rb_spec.rb
-- spec/acceptance/http_rb/http_rb_spec_helper.rb
-- spec/acceptance/httpclient/httpclient_spec.rb
-- spec/acceptance/httpclient/httpclient_spec_helper.rb
-- spec/acceptance/manticore/manticore_spec.rb
-- spec/acceptance/manticore/manticore_spec_helper.rb
-- spec/acceptance/net_http/net_http_shared.rb
-- spec/acceptance/net_http/net_http_spec.rb
-- spec/acceptance/net_http/net_http_spec_helper.rb
-- spec/acceptance/net_http/real_net_http_spec.rb
-- spec/acceptance/patron/patron_spec.rb
-- spec/acceptance/patron/patron_spec_helper.rb
-- spec/acceptance/shared/allowing_and_disabling_net_connect.rb
-- spec/acceptance/shared/callbacks.rb
-- spec/acceptance/shared/complex_cross_concern_behaviors.rb
-- spec/acceptance/shared/enabling_and_disabling_webmock.rb
-- spec/acceptance/shared/precedence_of_stubs.rb
-- spec/acceptance/shared/request_expectations.rb
-- spec/acceptance/shared/returning_declared_responses.rb
-- spec/acceptance/shared/stubbing_requests.rb
-- spec/acceptance/typhoeus/typhoeus_hydra_spec.rb
-- spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb
-- spec/acceptance/webmock_shared.rb
-- spec/fixtures/test.txt
-- spec/quality_spec.rb
-- spec/spec_helper.rb
-- spec/support/example_curl_output.txt
-- spec/support/failures.rb
-- spec/support/my_rack_app.rb
-- spec/support/network_connection.rb
-- spec/support/webmock_server.rb
-- spec/unit/api_spec.rb
-- spec/unit/errors_spec.rb
-- spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
-- spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
-- spec/unit/matchers/hash_excluding_matcher_spec.rb
-- spec/unit/matchers/hash_including_matcher_spec.rb
-- spec/unit/rack_response_spec.rb
-- spec/unit/request_body_diff_spec.rb
-- spec/unit/request_execution_verifier_spec.rb
-- spec/unit/request_pattern_spec.rb
-- spec/unit/request_registry_spec.rb
-- spec/unit/request_signature_snippet_spec.rb
-- spec/unit/request_signature_spec.rb
-- spec/unit/request_stub_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/stub_registry_spec.rb
-- spec/unit/stub_request_snippet_spec.rb
-- spec/unit/util/hash_counter_spec.rb
-- spec/unit/util/hash_keys_stringifier_spec.rb
-- spec/unit/util/headers_spec.rb
-- spec/unit/util/json_spec.rb
-- spec/unit/util/query_mapper_spec.rb
-- spec/unit/util/uri_spec.rb
-- spec/unit/util/version_checker_spec.rb
-- spec/unit/webmock_spec.rb
-- test/http_request.rb
-- test/shared_test.rb
-- test/test_helper.rb
-- test/test_webmock.rb
+test_files: []

data/.github/workflows/CI.yml

@@ -1,38 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - head
-          - '3.1'
-          - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-          - jruby
-    continue-on-error: ${{ matrix.ruby == 'head' }}
-    name: Ruby ${{ matrix.ruby }}
-    env:
-      JRUBY_OPTS: "--debug"
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Apt Packages
-        run: |
-          sudo apt-get install libcurl4-openssl-dev -y
-      - uses: ruby/setup-ruby@v1
-        continue-on-error: true
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: |
-          bundle exec rake

data/.gitignore

@@ -1,34 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-.*.sw[a-z]
-
-## RubyMine and related
-.idea
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-*.gem
-.bundle
-Gemfile.lock
-gemfiles/*.gemfile.lock
-pkg/*
-tmp/*
-*.rbc
-*.rbx
-.ruby-gemset
-.ruby-version

data/.rspec-tm

@@ -1,2 +0,0 @@
---rspec-version 2.0.0
---bundler

data/Gemfile

@@ -1,9 +0,0 @@
-source 'https://rubygems.org/'
-
-gemspec
-
-gem 'rake'
-
-platforms :jruby do
-  gem 'jruby-openssl'
-end

data/Rakefile

@@ -1,38 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = %w[
-    --force-color
-    --format progress
-    --require ./spec/spec_helper.rb
-  ]
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|
-  t.rspec_opts = %w[
-    --force-color
-    --format progress
-    --require ./spec/acceptance/net_http/real_net_http_spec.rb
-  ]
-  t.pattern = 'spec/acceptance/net_http/real_net_http_spec.rb'
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.test_files = FileList["test/**/*.rb"].exclude("test/test_helper.rb")
-  test.options = "--use-color"
-  test.verbose = false
-  test.warning = false
-end
-
-Rake::TestTask.new(:minitest) do |test|
-  test.test_files = FileList["minitest/**/*.rb"].exclude("test/test_helper.rb")
-  test.options = "--pride"
-  test.verbose = false
-  test.warning = false
-end
-
-task default: [:spec, :spec_http_without_webmock, :test, :minitest]

data/minitest/test_helper.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require File.expand_path(File.dirname(__FILE__) + '/../test/http_request')
-
-gem 'minitest'
-
-require 'minitest/autorun'
-require 'webmock/minitest'
-
-test_class = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
-
-test_class.class_eval do
-
-  def assert_raise(*exp, &block)
-    assert_raises(*exp, &block)
-  end
-
-  def assert_raise_with_message(e, message, &block)
-     e = assert_raises(e, &block)
-     if message.is_a?(Regexp)
-       assert_match(message, e.message)
-     else
-       assert_equal(message, e.message)
-     end
-   end
-
-   def assert_fail(message, &block)
-     assert_raise_with_message(MiniTest::Assertion, message, &block)
-   end
-
-end

data/minitest/test_webmock.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../test/shared_test')
-
-test_class = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
-
-
-class MiniTestWebMock < test_class
-  include SharedTest
-end

data/minitest/webmock_spec.rb

@@ -1,60 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-  describe "Webmock" do
-    include HttpRequestTestHelper
-
-    before do
-      @stub_http = stub_http_request(:any, "http://www.example.com")
-      @stub_https = stub_http_request(:any, "https://www.example.com")
-    end
-
-    it "should update assertions count" do
-      assert_equal 0, assertions
-      http_request(:get, "http://www.example.com/")
-
-      assert_requested(@stub_http)
-      assert_equal 2, assertions
-
-      assert_not_requested(:post, "http://www.example.com")
-      assert_equal 4, assertions
-    end
-
-    it "should raise error on non stubbed request" do
-      expect { http_request(:get, "http://www.example.net/") }.must_raise(WebMock::NetConnectNotAllowedError)
-    end
-
-    it "should verify that expected request occured" do
-      http_request(:get, "http://www.example.com/")
-      assert_requested(:get, "http://www.example.com", times: 1)
-      assert_requested(:get, "http://www.example.com")
-    end
-
-    it "should verify that expected http stub occured" do
-      http_request(:get, "http://www.example.com/")
-      assert_requested(@stub_http, times: 1)
-      assert_requested(@stub_http)
-    end
-
-    it "should verify that expected https stub occured" do
-      http_request(:get, "https://www.example.com/")
-      http_request(:get, "https://www.example.com/")
-      assert_requested(@stub_https, times: 2)
-    end
-
-    it  "should verify that expect request didn't occur" do
-     expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
-     assert_fail(expected_message) do
-       assert_requested(:get, "http://www.example.com")
-     end
-    end
-
-    it  "should verify that expect stub didn't occur" do
-     expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
-     assert_fail(expected_message) do
-       assert_requested(@stub_http)
-     end
-    end
-  end
-