rdoc-babel 1.2.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d4465a4ef80ca08eac47af424ee6812ae579733e6e8c45e42687a056bbc2ba
-  data.tar.gz: ef4ad57af3f4e00744ba74de09b9b2d72bf50a86f4c04e5d21ed95758e7b60b9
+  metadata.gz: b6ae764381b167bd89156dc785a2a039b9fe66197e26ab1887b565225279c0de
+  data.tar.gz: 07c955b085e7aa2c195363b40cd0904bcc3a871727f19089d6060546131d9647
 SHA512:
-  metadata.gz: c7e4e1224ac4b5118117189e68a4ea2652131ca105dee68f8569a553d205d7e2ba3f4011abdfc5c13a1cf709fca3424282e6fb69c4db8424f1392a5eac4fd971
-  data.tar.gz: b5e429343ff77e7156dff182b7990a33f262d03629acad381866d15888fefe553224e8658621a4c20b38153230da1ed9a66350a6fc95f311d39f740b7fce95f9
+  metadata.gz: 011f9c6d9f66bbf81ae89064b8de0b4973dd397409ba439a8d6b03a8bad2549db5542e4f1d4c607a9c53c672a3d30dcfe152ebd9a055522bad9f70f10aa54402
+  data.tar.gz: 5aa917b782b26a0e1adc5217168d1eaa16e19d9a447eb664bd5ced9e52f0a3eeff2b12fb83660b61f0af1f8fcf572d8423ba82e74e39ef99cf761bb8441ee8ba

data/HISTORY.rdoc

@@ -1,3 +1,19 @@
+=== 1.4.1
+
+* remove an extra </span> in class HTML
+* use flex to display the header components
+
+=== 1.4.0
+
+* add a TOC button on the top right
+* fix initial sizing in the left pane
+* fix too wide <pre> sections
+
+=== 1.3.0
+
+* switch from frameset to iframe
+* highlight the current file/class/method in the left frame
+
 === 1.2.1
 
 * filter: only search in link text (skip class/method type)

data/README.rdoc

@@ -16,39 +16,40 @@ and to contribute alternate templates or style sheets.
 - Dual-frame output, with indexes on the left.
 - Search boxes for classes and methods.
 - Links to undocumented classes/methods are grayed.
-- Highlights target methods, attributes and constants.
+- Highlights the current file/class/method in the left frame.
+- Highlights the target method, attribute or constant in the main frame.
 - Adds links to ancestor methods/attributes.
 - Borrows some ideas (and one icon) from Darkfish.
-- Tested on Firefox 3.5 & 5, Chrome 9 & 12, Safari 4 & 5.
+- Tested on Firefox 125.<br>
+  If using the <tt>file://</tt> protocol, the "same origin policy" for local files must be turned off:<br>
+  <tt>about:config</tt> > <tt>security.fileuri.strict_origin_policy = false</tt>
 
 == Synopsis
 
 To output documentation formatted by Babel, use the <tt>--format/-f</tt>
-RDoc switch. For instance, to generate the documentation for Ruby core:
+RDoc switch. For instance, to generate the documentation for Ruby core and stdlib:
 
-  $ gem install rdoc-babel
-  $ cd ~/.rvm/src/ruby-1.8.7-p302
-  $ rdoc -f babel -a -t "Ruby 1.8.7 Core" -o ~/docs/ruby_core_187 *.c
+  > gem install rdoc-babel
+  > cd /ruby/src
+  > rdoc -f babel -a -t "Ruby Core + Stdlib" -o /docs/ruby-core
 
 Using rake:
 
   require 'rdoc/task'
 
   RDoc::Task.new do |t|
-    Dir.chdir '~/.rvm/src/ruby-1.9.2-p0'
+    Dir.chdir '/ruby/src'
     rdoc.options <<
       '--format' << 'babel' <<
       '--all'
