rdoc-markdown 0.17.0 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8f2f083fa79cfc383a5de5efe80ed2ce86ca5c8820218ae57f9de9427f8e6e
-  data.tar.gz: b9380e6323ce669abc903f3fb29f598cd346f017c565ef4c7f8d48146124184a
+  metadata.gz: b8caf2553ce9d28bdd362ab86ee4ee7b18981e3da7254dd0e752de2471e70c69
+  data.tar.gz: c67f5d859ffe70426fde7cd058486c0ced84e9c5066a1340574b8342b458d6e0
 SHA512:
-  metadata.gz: 7245acbe5230c82d9209a9203d9c86dfcd18416b1a60b56c574b5c59bbf81a752c388771e81e7cb135d9197620f2bc7f497db3ad33a0d7151ae1032b1f0b8115
-  data.tar.gz: 547ef3178aceffcf1e44ace777f18e97ed4ffc370ab3e99526ebbcebc053eca307c0c57e9f5d739ebc3b8156912c1b9dc13fbb08289408130c1bc38c92d87855
+  metadata.gz: 716297af9880007fc262c1c207603c5ad77d1cface68a5e08c22c9523b4e48e2d1952559fa1909ddd5d6d8f20f3e4169c9688a409125146d1eeccfbaeb19499c
+  data.tar.gz: 28949178739a1d0539c5a9d45ef260513b18f929f95db6b3a02feed82b45a24fb2f7bd2fb19cc90ea2688a923e9ff8fd7c8be53e25ac851e7b5168a61f654fb4

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 
 ## Unreleased
 
+
+## 0.17.2
+
+- Remove spaces after headers
+- Remove legacy anchor links
+- Remove extra files that are not required (js, css and etc)
+
+## 0.17.1
+
+- Don't include files with .tt extension
+
 ## 0.17.0
 
 - Remove fabricated external namespaces and preserve exact class and module identities across generated paths, index entries, metadata, and links.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdoc-markdown (0.17.0)
+    rdoc-markdown (0.17.2)
       csv
       erb
       rdoc (>= 8.0)
@@ -108,7 +108,7 @@ GEM
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.0.2)
+    rbs (4.1.0)
       logger
       prism (>= 1.6.0)
       tsort

data/lib/rdoc/generator/markdown.rb

@@ -224,7 +224,7 @@ class RDoc::Generator::Markdown
       out_file = Pathname.new("#{output_dir}/#{page_output_path(page)}")
       out_file.dirname.mkpath
 
-      next FileUtils.cp(File.expand_path(page.absolute_name, @source_dir), out_file) if page.relative_name.end_with?(".md", ".markdown")
+      next FileUtils.cp(File.expand_path(page.absolute_name, @source_dir), out_file) if page.relative_name.match?(/\.(?:md|markdown)\z/i)
 
       content = markdownify(render_description(page))
       File.write(out_file, finalize_markdown(
@@ -250,7 +250,7 @@ class RDoc::Generator::Markdown
   # @return [String] Relative Markdown path.
   def page_output_path(page)
     source_path = normalize_input_path_for_output(page.relative_name)
-    return source_path if page.relative_name.match?(/\.(?:md|markdown)\z/)
+    return source_path if page.relative_name.match?(/\.(?:md|markdown)\z/i)
 
     dirname = File.dirname(source_path)
     basename = "#{File.basename(source_path).tr(".", "_")}.md"
@@ -306,6 +306,13 @@ class RDoc::Generator::Markdown
     # - raise - Raise an error to let you know
 
     fragment = Nokogiri::HTML.fragment(input)
+    fragment.css("span.legacy-anchor[id]").select do |span|
+      span.next_element&.name == "h1" && span["id"].match?(/\A(?:class|module)-/)
+    end.each(&:remove)
+    fragment.css("span.legacy-anchor[id]").each do |span|
+      heading = span.next_element
+      heading.add_child(span) if heading&.name&.match?(/\Ah[1-6]\z/)
+    end
 
     fragment.css("pre").each do |pre|
       language = pre["class"].to_s[/\A(?!highlight\z)[A-Za-z][A-Za-z0-9_+-]*\z/]
@@ -357,9 +364,7 @@ class RDoc::Generator::Markdown
       unknown_tags: @markdown_unknown_tags
     ).dup
     anchor_aliases.each do |token, id|
-      anchor = %(<a id="#{id}"></a>)
-      md.gsub!("#{token}\n\n#", "#{anchor}\n#")
-      md.gsub!(token, anchor)
+      md.gsub!(token, %(<a id="#{id}"></a>))
     end
 
     normalize_definition_list_code_blocks(md).rstrip
@@ -607,6 +612,7 @@ class RDoc::Generator::Markdown
     output = content.lines.map(&:rstrip).join("\n")
     output = normalize_internal_links(output, current_output_path: current_output_path)
     output = output.sub(/\n{3,}/, "\n\n")
+    output = output.gsub(/^(#+ .+)\n\n/, "\\1\n")
     "#{output}\n"
   end
 
@@ -711,7 +717,7 @@ class RDoc::Generator::Markdown
   # @return [String, nil] Resolved output path, or nil when unresolved.
   def resolve_output_path(path, current_dir)
     candidates = [path, path.delete_prefix("#{@root_path_segment}/")]
-    candidates += candidates.map { |candidate| candidate.sub(/_(md|markdown)\.md\z/, '.\1') }
+    candidates += candidates.map { |candidate| candidate.sub(/_(md|markdown)\.md\z/i, '.\1') }
 
     candidates.each do |candidate|
       return candidate if @known_output_paths.include?(candidate)
@@ -760,7 +766,9 @@ class RDoc::Generator::Markdown
         klass.sections.any? { |section| section.title.to_s.match?(/\S/) || !section.to_document.empty? }
     end.sort
     @class_output_paths = @classes.to_h { |klass| [klass.full_name, output_path_for(klass)] }
-    @pages = @store.all_files.select(&:text?).select(&:display?).sort_by(&:base_name)
+    @pages = @store.all_files.select(&:text?).select(&:display?)
+      .select { |page| page.relative_name.match?(/\.(?:md|markdown|rdoc)\z/i) }
+      .sort_by(&:base_name)
     @markdown_output_object_ids = (@classes + @pages).map(&:object_id)
     @known_output_paths = @class_output_paths.values
     @pages.each { |page| @known_output_paths << page_output_path(page) }

data/lib/rdoc/markdown/version.rb

@@ -5,6 +5,6 @@ module Rdoc
   # @private
   module Markdown
     # @private
-    VERSION = "0.17.0"
+    VERSION = "0.17.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc-markdown
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.2
 platform: ruby
 authors:
 - Stanislav (Stas) Katkov