Removed method_missing on Hash

Author: drbrain

lib/rdoc/ri/driver.rb

@@ -11,6 +11,54 @@
 
 class RDoc::RI::Driver
 
+  class Hash < ::Hash
+    def self.convert(hash)
+      hash = new.update hash
+
+      hash.each do |key, value|
+        hash[key] = case value
+                    when ::Hash then
+                      convert value
+                    when Array then
+                      value = value.map do |v|
+                        ::Hash === v ? convert(v) : v
+                      end
+                      value
+                    else
+                      value
+                    end
+      end
+
+      hash
+    end
+
+    def method_missing method, *args
+      self[method.to_s]
+    end
+
+    def merge_enums(other)
+      other.each do |k, v|
+        if self[k] then
+          case v
+          when Array then
+            # HACK dunno
+            if String === self[k] and self[k].empty? then
+              self[k] = v
+            else
+              self[k] += v
+            end
+          when Hash then
+            self[k].update v
+          else
+            # do nothing
+          end
+        else
+          self[k] = v
+        end
+      end
+    end
+  end
+
   class Error < RDoc::RI::Error; end
 
   class NotFoundError < Error
@@ -244,7 +292,7 @@ def class_cache
     @class_cache = if up_to_date then
                      load_cache_for @class_cache_name
                    else
-                     class_cache = {}
+                     class_cache = RDoc::RI::Driver::Hash.new
 
                      classes = map_dirs('**/cdesc*.yaml', :sys) { |f| Dir[f] }
                      populate_class_cache class_cache, classes
@@ -271,6 +319,7 @@ def cache_file_path
 
   def display_class(name)
     klass = class_cache[name]
+    klass = RDoc::RI::Driver::Hash.convert klass
     @display.display_class_info klass, class_cache
   end
 
@@ -282,10 +331,12 @@ def get_info_for(arg)
   def load_cache_for(klassname)
     path = cache_file_for klassname
 
+    cache = nil
+
     if File.exist? path and
        File.mtime(path) >= File.mtime(class_cache_file_path) then
       File.open path, 'rb' do |fp|
-        Marshal.load fp.read
+        cache = Marshal.load fp.read
       end
     else
       class_cache = nil
@@ -298,7 +349,7 @@ def load_cache_for(klassname)
       return nil unless klass
 
       method_files = klass["sources"]
-      cache = {}
+      cache = RDoc::RI::Driver::Hash.new
 
       sys_dir = @sys_dirs.first
       method_files.each do |f|
@@ -311,16 +362,18 @@ def load_cache_for(klassname)
           ext_path = f
           ext_path = "gem #{$1}" if f =~ %r%gems/[\d.]+/doc/([^/]+)%
           method["source_path"] = ext_path unless system_file
-          cache[name] = method
+          cache[name] = RDoc::RI::Driver::Hash.convert method
         end
       end
 
       write_cache cache, path
     end
+
+    RDoc::RI::Driver::Hash.convert cache
   end
 
   ##
-  # Finds the method 
+  # Finds the method
 
   def lookup_method(name, klass)
     cache = load_cache_for klass
@@ -459,31 +512,3 @@ def write_cache(cache, path)
 
 end
 
-class Hash # HACK don't add stuff to Hash.
-  def method_missing method, *args
-    self[method.to_s]
-  end
-
-  def merge_enums(other)
-    other.each do |k,v|
-      if self[k] then
-        case v
-        when Array then
-          # HACK dunno
-          if String === self[k] and self[k].empty? then
-            self[k] = v
-          else
-            self[k] += v
-          end
-        when Hash then
-          self[k].merge! v
-        else
-          # do nothing
-        end
-      else
-        self[k] = v
-      end
-    end
-  end
-end
-

test/test_rdoc_ri_default_display.rb

@@ -4,7 +4,7 @@
 require 'rdoc/ri/display'
 require 'rdoc/ri/driver'
 
-class TestRDocRIDefaultDisplay < Test::Unit::TestCase
+class TestRdocRiDefaultDisplay < Test::Unit::TestCase
 
   def setup
     @output = StringIO.new
@@ -14,7 +14,7 @@ def setup
     @dd = RDoc::RI::DefaultDisplay.new RDoc::RI::Formatter, @width, true,
                                        @output
 
-    @some_method = {
+    @some_method = h \
       'aliases' => [{'name' => 'some_method_alias'}],
       'block_params' => 'block_param',
       'comment' => [RDoc::Markup::Flow::P.new('some comment')],
@@ -23,13 +23,12 @@ def setup
       'name' => 'some_method',
       'params' => '(arg1, arg2) {|block_param| ...}',
       'source_path' => '/nonexistent',
-      'visibility' => 'public',
-    }
+      'visibility' => 'public'
   end
 
   def test_display_class_info
     ri_reader = nil
-    klass = {
+    klass = h \
       'attributes' => [
         { 'name' => 'attribute', 'rw' => 'RW',
           'comment' => [RDoc::Markup::Flow::P.new('attribute comment')] },
@@ -58,8 +57,7 @@ def test_display_class_info
       'instance_method_extensions' => [
         { 'name' => 'instance_method_extension' },
       ],
-      'superclass_string' => 'Object',
-    }
+      'superclass_string' => 'Object'
 
     @dd.display_class_info klass, ri_reader
 
@@ -154,16 +152,15 @@ def test_display_method_info
   end
 
   def test_display_method_info_singleton
-    method = {
+    method = RDoc::RI::Driver::Hash.new.update \
       'aliases' => [],
       'block_params' => nil,
       'comment' => nil,
       'full_name' => 'SomeClass::some_method',
       'is_singleton' => true,
       'name' => 'some_method',
       'params' => '(arg1, arg2)',
-      'visibility' => 'public',
-    }
+      'visibility' => 'public'
 
     @dd.display_method_info method
 
@@ -179,26 +176,26 @@ def test_display_method_info_singleton
 
   def test_display_method_list
     methods = [
-      {
+      RDoc::RI::Driver::Hash.new.update(
         "aliases" => [],
         "block_params" => nil,
         "comment" =>  nil,
         "full_name" => "SomeClass#some_method",
         "is_singleton" => false,
         "name" => "some_method",
         "params" => "()",
-        "visibility" => "public",
-      },
-      {
+        "visibility" => "public"
+      ),
+      RDoc::RI::Driver::Hash.new.update(
         "aliases" => [],
         "block_params" => nil,
         "comment" => nil,
         "full_name" => "SomeClass#some_other_method",
         "is_singleton" => false,
         "name" => "some_other_method",
         "params" => "()",
-        "visibility" => "public",
-      },
+        "visibility" => "public"
+      ),
     ]
 
     @dd.display_method_list methods
@@ -291,5 +288,9 @@ def test_list_known_classes_empty
     assert_equal expected, @output.string
   end
 
+  def h(hash)
+    RDoc::RI::Driver::Hash.convert hash
+  end
+
 end