marked-conductor 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fd34f9a06a34ea2a2f4d226143a850d0e1f38dca0528a8df454a3477c2c08a
-  data.tar.gz: d7b1ce254b548ccf2d8da5839ff855409d9313c99764e37371cf8642c761e7d3
+  metadata.gz: b8baea5f97cf53a0a8ff79a8ccb0f6fc06ce84192f708291f2e07ebd85e3c393
+  data.tar.gz: 43c20bc158834e03ca7a8d2e5e52bde33ff27b7397183b2eece3adeb77162991
 SHA512:
-  metadata.gz: 549e27e12fe646d0367a72181a0217b5176b5b78286f4657d9ae76e4715b52a43f59e800961f48054f8d9dcf307c65d7f4c188011f507883fce41c7ae5544339
-  data.tar.gz: 0c5af7759efef1f1748b5e8b56b6b70b11d416019f01dcd201571346ed4b9207046e1e1d26ba0bd6d2542bdcf0ffbf838d1abe6cf2ce00384414d6dfa7f59448
+  metadata.gz: 4672bd627a2d34dfc578ff80f9a3360d8a5319428c8b4746442a77adae4e7555f68c91797a0be91b4ddc2e384fb8dd84164682643d64342b580db4dd79921b76
+  data.tar.gz: 1ba57715e5ad4d0844f654a3792551d9d7bd333385a4018b0a0a00f1a90e67f3105798a89be2fb2be0f453ee5c88f170e5e6d183196213e4f258de7b8d59007e

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.0.3
+
+2024-04-25 14:32
+
+#### FIXED
+
+- YAML true/false testing
+
+### 1.0.2
+
+2024-04-25 14:15
+
+#### CHANGED
+
+- Prepped for gem release
+
+#### FIXED
+
+- Encoding issue affecting Shellwords.escape
+
 ### 1.0.0
 
 2024-04-25 10:51

data/README.md

@@ -1,4 +1,5 @@
 
