kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merged differences between uri-0.9.6 and uri-0.9.7

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akira 2002-06-12 09:32:35 +00:00
parent 91511afa9c
commit b8be8d535a
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/uri/generic.rb
View file

@ -121,7 +121,7 @@ Object
end
else
raise ArgumentError,
"expected Array of or Hash of compornents of #{self.type} (#{self.type.component.join(', ')})"
"expected Array of or Hash of components of #{self.type} (#{self.type.component.join(', ')})"
end
tmp << true
@ -296,9 +296,12 @@ Object
end
private :check_password
def userinfo=(user, password = nil)
check_userinfo(user, password)
set_userinfo(user, password)
def userinfo=(userinfo)
if userinfo.nil?
return nil
end
check_userinfo(*userinfo)
set_userinfo(*userinfo)
end
def user=(user)
@ -312,21 +315,25 @@ Object
end
def set_userinfo(user, password = nil)
if !password
unless password
user, password = split_userinfo(user)
end
@user = user
@password = password
@password = password if password
[@user, @password]
end
protected :set_userinfo
def set_user(v)
set_userinfo(v, @password)
v
end
protected :set_user
def set_password(v)
set_userinfo(@user, v)
v
end
protected :set_password