Merge pull request #16311 from Homebrew/dependabot/bundler/Library/Homebrew/addressable-2.8.6

build(deps): bump addressable from 2.8.5 to 2.8.6 in /Library/Homebrew
This commit is contained in:
Bo Anderson 2023-12-12 16:41:22 +00:00 committed by GitHub
commit b3064d16c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 47 additions and 31 deletions

View File

@ -7,7 +7,7 @@ GEM
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
zeitwerk (~> 2.3) zeitwerk (~> 2.3)
addressable (2.8.5) addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2) ast (2.4.2)
bindata (2.4.15) bindata (2.4.15)

View File

@ -11,7 +11,7 @@ module Addressable::IDNA
def _deprecated_unicode_normalize_kc(value); end def _deprecated_unicode_normalize_kc(value); end
def to_ascii(input); end def to_ascii(input); end
def to_unicode(input); end def to_unicode(input); end
def unicode_normalize_kc(*args, &block); end def unicode_normalize_kc(*args, **_arg1, &block); end
private private
@ -249,9 +249,20 @@ Addressable::URI::CharacterClasses::PATH = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::PCHAR = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::PCHAR = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::QUERY = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::QUERY = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::RESERVED = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::RESERVED = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::RESERVED_AND_UNRESERVED = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::SCHEME = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::SCHEME = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::SUB_DELIMS = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::SUB_DELIMS = T.let(T.unsafe(nil), String)
Addressable::URI::CharacterClasses::UNRESERVED = T.let(T.unsafe(nil), String) Addressable::URI::CharacterClasses::UNRESERVED = T.let(T.unsafe(nil), String)
module Addressable::URI::CharacterClassesRegexps; end
Addressable::URI::CharacterClassesRegexps::AUTHORITY = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::FRAGMENT = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::HOST = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::PATH = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::QUERY = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::RESERVED = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::RESERVED_AND_UNRESERVED = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::SCHEME = T.let(T.unsafe(nil), Regexp)
Addressable::URI::CharacterClassesRegexps::UNRESERVED = T.let(T.unsafe(nil), Regexp)
Addressable::URI::EMPTY_STR = T.let(T.unsafe(nil), String) Addressable::URI::EMPTY_STR = T.let(T.unsafe(nil), String)
class Addressable::URI::InvalidURIError < ::StandardError; end class Addressable::URI::InvalidURIError < ::StandardError; end
module Addressable::URI::NONE; end module Addressable::URI::NONE; end

View File

@ -6383,13 +6383,7 @@ Net::HTTPServerErrorCode = Net::HTTPServerError
Net::HTTPSession = Net::HTTP Net::HTTPSession = Net::HTTP
class Net::HTTPSuccess Net::HTTPSuccessCode = Net::HTTPSuccess
end
Net::HTTPSuccessCode::EXCEPTION_TYPE = Net::HTTPError
class Net::HTTPSuccess
end
class Net::HTTPURITooLong class Net::HTTPURITooLong
HAS_BODY = ::T.let(nil, ::T.untyped) HAS_BODY = ::T.let(nil, ::T.untyped)

View File

@ -34,7 +34,7 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/zeitwerk-2.6.12/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/zeitwerk-2.6.12/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/activesupport-6.1.7.6/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/activesupport-6.1.7.6/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.4/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/public_suffix-5.0.4/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/addressable-2.8.5/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/addressable-2.8.6/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.4.15/lib") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.4.15/lib")
$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/msgpack-1.7.2") $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-darwin-15/#{Gem.extension_api_version}/msgpack-1.7.2")

View File

