excon 0.110.0 → 0.111.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c669c6654fe1baab80a1a55bc0a2d2b40a64360f3d95d77ef79b59315f879a
-  data.tar.gz: '0759c4b45586f33258913b23ffb9b649cf40848816537f57763be8922ecc2b0b'
+  metadata.gz: '09b9d8be1f0954461960791f025122147f57ac828e24adb25cd63b7f0d520a4d'
+  data.tar.gz: 55f4fd066a2afdac2aecde07b7d91f3e564a89a5d0680e967a5227ca8171eafc
 SHA512:
-  metadata.gz: 1d25f9b6551303983b04114bf9fa2d27e7a3ad06bcfa8cc2295fe8b8afd04142f103ce02d4969b7f06af5c10465c343921a12543dd348787a348b9ca150f30c9
-  data.tar.gz: 3db2e11eae51f277b7a22ab3daa2505ea836098f6789001e580354f29706e5b6f1cd063cbab772ac6811186f0a8af955dd26029a17b15ea5a5b79d14285ba7b6
+  metadata.gz: 33469a58ddb269ffe4cf35066ec7c2e87921aacd49a4766ae85fbe7bdc0d7f1b26ee287838cd07ff322d008327c7ef7edf8cda0015a7a48a1b6a9c6537a4df1e
+  data.tar.gz: 65e294c562e75540e33f5555060289afeafb84024acbedc482d5efa526136605f45612972576ebc1612f3483d65290134a65709bcdd8ec3dfefdab015b62e556

data/data/cacert.pem

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Mar 11 15:25:27 2024 GMT
+## Certificate data from Mozilla as of: Tue Jul  2 03:12:04 2024 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e
+## SHA256: 456ff095dde6dd73354c5c28c73d9c06f53b61a803963414cb91a1d92945cdd3
 ##
 
 
@@ -2600,36 +2600,6 @@ vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
 CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
-GLOBALTRUST 2020
-================
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
-IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
-VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
-BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
-MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
-D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
-VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
-CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
-fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
-A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
-JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
-DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
-clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
-mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
-IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
-4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
-iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
-8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
-HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
-vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
-oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
-YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
-gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
 ANF Secure Server Root CA
 =========================
 -----BEGIN CERTIFICATE-----
@@ -3579,3 +3549,20 @@ wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
 HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
 o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
 -----END CERTIFICATE-----
+
+FIRMAPROFESIONAL CA ROOT-A WEB
+==============================
+-----BEGIN CERTIFICATE-----
+MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQswCQYDVQQGEwJF
+UzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4
+MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENBIFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2
+WhcNNDcwMzMxMDkwMTM2WjBuMQswCQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25h
+bCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFM
+IENBIFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zfe9MEkVz6
+iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6CcyvHZpsKjECcfIr28jlg
+st7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FD
+Y1w8ndYn81LsF7Kpryz3dvgwHQYDVR0OBBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB
+/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgL
+cFBTApFwhVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dGXSaQ
+pYXFuXqUPoeovQA=
+-----END CERTIFICATE-----

data/lib/excon/connection.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'ipaddr'
 
 module Excon
   class Connection

data/lib/excon/constants.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 module Excon
-
   CR_NL = "\r\n"
 
-  DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
+  DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'cacert.pem'))
 
-  DEFAULT_CHUNK_SIZE = 1048576 # 1 megabyte
+  DEFAULT_CHUNK_SIZE = 1_048_576 # 1 megabyte
 
   # avoid overwrite if somebody has redefined
-  unless const_defined?(:CHUNK_SIZE)
-    CHUNK_SIZE = DEFAULT_CHUNK_SIZE
-  end
+  CHUNK_SIZE = DEFAULT_CHUNK_SIZE unless const_defined?(:CHUNK_SIZE)
 
   DEFAULT_REDIRECT_LIMIT = 10
 
@@ -20,13 +17,13 @@ module Excon
     Excon::Error::Timeout,
     Excon::Error::Socket,
     Excon::Error::HTTPStatus
-  ]
+  ].freeze
 
   FORCE_ENC = CR_NL.respond_to?(:force_encoding)
 
   HTTP_1_1 = " HTTP/1.1\r\n"
 
-  HTTP_VERBS = %w{connect delete get head options patch post put trace}
+  HTTP_VERBS = %w[connect delete get head options patch post put trace].freeze
 
   HTTPS = 'https'
 
@@ -40,89 +37,89 @@ module Excon
 
   VERSIONS = "#{USER_AGENT} (#{RUBY_PLATFORM}) ruby/#{RUBY_VERSION}"
 
