marked-conductor 1.0.19 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36eba533a0b58958b2a4a9cb9c1a4ec2e9d93a1f57fb91524fead2ef93f55a5
-  data.tar.gz: 37897dda228ea0b7f8e84c233fb5703c4ed2e9573fe412ae54b724f7d0c6ef4f
+  metadata.gz: 5e859f85b430fafdb74633e795caefd6cfc14ce26585970026d77c20ddce06c2
+  data.tar.gz: 292fbc78bdeaeb3480092872afa558c25fa156c1cb80784eee98c87dca55f253
 SHA512:
-  metadata.gz: 15a5ec6f5a56f5def420bddbd26c4c644f0ce37e3b32a430d13ba51d35957811f882778ce5f9cd396bde255607ef6697b6c07ce7b64a7a3191548f3302705a76
-  data.tar.gz: 73472bc3cb6add78f1566d79e7b5c032da312af0021fc7ccebb17523ba719ca1e7f65f5ab478d05a4e5f29782a62141c169c74136997085230be45c23f2f607f
+  metadata.gz: 5ea468effe4d2be8b534d7bc9ea27dbb09a57f756393d7aebe4a33cda998326fb0eaa8b31194bc8c17e21487d3dd28aeaf3cedf21b707e61bda65a2253a609b8
+  data.tar.gz: 893e362f929e2a26a4815bc3782d758d6f4d25270ca2137867c56de846b5755adbb4dc1bf3983b996b88a61e904731220d2c76123f523825d88be39dc5bb4ebd

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.0.21
+
+2024-07-10 12:18
+
+#### NEW
+
+- New filter `fixHeaders` will adapt all headlines in the document to be in semantic order
+
+### 1.0.20
+
+2024-07-04 12:18
+
+#### NEW
+
+- The `insertTitle` filter can now take an argument of `true` or a number and will shift the remaining headlines in the document by 1 (or the number given in the argument), allowing for title insertion while only having 1 H1 in the document.
+
+#### IMPROVED
+
+- Ignore self-linking urls in single quotes, just in case they're used in a script line
+
 ### 1.0.19
 
 2024-07-02 11:25

data/README.md

@@ -163,6 +163,7 @@ The action can be `script`, `command`, or `filter`.
 | `prepend/appendCode(path)` | insert a file as a code block at beginning or end of content |
 | `insertCSS(path)` | insert custom CSS into document |
 | `autoLink()` | Turn bare URLs into \<self-linked\> urls |
+| `fixHeaders()` | Reorganize headline levels to semantic order |
 
 For `replace` and `replaceAll`: If *search* is surrounded with forward slashes followed by optional flags (*i* for case-insensitive, *m* to make dot match newlines), e.g. `/contribut(ing)?/i`, it will be interpreted as a regular expression. The *replace* value can include numeric capture groups, e.g. `Follow$2`.
 