+[![RubyGems.org](https://img.shields.io/gem/v/marked-conductor)](https://rubygems.org/gems/marked-conductor)
 
 # Marked Conductor
 
@@ -72,7 +73,7 @@ Available conditions are:
 - `path`: This tests just the path itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
 - `phase`: Tests whether Marked is in Preprocessor or Processor phase, allowing conditions like `phase is preprocess` or `phase is process` (which can be shortened to `pre` and `pro`).
 - `text`: This tests for any string match within the text of the document being processed. This can be used with operators `starts with`, `ends with`, or `contains`, e.g. `text contains @taskpaper` or `text does not contain <!--more-->`. 
-    - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text matches @\w+`.
+    - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text contains /@\w+/`.
 - `yaml`, `headers`, or `frontmatter` will test for YAML headers. If a `yaml:KEY` is defined, a specific YAML key will be tested for. If a value is defined with an operator, it will be tested against the value key.
     - `yaml` tests for the presence of YAML frontmatter.
     - `yaml:comments` tests for the presence of a `comments` key.
@@ -107,6 +108,12 @@ Commands are interpreted as shell commands. If a command exists in the `$PATH`,
 
 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.
 
+## Custom Processors
+
+All of the [capabilities and requirements](https://marked2app.com/help/Custom_Processor) of a Custom Processor script or command still apply, and all of the [environment variables that Marked sets](https://marked2app.com/help/Custom_Processor#environmentvariables) are still available. You just no longer have to have one huge script that forks on the various environment variables and you don't have to write your own tests for handling different scenarios.
+
+A script run by Conductor already knows it has the right type of file with the expected data and path, so your script can focus on just processing one file type. It's recommended to separate all of that logic you may already have written out into separate scripts and let Conductor handle the forking based on various criteria.
+
 ## Testing
 
 In order to test from the command line, you'll need certain environment variables set. This can be done by exporting the following variables with your own definitions, or by running conductor with all of the variables preceding the command, e.g. `$ MARKED_ORIGIN=/path/to/markdown_file.md [...] conductor`.

data/lib/conductor/boolean.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# True class
+class ::TrueClass
+  def bool?
+    true
+  end
+end
+
+# False class
+class ::FalseClass
+  def bool?
+    true
+  end
+end

data/lib/conductor/condition.rb

@@ -150,7 +150,7 @@ module Conductor
     def test_truthy(value1, value2, operator)
       return false unless value2.bool?
 
-      value2.to_bool!
+      value2 = value2.to_bool if value2.is_a?(String)
 
       res = value1 == value2
 
@@ -182,16 +182,18 @@ module Conductor
         test_string(IO.read(@env[:filepath]), value, operator) ? true : false
       when /^(yaml|headers|frontmatter)(?::(.*?))?$/i
         m = Regexp.last_match
-        content = IO.read(@env[:filepath])
+        content = IO.read(@env[:filepath]).force_encoding('utf-8')
         return false unless content =~ /^---/
 
-        yaml = YAML.safe_load(content.split(/(---|\.\.\.)/)[1])
+        yaml = YAML.safe_load(content.split(/^(?:---|\.\.\.)/)[1])
+
+        return false unless yaml
         if m[2]
           value1 = yaml[m[2]]
           value1 = value1.join(',') if value1.is_a?(Array)
           if %i[type_of not_type_of].include?(operator)
             test_type(value1, value, operator)
-          elsif value1.is_a?(Boolean)
+          elsif value1.bool?
             test_truthy(value1, value, operator)
           elsif value1.number? && value2.number? && %i[gt lt equal not_equal].include?(operator)
             test_operator(value1, value, operator)

data/lib/conductor/env.rb

@@ -28,11 +28,11 @@ module Conductor
         css_path: '/Applications/Marked 2.app/Contents/Resources/swiss.css',
         ext: 'md',
         includes: [],
-        origin: '/Users/ttscoff/Library/Mobile Documents/9CR7T2DMDG~com~ngocluu~onewriter/Documents/nvALT2.2/',
-        filepath: '/Users/ttscoff/Library/Mobile Documents/9CR7T2DMDG~com~ngocluu~onewriter/Documents/nvALT2.2/bt.com App Review- AeroPress timer for iPhone.md',
+        origin: '/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/',
+        filepath: '/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/marked-2-and-obsidian.md',
         phase: 'PREPROCESS',
         outline: 'NONE',
-        path: '/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Library/Mobile Documents/9CR7T2DMDG~com~ngocluu~onewriter/Documents/nvALT2.2'
+        path: '/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/'
       }
     end
 

data/lib/conductor/version.rb

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

data/lib/conductor.rb

@@ -11,6 +11,7 @@ require_relative 'conductor/env'
 require_relative 'conductor/config'
 require_relative 'conductor/hash'
 require_relative 'conductor/array'
+require_relative 'conductor/boolean'
 require_relative 'conductor/string'
 require_relative 'conductor/script'
 require_relative 'conductor/command'
@@ -19,7 +20,7 @@ require_relative 'conductor/condition'
 module Conductor
   class << self
     def stdin
-      @stdin ||= $stdin.read.strip if $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
+      @stdin ||= $stdin.read.strip.force_encoding('utf-8') if $stdin.stat.size.positive? || $stdin.fcntl(Fcntl::F_GETFL, 0).zero?
     end
   end
 end

data/src/_README.md

@@ -1,5 +1,5 @@
 <!--README-->
-[![RubyGems.org](https://img.shields.io/gem/v/journal-cli)](https://rubygems.org/gems/journal-cli)
+[![RubyGems.org](https://img.shields.io/gem/v/marked-conductor)](https://rubygems.org/gems/marked-conductor)
 
 # Marked Conductor
 
@@ -73,7 +73,7 @@ Available conditions are:
 - `path`: This tests just the path itself, allowing conditions like `path contains _drafts` or `path does not contain _posts`.
 - `phase`: Tests whether Marked is in Preprocessor or Processor phase, allowing conditions like `phase is preprocess` or `phase is process` (which can be shortened to `pre` and `pro`).
 - `text`: This tests for any string match within the text of the document being processed. This can be used with operators `starts with`, `ends with`, or `contains`, e.g. `text contains @taskpaper` or `text does not contain <!--more-->`. 
-    - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text matches @\w+`.
+    - If the test value is surrounded by forward slashes, it will be treated as a regular expression. Regexes are always flagged as case insensitive. Use it like `text contains /@\w+/`.
 - `yaml`, `headers`, or `frontmatter` will test for YAML headers. If a `yaml:KEY` is defined, a specific YAML key will be tested for. If a value is defined with an operator, it will be tested against the value key.
     - `yaml` tests for the presence of YAML frontmatter.
     - `yaml:comments` tests for the presence of a `comments` key.
@@ -108,6 +108,12 @@ Commands are interpreted as shell commands. If a command exists in the `$PATH`,
 
 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.
 
+## Custom Processors
+
+All of the [capabilities and requirements](https://marked2app.com/help/Custom_Processor) of a Custom Processor script or command still apply, and all of the [environment variables that Marked sets](https://marked2app.com/help/Custom_Processor#environmentvariables) are still available. You just no longer have to have one huge script that forks on the various environment variables and you don't have to write your own tests for handling different scenarios.
+
+A script run by Conductor already knows it has the right type of file with the expected data and path, so your script can focus on just processing one file type. It's recommended to separate all of that logic you may already have written out into separate scripts and let Conductor handle the forking based on various criteria.
+
 ## Testing
 
 In order to test from the command line, you'll need certain environment variables set. This can be done by exporting the following variables with your own definitions, or by running conductor with all of the variables preceding the command, e.g. `$ MARKED_ORIGIN=/path/to/markdown_file.md [...] conductor`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Brett Terpstra
@@ -88,6 +88,7 @@ files:
 - images/preferences.jpg
 - lib/conductor.rb
 - lib/conductor/array.rb
+- lib/conductor/boolean.rb
 - lib/conductor/command.rb
 - lib/conductor/condition.rb
 - lib/conductor/config.rb