excon 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9471d3e2333a1c6ba7538ff718f835fed10e5eb936e20d9a44630f15859bebf
-  data.tar.gz: 0fb48dec98417ebe8e4fc7711e85ebe9e0025763afe7062a0a5dcdbf9317513d
+  metadata.gz: 549d655a9aa947cf069caa926be4af5f1f4195ffde3e074f13186edc97338f7b
+  data.tar.gz: e1ad803cb67388ee741e690b6af6d79818875962cbcad1573c811c30d8ff6fef
 SHA512:
-  metadata.gz: 6869ae02f3045da53b565d33dcf0944cc531daf5c6625ca2a78b4e6c51d89411d69a1e2bb221c9a1435c54ca99aadd418ee904ee928abf67d17dbf7e6af026f6
-  data.tar.gz: 57ca12657eaabc5904f3aa844a77c6aca6b44b0e9829307efec5527c9199477f7ef5a342441788a599482e7a1829ea1ae108565abbdc1fdfcfa7480fdda1d250
+  metadata.gz: 72f72fe4fb083d44948853b48777d37e1bce9f974f3f8e19aa080e6480dde462167e14542fc70b19eb535dc2e67f2c49a87b77998cccb10efe8a35d6ae2c67f4
+  data.tar.gz: a2e886809a5504a567ec1ce9f56058aaed9bdc28875c6ccafdb0a1373f8028c4e443e3627958f38f13caf93f67e05eafc0b135727e2a6169a6ae99d9bd0d8adf

data/data/cacert.pem

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Nov 26 13:58:25 2024 GMT
+## Certificate data from Mozilla as of: Tue Dec 31 04:12:05 2024 GMT
 ##
 ## Find updated versions here: https://curl.se/docs/caextract.html
 ##
@@ -16,7 +16,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 36105b01631f9fc03b1eca779b44a30a1a5890b9bf8dc07ccb001a07301e01cf
+## SHA256: c99d6d3f8d3d4e47719ba2b648992f5b58b150128d3aca3c05c566d8dc98e116
 ##
 
 
@@ -584,27 +584,6 @@ NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
 dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
 -----END CERTIFICATE-----
 
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
 Microsec e-Szigno Root CA 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -2319,40 +2298,6 @@ hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
 dBb9HxEGmpv0
 -----END CERTIFICATE-----
 
-Entrust Root Certification Authority - G4
-=========================================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAwgb4xCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3Qu
-bmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1
-dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSAtIEc0MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEc0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3D
-umSXbcr3DbVZwbPLqGgZ2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV
-3imz/f3ET+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j5pds
-8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAMC1rlLAHGVK/XqsEQ
-e9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73TDtTUXm6Hnmo9RR3RXRv06QqsYJn7
-ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNXwbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5X
-xNMhIWNlUpEbsZmOeX7m640A2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV
-7rtNOzK+mndmnqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
-dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwlN4y6mACXi0mW
-Hv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNjc0kCAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9n
-MA0GCSqGSIb3DQEBCwUAA4ICAQAS5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4Q
-jbRaZIxowLByQzTSGwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht
-7LGrhFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/B7NTeLUK
-YvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uIAeV8KEsD+UmDfLJ/fOPt
-jqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbwH5Lk6rWS02FREAutp9lfx1/cH6NcjKF+
-m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKW
-RGhXxNUzzxkvFMSUHHuk2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjA
-JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G
-+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT
-kcpG2om3PVODLAgfi49T3f+sHw==
------END CERTIFICATE-----
-
 Microsoft ECC Root Certificate Authority 2017
 =============================================
 -----BEGIN CERTIFICATE-----
@@ -3170,36 +3115,6 @@ AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
 rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
 -----END CERTIFICATE-----
 
-Security Communication RootCA3
-==============================
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
-IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
-b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
-CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
-AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
-hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
-NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
-/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
-npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
-XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
-p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
-3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
-GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
-CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
-/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
-YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
-Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
-H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
-YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
-XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
-+LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
-KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
-dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
-6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
------END CERTIFICATE-----
-
 Security Communication ECC RootCA1
 ==================================
 -----BEGIN CERTIFICATE-----

data/excon.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('open4')
   s.add_development_dependency('puma')
   s.add_development_dependency('rake')
+  s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec', '>= 3.5.0')
   s.add_development_dependency('shindo')
   s.add_development_dependency('sinatra')

data/lib/excon/connection.rb

@@ -159,7 +159,7 @@ module Excon
               if chunk.length > 0
                 socket(datum).write(chunk.length.to_s(16) << CR_NL << chunk << CR_NL)
               else
-                socket(datum).write(String.new("0#{CR_NL}#{CR_NL}"))
+                socket(datum).write("0#{CR_NL}#{CR_NL}")
                 break
               end
             end
@@ -329,7 +329,7 @@ module Excon
     # @param pipeline_params [Array<Hash>] An array of one or more optional params, override defaults set in Connection.new, see #request for details
     def requests(pipeline_params)
       pipeline_params.each {|params| params.merge!(:pipeline => true, :persistent => true) }
-      pipeline_params.last.merge!(:persistent => @data[:persistent])
+      pipeline_params.last[:persistent] = @data[:persistent]
 
       responses = pipeline_params.map do |params|
         request(params)
@@ -511,7 +511,7 @@ module Excon
     end
 
     def raise_socket_error(error)
-      if error.message =~ /certificate verify failed/
+      if error.message.include?('certificate verify failed')
         raise(Excon::Errors::CertificateError.new(error))
       else
         raise(Excon::Errors::SocketError.new(error))

data/lib/excon/constants.rb

@@ -86,6 +86,7 @@ module Excon
     keepalive
     host
     hostname
+    ignore_unexpected_eof
     include_default_port
     omit_default_port
     nonblock

data/lib/excon/error.rb

@@ -216,8 +216,8 @@ or:
 
     klasses.each do |klass|
       class_name = klass.to_s
-      unless class_name =~ /Error\Z/
-        class_name = klass.to_s + 'Error' if class_name =~ legacy_re
+      unless class_name.match?(/Error\Z/)
+        class_name = klass.to_s + 'Error' if class_name.match?(legacy_re)
       end
       Excon::Errors.const_set(class_name, Excon::Error.const_get(klass))
     end

data/lib/excon/middlewares/redirect_follower.rb

@@ -67,8 +67,8 @@ module Excon
               :query      => uri.query
             )
 
