marked-conductor 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684cf7a82ae4cce7240617f832ce52572b0373e578aaff487fbc50b47e2f5afd
-  data.tar.gz: a6c5a9db2ee07216abd703f9ca833e4f83110b19eeba0ad993327ad2ef963623
+  metadata.gz: 3b5faacd380f833b615f2f848ed6f0bcb54dd955082b71228ab4f49c9e2bf0ac
+  data.tar.gz: 7c513f2fc4f75094e99ea27c48cf545ca738abe366271ec3da216f92ff0a4a5e
 SHA512:
-  metadata.gz: e47df55cfed559207ddf931b2c08b98cae32709534d2b612b6b94afd3bee3b79342a7c4dc558ca4eefc77a6e894c0e8d37bb09358275fa260c2ccaffac480235
-  data.tar.gz: 077e24abc630b9588671e2eb8b3af7736f88299063e76b5176b84b681690c81eb89532057121a795ce2c50fcf34ad3c4356f298064186e156c778f2f9fdb7184
+  metadata.gz: c84b488b4cc93effd14039e59be3ea76ce4d8e0c5ab882ceb542e93d158fb82d11b5f46bfcd60d5942a265d6554107fa964bb8acafe2d9ced9e8302ea7eb10a6
+  data.tar.gz: 7e80a80708878d3ab4dbc515d5554c77af6bdd42b8ceb496c2b16bb48b054ea8696aa57351eeae0a35adb3de00ef2dce6c509e77c850aa8ebb4a71c2d672a4f2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.7
+
+2024-04-26 11:53
+
+#### NEW
+
+- Added test for MMD metadata, either for presence of meta or for specific keys or key values
+
+#### FIXED
+
+- Remove some debugging garbage
+
 ### 1.0.6
 
 2024-04-26 11:17

data/README.md

@@ -82,6 +82,7 @@ Available conditions are:
     - If the YAML key is a date, it can be tested against with `before`, `after`, and `is`, and the value can be a natural language date, e.g. `yaml:date is after may 3, 2024`
     - If both the YAML key value and the test value are numbers, you can use operators `greater than` (`>`), `less than` (`<`), `equal`/`is` (`=`/`==`), and `is not equal`/`not equals` (`!=`/`!==`). Numbers will be interpreted as floats.
     - If the YAML value is a boolean, you can test with `is true` or `is not true` (or `is false`)
+- `mmd` or `meta` will test for MultiMarkdown metadata using the same formatting as `yaml`.
 - The following keywords act as a catchall and can be used as the last track in the config to act on any documents that aren't matched by preceding rules:
     - `any`
     - `else`
@@ -116,8 +117,9 @@ A script run by Conductor already knows it has the right type of file with the e
 
 ## Tips
 
+- 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 <b>Help->Show Custom Processor Log</b> 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/`
+- To run [a custom processor for Bear](https://brettterpstra.com/2023/10/08/marked-and-bear/), use the condition `"text contains <!-- source: bear.app -->"`
 - To run a custom processor for Obsidian, use the condition `tree contains .obsidian`
 
 ## Testing

data/lib/conductor/command.rb

@@ -45,7 +45,6 @@ module Conductor
       if use_stdin
         `echo #{Shellwords.escape(stdin)} | #{Env} #{path} #{args}`
       else
-        puts "#{Env} #{path} #{args}"
         `#{Env} #{path} #{args}`
       end
     end

data/lib/conductor/condition.rb

@@ -159,6 +159,59 @@ module Conductor
       operator == :not_equal ? !res : res
     end
 