-    t.title = "Ruby 1.9.2 Core"
-    t.rdoc_dir = '~/docs/ruby_core_192'
-    t.rdoc_files.concat Dir['*.c']
+    t.title = "Ruby Core + Stdlib"
+    t.rdoc_dir = '/docs/ruby-core'
   end
 
 To make Babel the default format when generating RDoc documentation,
-define the RDOCOPT environment variable in the appropriate file
-(e.g., <tt>~/.bashrc</tt>):
+define the RDOCOPT environment variable:
 
-  export RDOCOPT="--format babel"
+  RDOCOPT="--format babel"
 
 == Specific options
 
@@ -70,8 +71,8 @@ Babel supports specific options in addition to the standard RDoc options:
 
 == Requirements
 
-- Ruby >= 2.3.0 (may work with >= 1.9.3, but untested)
-- RDoc >= 5.0 (may work with >= 4.0, but untested)
+- Ruby >= 3.1.0 (may work with >= 2.5.0, but untested)
+- RDoc >= 6.5.0 (may work with >= 5.0, but untested)
 
 == Installation
 
@@ -81,7 +82,7 @@ Babel supports specific options in addition to the standard RDoc options:
 
 (The MIT License)
 
-Copyright (c) 2010-2020 Thierry Lambert
+Copyright (c) 2010-2024 Thierry Lambert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/rdoc/generator/babel.rb

@@ -33,7 +33,7 @@ class RDoc::Generator::Babel
 
   RDoc::RDoc.add_generator(self)
 
-  VERSION = '1.2.1'
+  VERSION = '1.4.1'
   DESCRIPTION = 'Alternate HTML documentation'
 
   include ERB::Util
@@ -157,6 +157,25 @@ class RDoc::Generator::Babel
 
   def generate
 
+    # rdoc bug fix: public class/module methods appear as external_aliases (unresolved aliases)
+
+    @store.all_classes_and_modules.each do |cm|
+      next if cm.external_aliases.empty?
+      class_level_names = cm.method_list.select { |m| m.type == 'class' }.map(&:name)
+      cm.external_aliases.dup.each do |a|
+        cm.external_aliases.delete a if class_level_names.include?(a.name)
+      end
+    end
+
+    # other bug fix: method aliases with singleton mismatch
+
+    @store.all_classes_and_modules.each do |cm|
+      cm.class_method_list.each do |m|
+        m.is_alias_for.singleton = true if m.is_alias_for
+        m.aliases.each { |a| a.singleton = true }
+      end
+    end
+
     # set instance variables
 
     @output_dir = Pathname.new(@options.op_dir).expand_path(@source_dir)
@@ -178,11 +197,25 @@ class RDoc::Generator::Babel
         @simple_files
       end
 
-    @main_file = @options.main_page && @all_files.find { |f| f.full_name == @options.main_page }
-    if @main_file
-      unless @files_to_display.find { |f| f.full_name == @options.main_page }
-        @files_to_display.unshift @main_file
+    if @options.main_page
+      # look for a TopLevel matching the main page
+      @main_page = @all_files.find { |f| f.full_name == @options.main_page }
+      if @main_page
+        # TODO are there cases where main_page = 'README' for 'lib/README'?
+        unless @files_to_display.find { |f| f.full_name == @options.main_page }
+          @files_to_display.unshift @main_page
+        end
+      # look for a class/module with that name
+      else
+        match = @unique_classes_and_modules.find { |cm| cm.full_name == @options.main_page }
+        if match
+          @main_page = match
+        else
+          warn "no such page: --main #{@options.main_page}"
+        end
       end
+    else
+      @main_page = nil
     end
 
     # write the output
@@ -263,7 +296,7 @@ class RDoc::Generator::Babel
   # Returns the first +Context+ object to display in the main frame.
   # This is, in order:
   # - The file designated by the +main_page+ option,
-  #   if there is a +TopLevel+ with that name.
+  #   if there is a +TopLevel+ or class/module with that name.
   # - The first simple file that contains a comment
   #   (in the order given on the command line).
   # - The first class or module that contains a comment.