@@ -170,11 +171,17 @@ For `insertScript`, if path is just a filename it will look for a match in `~/.c
 
 For `insertCSS`, if path is just a filename (with or without .css extension), the file will be searched for in `~/.config/conductor/css` or `~/.config/conductor/files` and injected. CSS will be compressed using the YUI algorithm and inserted at the top of the document, but after any existing metadata.
 
+For `insertTitle`, if an argument of `true` or a number is given (e.g. `insertTitle(true)`, the headers in the document will be shifted by 1 (or by the number given) so that there's only one H1 in the document.
+
 If the path for `insertScript` or `insertCSS` is a URL instead of a filename, the URL will be properly inserted instead of a file path. Inserted scripts will be surrounded with `<div>` tags, which fixes a quirk with javascript in Marked.
 
 For all of the prepend/append file filters, you can store files in `~/.config/conductor/files` and reference them with just a filename. Otherwise a full path will be assumed.
 
-For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`.
+For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`. Must be run on Markdown, not HTML.
+
+For `fixHeaders`, it will be ensured that the document has an h1, and all header levels will be adapted to never jump more than one header level when increasing. If no H1 exists in the document, the first header of the lowest existing level will be turned into an H1 and all other headers will be decremented to fit the hierarchy. It's not perfect, but it does a pretty good job. When saving the document as Markdown from Marked, the new headers will be applied.
+
+**Note:** successive filters in a sequence that insert or prepend will always insert content before/above the result of the previous insert filter. So if you have an `insertTitle` filter followed by an `insertCSS` filter, the CSS will appear above the inserted title. If you want elements inserted in reverse order, reverse the order of the inserts in the sequence.
 
 > Example:
 > 

data/lib/conductor/config.rb

@@ -15,6 +15,8 @@ module Conductor
       @tracks = @config["tracks"].symbolize_keys
     end
 
+    private
+
     def create_config(config_file)
       config_dir = File.dirname(config_file)
       scripts_dir = File.dirname(File.join(config_dir, "scripts"))

data/lib/conductor/filter.rb

@@ -69,9 +69,40 @@ class ::String
     first
   end
 
+  ##
+  ## Count the characters in a string
+  ##
+  ## @return     [Integer] number of characters
+  ##
+  def chars
+    split(//).count
+  end
+
+  def decrease_headers(amt = 1)
+    gsub(/^(\#{1,6})(?!=#)/) do
+      m = Regexp.last_match
+      level = m[1].chars
+      level -= amt
+      level = 1 if level < 1
+      "#{"#" * level}"
+    end
+  end
+
+  def decrease_headers!(amt = 1)
+    replace decrease_headers(amt)
+  end
+
+  def increase_headers(amt = 1)
+    gsub(/^#/, "#{"#" * amt}#").gsub(/^\#{7,}/, '######')
+  end
+
+  def increase_headers!(amt = 1)
+    replace increase_headers(amt)
+  end
+
   def insert_toc(max = nil, after = :h1)
     lines = split(/\n/)
-    max = max && max.to_i.positive? ? " max#{max}" : ""
+    max = max.to_i&.positive? ? " max#{max}" : ""
     line = case after.to_sym
            when :h2
              first_h2.positive? ? first_h2 + 1 : 0
@@ -234,10 +265,12 @@ class ::String
     title
   end
 
-  def insert_title
+  def insert_title(shift: 0)
+    content = dup
     title = get_title
-    lines = split(/\n/)
-    insert_point = meta_insert_point
+    content.increase_headers!(shift) if shift.positive?
+    lines = content.split(/\n/)
+    insert_point = content.meta_insert_point
     insert_at = insert_point.positive? ? insert_point + 1 : 0
     lines.insert(insert_at, "# #{title}\n")
     lines.join("\n")
@@ -328,10 +361,125 @@ class ::String
   end
 
   def autolink
-    gsub(%r{(?mi)(?<!\(|\]: |")\b((?:[\w-]+?://)[-a-zA-Z0-9@:%._+~#=]{2,256}\b(?:[-a-zA-Z0-9@:%_+.~#?&/=]*))},
+    gsub(%r{(?mi)(?<!\(|\]: |"|')\b((?:[\w-]+?://)[-a-zA-Z0-9@:%._+~#=]{2,256}\b(?:[-a-zA-Z0-9@:%_+.~#?&/=]*))},
          '<\1>')
   end
 
+  ##
+  ## Count the number of h1 headers in the document
+  ##
+  ## @return     Number of h1s.
+  ##
+  def count_h1s
+    scan(/^#[^#]/).count
+  end
+
+  ##
+  ## Normalize Setext headers to ATX
+  ##
+  ## @return [String] content with headers updated
+  ##
+  def normalize_headers
+    gsub(/^(\S.*)\n([=-]+)\n/) do
+      m = Regexp.last_match
+      case m[2]
+      when /\=/
+        "# #{m[1]}\n\n"
+      else
+        "## #{m[1]}\n\n"
+      end
+    end
+  end
+
+  def normalize_headers!
+    replace normalize_headers
+  end
+
+  ##
+  ## Ensure there's at least 1 h1 in the document
+  ##
+  ## If no h1 is found, converts the lowest level header (first one) into an h1
+  ##
+  ## @return     [String] content with at least 1 h1
+  ##
+  def ensure_h1
+    headers = to_enum(:scan, /(\#{1,6})([^#].*?)$/m).map { Regexp.last_match }
+    return self if headers.select { |h| h[1].chars == 1 }.count.positive?
+
+    lowest_header = headers.min_by { |h| h[1].chars }
+    level = lowest_header[1].chars
+
+    sub(/#{Regexp.escape(lowest_header[0])}/, "# #{lowest_header[2].strip}").decrease_headers(level)
+  end
+
+  def ensure_h1!
+    replace ensure_h1
+  end
+
+  ##
+  ## Bump all headers except for first H1
+  ##
+  ## @return     Content with adjusted headers
+  ##
+  def fix_headers
+    return self if count_h1s == 1
+
+    first_h1 = true
+
+    gsub(%r/^(\#{1,6})([^#].*?)$/m) do
+      m = Regexp.last_match
+      level = m[1].chars
+      content = m[2].strip
+      if level == 1 && first_h1
+        first_h1 = false
+        m[0]
+      else
+        level += 1 if level < 6
+
+        "#{"#" * level} #{content}"
+      end
+    end
+  end
+
+  def fix_headers!
+    replace fix_headers
+  end
+
+  ##
+  ## Adjust header levels so there's no jump greater than 1
+  ##
+  ## @return     Content with adjusted headers
+  ##
+  def fix_hierarchy
+    normalize_headers!
+    ensure_h1!
+    fix_headers!
+    headers = to_enum(:scan, /(\#{1,6})([^#].*?)$/m).map { Regexp.last_match }
+    content = dup
+    last = 1
+    headers.each do |h|
+      level = h[1].chars
+      if level <= last + 1
+        last = level
+        next
+      end
+
+      level = last + 1
+      content.sub!(/#{Regexp.escape(h[0])}/, "#{"#" * level} #{h[2].strip}")
+    end
+
+    content
+  end
+
+  ##
+  ## Convert a string to a regular expression
+  ##
+  ## If the string matches /xxx/, it will be interpreted
+  ## directly as a regex. Otherwise it will be escaped and
+  ## converted to regex.
+  ##
+  ## @return     [Regexp] Regexp representation of the string.
+  ##
   def to_rx
     if self =~ %r{^/(.*?)/([im]+)?$}
       m = Regexp.last_match
@@ -343,6 +491,11 @@ class ::String
     end
   end
 
+  ##
+  ## Convert a string containing $1, $2 to a Regexp replace pattern
+  ##
+  ## @return     [String] Pattern representation of the object.
+  ##
   def to_pattern
     gsub(/\$(\d+)/, '\\\\\1').gsub(/(^["']|["']$)/, "")
   end
@@ -367,7 +520,15 @@ class Filter < String
       end
       content
     when /(insert|add|inject)title/
-      content.insert_title
+      amt = 0
+      if @params
+        amt = if @params[0] =~ /^[yts]/
+                1
+              else
+                @params[0].to_i
+              end
+      end
+      content.insert_title(shift: amt)
     when /(insert|add|inject)script/
       content.append!("\n\n<div>")
       @params.each do |script|
@@ -427,6 +588,8 @@ class Filter < String
       content.replace_one(@params[0], @params[1])
     when /(auto|self)link/
       content.autolink
+    when /fix(head(lines|ers)|hierarchy)/
+      content.fix_hierarchy
     end
   end
 end

data/lib/conductor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conductor
-  VERSION = '1.0.19'
+  VERSION = '1.0.21'
 end

data/src/_README.md

@@ -163,6 +163,7 @@ The action can be `script`, `command`, or `filter`.
 | `prepend/appendCode(path)` | insert a file as a code block at beginning or end of content |
 | `insertCSS(path)` | insert custom CSS into document |
 | `autoLink()` | Turn bare URLs into \<self-linked\> urls |
+| `fixHeaders()` | Reorganize headline levels to semantic order |
 
 For `replace` and `replaceAll`: If *search* is surrounded with forward slashes followed by optional flags (*i* for case-insensitive, *m* to make dot match newlines), e.g. `/contribut(ing)?/i`, it will be interpreted as a regular expression. The *replace* value can include numeric capture groups, e.g. `Follow$2`.
 
@@ -170,11 +171,17 @@ For `insertScript`, if path is just a filename it will look for a match in `~/.c
 
 For `insertCSS`, if path is just a filename (with or without .css extension), the file will be searched for in `~/.config/conductor/css` or `~/.config/conductor/files` and injected. CSS will be compressed using the YUI algorithm and inserted at the top of the document, but after any existing metadata.
 