-  VALID_REQUEST_KEYS = [
-    :allow_unstubbed_requests,
-    :body,
-    :chunk_size,
-    :debug_request,
-    :debug_response,
-    :dns_timeouts,
-    :headers,
-    :instrumentor, # Used for setting logging within Connection
-    :logger,
-    :method,
-    :middlewares,
-    :password,
-    :path,
-    :persistent,
-    :pipeline,
-    :query,
-    :read_timeout,
-    :request_block,
-    :resolv_resolver,
-    :response_block,
-    :stubs,
-    :timeout,
-    :user,
-    :versions,
-    :write_timeout
-  ]
-
-  VALID_CONNECTION_KEYS = VALID_REQUEST_KEYS + [
-    :ciphers,
-    :client_key,
-    :client_key_data,
-    :client_key_pass,
-    :client_cert,
-    :client_cert_data,
-    :client_chain,
-    :client_chain_data,
-    :certificate,
-    :certificate_path,
-    :disable_proxy,
-    :private_key,
-    :private_key_path,
-    :connect_timeout,
-    :family,
-    :keepalive,
-    :host,
-    :hostname,
-    :omit_default_port,
-    :nonblock,
-    :reuseaddr,
-    :port,
-    :proxy,
-    :scheme,
-    :socket,
-    :ssl_ca_file,
-    :ssl_ca_path,
-    :ssl_cert_store,
-    :ssl_verify_callback,
-    :ssl_verify_peer,
-    :ssl_verify_peer_host,
-    :ssl_verify_hostname,
-    :ssl_version,
-    :ssl_min_version,
-    :ssl_max_version,
-    :ssl_security_level,
-    :ssl_proxy_headers,
-    :ssl_uri_schemes,
-    :tcp_nodelay,
-    :thread_safe_sockets,
-    :uri_parser,
+  VALID_REQUEST_KEYS = %i[
+    allow_unstubbed_requests
+    body
+    chunk_size
+    debug_request
+    debug_response
+    dns_timeouts
+    headers
+    instrumentor
+    logger
+    method
+    middlewares
+    password
+    path
+    persistent
+    pipeline
+    query
+    read_timeout
+    request_block
+    resolv_resolver
+    response_block
+    stubs
+    timeout
+    user
+    versions
+    write_timeout
+  ].freeze
+
+  VALID_CONNECTION_KEYS = VALID_REQUEST_KEYS + %i[
+    ciphers
+    client_key
+    client_key_data
+    client_key_pass
+    client_cert
+    client_cert_data
+    client_chain
+    client_chain_data
+    certificate
+    certificate_path
+    disable_proxy
+    private_key
+    private_key_path
+    connect_timeout
+    family
+    keepalive
+    host
+    hostname
+    omit_default_port
+    nonblock
+    reuseaddr
+    port
+    proxy
+    scheme
+    socket
+    ssl_ca_file
+    ssl_ca_path
+    ssl_cert_store
+    ssl_verify_callback
+    ssl_verify_peer
+    ssl_verify_peer_host
+    ssl_verify_hostname
+    ssl_version
+    ssl_min_version
+    ssl_max_version
+    ssl_security_level
+    ssl_proxy_headers
+    ssl_uri_schemes
+    tcp_nodelay
+    thread_safe_sockets
+    uri_parser
   ]
 
   DEPRECATED_VALID_REQUEST_KEYS = {
-    :captures => 'Mock',
-    :expects => 'Expects',
-    :idempotent => 'Idempotent',
-    :instrumentor_name => 'Instrumentor',
-    :mock => 'Mock',
-    :retries_remaining => 'Idempotent', # referenced in Instrumentor, but only relevant with Idempotent
-    :retry_errors => 'Idempotent',
-    :retry_interval => 'Idempotent',
-    :retry_limit => 'Idempotent' # referenced in Instrumentor, but only relevant with Idempotent
-  }
+    captures: 'Mock',
+    expects: 'Expects',
+    idempotent: 'Idempotent',
+    instrumentor_name: 'Instrumentor',
+    mock: 'Mock',
+    retries_remaining: 'Idempotent', # referenced in Instrumentor, but only relevant with Idempotent
+    retry_errors: 'Idempotent',
+    retry_interval: 'Idempotent',
+    retry_limit: 'Idempotent' # referenced in Instrumentor, but only relevant with Idempotent
+  }.freeze
 
   unless ::IO.const_defined?(:WaitReadable)
     class ::IO
