Extract class grouping logic from classes sidebar view

Author: st0012

lib/rdoc/generator/darkfish.rb

@@ -824,6 +824,17 @@ def generate_ancestor_list(ancestors, klass)
     content << '</li></ul>'
   end
 
+  def group_classes_by_namespace_for_sidebar(classes)
+    grouped_classes = classes.group_by do |klass|
+      klass.full_name[/\A[^:]++(?:::[^:]++(?=::))*+(?=::[^:]*+\z)/]
+    end.select do |_, klasses|
+      klasses.any?(&:display?)
+    end
+
+    grouped_classes.values.each(&:uniq!)
+    grouped_classes
+  end
+
   private
 
   def nesting_namespaces_to_class_modules klass

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

@@ -2,11 +2,7 @@
   <h3>Class and Module Index</h3>
 
   <%-
-  all_classes = @classes.group_by do |klass|
-    klass.full_name[/\A[^:]++(?:::[^:]++(?=::))*+(?=::[^:]*+\z)/]
-  end.delete_if do |_, klasses|
-    !klasses.any?(&:display?)
-  end
+  all_classes = group_classes_by_namespace_for_sidebar(@classes)
   link = proc do |index_klass, display = index_klass.display?|
     if display
       -%><code><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.name %></a></code><%-
@@ -18,7 +14,6 @@
     solo = top.one? {|klass| klass.display?}
     traverse = proc do |klasses| -%>
   <ul class="link-list">
-      <%- klasses.uniq!(&:full_name) -%>
       <%- klasses.each do |index_klass| -%>
         <%- if children = all_classes[index_klass.full_name] -%>
   <li><details<% if solo; solo = false %> open<% end %>><summary><% link.call(index_klass) %></summary>