marked-conductor 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc01f58de2ca4d81c45420e08128c3ae0dd3f125badce5d62a8cc568c599d202
-  data.tar.gz: ad0724664a346aea50e4467d7a492737d885b6b2916f04077a73866b3ba0e915
+  metadata.gz: 3a9a26a3ab2e4ec5e86b55290f01f7af7d00ef589e74192550c36c37c2faa256
+  data.tar.gz: 0d2bd24779518b49d29c40e1b0f8936c15f040219abccca6341d80a89618e99b
 SHA512:
-  metadata.gz: b812adad30a746bc2b38f302047a595796d8ec2886b503a198b1384dd570d0b61d41de1029788c95b3f6a579c98c4571bef01c00c8f866aeb6245028676ab104
-  data.tar.gz: 11f506aa92cdc7ea0c5f219b84d694615c32da729ba57dfafa0f4eb9aa258d33c69c36383d858b0d0764c03362eb7e6db0b3fe4862b441db3d326e5c5f678f36
+  metadata.gz: dec71a5077f59b7c4129dafa5fd74bf0dc093117b37b3cd6bd48e3f32693ed7a2f193e7f5f05334f9bb4e1f941337996ec73059143fe67041bdcb06c4148e01a
+  data.tar.gz: b2b2772e94096709bf4cb212f800789a37425edcb508e766ba21571521bcfd987a224d14ce8cf134c3afa43c49932bba81ea8e354f0f905ec5d0bf420adf87f5

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.9
+
+2024-04-27 16:00
+
+#### NEW
+
+- Test for pandoc metadata (%%) with `is pandoc` or `is not pandoc`
+
+#### FIXED
+
+- Filename comparison not working
+
 ### 1.0.8
 
 2024-04-27 14:01

data/lib/conductor/condition.rb

@@ -86,12 +86,20 @@ module Conductor
     ## @return [Array] Value, value to compare, operator
     ##
     def split_condition(condition)
-      if condition.match(/(?:((?:does )?not)?(?:ha(?:s|ve)|contains?|includes?) +)?(yaml|headers|frontmatter|mmd|meta(?:data)?)(:\S+)?/i)
+      if condition.match(/(?:((?:does )?not)?(?:ha(?:s|ve)|contains?|includes?) +)?(yaml|headers|frontmatter|mmd|meta(?:data)?|pandoc)(:\S+)?/i)
         m = Regexp.last_match
         op = m[1].nil? ? :contains : :not_contains
-        type = m[2] =~ /^m/i ? "mmd" : "yaml"
+        type = case m[2]
+               when /^m/i
+                 "mmd"
+               when /^p/i
+                 "pandoc"
+               else
+                 "yaml"
+               end
         return ["#{type}#{m[3]}", nil, op]
       end
+
       res = condition.match(/^(?<val1>.*?)(?:(?: +(?<op>(?:is|does)(?: not)?(?: an?|type(?: of)?|equals?(?: to))?|!?==?|[gl]t|(?:greater|less)(?: than)?|<|>|(?:starts|ends) with|(?:ha(?:s|ve) )?(?:prefix|suffix)|has|contains?|includes?) +)(?<val2>.*?))?$/i)
       [res["val1"], res["val2"], operator_to_symbol(res["op"])]
     end
@@ -312,6 +320,11 @@ module Conductor
       end
     end
 
+    def test_pandoc(content, operator)
+      res = content.match(/^%% /)
+      %i[not_contains not_equal].include?(operator) ? !res.nil? : res.nil?
+    end
+
     def test_condition(condition)
       type, value, operator = split_condition(condition)
 
@@ -343,6 +356,8 @@ module Conductor
       when /^(?:mmd|meta(?:data)?)(?::(.*?))?$/i
         key = Regexp.last_match(1) || nil
         Conductor.stdin.meta? ? test_meta(Conductor.stdin, value, key, operator) : false
+      when /^pandoc/
+        test_pandoc(Conductor.stdin, operator)
       else
         false
       end
@@ -356,7 +371,7 @@ module Conductor
         :gt
       when /(lt|less( than)?|<|(?:is )?before)/i
         :lt
-      when /not (ha(?:s|ve)|contains|includes|match(es)?|\*=)/i
+      when /not (ha(?:s|ve)|contains|includes|match(es)?)/i
         :not_contains
       when /(ha(?:s|ve)|contains|includes|match(es)?|\*=)/i
         :contains

data/lib/conductor/env.rb

@@ -13,7 +13,7 @@ module Conductor
           includes: ENV["MARKED_INCLUDES"],
           origin: ENV["MARKED_ORIGIN"],
           filepath: ENV["MARKED_PATH"],
-          filename: File.basename(filepath),
+          filename: File.basename(ENV["MARKED_PATH"]),
           phase: ENV["MARKED_PHASE"],
           outline: ENV["OUTLINE"],
           path: ENV["PATH"]
@@ -29,12 +29,12 @@ module Conductor
         css_path: "/Applications/Marked 2.app/Contents/Resources/swiss.css",
         ext: "md",
         includes: [],
-        origin: "/Users/ttscoff/Desktop/Code/marked-conductor/",
-        filepath: "/Users/ttscoff/Desktop/Code/marked-conductor/README.md",
-        filename: "README.md",
-        phase: "PREPROCESS",
+        origin: "/Users/ttscoff/Desktop/Code/nvultra-docs/content/",
+        filepath: "/Users/ttscoff/Desktop/Code/nvultra-docs/content/advanced-features.md",
+        filename: "advanced-features.md",
+        phase: "PROCESS",
         outline: "NONE",
-        path: "/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Dropbox/Writing/brettterpstra.com/_drafts/"
+        path: "/Developer/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/ttscoff/Desktop/Code/nvultra-docs/content/"
       }
     end
 

data/lib/conductor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conductor
-  VERSION = "1.0.8"
+  VERSION = '1.0.9'
 end

metadata

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