summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-16 00:52:32 +0000
committerakira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-16 00:52:32 +0000
commit42276b5e0ca1407368a0280d108a25fec820abc9 (patch)
tree7060cb690f9e7c6e887daa70a67bc29be76c4d21 /lib
parent8a429d7e31a6f2a3c3aa0eb66245a0d6ec6d6477 (diff)
downloadruby-42276b5e0ca1407368a0280d108a25fec820abc9.tar.gz
ruby-42276b5e0ca1407368a0280d108a25fec820abc9.tar.xz
ruby-42276b5e0ca1407368a0280d108a25fec820abc9.zip
* removed URI::Generic#to_ary.
* URI::Generic included URI. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri.rb2
-rw-r--r--lib/uri/generic.rb11
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/uri.rb b/lib/uri.rb
index 568ff008c..f95d72b7c 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 b819dd12b..4a671e9ed 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)