Remove unnecessary ivars from darkfish

Author: st0012

lib/rdoc/generator/darkfish.rb

@@ -128,16 +128,6 @@ class RDoc::Generator::Darkfish
 
   attr_reader :json_index
 
-  ##
-  # Methods to be displayed by this generator
-
-  attr_reader :methods
-
-  ##
-  # Sorted list of classes and modules to be displayed by this generator
-
-  attr_reader :modsort
-
   ##
   # The RDoc::Store that is the source of the generated content
 
@@ -170,8 +160,6 @@ def initialize store, options
     @classes = nil
     @context = nil
     @files   = nil
-    @methods = nil
-    @modsort = nil
 
     @json_index = RDoc::Generator::JsonIndex.new self, options
   end
@@ -620,8 +608,6 @@ def setup
 
     @classes = @store.all_classes_and_modules.sort
     @files   = @store.all_files.sort
-    @methods = @classes.flat_map { |m| m.method_list }.sort
-    @modsort = get_sorted_module_list @classes
     @page_files = @files.select { |f| f.text? }
   end
 

lib/rdoc/generator/template/darkfish/table_of_contents.rhtml

@@ -36,7 +36,7 @@
 
 <h2 id="classes">Classes and Modules</h2>
 <ul>
-<%- @modsort.each do |klass| -%>
+<%- get_sorted_module_list(@classes).each do |klass| -%>
   <li class="<%= klass.type %>">
     <a href="<%= klass.path %>"><%= klass.full_name %></a>
 <%- table = []

test/rdoc/test_rdoc_generator_darkfish.rb

@@ -300,8 +300,6 @@ def test_setup
     assert_equal [@klass_alias, @ignored, @klass, @object],
                  @g.classes.sort_by { |klass| klass.full_name }
     assert_equal [@top_level],                           @g.files
-    assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
   end
 
   def test_template_for