marked-conductor 1.0.28 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 333d82d6ed153da7c528506348ac3faff3852fef0614f0009bbcc0a963907a7f
-  data.tar.gz: c24154363d7035cc4bcd1539abe117276f1955231fa0f7af27f49678164cf1db
+  metadata.gz: 4960753920594bf8bc9a5abf999c6a40b9d0d2b88c2aadcb6b3c05db659af3bd
+  data.tar.gz: efb3cb83e50415a108d68e58468469b8b78132ad231825fff7f6fb3c2918d364
 SHA512:
-  metadata.gz: 323227fde6789d933d412afe287a9784c18ac2610e2d50e5050c14840b8045ce9c2b380fe714aa658c009eaa7dd038b6a6d88f0f648719f4dcd5f0958a862ef2
-  data.tar.gz: ebdef901d6a9407adb9cfeb7412f0a21ac01eeeb89f38593556269594e58d32737cf426849d74a9f485e9d865646bbafa16a6b5c25430ed4f98391139d5265e7
+  metadata.gz: ff89946ef72b83902d598685e1c455384fba1e453674672d94c116a4598a29c19d65a2d0e51b1fc6f898d2c14799417f8bb3171b2a6d00d2d13e32b80e76cf3d
+  data.tar.gz: 8dd2b41b6750edd993e05c19c95b1fd98b9c4b969a6bedef6c8e56a43b98d06a6cce06eacf6cabd37887c3791562b9bdd1a440b9d138f72f48a2521dc55411a9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.30
+
+2024-07-29 11:47
+
+### 1.0.29
+
+2024-07-28 09:57
+
+#### NEW
+
+- Increase/decreaseHeaders(count) filter
+
 ### 1.0.28
 
 2024-07-27 14:54

data/README.md

@@ -107,6 +107,8 @@ Available conditions are:
 - `includes` are files included in the document with special syntax (Marked, IA Writer, etc.)
     - `includes contain file` or `includes not contains file` will test all included files for filename matches
     - `includes contain path` or `includes not contains path` will test all included files for fragment matches anywhere in the path
+- `env:KEY matches VALUE` will test for matching values in a environment key. All string matching operators are available, and `env[KEY]` syntax will also work.
+    - `env contains KEY` tests just for the existence of an environment variable key (can include variables set by Marked).
 - 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`
@@ -167,6 +169,8 @@ The action can be `script`, `command`, or `filter`.
 | `insertCSS(path)` | insert custom CSS into document |
 | `autoLink()` | Turn bare URLs into \<self-linked\> urls |
 | `fixHeaders()` | Reorganize headline levels to semantic order |
+| `increaseHeaders(count) | Increase header levels by count (default 1) |
+| `decreaseHeaders(count) | Decrease header levels by count (default 1) |
 
 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`.
 

data/bin/conductor

@@ -4,9 +4,20 @@
 require_relative "../lib/conductor"
 require "optparse"
 
+options = {
+  config_file: nil
+}
+
 optparse = OptionParser.new do |opts|
   opts.banner = "Called from Marked 2 as a Custom Pre/Processor"
 
+  opts.on("-c", "--config", "Specify alternate config file") do |file|
+    config = File.expand_path(file)
+    raise "Config file not found" unless File.exist?(config)
+
+    options[:config_file] = file
+  end
+
   opts.on("-v", "--version", "Show version number") do
     puts "conductor v#{Conductor::VERSION}"
     Process.exit 0
@@ -21,6 +32,7 @@ end
 optparse.parse!
 
 config = Conductor::Config.new
+config.config_file = options[:config_file] if options[:config_file]
 res = config.configure
 
 Process.exit 0 unless res

data/lib/conductor/condition.rb

@@ -184,6 +184,11 @@ module Conductor
 
       val2 = val2.to_s.dup.force_encoding("utf-8")
 
+      if val2.bool?
+        res = val2.to_bool == val1.to_bool
+        return operator === :not_equal ? !res : res
+      end
+
       if val1.date?
         if val2.time?
           date1 = val1.to_date
@@ -276,6 +281,26 @@ module Conductor
       operator == :not_equal ? !res : res
     end
 
+    ##
+    ## Test for environment variable
+    ##
+    ## @param      value     [String] The value (test for existence of key if
+    ##                       nil)
+    ## @param      key       [String] The key
+    ## @param      operator  [Symbol] The operator
+    ##
+    ## @return     [Boolean] test result
+    ##
+    def test_env(value, key, operator)
+      env = Env.env.merge(ENV)
+      if key.nil?
+        res = !env[value].nil?
+        return operator == :not_contains ? !res : res
+      end
+
+      return test_string(env[key], value, operator)
+    end
+
     ##
     ## Test for presence of yaml, optionall for
     ##             a key, optionally for a key's value
