marked-conductor 1.0.14 → 1.0.16

data/lib/conductor/yui-compressor.rb

@@ -0,0 +1,230 @@
+# This is a Ruby port of the YUI CSS compressor
+# See LICENSE for license information
+
+module YuiCompressor
+  # Compress CSS rules using a variety of techniques
+
+  class Yui
+    attr_reader :input_size, :output_size
+
+    def initialize
+      @preservedTokens = []
+      @comments = []
+      @input_size = 0
+      @output_size = 0
+    end
+
+    def compress(css, line_length = 0)
+      @input_size = css.length
+
+      css = process_comments_and_strings(css)
+
+      # Normalize all whitespace strings to single spaces. Easier to work with that way.
+      css.gsub!(/\s+/, ' ')
+
+      # Remove the spaces before the things that should not have spaces before them.
+      # But, be careful not to turn "p :link {...}" into "p:link{...}"
+      # Swap out any pseudo-class colons with the token, and then swap back.
+      css.gsub!(/(?:^|\})[^{:]+\s+:+[^{]*\{/) do |match|
+        match.gsub(':', '___PSEUDOCLASSCOLON___')
+      end
+      css.gsub!(/\s+([!{};:>+()\],])/, '\1')
+      css.gsub!(/([!{}:;>+(\[,])\s+/, '\1')
+      css.gsub!('___PSEUDOCLASSCOLON___', ':')
+
+      # special case for IE
+      css.gsub!(/:first-(line|letter)(\{|,)/, ':first-\1 \2')
+
+      # no space after the end of a preserved comment
+      css.gsub!(%r{\*/ }, '*/')
+
+      # If there is a @charset, then only allow one, and push to the top of the file.
+      css.gsub!(/^(.*)(@charset "[^"]*";)/i, '\2\1')
+      css.gsub!(/^(\s*@charset [^;]+;\s*)+/i, '\1')
+
+      # Put the space back in some cases, to support stuff like
+      # @media screen and (-webkit-min-device-pixel-ratio:0){
+      css.gsub!(/\band\(/i, 'and (')
+
+      # remove unnecessary semicolons
+      css.gsub!(/;+\}/, '}')
+
+      # Replace 0(%, em, ex, px, in, cm, mm, pt, pc) with just 0.
+      css.gsub!(/([\s:])([+-]?0)(?:%|em|ex|px|in|cm|mm|pt|pc)/i, '\1\2')
+
+      # Replace 0 0 0 0; with 0.
+      css.gsub!(/:(?:0 )+0(;|\})/, ':0\1')
+
+      # Restore background-position:0 0; if required
+      css.gsub!(/(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|\})/i) {
+ "#{::Regexp.last_match(1).downcase}:0 0#{::Regexp.last_match(2)}" }
+
+      # Replace 0.6 with .6, but only when preceded by : or a space.
+      css.gsub!(/(:|\s)0+\.(\d+)/, '\1.\2')
+
+      # Shorten colors from rgb(51,102,153) to #336699
+      # This makes it more likely that it'll get further compressed in the next step.
+      css.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |_match|
+        '#' << ::Regexp.last_match(1).scan(/\d+/).map {|n| n.to_i.to_s(16).rjust(2, '0') }.join
+      end
+
+      # Shorten colors from #AABBCC to #ABC. Note that we want to make sure
+      # the color is not preceded by either ", " or =. Indeed, the property
+      #     filter: chroma(color="#FFFFFF");
+      # would become
+      #     filter: chroma(color="#FFF");
+      # which makes the filter break in IE.
+      css.gsub!(/([^"'=\s])(\s?)\s*#([0-9a-f])\3([0-9a-f])\4([0-9a-f])\5/i, '\1\2#\3\4\5')
+
+      # border: none -> border:0
+      css.gsub!(/(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|\})/i) {
+ "#{::Regexp.last_match(1).downcase}:0#{::Regexp.last_match(2)}" }
+
+      # shorter opacity IE filter
+      css.gsub!(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i, 'alpha(opacity=')
+
+      # Remove empty rules.
+      css.gsub!(%r{[^\};\{/]+\{\}}, '')
+
+      if line_length > 0
+        # Some source control tools don't like it when files containing lines longer
+        # than, say 8000 characters, are checked in. The linebreak option is used in
+        # that case to split long lines after a specific column.
+        startIndex = 0
+        index = 0
+        length = css.length
+        while index < length
+          index += 1
+          if css[index - 1, 1] === '}' && index - startIndex > line_length
+            css = css.slice(0, index) + "\n" + css.slice(index, length)
+            startIndex = index
+          end
+        end
+      end
+
+      # Replace multiple semi-colons in a row by a single one
+      # See SF bug #1980989
+      css.gsub!(/;+/, ';')
+
+      # restore preserved comments and strings
+      css = restore_preserved_comments_and_strings(css)
+
+      # top and tail whitespace
+      css.strip!
+
+      @output_size = css.length
+      css
+    end
+
+    def process_comments_and_strings(css_text)
+      css = css_text.clone
+
+      startIndex = 0
+      endIndex = 0
+      i = 0
+      max = 0
+      token = ''
+      totallen = css.length
+      placeholder = ''
+
+      # collect all comment blocks
+      while (startIndex = css.index(%r{/\*}, startIndex))
+        endIndex = css.index(%r{\*/}, startIndex + 2)
+        endIndex = totallen unless endIndex
+        token = css.slice(startIndex + 2..endIndex - 1)
+        @comments.push(token)
+        css = css.slice(0..startIndex + 1).to_s + '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' + (@comments.length - 1).to_s + '___' + css.slice(
+endIndex, totallen).to_s
+        startIndex += 2
+      end
+
+      # preserve strings so their content doesn't get accidentally minified
+      css.gsub!(/("([^\\"]|\\.|\\)*")|('([^\\']|\\.|\\)*')/) do |match|
+        quote = match[0, 1]
+        string = match.slice(1..-2)
+
+        # maybe the string contains a comment-like substring?
+        # one, maybe more? put'em back then
+        if string =~ /___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_/
+          @comments.each_index do |index|
+            string.gsub!(/___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_#{index}___/, @comments[index])
+          end
+        end
+
+        # minify alpha opacity in filter strings
+        string.gsub!(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i, 'alpha(opacity=')
+        @preservedTokens.push(string)
+
+        quote + '___YUICSSMIN_PRESERVED_TOKEN_' + (@preservedTokens.length - 1).to_s + '___' + quote
+      end
+
+      # used to jump one index in loop
+      ie5_hack = false
+      # strings are safe, now wrestle the comments
+      @comments.each_index do |index|
+        if ie5_hack
+          ie5_hack = false
+          next
+        end
+
+        token = @comments[index]
+        placeholder = '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' + index.to_s + '___'
+
+        # ! in the first position of the comment means preserve
+        # so push to the preserved tokens keeping the !
+        if token[0, 1] === '!'
+          @preservedTokens.push(token)
+          css.gsub!(/#{placeholder}/i, '___YUICSSMIN_PRESERVED_TOKEN_' + (@preservedTokens.length - 1).to_s + '___')
+          next
+        end
+
+        # \ in the last position looks like hack for Mac/IE5
+        # shorten that to /*\*/ and the next one to /**/
+        if token[-1, 1] === '\\'
+          @preservedTokens.push('\\')
+          css.gsub!(/#{placeholder}/, '___YUICSSMIN_PRESERVED_TOKEN_' + (@preservedTokens.length - 1).to_s + '___')
+          # keep the next comment but remove its content
+          @preservedTokens.push('')
+          css.gsub!(/___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_#{index + 1}___/, 
+'___YUICSSMIN_PRESERVED_TOKEN_' + (@preservedTokens.length - 1).to_s + '___')
+          ie5_hack = true
+          next
+        end
+
+        # keep empty comments after child selectors (IE7 hack)
+        # e.g. html >/**/ body
+        if (token.length === 0) && (startIndex = css.index(/#{placeholder}/))
+          if startIndex > 2
+            if css[startIndex - 3, 1] === '>'
+              @preservedTokens.push('')
+              css.gsub!(/#{placeholder}/, '___YUICSSMIN_PRESERVED_TOKEN_' + (@preservedTokens.length - 1).to_s + '___')
+            end
+          end
+        end
+
+        # in all other cases kill the comment
+        css.gsub!(%r{/\*#{placeholder}\*/}, '')
+      end
+
+      css
+    end
+
+    def restore_preserved_comments_and_strings(clean_css)
+      css = clean_css.clone
+      css_length = css.length
+      @preservedTokens.each_index do |index|
+        # slice these back into place rather than regex, because
+        # complex nested strings cause the replacement to fail
+        placeholder = "___YUICSSMIN_PRESERVED_TOKEN_#{index}___"
+        startIndex = css.index(placeholder, 0)
+        next unless startIndex # skip if nil
+
+        endIndex = startIndex + placeholder.length
+
+        css = css.slice(0..startIndex - 1).to_s + @preservedTokens[index] + css.slice(endIndex, css_length).to_s
+      end
+
+      css
+    end
+  end
+end

data/lib/conductor.rb

@@ -18,6 +18,7 @@ require_relative "conductor/filter"
 require_relative "conductor/script"
 require_relative "conductor/command"
 require_relative "conductor/condition"
+require_relative "conductor/yui-compressor"
 
 module Conductor
   class << self

data/src/_README.md

@@ -3,7 +3,7 @@
 
 # Marked Conductor
 
-A "train conductor" for [Marked 2](https://marked2app.com). Conductor can be set up as a Custom Preprocessor or Custom Processor for Marked, and can run different commands and scripts based on conditions in a YAML configuration file, allowing you to have multiple processors that run based on predicates.
+A "train conductor" for [Marked 2](https://marked2app.com) (Mac only). Conductor can be set up as a Custom Preprocessor or Custom Processor for Marked, and can run different commands and scripts based on conditions in a YAML configuration file, allowing you to have multiple processors that run based on predicates.
 
 ## Installation
 
@@ -124,12 +124,16 @@ Conditions can be combined with AND or OR (must be uppercase) and simple parenth
 
 The action can be `script`, `command`, or `filter`. 
 
+#### Scripts
+
 **Scripts** are located in `~/.config/conductor/scripts/` and should be executable files that take input on STDIN (unless `$file` is specified in the `script` definition). If a script is defined starting with `~` or `/`, that will be interpreted as a full path to an alternate location.
 
 > Example:
 > 
 >    script: github_pre
 
+#### Commands
+
 **Commands** are interpreted as shell commands. If a command exists in the `$PATH`, a full path will automatically be determined, so a command can be as simple as just `pandoc`. Add any arguments needed after the command.
 
 > Example:
@@ -139,21 +143,30 @@ The action can be `script`, `command`, or `filter`.
 
 > Using `$file` as an argument to a script or command will bypass processing of STDIN input, and instead use the value of $MARKED_PATH to read the contents of the specified file.
 
+#### Filters
+
 **Filters** are simple actions that can be run on the content without having to write a separate script for it. Available filters are:
+
 | filter | description |
 | :----  | :---------- |
 | `setMeta(key, value)` | adds or updates a meta key, aware of YAML and MMD |
 | `stripMeta` | strips all metadata (YAML or MMD) from the content |
-| `stripMeta(key)` | removes a specific key (YAML or MMD) |
-| `setStyle(name)` | sets the Marked preview style to a preconfigured Style name
+| `deleteMeta(key)` | removes a specific key (YAML or MMD) |
+| `setStyle(name)` | sets the Marked preview style to a preconfigured Style name |
 | `replace(search, replace)` | performs a (single) search and replace on content | 
 | `replaceAll(search, replace)` | global version of `replaceAll`) |
 | `insertTitle` | adds a title to the document, either from metadata or filename |
 | `insertScript(path[,path])` | injects javascript(s) |
+| `insertTOC(max, after)` | insert TOC (max=max levels, after=start, \*h1, or h2) |
+| `prepend/appendFile(path)` | insert a file as Markdown at beginning or end of content |
+| `prepend/appendRaw(path)` | insert a file as raw HTML at beginning or end of content |
+| `prepend/appendCode(path)` | insert a file as a code block at beginning or end of content |
+
+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`.
 
 For `insertScript`, if path is just a filename it will look for a match in `~/.config/conductor/javascript` or `~/.config/conductor/scripts` and turn that into an absolute path if the file is found.
 
-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`.
+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.
 
 > Example:
 > 
@@ -176,7 +189,7 @@ A script run by Conductor already knows it has the right type of file with the e
 - Config file must be valid YAML. Any value containing colons, brackets, or other special characters should be quoted, e.g. (`condition: "text contains my:text"`)
 - You can see what condition matched in Marked by opening **Help->Show Custom Processor Log** and checking the STDERR output.
 - To run [a custom processor for Bear](https://brettterpstra.com/2023/10/08/marked-and-bear/), use the condition `"text contains <!-- source: bear.app -->"`. You might consider running a commonmark CLI with Bear to support more of its syntax.
-- To run a custom processor for Obsidian, use the condition `tree contains .obsidian`
+- To run a [custom processor for Obsidian](https://brettterpstra.com/2024/05/16/marked-2-and-obsidian/), use the condition `tree contains .obsidian`
 
 ## Testing
 

data/test.md

@@ -0,0 +1,14 @@
+---
+title: hello there
+date: 2024-05-25 08:00
+---
+
+# This is a test
+
+Here's a test file for you.
+
+## It's only a test
+
+With a few paragraphs.
+
+Just three.

data/test.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
 
-# ./test.sh PATH [pr[eo]]
+# ./test.sh OPTIONS PATH
+# test.sh -h for options
 
-OPTIND=1         # Reset in case getopts has been used previously in the shell.
-
-# Initialize our own variables:
-output_file=""
-verbose=0
+OPTIND=1
 
 show_help() {
 	echo "$(basename $0): Shortcut for testing conductor with a given file"
@@ -18,7 +15,7 @@ show_help() {
 	echo "  $0 [-p PHASE] [-o OUTPUT] FILE_PATH"
 }
 
-if [[ -d bin ]]; then
+if [[ -f bin/conductor ]]; then
 	CMD="./bin/conductor"
 else
 	CMD="$(which conductor)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-25 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -275,8 +275,10 @@ files:
 - lib/conductor/script.rb
 - lib/conductor/string.rb
 - lib/conductor/version.rb
+- lib/conductor/yui-compressor.rb
 - marked-conductor.gemspec
 - src/_README.md
+- test.md
 - test.sh
 homepage: https://github.com/ttscoff/marked-conductor
 licenses: