marked-conductor 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36eba533a0b58958b2a4a9cb9c1a4ec2e9d93a1f57fb91524fead2ef93f55a5
-  data.tar.gz: 37897dda228ea0b7f8e84c233fb5703c4ed2e9573fe412ae54b724f7d0c6ef4f
+  metadata.gz: c1f949d9bf655cb035b9bc2ed9f023e49c475effab65533f30b86c5392fa9908
+  data.tar.gz: de2824955f1c84608c3c32e5c9ef43b9b28a9e9623f454723ca7ddff3cede011
 SHA512:
-  metadata.gz: 15a5ec6f5a56f5def420bddbd26c4c644f0ce37e3b32a430d13ba51d35957811f882778ce5f9cd396bde255607ef6697b6c07ce7b64a7a3191548f3302705a76
-  data.tar.gz: 73472bc3cb6add78f1566d79e7b5c032da312af0021fc7ccebb17523ba719ca1e7f65f5ab478d05a4e5f29782a62141c169c74136997085230be45c23f2f607f
+  metadata.gz: 0f9c7c098a2e714ddca8673eda552d912319822c3a3c711fbfdba1a816e3f26dc8e42162532a68ccd1fb478d0452304b72e2a0d19c2a3025766ee9e0b3800db2
+  data.tar.gz: ae32f776ecbd94a2eba88b92fbdb3f30c016ace349ded8f8b64ecf1fb688125732d790f6d5ad31152ec74570aab16ef859be9bb43b0df49219086d64c0f52169

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 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

@@ -170,12 +170,16 @@ 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`.
 
+**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:
 > 
 >    filter: setStyle(github)

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,17 @@ class ::String
     first
   end
 
+  def shift_headers(amt = 1)
+    gsub(/^#/, "#{"#" * amt}#")
+  end
+
+  def shift_headers!(amt = 1)
+    replace shift_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 +242,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.shift_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,7 +338,7 @@ 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
 
@@ -367,7 +377,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|

data/lib/conductor/version.rb

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

data/src/_README.md

@@ -170,12 +170,16 @@ 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`.
 
+**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:
 > 
 >    filter: setStyle(github)

metadata

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