@@ -274,19 +307,30 @@ class RDoc::Generator::Babel
   # - The first file.
 
   def first_page
-    # TODO are there cases where main_page = 'README' for 'lib/README'?
-    if @options.main_page && (main_file = @all_files.find { |f| f.full_name == @options.main_page })
-      main_file
+    if @main_page
+      debug_msg "main as --main: #{@main_page}"
+      @main_page
     elsif (file = @simple_files.first)
+      debug_msg "main as first simple file: #{file}"
       file
     elsif (cm = @unique_classes_and_modules.find { |k| !k.comment.empty? })
+      debug_msg "main as first module/class with comment: #{cm}"
       cm
-    elsif (file = @files_with_comment.first)
-      file
+    # this is not a simple file, so currently not displayed in files
+    # elsif (file = @files_with_comment.first)
+    #   debug_msg "main as first file with comment: #{file}"
+    #   file
     elsif !@unique_classes_and_modules.empty?
-      @unique_classes_and_modules.find { |k| k.any_content } or
-        @unique_classes_and_modules.first
+      cm = @unique_classes_and_modules.find { |k| k.any_content }
+      if cm
+        debug_msg "main as first module/class with any content: #{cm}"
+      else
+        debug_msg "main as first module/class (no content): #{cm}"
+        cm = @unique_classes_and_modules.first
+      end
+      cm
     else
+      debug_msg "main as first file: #{cm}"
       @all_files.first
     end
   end
@@ -450,9 +494,32 @@ protected
 
     return if @options.dry_run
 