@@ -391,6 +416,9 @@ module Conductor
       end
 
       case type
+      when /^env(?:ironment)?(?:[:\[\()](.*?)[\]\)]?)?$/i
+        key = Regexp.last_match(1) || nil
+        test_env(value, key, operator)
       when /^include/i
         test_includes(@env[:includes], value, operator) ? true : false
       when /^ext/i

data/lib/conductor/config.rb

@@ -41,8 +41,12 @@ module Conductor
       config_file ||= @config_file
       config_dir = File.dirname(config_file)
       scripts_dir = File.dirname(File.join(config_dir, "scripts"))
+      styles_dir = File.dirname(File.join(config_dir, "css"))
+      js_dir = File.dirname(File.join(config_dir, "js"))
       FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
       FileUtils.mkdir_p(scripts_dir) unless File.directory?(scripts_dir)
+      FileUtils.mkdir_p(styles_dir) unless File.directory?(styles_dir)
+      FileUtils.mkdir_p(js_dir) unless File.directory?(js_dir)
       unless File.exist?(config_file)
         File.open(config_file, "w") { |f| f.puts sample_config }
         puts "Sample config created at #{config_file}"

data/lib/conductor/env.rb

@@ -7,7 +7,7 @@ module Conductor
     ## Define @env using Marked environment variables
     ##
     def self.env
-      if ENV["CONDUCTOR_TEST"] == "true"
+      if ENV["CONDUCTOR_TEST"].to_bool
         load_test_env
       else
         @env ||= {

data/lib/conductor/filter.rb

@@ -135,7 +135,7 @@ class ::String
   ## @param      amt   [Integer] The amount to decrease
   ##
   def decrease_headers(amt = 1)
-    gsub(/^(\#{1,6})(?!=#)/) do
+    normalize_headers.gsub(/^(\#{1,6})(?!=#)/) do
       m = Regexp.last_match
       level = m[1].size
       level -= amt
@@ -152,7 +152,7 @@ class ::String
   ## @return     [String] content with headers increased
   ##
   def increase_headers(amt = 1)
-    gsub(/^#/, "#{"#" * amt}#").gsub(/^\#{7,}/, "######")
+    normalize_headers.gsub(/^#/, "#{"#" * amt}#").gsub(/^\#{7,}/, "######")
   end
 
   ##
@@ -764,6 +764,9 @@ module Conductor
         content.autolink
       when /fix(head(lines|ers)|hierarchy)/
         content.fix_hierarchy
+      when /(increase|decrease)headers/
+        count = @params ? @params[0].to_i : 1
+        @filter =~ /^inc/ ? content.increase_headers(count) : content.decrease_headers(count)
       else
         content
       end

data/lib/conductor/version.rb

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

data/src/_README.md

@@ -107,6 +107,8 @@ Available conditions are:
 - `includes` are files included in the document with special syntax (Marked, IA Writer, etc.)
     - `includes contain file` or `includes not contains file` will test all included files for filename matches
     - `includes contain path` or `includes not contains path` will test all included files for fragment matches anywhere in the path
+- `env:KEY matches VALUE` will test for matching values in a environment key. All string matching operators are available, and `env[KEY]` syntax will also work.
+    - `env contains KEY` tests just for the existence of an environment variable key (can include variables set by Marked).
 - 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`
@@ -167,6 +169,8 @@ The action can be `script`, `command`, or `filter`.
 | `insertCSS(path)` | insert custom CSS into document |
 | `autoLink()` | Turn bare URLs into \<self-linked\> urls |
 | `fixHeaders()` | Reorganize headline levels to semantic order |
+| `increaseHeaders(count) | Increase header levels by count (default 1) |
+| `decreaseHeaders(count) | Decrease header levels by count (default 1) |
 
 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`.
 

data/test.sh

@@ -23,6 +23,7 @@ fi
 
 PHASE="PREPROCESS"
 STD="BOTH"
+CONFIG=""
 
 while getopts "h?p:o:d" opt; do
   case "$opt" in
@@ -32,6 +33,8 @@ while getopts "h?p:o:d" opt; do
       ;;
     p)  PHASE=$OPTARG
       ;;
+    c)  CMD="$CMD -c \"$OPTARG\""
+      ;;
     o)  STD=$OPTARG
       ;;
     d)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.30
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-27 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print