marked-conductor 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e859f85b430fafdb74633e795caefd6cfc14ce26585970026d77c20ddce06c2
-  data.tar.gz: 292fbc78bdeaeb3480092872afa558c25fa156c1cb80784eee98c87dca55f253
+  metadata.gz: 0bd701f59c197143e9a8744da69209db39e2b2f124cd239cd0c21bd11f791b81
+  data.tar.gz: e18d60353643a68a1b93f1f73c7f7f7e2bf26884593e2b7b2895f0b775a8c102
 SHA512:
-  metadata.gz: 5ea468effe4d2be8b534d7bc9ea27dbb09a57f756393d7aebe4a33cda998326fb0eaa8b31194bc8c17e21487d3dd28aeaf3cedf21b707e61bda65a2253a609b8
-  data.tar.gz: 893e362f929e2a26a4815bc3782d758d6f4d25270ca2137867c56de846b5755adbb4dc1bf3983b996b88a61e904731220d2c76123f523825d88be39dc5bb4ebd
+  metadata.gz: 86811c1cee6bc68847e79231af591abe4f94aa45fea9eb8e9ac9c3f288dd92e26db64068b405a647523829fa1109d4fa8fea699cfa73a0e3d527a924ae1db074
+  data.tar.gz: ca22bf9fa7db8390b7a0b0851d1d71e58c8cb45e4454d21d49b9cac455343f09ca67068e343acb2373df7250284c69b791d9d4510bbee58fccd6bf490294565b

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.0.23
+
+2024-07-17 15:51
+
+#### FIXED
+
+- Environment variable escaping was hyperactive, only escape includes array
+
+### 1.0.22
+
+2024-07-16 12:30
+
+#### IMPROVED
+
+- When injecting CSS or JS paths, URL encode the path
+
+#### FIXED
+
+- Shell escape environment variables
+
 ### 1.0.21
 
 2024-07-10 12:18

data/README.md

@@ -177,9 +177,9 @@ If the path for `insertScript` or `insertCSS` is a URL instead of a filename, th
 
 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`. Must be run on Markdown, not HTML.
+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 (prior to any postprocessor HTML conversion).
 
-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.
+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. Must be run on Markdown (prior to any postprocessor HTML conversion).
 
 **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.
 

data/buildnotes.md

@@ -0,0 +1,41 @@
+template: git, gem, project
+project: conductor
+readme: src/_README.md
+
+# marked-conductor
+
+Train conductor for Marked
+
+## File Structure
+
+Standard gem structure.
+
+## Deploy
+
+You no longer need to manually bump the version, it will be incremented when this task runs.
+
+```run Update Changelog
+#!/bin/bash
+
+changelog -u
+```
+
+@include(project:Update GitHub README)
+
+```run Commit with changelog
+#!/bin/bash
+
+changelog | git commit -a -F -
+git pull
+git push
+```
+
+@include(gem:Release Gem) Release Gem
+@include(project:Update Blog Project) Update Blog Project
+@run(rake bump[patch]) Bump Version
+
+@run(git commit -am 'Version bump')
+
+@after
+Don't forget to publish the website!
+@end

data/lib/conductor/env.rb

@@ -56,7 +56,7 @@ module Conductor
         "MARKED_CSS_PATH" => @env[:css_path],
         "MARKED_EXT" => @env[:ext],
         "MARKED_ORIGIN" => @env[:origin],
-        "MARKED_INCLUDES" => @env[:includes],
+        "MARKED_INCLUDES" => Shellwords.escape(@env[:includes]),
         "MARKED_PATH" => @env[:filepath],
         "MARKED_PHASE" => @env[:phase],
         "OUTLINE" => @env[:outline],

data/lib/conductor/filter.rb

@@ -2,6 +2,19 @@
 
 # String helpers
 class ::String
+  def find_file_in(paths, filename, ext)
+    return filename if File.exist?(filename)
+
+    filename = File.basename(filename, ".#{ext}")
+
+    paths.each do |path|
+      exp = File.join(File.expand_path('~/.config/conductor/'), path, "#{filename}.#{ext}")
+      return exp if File.exist?(exp)
+    end
+
+    "#{filename}.#{ext}"
+  end
+
   def normalize_filter
     parts = match(/(?<filter>[\w_]+)(?:\((?<paren>.*?)\))?$/i)
     filter = parts["filter"].downcase.gsub(/_/, "")
@@ -9,6 +22,11 @@ class ::String
     [filter, params]
   end
 
+  ##
+  ## Determine type of metadata (yaml, mmd, none)
+  ##
+  ## @return     [Symbol] metadata type
+  ##
   def meta_type
     lines = split(/\n/)
     case lines[0]
@@ -124,6 +142,7 @@ class ::String
   end
 
   def insert_stylesheet(path)
+    path = find_file_in(['css', 'styles'], path, 'css') unless path =~ /^http/
     inject_after_meta(%(<link rel="stylesheet" href="#{path.strip}">))
   end
 
@@ -200,7 +219,7 @@ class ::String
   end
 
   def insert_javascript(path)
-    %(#{self}\n<script type="javascript" src="#{path.strip}"></script>\n)
+    %(#{self}\n<script type="javascript" src="#{ERB::Util.url_encode(path.strip)}"></script>\n)
   end
 
   def insert_raw_javascript(content)
@@ -514,6 +533,11 @@ class Filter < String
     content = Conductor.stdin
 
     case @filter
+    when /(insert|add|inject)stylesheet/
+      @params.each do |sheet|
+        content = content.insert_stylesheet(sheet)
+      end
+      content
     when /(insert|add|inject)(css|style)/
       @params.each do |css|
         content = content.insert_css(css)

data/lib/conductor/version.rb

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

data/lib/conductor.rb

@@ -7,6 +7,7 @@ require "fcntl"
 require "time"
 require "chronic"
 require "fileutils"
+require "erb"
 require_relative "conductor/version"
 require_relative "conductor/env"
 require_relative "conductor/config"

data/src/_README.md

@@ -177,9 +177,9 @@ If the path for `insertScript` or `insertCSS` is a URL instead of a filename, th
 
 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`. Must be run on Markdown, not HTML.
+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 (prior to any postprocessor HTML conversion).
 
-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.
+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. Must be run on Markdown (prior to any postprocessor HTML conversion).
 
 **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.
 

data/test.sh

@@ -49,7 +49,7 @@ if [[ -z $1 ]]; then
 	exit 1
 fi
 
-FILE=$(realpath $1)
+FILE=$(realpath "$1")
 FILENAME=$(basename -- "$FILE")
 EXTENSION="${FILENAME##*.}"
 PHASE=$(echo $PHASE | tr [a-z] [A-Z])
@@ -67,7 +67,7 @@ export MARKED_EXT="$EXTENSION"
 export MARKED_CSS_PATH="/Applications/Marked 2.app/Contents/Resources/swiss.css"
 export PATH="$PATH:$(dirname "$FILE")"
 export MARKED_PATH="$FILE"
-export MARKED_INCLUDES=""
+export MARKED_INCLUDES="/Applications/Marked 2.app/Contents/Resources/tocstyle.css"
 export MARKED_PHASE="$PHASE"
 
 if [[ $STD =~ ^(STD)?E ]]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.23
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -204,6 +204,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/conductor
+- buildnotes.md
 - images/preferences.jpg
 - lib/conductor.rb
 - lib/conductor/array.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A custom processor manager for Marked 2 (Mac)