+For `insertTitle`, if an argument of `true` or a number is given (e.g. `insertTitle(true)`, the headers in the document will be shifted by 1 (or by the number given) so that there's only one H1 in the document.
+
 If the path for `insertScript` or `insertCSS` is a URL instead of a filename, the URL will be properly inserted instead of a file path. Inserted scripts will be surrounded with `<div>` tags, which fixes a quirk with javascript in Marked.
 
 For all of the prepend/append file filters, you can store files in `~/.config/conductor/files` and reference them with just a filename. Otherwise a full path will be assumed.
 
-For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`.
+For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`. Must be run on Markdown, not HTML.
+
+For `fixHeaders`, it will be ensured that the document has an h1, and all header levels will be adapted to never jump more than one header level when increasing. If no H1 exists in the document, the first header of the lowest existing level will be turned into an H1 and all other headers will be decremented to fit the hierarchy. It's not perfect, but it does a pretty good job. When saving the document as Markdown from Marked, the new headers will be applied.
+
+**Note:** successive filters in a sequence that insert or prepend will always insert content before/above the result of the previous insert filter. So if you have an `insertTitle` filter followed by an `insertCSS` filter, the CSS will appear above the inserted title. If you want elements inserted in reverse order, reverse the order of the inserts in the sequence.
 
 > Example:
 > 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.21
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print