Update some RI classes to work with RDoc 2.0.

Author: technomancy

lib/rdoc/ri/descriptions.rb

@@ -77,7 +77,9 @@ def <=>(other)
 class RDoc::RI::ModuleDescription < RDoc::RI::Description
 
   attr_accessor :class_methods
+  attr_accessor :class_method_extensions
   attr_accessor :instance_methods
+  attr_accessor :instance_method_extensions
   attr_accessor :attributes
   attr_accessor :constants
   attr_accessor :includes
@@ -148,6 +150,7 @@ class RDoc::RI::MethodDescription < RDoc::RI::Description
   attr_accessor :aliases
   attr_accessor :is_alias_for
   attr_accessor :params
+  attr_accessor :source_path
 
 end
 

lib/rdoc/ri/display.rb

@@ -192,7 +192,7 @@ def display_class_method_list(klass)
     class_data.each do |data_type|
       data = klass.send data_type
 
-      unless data.empty? then
+      unless data.nil? or data.empty? then
         @formatter.blankline
 
         heading = data_type.to_s.split('_').join(' ').capitalize << ':'

lib/rdoc/ri/reader.rb

@@ -45,7 +45,7 @@ def find_methods(name, is_class_method, namespaces)
 
   def get_method(method_entry)
     path = method_entry.path_name
-    File.open(path) { |f| RI::Description.deserialize(f) }
+    File.open(path) { |f| RDoc::RI::Description.deserialize(f) }
   end
 
   ##
@@ -54,8 +54,8 @@ def get_method(method_entry)
   def get_class(class_entry)
     result = nil
     for path in class_entry.path_names
-      path = RiWriter.class_desc_path(path, class_entry)
-      desc = File.open(path) {|f| RI::Description.deserialize(f) }
+      path = RDoc::RI::Writer.class_desc_path(path, class_entry)
+      desc = File.open(path) {|f| RDoc::RI::Description.deserialize(f) }
       if result
         result.merge_in(desc)
       else