rdoc 8.0.0 → 8.1.0

data/lib/rdoc/erbio.rb

@@ -1,37 +1,39 @@
 # frozen_string_literal: true
 require 'erb'
 
-##
-# A subclass of ERB that writes directly to an IO.  Credit to Aaron Patterson
-# and Masatoshi SEKI.
-#
-# To use:
-#
-#   erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
-#
-#   File.open 'hello.txt', 'w' do |io|
-#     erbio.result binding
-#   end
-#
-# Note that binding must enclose the io you wish to output on.
+module RDoc
+  ##
+  # A subclass of ERB that writes directly to an IO.  Credit to Aaron Patterson
+  # and Masatoshi SEKI.
+  #
+  # To use:
+  #
+  #   erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
+  #
+  #   File.open 'hello.txt', 'w' do |io|
+  #     erbio.result binding
+  #   end
+  #
+  # Note that binding must enclose the io you wish to output on.
 
-class RDoc::ERBIO < ERB
+  class ERBIO < ERB
 
-  ##
-  # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
+    ##
+    # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
 
-  def initialize(str, trim_mode: nil, eoutvar: 'io')
-    super(str, trim_mode: trim_mode, eoutvar: eoutvar)
-  end
+    def initialize(str, trim_mode: nil, eoutvar: 'io')
+      super(str, trim_mode: trim_mode, eoutvar: eoutvar)
+    end
 
-  ##
-  # Instructs +compiler+ how to write to +io_variable+
+    ##
+    # Instructs +compiler+ how to write to +io_variable+
 
-  def set_eoutvar(compiler, io_variable)
-    compiler.put_cmd    = "#{io_variable}.write"
-    compiler.insert_cmd = "#{io_variable}.write"
-    compiler.pre_cmd    = []
-    compiler.post_cmd   = []
-  end
+    def set_eoutvar(compiler, io_variable)
+      compiler.put_cmd    = "#{io_variable}.write"
+      compiler.insert_cmd = "#{io_variable}.write"
+      compiler.pre_cmd    = []
+      compiler.post_cmd   = []
+    end
 
+  end
 end

data/lib/rdoc/generator/aliki.rb

@@ -2,199 +2,207 @@
 
 require 'uri'
 
-##
-# Aliki theme for RDoc documentation
-#
-# Author: Stan Lo
-#
+module RDoc
+  module Generator
+    ##
+    # Aliki theme for RDoc documentation
+    #
+    # Author: Stan Lo
+    #
+
+    class Aliki < Generator::Darkfish
+      DESCRIPTION = 'HTML generator, written by Stan Lo'
+
+      RDoc.add_generator self
+
+      def initialize(store, options)
+        super
+        aliki_template_dir = File.expand_path(File.join(__dir__, 'template', 'aliki'))
+        @template_dir = Pathname.new(aliki_template_dir)
+      end
 
-class RDoc::Generator::Aliki < RDoc::Generator::Darkfish
-  DESCRIPTION = 'HTML generator, written by Stan Lo'
+      ##
+      # Generate documentation. Overrides Darkfish to use Aliki's own search index
+      # instead of the JsonIndex generator.
 
-  RDoc::RDoc.add_generator self
+      def generate
+        setup
 
-  def initialize(store, options)
-    super
-    aliki_template_dir = File.expand_path(File.join(__dir__, 'template', 'aliki'))
-    @template_dir = Pathname.new(aliki_template_dir)
-  end
+        write_style_sheet
+        generate_index
+        generate_class_files
+        generate_file_files
+        generate_table_of_contents
+        write_search_index
 
-  ##
-  # Generate documentation. Overrides Darkfish to use Aliki's own search index
-  # instead of the JsonIndex generator.
+        copy_static
 
-  def generate
-    setup
+      rescue => e
+        debug_msg "%s: %s\n  %s" % [
+          e.class.name, e.message, e.backtrace.join("\n  ")
+        ]
 
-    write_style_sheet
-    generate_index
-    generate_class_files
-    generate_file_files
-    generate_table_of_contents
-    write_search_index
+        raise
+      end
 
-    copy_static
+      ##
+      # Copy only the static assets required by the Aliki theme. Unlike Darkfish we
+      # don't ship embedded fonts or image sprites, so limit the asset list to keep
+      # generated documentation lightweight.
 