+    # fix file cross-references
+    # rdoc:ref handling by RDoc requires that files and classes are stored in the
+    # root output directory, while we have files and classes in separate subdirectories
+    output.gsub!(/<a (.*?)\bhref="(.+?)"/) do |match|
+      atts = $1
+      href = $2
+      next match if href[0] == '#'
+      path, id = href.split('#')
+      # in classes/OptionParser.html:
+      # we find for instance <a href="optparse/tutorial_rdoc.html">Tutorial</a>
+      # which matches files/doc/optparse/tutorial_rdoc.html
+      matches = @all_files.select do |f|
+        f.path.end_with?(path) && f.path != path
+      end
+      next match if matches.empty?
+      # we replace optparse/tutorial_rdoc.html by ../files/doc/optparse/tutorial_rdoc.html
+      f = matches.first
+      actual = Pathname.new(f.path).expand_path(@output_dir).relative_path_from(outfile.dirname).to_s
+      next match if actual == path
+      actual << '#' << id if id
+      %(<a #{atts}href="#{actual}")
+    end
+
     outfile.dirname.mkpath
-    outfile.open('w', 0644) do |ofh|
-      ofh.print(output)
+    outfile.open('w', 0644) do |io|
+      io.print(output)
     end
 
   end

data/lib/rdoc/generator/ruby-lang/class-page.html.erb

@@ -2,65 +2,52 @@
 <html lang="en">
 <head>
   <meta charset="<%= @options.charset %>">
-  <title><%= @class.type.capitalize %> <%= @class.full_name %></title>
+  <title><%= @class.full_name %> &ndash; <%= h @options.title %></title>
   <link href="<%= @stylesheet_url %>" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
   <script src="<%= @rel_prefix %>/scripts/mainFrame.js" type="text/javascript"></script>
 </head>
 <body>
 
+<div id="left-container">
+<iframe id="left-frame" src="<%= @rel_prefix %>/indexes.html"></iframe>
+<div id="resizer"></div>
+</div>
+<div id="main-container">
 <div id="header">
   <p class="header-title">
     <span class="prefix"><%= @class.type.capitalize %></span><span class="name"> <%= @class.full_name %></span>
   </p>
   <% if @class.type == 'class' && @class.superclass %>
     <p class="header-title">
-    <% if String === @class.superclass %>
-      <span class="parent"> &lt; <%= @class.superclass %></span>
+    <% if @class.superclass.is_a?(String) %>
+      <span class="parent"> &nbsp;&lt; <%= @class.superclass %></span>
     <% else %>
-      </span><span class="parent"> &lt; <a href="<%= @class.aref_to @class.superclass.path %>"><%= @class.superclass.full_name %></a></span>
+      <span class="parent"> &nbsp;&lt; <a href="<%= @class.aref_to @class.superclass.path %>"><%= @class.superclass.full_name %></a></span>
     <% end %>
     </p>
   <% end %>
   <p id="file-info">
+    <span class="in-files">In:</span>
   <% if @class.in_files.length < 3 %>
-    <span class="displayed">
-      <span class="in-files">In:</span>
-      <span class="first-files">
-      <% @class.in_files.each do |f| %>
-        <a href="<%= @rel_prefix %>/<%= h f.path %>"><%= h f.full_name %></a><br>
-      <% end %>
-      </span>
-    </span>
-    <span class="hidden">
-      <span class="in-files">In:</span>
-      <span class="first-files">
-      <% @class.in_files.each do |f| %>
-        <a href="#"><%= h f.full_name %></a><br>
-      <% end %>
-      </span>
+    <span class="file-list">
+    <% @class.in_files.each do |f| %>
+      <a href="<%= @rel_prefix %>/<%= h f.path %>"><%= h f.full_name %></a><br>
+    <% end %>
+    <% if @class.in_files.length == 1 %>
+      &nbsp;
+    <% end %>
     </span>
   <% else %>
-    <span class="displayed">
-      <span class="in-files">In:</span>
-      <span class="first-files">
-        <a href="<%= @rel_prefix %>/<%= h @class.in_files.first.path %>"><%= h @class.in_files.first.full_name %></a><br>
-        <a href="#" id="show-all-files">(<%= @class.in_files.length - 1 %> more...)</a>
-      </span>
-    </span>
-    <span class="hidden">
-      <span class="in-files">In:</span>
-      <span class="first-files">
-        <a href="#"><%= h @class.in_files.first.full_name %></a><br>
-        <a href="#" id="show-all-files">(<%= @class.in_files.length - 1 %> more...)</a>
+    <span class="file-list">
+      <a href="<%= @rel_prefix %>/<%= h @class.in_files.first.path %>"><%= h @class.in_files.first.full_name %></a><br>
+      <a href="#" id="show-all-files">(<%= @class.in_files.length - 1 %> more...)</a>
+      <span id="all-files">
+      <% @class.in_files[1..-1].each do |f| %>
+        <a href="<%= @rel_prefix %>/<%= h f.path %>"><%= h f.full_name %></a><br>
+      <% end %>
       </span>
     </span>
-    <br>
-    <span id="all-files">
-    <% @class.in_files[1..-1].each do |f| %>
-      <a href="<%= @rel_prefix %>/<%= h f.path %>"><%= h f.full_name %></a><br>
-    <% end %>
-    </span>
   <% end %>
   </p>
 </div>
@@ -69,8 +56,8 @@
 
 <%= @class.description %>
 
-<!-- class/module aliases -->
 <% unless @class.aliases.empty? %>
+<!-- class/module aliases -->
 <div id="class-aliases" class="list">
   <h3><%= @class.type.capitalize %> Aliases</h3>
   <ul>
@@ -81,8 +68,8 @@
 </div>
 <% end %>
 
-<!-- list of methods -->
 <% unless @class.method_list.empty? %>
+<!-- list of methods -->
 <div id="method-list" class="list">
   <h3>Methods</h3>
   <% unless @class.class_method_list.empty? %>
@@ -104,8 +91,8 @@
 </div>
 <% end %>
 
-<!-- namespace contents -->
 <% unless @class.non_aliases.empty? %>
+<!-- namespace contents -->
 <div id="namespace-list" class="list">
   <h3>Modules and Classes</h3>
   <table class="classes-modules">
@@ -119,8 +106,8 @@
 </div>
 <% end %>
 
-<!-- included modules -->
 <% unless @class.includes.empty? %>
+<!-- included modules -->
 <div id="include-list" class="list">
   <h3>Included Modules</h3>
   <ul>
@@ -135,8 +122,8 @@
 </div>
 <% end %>
 
-<!-- constants -->
 <% unless @class.constants.empty? %>
+<!-- constants -->
 <div id="constant-list" class="list">
   <h3>Constants</h3>
   <table>
@@ -162,8 +149,8 @@
 </div>
 <% end %>
 
-<!-- external aliases -->
 <% unless @class.external_aliases.empty? %>
+<!-- external aliases -->
 <div id="external-aliases" class="list">
   <h3>External Aliases</h3>
   <table>
@@ -177,8 +164,8 @@
 </div>
 <% end %>
 
-<!-- class/module attributes -->
 <% unless @class.class_attributes.empty? %>
+<!-- class/module attributes -->
 <div id="class-attributes" class="list">
   <h3><%= @class.type.capitalize %> Attributes</h3>
   <table>
@@ -203,8 +190,8 @@
 </div>
 <% end %>
 
-<!-- instance attributes -->
 <% unless @class.instance_attributes.empty? %>
+<!-- instance attributes -->
 <div id="instance-attributes" class="list">
   <h3>Instance Attributes</h3>
   <table>
@@ -267,6 +254,7 @@
 <% end # @class.methods_by_type.each %>
 
 </div> <!-- #documentation -->
+</div> <!-- #main-container -->
 
 </body>
 </html>

data/lib/rdoc/generator/ruby-lang/file-page.html.erb

@@ -2,19 +2,21 @@
 <html lang="en">
 <head>
   <meta charset="<%= @options.charset %>">
-  <title>File <%= @file.base_name %></title>
+  <title><%= @file.base_name %> &ndash; <%= h @options.title %></title>
   <link href="<%= @stylesheet_url %>" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
   <script src="<%= @rel_prefix %>/scripts/mainFrame.js" type="text/javascript"></script>
 </head>
 <body>
+<div id="left-container">
+<iframe id="left-frame" src="<%= @rel_prefix %>/indexes.html"></iframe>
+<div id="resizer"></div>
+</div>
+<div id="main-container">
 <div id="header">
   <p class="header-title"><span class="prefix">File</span><span class="name"> <%= @file.base_name %></span></p>
   <p id="file-info">
-    <span class="displayed">
-      Path: <%= @file.absolute_name %><br>
-      Modified: <%= @file.last_modified ? @file.last_modified.strftime('%Y-%m-%d %H:%M:%S') : 'unknown' %>
-    </span>
+    Path: <%= @file.absolute_name %>
   </p>
 </div>
 <div id="documentation">
@@ -54,5 +56,6 @@
   </div>
 <% end %>
 </div>
+</div>
 </body>
 </html>

data/lib/rdoc/generator/ruby-lang/images/close_black_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="18px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"/></svg>

data/lib/rdoc/generator/ruby-lang/images/menu_black_18dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="18px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/></svg>

data/lib/rdoc/generator/ruby-lang/index.html.erb

@@ -1,11 +1,6 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-  <meta charset="<%= @options.charset %>">
-  <title><%= h @options.title %></title>
+  <meta http-equiv="refresh" content="0; url=<%= @first_page.path %>" />
 </head>
-<frameset cols="20%,*">
-  <frame name="indexFrame" src="indexes.html">
-  <frame name="mainFrame" src="<%= @first_page.path %>">
-</frameset>
 </html>

data/lib/rdoc/generator/ruby-lang/indexes.html.erb

@@ -7,7 +7,7 @@
   <link href="https://fonts.googleapis.com/css?family=Noto+Sans" rel="stylesheet">
   <script src="scripts/quicksearch.js" type="text/javascript"></script>
   <script src="scripts/indexFrame.js" type="text/javascript"></script>
-  <base target="mainFrame">
+  <base target="_parent">
 </head>
 <body class="index">
 <% $stderr.sync = true %>