@ -50,6 +50,7 @@ module Addressable
SUB_DELIMS = "\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=" SUB_DELIMS = "\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\="
RESERVED = (GEN_DELIMS + SUB_DELIMS).freeze RESERVED = (GEN_DELIMS + SUB_DELIMS).freeze
UNRESERVED = (ALPHA + DIGIT + "\\-\\.\\_\\~").freeze UNRESERVED = (ALPHA + DIGIT + "\\-\\.\\_\\~").freeze
RESERVED_AND_UNRESERVED = RESERVED + UNRESERVED
PCHAR = (UNRESERVED + SUB_DELIMS + "\\:\\@").freeze PCHAR = (UNRESERVED + SUB_DELIMS + "\\:\\@").freeze
SCHEME = (ALPHA + DIGIT + "\\-\\+\\.").freeze SCHEME = (ALPHA + DIGIT + "\\-\\+\\.").freeze
HOST = (UNRESERVED + SUB_DELIMS + "\\[\\:\\]").freeze HOST = (UNRESERVED + SUB_DELIMS + "\\[\\:\\]").freeze
@ -68,6 +69,18 @@ module Addressable
QUERY = %r{[^a-zA-Z0-9\-\.\_\~\!\$\'\(\)\*\+\,\=\:\@\/\?%]|%(?!2B|2b)} QUERY = %r{[^a-zA-Z0-9\-\.\_\~\!\$\'\(\)\*\+\,\=\:\@\/\?%]|%(?!2B|2b)}
end end
module CharacterClassesRegexps
AUTHORITY = /[^#{CharacterClasses::AUTHORITY}]/
FRAGMENT = /[^#{CharacterClasses::FRAGMENT}]/
HOST = /[^#{CharacterClasses::HOST}]/
PATH = /[^#{CharacterClasses::PATH}]/
QUERY = /[^#{CharacterClasses::QUERY}]/
RESERVED = /[^#{CharacterClasses::RESERVED}]/
RESERVED_AND_UNRESERVED = /[^#{CharacterClasses::RESERVED_AND_UNRESERVED}]/
SCHEME = /[^#{CharacterClasses::SCHEME}]/
UNRESERVED = /[^#{CharacterClasses::UNRESERVED}]/
end
SLASH = '/' SLASH = '/'
EMPTY_STR = '' EMPTY_STR = ''
@ -387,9 +400,7 @@ module Addressable
# "simple/example", Addressable::URI::CharacterClasses::UNRESERVED # "simple/example", Addressable::URI::CharacterClasses::UNRESERVED
# ) # )
# => "simple%2Fexample" # => "simple%2Fexample"
def self.encode_component(component, character_class= def self.encode_component(component, character_class=CharacterClassesRegexps::RESERVED_AND_UNRESERVED, upcase_encoded='')
CharacterClasses::RESERVED + CharacterClasses::UNRESERVED,
upcase_encoded='')
return nil if component.nil? return nil if component.nil?
begin begin
@ -539,7 +550,7 @@ module Addressable
# ) # )
# => "one two%2Fthree&four" # => "one two%2Fthree&four"
def self.normalize_component(component, character_class= def self.normalize_component(component, character_class=
CharacterClasses::RESERVED + CharacterClasses::UNRESERVED, CharacterClassesRegexps::RESERVED_AND_UNRESERVED,
leave_encoded='') leave_encoded='')
return nil if component.nil? return nil if component.nil?
@ -619,15 +630,15 @@ module Addressable
uri_object = uri.kind_of?(self) ? uri : self.parse(uri) uri_object = uri.kind_of?(self) ? uri : self.parse(uri)
encoded_uri = Addressable::URI.new( encoded_uri = Addressable::URI.new(
:scheme => self.encode_component(uri_object.scheme, :scheme => self.encode_component(uri_object.scheme,
Addressable::URI::CharacterClasses::SCHEME), Addressable::URI::CharacterClassesRegexps::SCHEME),
:authority => self.encode_component(uri_object.authority, :authority => self.encode_component(uri_object.authority,
Addressable::URI::CharacterClasses::AUTHORITY), Addressable::URI::CharacterClassesRegexps::AUTHORITY),
:path => self.encode_component(uri_object.path, :path => self.encode_component(uri_object.path,
Addressable::URI::CharacterClasses::PATH), Addressable::URI::CharacterClassesRegexps::PATH),
:query => self.encode_component(uri_object.query, :query => self.encode_component(uri_object.query,
Addressable::URI::CharacterClasses::QUERY), Addressable::URI::CharacterClassesRegexps::QUERY),
:fragment => self.encode_component(uri_object.fragment, :fragment => self.encode_component(uri_object.fragment,
Addressable::URI::CharacterClasses::FRAGMENT) Addressable::URI::CharacterClassesRegexps::FRAGMENT)
) )
if return_type == String if return_type == String
return encoded_uri.to_s return encoded_uri.to_s
@ -692,19 +703,19 @@ module Addressable
end end
encoded_uri = Addressable::URI.new( encoded_uri = Addressable::URI.new(
:scheme => self.encode_component(components[:scheme], :scheme => self.encode_component(components[:scheme],
Addressable::URI::CharacterClasses::SCHEME), Addressable::URI::CharacterClassesRegexps::SCHEME),
:user => self.encode_component(components[:user], :user => self.encode_component(components[:user],
Addressable::URI::CharacterClasses::UNRESERVED), Addressable::URI::CharacterClassesRegexps::UNRESERVED),
:password => self.encode_component(components[:password], :password => self.encode_component(components[:password],
Addressable::URI::CharacterClasses::UNRESERVED), Addressable::URI::CharacterClassesRegexps::UNRESERVED),
:host => components[:host], :host => components[:host],
:port => components[:port], :port => components[:port],
:path => self.encode_component(components[:path], :path => self.encode_component(components[:path],
Addressable::URI::CharacterClasses::PATH), Addressable::URI::CharacterClassesRegexps::PATH),
:query => self.encode_component(components[:query], :query => self.encode_component(components[:query],
Addressable::URI::CharacterClasses::QUERY), Addressable::URI::CharacterClassesRegexps::QUERY),
:fragment => self.encode_component(components[:fragment], :fragment => self.encode_component(components[:fragment],
Addressable::URI::CharacterClasses::FRAGMENT) Addressable::URI::CharacterClassesRegexps::FRAGMENT)
) )
if return_type == String if return_type == String
return encoded_uri.to_s return encoded_uri.to_s
@ -755,11 +766,11 @@ module Addressable
[ [
self.encode_component( self.encode_component(
key.gsub(/(\r\n|\n|\r)/, "\r\n"), key.gsub(/(\r\n|\n|\r)/, "\r\n"),
CharacterClasses::UNRESERVED CharacterClassesRegexps::UNRESERVED
).gsub("%20", "+"), ).gsub("%20", "+"),
self.encode_component( self.encode_component(
value.gsub(/(\r\n|\n|\r)/, "\r\n"), value.gsub(/(\r\n|\n|\r)/, "\r\n"),
CharacterClasses::UNRESERVED CharacterClassesRegexps::UNRESERVED
).gsub("%20", "+") ).gsub("%20", "+")
] ]
end end
@ -1734,20 +1745,20 @@ module Addressable
buffer = "".dup buffer = "".dup
new_query_values.each do |key, value| new_query_values.each do |key, value|
encoded_key = URI.encode_component( encoded_key = URI.encode_component(
key, CharacterClasses::UNRESERVED key, CharacterClassesRegexps::UNRESERVED
) )
if value == nil if value == nil
buffer << "#{encoded_key}&" buffer << "#{encoded_key}&"
elsif value.kind_of?(Array) elsif value.kind_of?(Array)
value.each do |sub_value| value.each do |sub_value|
encoded_value = URI.encode_component( encoded_value = URI.encode_component(
sub_value, CharacterClasses::UNRESERVED sub_value, CharacterClassesRegexps::UNRESERVED
) )
buffer << "#{encoded_key}=#{encoded_value}&" buffer << "#{encoded_key}=#{encoded_value}&"
end end
else else
encoded_value = URI.encode_component( encoded_value = URI.encode_component(
value, CharacterClasses::UNRESERVED value, CharacterClassesRegexps::UNRESERVED
) )
buffer << "#{encoded_key}=#{encoded_value}&" buffer << "#{encoded_key}=#{encoded_value}&"
end end

View File

@ -23,7 +23,7 @@ if !defined?(Addressable::VERSION)
module VERSION module VERSION
MAJOR = 2 MAJOR = 2
MINOR = 8 MINOR = 8
TINY = 5 TINY = 6
STRING = [MAJOR, MINOR, TINY].join('.') STRING = [MAJOR, MINOR, TINY].join('.')
end end