@@ -135,47 +132,46 @@ module Excon
       module WaitWritable; end
     end
   end
+
   # these come last as they rely on the above
   DEFAULTS = {
-    :chunk_size          => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
+    chunk_size: CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
     # see https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29
     # list provided then had DES related things sorted to the end
-    :ciphers             => 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:DES-CBC3-SHA:!DSS',
-    :connect_timeout     => 60,
-    :debug_request       => false,
-    :debug_response      => false,
-    :dns_timeouts        => nil,
-    # nil allows Resolv::DNS to set its default timeouts value (see https://ruby-doc.org/3.2.2/stdlibs/resolv/Resolv/DNS.html#method-i-timeouts-3D)
-    :headers             => {
+    ciphers: 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:DES-CBC3-SHA:!DSS',
+    connect_timeout: 60,
+    debug_request: false,
+    debug_response: false,
+    dns_timeouts: nil, # nil allows Resolv::DNS default timeout value (see https://ruby-doc.org/3.2.2/stdlibs/resolv/Resolv/DNS.html#method-i-timeouts-3D)
+    headers: {
       'User-Agent' => USER_AGENT,
-      'Accept'     =>  '*/*'
+      'Accept' => '*/*'
     },
-    :idempotent          => false,
-    :instrumentor_name   => 'excon',
-    :middlewares         => [
+    idempotent: false,
+    instrumentor_name: 'excon',
+    middlewares: [
       Excon::Middleware::ResponseParser,
       Excon::Middleware::Expects,
       Excon::Middleware::Idempotent,
       Excon::Middleware::Instrumentor,
       Excon::Middleware::Mock
     ],
-    :mock                => false,
-    :nonblock            => true,
-    :omit_default_port   => false,
-    :persistent          => false,
-    :read_timeout        => 60,
-    :resolv_resolver     => nil,
-    :retry_errors        => DEFAULT_RETRY_ERRORS,
-    :retry_limit         => DEFAULT_RETRY_LIMIT,
-    :ssl_verify_peer     => true,
-    :ssl_uri_schemes     => [HTTPS],
-    :stubs               => :global,
-    :tcp_nodelay         => false,
-    :thread_safe_sockets => true,
-    :timeout             => nil,
-    :uri_parser          => URI,
-    :versions            => VERSIONS,
-    :write_timeout       => 60
+    mock: false,
+    nonblock: true,
+    omit_default_port: false,
+    persistent: false,
+    read_timeout: 60,
+    resolv_resolver: nil,
+    retry_errors: DEFAULT_RETRY_ERRORS,
+    retry_limit: DEFAULT_RETRY_LIMIT,
+    ssl_verify_peer: true,
+    ssl_uri_schemes: [HTTPS],
+    stubs: :global,
+    tcp_nodelay: false,
+    thread_safe_sockets: true,
+    timeout: nil,
+    uri_parser: URI,
+    versions: VERSIONS,
+    write_timeout: 60
   }
-
 end

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = '0.110.0'
+  VERSION = '0.111.0'
 end

data/lib/excon.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'cgi'
 require 'forwardable'
+require 'ipaddr'
 require 'openssl'
 require 'rbconfig'
 require 'socket'
@@ -44,7 +46,6 @@ require 'excon/unix_socket'
 # Define defaults first so they will be available to other files
 module Excon
   class << self
-
     # @return [Hash] defaults for Excon connections
     def defaults
       @defaults ||= DEFAULTS
@@ -52,19 +53,15 @@ module Excon
 
     # Change defaults for Excon connections
     # @return [Hash] defaults for Excon connections
-    def defaults=(new_defaults)
-      @defaults = new_defaults
-    end
+    attr_writer :defaults
 
     def display_warning(warning)
       # Show warning if $VERBOSE or ENV['EXCON_DEBUG'] is set
-      if $VERBOSE || ENV['EXCON_DEBUG']
-        $stderr.puts "[excon][WARNING] #{warning}\n#{ caller.join("\n") }"
-      end
+      ($VERBOSE || ENV['EXCON_DEBUG']) && Warning.warn("[excon][WARNING] #{warning}\n#{caller.join("\n")}")
 
-      if @raise_on_warnings
-        raise Error::Warning.new(warning)
-      end
+      return unless @raise_on_warnings
+
+      raise(Error::Warning, warning)
     end
 
     def set_raise_on_warnings!(should_raise)
@@ -119,32 +116,25 @@ module Excon
     def new(url, params = {})
       uri_parser = params[:uri_parser] || defaults[:uri_parser]
       uri = uri_parser.parse(url)
-      if params[:path]
-        uri_parser.parse(params[:path])
-      end
-      unless uri.scheme
-        raise ArgumentError.new("Invalid URI: #{uri}")
-      end
+      params[:path] && uri_parser.parse(params[:path])
+      raise(ArgumentError, "Invalid URI: #{uri}") unless uri.scheme
+
       params = {
-        :host       => uri.host,
-        :hostname   => uri.hostname,
-        :path       => uri.path,
-        :port       => uri.port,
-        :query      => uri.query,
-        :scheme     => uri.scheme
+        host: uri.host,
+        hostname: uri.hostname,
+        path: uri.path,
+        port: uri.port,
+        query: uri.query,
+        scheme: uri.scheme
       }.merge(params)
-      if uri.password
-        params[:password] = Utils.unescape_uri(uri.password)
-      end
-      if uri.user
-        params[:user] = Utils.unescape_uri(uri.user)
-      end
+      uri.password && params[:password] = Utils.unescape_uri(uri.password)
+      uri.user && params[:user] = Utils.unescape_uri(uri.user)
       Excon::Connection.new(params)
     end
 
     # push an additional stub onto the list to check for mock requests
     # @param request_params [Hash<Symbol, >] request params to match against, omitted params match all
-    # @param response_params [Hash<Symbol, >] response params to return from matched request or block to call with params
+    # @param response_params [Hash<Symbol, >] response params to return or block to call with matched params
     def stub(request_params = {}, response_params = nil, &block)
       if (method = request_params.delete(:method))
         request_params[:method] = method.to_s.downcase.to_sym
@@ -152,19 +142,20 @@ module Excon
       if (url = request_params.delete(:url))
         uri = URI.parse(url)
         request_params = {
-          :host              => uri.host,
-          :path              => uri.path,
-          :port              => uri.port,
-          :query             => uri.query,
-          :scheme            => uri.scheme
+          host: uri.host,
+          path: uri.path,
+          port: uri.port,
+          query: uri.query,
+          scheme: uri.scheme
         }.merge!(request_params)
         if uri.user || uri.password
           request_params[:headers] ||= {}
-          user, pass = Utils.unescape_form(uri.user.to_s), Utils.unescape_form(uri.password.to_s)
+          user = Utils.unescape_form(uri.user.to_s)
+          pass = Utils.unescape_form(uri.password.to_s)
           request_params[:headers]['Authorization'] ||= 'Basic ' + ["#{user}:#{pass}"].pack('m').delete(Excon::CR_NL)
         end
       end
-      if request_params.has_key?(:headers)
+      if request_params.key?(:headers)
         headers = Excon::Headers.new
         request_params[:headers].each do |key, value|
           headers[key] = value
@@ -172,15 +163,13 @@ module Excon
         request_params[:headers] = headers
       end
       if block_given?
-        if response_params
-          raise(ArgumentError.new("stub requires either response_params OR a block"))
-        else
-          stub = [request_params, block]
-        end
+        raise(ArgumentError, 'stub requires either response_params OR a block') if response_params
+
+        stub = [request_params, block]
       elsif response_params
         stub = [request_params, response_params]
       else
-        raise(ArgumentError.new("stub requires either response_params OR a block"))
+        raise(ArgumentError, 'stub requires either response_params OR a block')
       end
       stubs.unshift(stub)
       stub
@@ -194,8 +183,8 @@ module Excon
         request_params[:method] = method.to_s.downcase.to_sym
       end
       Excon.stubs.each do |stub, response_params|
-        captures = { :headers => {} }
-        headers_match = !stub.has_key?(:headers) || stub[:headers].keys.all? do |key|
+        captures = { headers: {} }
+        headers_match = !stub.key?(:headers) || stub[:headers].keys.all? do |key|
           case value = stub[:headers][key]
           when Regexp
             case request_params[:headers][key]
@@ -249,9 +238,9 @@ module Excon
     # @param request_params [Hash<Symbol, >] request params to match against, omitted params match all
     # @return [Hash<Symbol, >] response params from deleted stub
     def unstub(request_params = {})
-      if (stub = stub_for(request_params))
-        Excon.stubs.delete_at(Excon.stubs.index(stub))
-      end
+      return unless (stub = stub_for(request_params))
+
+      Excon.stubs.delete_at(Excon.stubs.index(stub))
     end
 
     # Generic non-persistent HTTP methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.110.0
+  version: 0.111.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: speed, persistence, http(s)