mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-28 13:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ruby/uri] Add authority accessor

Browse Source 
https://github.com/ruby/uri/commit/6c6449e15f
This commit is contained in:
Nobuyoshi Nakada 2025-06-26 01:21:50 +09:00 committed by git
parent d0395bd0ea
commit eccc54b4fa
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/uri/generic.rb
View File

@ -574,6 +574,12 @@ module URI
@password
end
# Returns the authority info (array of user, password, host and
# port), if any is set. Or returns +nil+.
def authority
return @user, @password, @host, @port if @user || @password || @host || @port
end
# Returns the user component after URI decoding.
def decoded_user
URI.decode_uri_component(@user) if @user
@ -615,6 +621,13 @@ module URI
end
protected :set_host
# Protected setter for the authority info (+user+, +password+, +host+
# and +port+). If +port+ is +nil+, +default_port+ will be set.
#
protected def set_authority(user, password, host, port = nil)
@user, @password, @host, @port = user, password, host, port || self.default_port
end
#
# == Args
#
@ -1123,7 +1136,7 @@ module URI
base = self.dup
authority = rel.userinfo || rel.host || rel.port
authority = rel.authority
# RFC2396, Section 5.2, 2)
if (rel.path.nil? || rel.path.empty?) && !authority && !rel.query
@ -1136,9 +1149,7 @@ module URI
# RFC2396, Section 5.2, 4)
if authority
base.set_userinfo(rel.userinfo)
base.set_host(rel.host)
base.set_port(rel.port || base.default_port)
base.set_authority(*authority)
base.set_path(rel.path)
elsif base.path && rel.path
base.set_path(merge_path(base.path, rel.path))