+    def test_yaml(content, value, key, operator)
+      yaml = YAML.safe_load(content.split(/^(?:---|\.\.\.)/)[1])
+
+      return operator == :not_equal ? true : false unless yaml
+
+      if key
+        value1 = yaml[key]
+        return operator == :not_equal ? true : false if value1.nil?
+
+        value1 = value1.join(',') if value1.is_a?(Array)
+        if %i[type_of not_type_of].include?(operator)
+          test_type(value1, value, operator)
+        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)
+        else
+          test_string(value1, value, operator)
+        end
+      else
+        res = value ? yaml.key?(value) : true
+        operator == :not_equal ? !res : res
+      end
+    end
+
+    def test_meta(content, value, key, operator)
+      headers = []
+      content.split(/\n/).each do |line|
+        break if line == /^ *\n$/ || line !~ /\w+: *\S/
+
+        headers << line
+      end
+
+      return operator == :not_equal if headers.empty?
+
+      return operator != :not_equal if value.nil?
+
+      meta = {}
+      headers.each do |h|
+        parts = h.split(/ *: */)
+        k = parts[0].strip.downcase.gsub(/ +/, '')
+        v = parts[1..].join(':').strip
+        meta[k] = v
+      end
+
+      if key
+        test_string(meta[key], value, operator)
+      else
+        res = value ? meta.key?(value) : true
+        operator == :not_equal ? !res : res
+      end
+    end
+
     def test_condition(condition)
       type, value, operator = split_condition(condition)
 
@@ -181,35 +234,23 @@ module Conductor
       when /^phase/i
         test_string(@env[:phase], value, :starts_with) ? true : false
       when /^text/i
-        puts IO.read(@env[:filepath]).force_encoding('utf-8')
         test_string(IO.read(@env[:filepath]).force_encoding('utf-8'), value, operator) ? true : false
       when /^(yaml|headers|frontmatter)(?::(.*?))?$/i
         m = Regexp.last_match
+
+        key = m[2] || nil
+
         content = IO.read(@env[:filepath]).force_encoding('utf-8')
-        return false unless content =~ /^---/m
 
-        yaml = YAML.safe_load(content.split(/^(?:---|\.\.\.)/)[1])
+        content.yaml? ? test_yaml(content, value, key, operator) : false
+      when /^(mmd|meta(?:data)?)(?::(.*?))?$/i
+        m = Regexp.last_match
 
-        return false unless yaml
+        key = m[2] || nil
 
-        if m[2]
-          value1 = yaml[m[2]]
-          return false if value1.nil?
+        content = IO.read(@env[:filepath]).force_encoding('utf-8')
 
-          value1 = value1.join(',') if value1.is_a?(Array)
-          if %i[type_of not_type_of].include?(operator)
-            test_type(value1, value, operator)
-          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)
-          else
-            test_string(value1, value, operator)
-          end
-        else
-          res = value? ? yaml.key?(value) : true
-          operator == :not_equal ? !res : res
-        end
+        content.meta? ? test_meta(content, value, key, operator) : false
       else
         false
       end

data/lib/conductor/string.rb

@@ -42,6 +42,14 @@ class ::String
     dup.force_encoding('utf-8').match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
   end
 
+  def meta?
+    self =~ /^---/m
+  end
+
+  def yaml?
+    self =~ /^\w+: +\S+/m
+  end
+
   def to_bool!
     replace to_bool
   end

data/lib/conductor/version.rb

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

data/src/_README.md

@@ -82,6 +82,7 @@ Available conditions are:
     - If the YAML key is a date, it can be tested against with `before`, `after`, and `is`, and the value can be a natural language date, e.g. `yaml:date is after may 3, 2024`
     - If both the YAML key value and the test value are numbers, you can use operators `greater than` (`>`), `less than` (`<`), `equal`/`is` (`=`/`==`), and `is not equal`/`not equals` (`!=`/`!==`). Numbers will be interpreted as floats.
     - If the YAML value is a boolean, you can test with `is true` or `is not true` (or `is false`)
+- `mmd` or `meta` will test for MultiMarkdown metadata using the same formatting as `yaml`.
 - The following keywords act as a catchall and can be used as the last track in the config to act on any documents that aren't matched by preceding rules:
     - `any`
     - `else`
@@ -116,8 +117,9 @@ A script run by Conductor already knows it has the right type of file with the e
 
 ## Tips
 
+- 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 <b>Help->Show Custom Processor Log</b> 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/`
+- To run [a custom processor for Bear](https://brettterpstra.com/2023/10/08/marked-and-bear/), use the condition `"text contains <!-- source: bear.app -->"`
 - To run a custom processor for Obsidian, use the condition `tree contains .obsidian`
 
 ## Testing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Brett Terpstra