-  rescue => e
-    debug_msg "%s: %s\n  %s" % [
-      e.class.name, e.message, e.backtrace.join("\n  ")
-    ]
+      def write_style_sheet
+        debug_msg "Copying Aliki static files"
+        options = { verbose: $DEBUG_RDOC, noop: @dry_run }
 
-    raise
-  end
+        install_rdoc_static_file @template_dir + 'css/rdoc.css', "./css/rdoc.css", options
 
-  ##
-  # Copy only the static assets required by the Aliki theme. Unlike Darkfish we
-  # don't ship embedded fonts or image sprites, so limit the asset list to keep
-  # generated documentation lightweight.
+        unless @options.template_stylesheets.empty?
+          FileUtils.cp @options.template_stylesheets, '.', **options
+        end
 
-  def write_style_sheet
-    debug_msg "Copying Aliki static files"
-    options = { verbose: $DEBUG_RDOC, noop: @dry_run }
+        Dir[(@template_dir + 'js/**/*').to_s].each do |path|
+          next if File.directory?(path)
+          next if File.basename(path).start_with?('.')
 
-    install_rdoc_static_file @template_dir + 'css/rdoc.css', "./css/rdoc.css", options
+          dst = Pathname.new(path).relative_path_from(@template_dir)
 
-    unless @options.template_stylesheets.empty?
-      FileUtils.cp @options.template_stylesheets, '.', **options
-    end
+          install_rdoc_static_file @template_dir + path, dst, options
+        end
+      end
 
-    Dir[(@template_dir + 'js/**/*').to_s].each do |path|
-      next if File.directory?(path)
-      next if File.basename(path).start_with?('.')
+      ##
+      # Build a search index array for Aliki's searcher.
 
-      dst = Pathname.new(path).relative_path_from(@template_dir)
+      def build_search_index
+        setup
 
-      install_rdoc_static_file @template_dir + path, dst, options
-    end
-  end
+        index = []
 
-  ##
-  # Build a search index array for Aliki's searcher.
+        @classes.each do |klass|
+          next unless klass.display?
 
-  def build_search_index
-    setup
+          index << build_class_module_entry(klass)
 
-    index = []
+          klass.constants.each do |const|
+            next unless const.display?
 
-    @classes.each do |klass|
-      next unless klass.display?
+            index << build_constant_entry(const, klass)
+          end
+        end
 
-      index << build_class_module_entry(klass)
+        @methods.each do |method|
+          next unless method.display?
 
-      klass.constants.each do |const|
-        next unless const.display?
+          index << build_method_entry(method)
+        end
 
-        index << build_constant_entry(const, klass)
+        index
       end
-    end
 
-    @methods.each do |method|
-      next unless method.display?
+      ##
+      # Write the search index as a JavaScript file
+      # Format: var search_data = { index: [...] }
+      #
+      # We still write to a .js instead of a .json because loading a JSON file triggers CORS check in browsers.
+      # And if we simply inspect the generated pages using file://, which is often the case due to lack of the server mode,
+      # the JSON file will be blocked by the browser.
 
-      index << build_method_entry(method)
-    end
+      def write_search_index
+        debug_msg "Writing Aliki search index"
 
-    index
-  end
+        index = build_search_index
 
-  ##
-  # Write the search index as a JavaScript file
-  # Format: var search_data = { index: [...] }
-  #
-  # We still write to a .js instead of a .json because loading a JSON file triggers CORS check in browsers.
-  # And if we simply inspect the generated pages using file://, which is often the case due to lack of the server mode,
-  # the JSON file will be blocked by the browser.
+        FileUtils.mkdir_p 'js' unless @dry_run
 
-  def write_search_index
-    debug_msg "Writing Aliki search index"
+        search_index_path = 'js/search_data.js'
+        return if @dry_run
 
-    index = build_search_index
-
-    FileUtils.mkdir_p 'js' unless @dry_run
+        data = { index: index }
+        File.write search_index_path, "var search_data = #{JSON.generate(data)};"
+      end
 
-    search_index_path = 'js/search_data.js'
-    return if @dry_run
+      ##
+      # Returns the type signature of +method_attr+ as HTML with linked type names.
+      # Returns nil if no type signature is present.
 
