From 77d007dc05d07d2167e083d39b3afa6ca1562e9f Mon Sep 17 00:00:00 2001
From: akira <akira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Dec 2002 00:52:32 +0000
Subject: * removed URI::Generic#to_ary. * URI::Generic included URI.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/uri.rb         |  2 +-
 lib/uri/generic.rb | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib')

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 b819dd12b3..4a671e9ed5 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)
-- 
cgit v1.2.3