diff options
author | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-16 00:52:32 +0000 |
---|---|---|
committer | akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-16 00:52:32 +0000 |
commit | 9a2db62124c6d10e660d9301963f2c6d936d9b60 (patch) | |
tree | 53c3f2b588ba8212dca82b40e0238b0786baedab | |
parent | 94724396d54d1d16774437f0d0685714667afbea (diff) |
* removed URI::Generic#to_ary.
* URI::Generic included URI.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/uri.rb | 2 | ||||
-rw-r--r-- | lib/uri/generic.rb | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/uri.rb b/lib/uri.rb index 568ff008c7..f95d72b7ce 100644 --- a/lib/uri.rb +++ b/lib/uri.rb @@ -15,7 +15,7 @@ =end module URI - VERSION_CODE = '000908'.freeze + VERSION_CODE = '000909'.freeze VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze end diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 73f80c946c..26f7d7a6a7 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -20,6 +20,7 @@ Object =end class Generic + include URI include REGEXP =begin @@ -1085,7 +1086,7 @@ Object end if self.class == oth.class - self.normalize.to_ary == oth.normalize.to_ary + self.normalize.component_ary == oth.normalize.component_ary else false end @@ -1101,17 +1102,13 @@ Object # end =begin ---- URI::Generic#to_a =end - def to_ary + def component_ary component.collect do |x| self.send(x) end end - - def to_a - to_ary - end + protected :component_ary =begin --- URI::Generic#select(*components) |