Extract sidebar pages logic into helper methods

Author: st0012

lib/rdoc/generator/darkfish.rb

@@ -870,6 +870,43 @@ def group_classes_by_namespace_for_sidebar(classes)
     grouped_classes
   end
 
+  def generate_page_link(file, rel_prefix)
+    %(<a href="#{rel_prefix}/#{h file.path}">#{h file.page_name}</a>)
+  end
+
+  def generate_pages_index_content(page_files, rel_prefix, current)
+    return '' if page_files.empty?
+
+    dir = current&.full_name&.[](/\A[^\/]+(?=\/)/) || current&.page_name
+
+    content = +'<ul class="link-list">'
+    page_files.group_by do |f|
+      f.full_name[/\A[^\/]+(?=\/)/] || f.page_name
+    end.each do |n, grouped_files|
+      f = grouped_files.shift
+      if grouped_files.empty?
+        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
+        next
+      end
+
+      content << %(<li><details#{dir == n ? ' open' : ''}><summary>)
+      if n == f.page_name
+        content << generate_page_link(f, rel_prefix)
+      else
+        content << h(n)
+        grouped_files.unshift(f)
+      end
+      content << '</summary><ul class="link-list">'
+
+      grouped_files.each do |f|
+        content << %(<li>#{generate_page_link(f, rel_prefix)}</li>)
+      end
+
+      content << '</ul></details>'
+    end
+    content << '</ul>'
+  end
+
   private
 
   def nesting_namespaces_to_class_modules klass

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

@@ -1,31 +1,7 @@
-<%- if defined?(current) -%>
-  <%- dir = current.full_name[%r{\A[^/]+(?=/)}] || current.page_name -%>
-<%- end -%>
 <%- if @page_files.any? -%>
 <div id="fileindex-section" class="nav-section">
   <h3>Pages</h3>
 
-  <ul class="link-list">
-  <%- @page_files.group_by do |f| -%>
-    <%- f.full_name[%r{\A[^/]+(?=/)}] || f.page_name -%>
-  <%- end.each do |n, files| -%>
-    <%- f = files.shift -%>
-    <%- if files.empty? -%>
-    <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-      <%- next -%>
-    <%- end -%>
-    <li><details<% if dir == n %> open<% end %>><summary><%
-    if n == f.page_name
-      %><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h n %></a><%
-    else
-      %><%= h n %><% files.unshift(f)
-    end %></summary>
-    <ul class="link-list">
-    <%- files.each do |f| -%>
-      <li><a href="<%= rel_prefix %>/<%= h f.path %>"><%= h f.page_name %></a>
-    <%- end -%>
-    </ul></details>
-  <%- end -%>
-  </ul>
+  <%= generate_pages_index_content(@page_files, rel_prefix, current) %>
 </div>
 <%- end -%>