-    data = { index: index }
-    File.write search_index_path, "var search_data = #{JSON.generate(data)};"
-  end
+      def type_signature_html(method_attr, from_path)
+        lines = method_attr.type_signature_lines || @store.rbs_signature_for(method_attr)
+        return unless lines
 
-  ##
-  # Returns the type signature of +method_attr+ as HTML with linked type names.
-  # Returns nil if no type signature is present.
-
-  def type_signature_html(method_attr, from_path)
-    lines = method_attr.type_signature_lines || @store.rbs_signature_for(method_attr)
-    return unless lines
+        RbsHelper.signature_to_html(
+          lines,
+          lookup: @store.type_name_lookup,
+          from_path: from_path
+        )
+      end
 
-    RDoc::RbsHelper.signature_to_html(
-      lines,
-      lookup: @store.type_name_lookup,
-      from_path: from_path
-    )
-  end
+      ##
+      # Resolves a URL for use in templates. Absolute URLs are returned unchanged.
+      # Relative URLs are prefixed with rel_prefix to ensure they resolve correctly from any page.
+
+      def resolve_url(rel_prefix, url)
+        uri = URI.parse(url)
+        if uri.absolute?
+          url
+        else
+          "#{rel_prefix}/#{url}"
+        end
+      rescue URI::InvalidURIError
+        "#{rel_prefix}/#{url}"
+      end
 
-  ##
-  # Resolves a URL for use in templates. Absolute URLs are returned unchanged.
-  # Relative URLs are prefixed with rel_prefix to ensure they resolve correctly from any page.
+    private
 
-  def resolve_url(rel_prefix, url)
-    uri = URI.parse(url)
-    if uri.absolute?
-      url
-    else
-      "#{rel_prefix}/#{url}"
-    end
-  rescue URI::InvalidURIError
-    "#{rel_prefix}/#{url}"
-  end
+      def template_encoding
+        ::Encoding::UTF_8
+      end
 
-  private
-
-  def build_class_module_entry(klass)
-    type = case klass
-           when RDoc::NormalClass then 'class'
-           when RDoc::NormalModule then 'module'
-           else 'class'
-           end
-
-    entry = {
-      name: klass.name,
-      full_name: klass.full_name,
-      type: type,
-      path: klass.path
-    }
-
-    snippet = klass.search_snippet
-    entry[:snippet] = snippet unless snippet.empty?
-    entry
-  end
+      def build_class_module_entry(klass)
+        type = case klass
+               when NormalClass then 'class'
+               when NormalModule then 'module'
+               else 'class'
+               end
+
+        entry = {
+          name: klass.name,
+          full_name: klass.full_name,
+          type: type,
+          path: klass.path
+        }
+
+        snippet = klass.search_snippet
+        entry[:snippet] = snippet unless snippet.empty?
+        entry
+      end
 
-  def build_method_entry(method)
-    type = method.singleton ? 'class_method' : 'instance_method'
+      def build_method_entry(method)
+        type = method.singleton ? 'class_method' : 'instance_method'
 
-    entry = {
-      name: method.name,
-      full_name: method.full_name,
-      type: type,
-      path: method.path
-    }
+        entry = {
+          name: method.name,
+          full_name: method.full_name,
+          type: type,
+          path: method.path
+        }
 
-    snippet = method.search_snippet
-    entry[:snippet] = snippet unless snippet.empty?
-    entry
-  end
+        snippet = method.search_snippet
+        entry[:snippet] = snippet unless snippet.empty?
+        entry
+      end
 
-  def build_constant_entry(const, parent)
-    entry = {
-      name: const.name,
-      full_name: "#{parent.full_name}::#{const.name}",
-      type: 'constant',
-      path: parent.path
-    }
-
-    snippet = const.search_snippet
-    entry[:snippet] = snippet unless snippet.empty?
-    entry
+      def build_constant_entry(const, parent)
+        entry = {
+          name: const.name,
+          full_name: "#{parent.full_name}::#{const.name}",
+          type: 'constant',
+          path: parent.path
+        }
+
+        snippet = const.search_snippet
+        entry[:snippet] = snippet unless snippet.empty?
+        entry
+      end
+    end
   end
 end