rdoc-markdown 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5f77f880bb2c5dee60d22aaec8c1ed37e2525234afab66983549482406e321
-  data.tar.gz: c395b71591e6c71e16ef766cd6b389eb47a3c520dd859c6605b3540b30e98b83
+  metadata.gz: 7fe864809969e8bc21a90e174270ac16a0d346dc7e909b2bc621af2518bbc971
+  data.tar.gz: 8aa123afbc0ba9e29fe03e3d922636cae237183bfa0af99ac25feed38fe7eb12
 SHA512:
-  metadata.gz: 39fca2d4e12f36652b1991d6bbada634b1f7b3d2280c1d39c9a0dce6398aa7210384d1451ff43797f9fd09bdf897fc14ff92b0b2c20159bf74653c2a27da24c6
-  data.tar.gz: 90fb4b652886f2f8da0637ac102ec728bd457c9eb49b77b27e542afe945b5da211a5b57a3b860c4edc711f57a6a5ce8a121bff73ae542daad051a57356ac348f
+  metadata.gz: 452aa91cfc511f89e840b11b76dcaa8b6cb295acf8e20a59296f9298991d0c46a03274bc09e2e53ad56901803dd03cb36786480f574b222e547267cc1df0d9ad
+  data.tar.gz: ecabd0ada5aae3f3e0055f6cee4e8a41cf10497d13f116a05dae7863c1f6d15d3f6b4166602d947c96a7a9e624e2bcb637056feae2b083c8596c9c5675a43e4d

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## 0.20.0
+
+- Restore legacy anchors in a single Markdown substitution pass.
+- Reduce internal-link candidate construction and deduplication work.
+
+## 0.19.1
+
+- Store fullpath for files, instead of just file names.
+
 ## 0.19.0
 
 - Remove the `markdown_unknown_tags` option and use reverse_markdown's default handling.

data/lib/rdoc/generator/markdown/conversion.rb

@@ -14,7 +14,7 @@ class RDoc::Generator::Markdown::Conversion
     document = fragment.document
     fragment.css("a").each { |link| normalize_link(link, document) }
     markdown = ReverseMarkdown.convert(fragment, github_flavored: true).dup
-    anchor_aliases.each { |token, id| markdown.gsub!(token, %(<a id="#{id}"></a>)) }
+    markdown.gsub!(Regexp.union(anchor_aliases.keys), anchor_aliases)
     normalize_definition_list_code_blocks(markdown).rstrip.gsub(/^(#+)(\s)/) do
       "#{"#" * [Regexp.last_match(1).length + heading_level_offset, 6].min}#{Regexp.last_match(2)}"
     end
@@ -101,13 +101,13 @@ class RDoc::Generator::Markdown::Conversion
     #
     # @param anchors [Nokogiri::XML::NodeSet] Legacy anchor spans.
     #
-    # @return [Array<Array<String>>] Token and anchor ID pairs.
+    # @return [Hash{String => String}] Token-to-anchor HTML lookup.
     def tokenize_legacy_anchors(anchors)
-      anchors.map.with_index do |span, index|
+      anchors.each.with_index.to_h do |span, index|
         token = "RDocMarkdownAnchor#{index}End"
-        id = span["id"]
+        anchor = %(<a id="#{span["id"]}"></a>)
         span.replace(token)
-        [token, id]
+        [token, anchor]
       end
     end
 

data/lib/rdoc/generator/markdown/index.rb

@@ -19,7 +19,7 @@ module RDoc::Generator::Markdown::Index
   def write_index(csv)
     csv << %w[name type path]
     classes.each { |klass| write_class_rows(csv, klass, output_path_for(klass)) }
-    pages.each { |page| csv << [File.basename(normalize_input_path_for_output(page.relative_name)), "File", page_output_path(page)] }
+    pages.each { |page| csv << [normalize_input_path_for_output(page.relative_name), "File", page_output_path(page)] }
   end
 
   # Writes one class and its visible member rows.

data/lib/rdoc/generator/markdown/paths.rb

@@ -83,11 +83,16 @@ module RDoc::Generator::Markdown::Paths
   #
   # @return [String, nil] Resolved output path, or nil when unresolved.
   def self.resolve_output_path_from(path, current_dir, state)
+    return if path.empty? || path.match?(%r{\A(?:[a-z][a-z0-9+.-]*:|//)}i)
+
     candidates = [path, path.delete_prefix("#{state.root_path_segment}/")]
     candidates += candidates.map { |candidate| candidate.sub(/_(md|markdown)\.md\z/i, '.\1') }
-    expanded_candidates = candidates.map { |candidate| current_dir.join(candidate).cleanpath.to_s }
+    candidates.uniq!
 
-    (candidates + expanded_candidates).find { |candidate| state.known_output_paths.include?(candidate) }
+    candidates.find { |candidate| state.known_output_paths.include?(candidate) } ||
+      candidates.lazy
+        .map { |candidate| current_dir.join(candidate).cleanpath.to_s }
+        .find { |candidate| state.known_output_paths.include?(candidate) }
   end
 
   # Normalizes an input filename into an output-relative source path.

data/lib/rdoc/generator/markdown.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require "erb"
+# standard:disable Lint/RedundantRequireStatement
+require "set"
+# standard:enable Lint/RedundantRequireStatement
 require "reverse_markdown"
 require "csv"
 require "fileutils"
@@ -173,8 +176,8 @@ class RDoc::Generator::Markdown
       classes: classes,
       pages: pages,
       class_output_paths: class_output_paths,
-      markdown_output_object_ids: (classes + pages).map(&:object_id),
-      known_output_paths: class_output_paths.values + pages.map { |page| page_output_path(page) },
+      markdown_output_object_ids: (classes + pages).to_set(&:object_id),
+      known_output_paths: class_output_paths.values.to_set.merge(pages.map { |page| page_output_path(page) }),
       root_path_segment: Pathname.new(options.root || ".").basename
     )
   end

data/lib/rdoc/markdown/version.rb

@@ -5,6 +5,6 @@ module Rdoc
   # @private
   module Markdown
     # @private
-    VERSION = "0.19.0"
+    VERSION = "0.20.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc-markdown
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Stanislav (Stas) Katkov
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.19
 specification_version: 4
 summary: RDoc plugin to generate markdown documentation
 test_files: []