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

* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""

Browse source 
and "pass".  [ruby-dev:25667]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akira 2005-02-23 06:08:29 +00:00
parent de26996f0a
commit c36a0f0ec0
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Feb 23 15:04:32 2005 akira yamada <akira@ruby-lang.org>
* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
and "pass". [ruby-dev:25667]
Wed Feb 23 01:53:29 2005 Shugo Maeda <shugo@ruby-lang.org> Wed Feb 23 01:53:29 2005 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (initialize): handle certs correctly. Thanks, * lib/net/imap.rb (initialize): handle certs correctly. Thanks,

9
lib/uri/generic.rb
View file

@ -343,14 +343,7 @@ module URI
def split_userinfo(ui) def split_userinfo(ui)
return nil, nil unless ui return nil, nil unless ui
tmp = ui.index(':') user, password = ui.split(/:/, 2)
if tmp
user = ui[0..tmp - 1]
password = ui[tmp + 1..-1]
else
user = ui
password = nil
end
return user, password return user, password
end end

17
test/uri/test_generic.rb
View file

@ -117,11 +117,26 @@ class TestGeneric < Test::Unit::TestCase
assert_raises(URI::InvalidURIError) { URI.parse('http://a_b/') } assert_raises(URI::InvalidURIError) { URI.parse('http://a_b/') }
# 8 # 8
# reporte by m_seki # reported by m_seki
uri = URI.parse('file:///foo/bar.txt') uri = URI.parse('file:///foo/bar.txt')
assert_kind_of(URI::Generic, url) assert_kind_of(URI::Generic, url)
uri = URI.parse('file:/foo/bar.txt') uri = URI.parse('file:/foo/bar.txt')
assert_kind_of(URI::Generic, url) assert_kind_of(URI::Generic, url)
# 9
# [ruby-dev:25667]
url = URI.parse('ftp://:pass@localhost/')
assert_equal('', url.user)
assert_equal('pass', url.password)
assert_equal(':pass', url.userinfo)
url = URI.parse('ftp://user@localhost/')
assert_equal('user', url.user)
assert_equal(nil, url.password)
assert_equal('user', url.userinfo)
url = URI.parse('ftp://localhost/')
assert_equal(nil, url.user)
assert_equal(nil, url.password)
assert_equal(nil, url.userinfo)
end end
def test_merge def test_merge