-            params.merge!(:user => Utils.unescape_uri(uri.user)) if uri.user
-            params.merge!(:password => Utils.unescape_uri(uri.password)) if uri.password
+            params[:user] = Utils.unescape_uri(uri.user) if uri.user
+            params[:password] = Utils.unescape_uri(uri.password) if uri.password
 
             response = Excon::Connection.new(params).request
             datum.merge!({

data/lib/excon/socket.rb

@@ -181,7 +181,7 @@ module Excon
             socket.close rescue nil
           end
         rescue SystemCallError => exception
-          socket.close rescue nil if socket
+          socket&.close rescue nil
         end
       end
 

data/lib/excon/ssl_socket.rb

@@ -26,6 +26,7 @@ module Excon
       if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
         ssl_context_options |= OpenSSL::SSL::OP_NO_COMPRESSION
       end
+      ssl_context_options |= OpenSSL::SSL::OP_IGNORE_UNEXPECTED_EOF if @data[:ignore_unexpected_eof]
       ssl_context.options = ssl_context_options
 
       ssl_context.ciphers = @data[:ciphers]
@@ -63,7 +64,7 @@ module Excon
         unless ca_file || ca_path || cert_store
           # workaround issue #257 (JRUBY-6970)
           ca_file = DEFAULT_CA_FILE
-          ca_file = ca_file.gsub(/^jar:/, '') if ca_file =~ /^jar:file:\//
+          ca_file = ca_file.gsub(/^jar:/, '') if ca_file.match?(/^jar:file:\//)
 
           begin
             ssl_context.cert_store.add_file(ca_file)

data/lib/excon/test/plugin/server/puma.rb

@@ -7,7 +7,7 @@ module Excon
             open_process(RbConfig.ruby, '-S', 'puma', '-b', bind_uri.to_s, app_str)
             process_stderr = ""
             line = ''
-            until line =~ /Use Ctrl-C to stop/
+            until line.include?('Use Ctrl-C to stop')
               line = read.gets
               raise process_stderr if line.nil?
               process_stderr << line

data/lib/excon/test/plugin/server/unicorn.rb

@@ -12,19 +12,19 @@ module Excon
               host = bind_uri.host.gsub(/[\[\]]/, '')
               bind_str = "#{host}:#{bind_uri.port}"
             end
-            args = [ 
+            args = [
               RbConfig.ruby,
               '-S',
-              'unicorn', 
-              '--no-default-middleware', 
+              'unicorn',
+              '--no-default-middleware',
               '-l',
-              bind_str,  
+              bind_str,
               app_str
             ]
             open_process(*args)
             process_stderr = ''
             line = ''
-            until line =~ /worker\=0 ready/
+            until line.include?('worker=0 ready')
               line = error.gets
               raise process_stderr if line.nil?
               process_stderr << line

data/lib/excon/test/plugin/server/webrick.rb

@@ -10,7 +10,7 @@ module Excon
             open_process(RbConfig.ruby, '-S', 'rackup', '-s', 'webrick', '--host', host, '--port', port, app_str)
             process_stderr = ""
             line = ''
-            until line =~ /HTTPServer#start/
+            until line.include?('HTTPServer#start')
               line = error.gets
               raise process_stderr if line.nil?
               process_stderr << line

data/lib/excon/test/server.rb

@@ -73,7 +73,7 @@ module Excon
         while (line = lines.shift)
           case line
             when /(ERROR|Error)/
-              unless line =~ /(null cert chain|did not return a certificate|SSL_read:: internal error)/
+              unless line.match?(/(null cert chain|did not return a certificate|SSL_read:: internal error)/)
                 in_err = true
                 puts
               end

data/lib/excon/unix_socket.rb

@@ -34,7 +34,7 @@ module Excon
       end
 
     rescue => error
-      @socket.close rescue nil if @socket
+      @socket&.close rescue nil
       raise error
     end
 

data/lib/excon/utils.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
+
 module Excon
   module Utils
-    extend self
+    module_function
 
-    CONTROL   = (0x0..0x1f).map {|c| c.chr }.join + "\x7f"
+    CONTROL   = "#{(0x0..0x1f).map(&:chr).join}\u007F"
     DELIMS    = '<>#%"'
     UNWISE    = '{}|\\^[]`'
-    NONASCII  = (0x80..0xff).map {|c| c.chr }.join
-    UNESCAPED = /([#{ Regexp.escape(CONTROL + ' ' + DELIMS + UNWISE + NONASCII) }])/
-    ESCAPED   = /%([0-9a-fA-F]{2})/
+    NONASCII  = (0x80..0xff).map(&:chr).join
+    UNESCAPED = /([#{Regexp.escape("#{CONTROL} #{DELIMS}#{UNWISE}#{NONASCII}")}])/.freeze
+    ESCAPED   = /%([0-9a-fA-F]{2})/.freeze
 
     def binary_encode(string)
       if FORCE_ENC && string.encoding != Encoding::ASCII_8BIT
@@ -23,9 +24,8 @@ module Excon
     end
 
     def connection_uri(datum = @data)
-      unless datum
-        raise ArgumentError, '`datum` must be given unless called on a Connection'
-      end
+      raise ArgumentError, '`datum` must be given unless called on a Connection' unless datum
+
       if datum[:scheme] == UNIX
         "#{datum[:scheme]}://#{datum[:socket]}"
       else
@@ -36,21 +36,15 @@ module Excon
     # Redact sensitive info from provided data
     def redact(datum)
       datum = datum.dup
-      if datum.has_key?(:headers)
-        if datum[:headers].has_key?('Authorization') || datum[:headers].has_key?('Proxy-Authorization')
+      if datum.key?(:headers)
+        if datum[:headers].key?('Authorization') || datum[:headers].key?('Proxy-Authorization')
           datum[:headers] = datum[:headers].dup
         end
-        if datum[:headers].has_key?('Authorization')
-          datum[:headers]['Authorization'] = REDACTED
-        end
-        if datum[:headers].has_key?('Proxy-Authorization')
-          datum[:headers]['Proxy-Authorization'] = REDACTED
-        end
+        datum[:headers]['Authorization'] = REDACTED if datum[:headers].key?('Authorization')
+        datum[:headers]['Proxy-Authorization'] = REDACTED if datum[:headers].key?('Proxy-Authorization')
       end
-      if datum.has_key?(:password)
-        datum[:password] = REDACTED
-      end
-      if datum.has_key?(:proxy) && datum[:proxy] && datum[:proxy].has_key?(:password)
+      datum[:password] = REDACTED if datum.key?(:password)
+      if datum.key?(:proxy) && datum[:proxy]&.key?(:password)
         datum[:proxy] = datum[:proxy].dup
         datum[:proxy][:password] = REDACTED
       end
@@ -76,13 +70,13 @@ module Excon
     end
 
     def query_string(datum)
-      str = String.new
+      str = +''
       case datum[:query]
       when String
         str << '?' << datum[:query]
       when Hash
         str << '?'
-        datum[:query].sort_by {|k,_| k.to_s }.each do |key, values|
+        datum[:query].sort_by { |k, _| k.to_s }.each do |key, values|
           key = CGI.escape(key.to_s)
           if values.nil?
             str << key << '&'
@@ -100,46 +94,49 @@ module Excon
     # Splits a header value +str+ according to HTTP specification.
     def split_header_value(str)
       return [] if str.nil?
+
       str = str.dup.strip
       str = binary_encode(str)
-      str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",])+)
-                    (?:,\s*|\Z)'xn).flatten
+      str.scan(/\G((?:"(?:\\.|[^"])+?"|[^",])+)
+                    (?:,\s*|\Z)/xn).flatten
     end
 
     # Escapes HTTP reserved and unwise characters in +str+
     def escape_uri(str)
       str = str.dup
       str = binary_encode(str)
-      str.gsub(UNESCAPED) { "%%%02X" % $1[0].ord }
+      str.gsub(UNESCAPED) { format('%%%02X', ::Regexp.last_match(1)[0].ord) }
     end
 
     # Unescapes HTTP reserved and unwise characters in +str+
     def unescape_uri(str)
       str = str.dup
       str = binary_encode(str)
-      str.gsub(ESCAPED) { $1.hex.chr }
+      str.gsub(ESCAPED) { ::Regexp.last_match(1).hex.chr }
     end
 
     # Unescape form encoded values in +str+
     def unescape_form(str)
       str = str.dup
       str = binary_encode(str)
-      str.gsub!(/\+/, ' ')
-      str.gsub(ESCAPED) { $1.hex.chr }
+      str.tr!('+', ' ')
+      str.gsub(ESCAPED) { ::Regexp.last_match(1).hex.chr }
     end
 
     # Performs validation on the passed header hash and returns a string representation of the headers
     def headers_hash_to_s(headers)
-      headers_str = String.new
+      headers_str = +''
       headers.each do |key, values|
-        if key.to_s.match(/[\r\n]/)
-          raise Excon::Errors::InvalidHeaderKey.new(key.to_s.inspect + ' contains forbidden "\r" or "\n"')
+        if key.to_s.match?(/[\r\n]/)
+          raise Excon::Errors::InvalidHeaderKey, "#{key.to_s.inspect} contains forbidden \"\\r\" or \"\\n\""
         end
+
         [values].flatten.each do |value|
-          if value.to_s.match(/[\r\n]/)
+          if value.to_s.match?(/[\r\n]/)
             # Don't include the potentially sensitive header value (i.e. authorization token) in the message
-            raise Excon::Errors::InvalidHeaderValue.new(key.to_s + ' header value contains forbidden "\r" or "\n"')
+            raise Excon::Errors::InvalidHeaderValue, "#{key} header value contains forbidden \"\\r\" or \"\\n\""
           end
+
           headers_str << key.to_s << ': ' << value.to_s << CR_NL
         end
       end

data/lib/excon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,6 +110,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  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: rspec
   requirement: !ruby/object:Gem::Requirement