marked-conductor 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dd28de6ae0aaf52e49579cb6d42e7d5ae46c5e74fa9016c661f983330ba1163
-  data.tar.gz: 4a376f1832720b796dca464b62e3ee4bc47217892658b043fd0eeaf53417cf13
+  metadata.gz: 69dbd324dd85fed4c343563e7431920138a99d4968b8aa8af99ba7fcd5c82087
+  data.tar.gz: ae2eb1f5251187fb67498139dae2d73b6fbce62778f2ef0197a01cb57561fe2c
 SHA512:
-  metadata.gz: bdfe7d8bfd2834f5bd21ef4c2294f5b1295e26c0e065154f671bcde34ac81af5c79b2beb9405f8b71a69156a69143ead64609ee327459f41f37bfbf7fe0ad739
-  data.tar.gz: 5aece7af60fd7a296cc21ab28ea64d8cd5fe8fd22e2dd93c6fe1b7579080aba8bc6aca61fb945c015ecb3899114a2663b4ff98c69b7eadb24c24f79987fc3568
+  metadata.gz: 055a623d15c8bb843b97d6f1931342cab64ec596564f812ffb1b473a85dba9547f7091149619952baacc2d5c9b17e44597f9625aa5b7f2818b72c10760b51a66
+  data.tar.gz: 4f998b8b19bca44f0f08ded4ad89f043802f62e4770d692b9b779c93aa8a52e6cd519fc675716f7b7c1dabaff66fbdbf4eea6611f224ac5db7cc61d7e22d704c

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.0.24
+
+2024-07-18 11:32
+
+#### IMPROVED
+
+- Use Shellwords.shellsplit/join instead of escaping MARKED_INCLUDES environment variable
+
+### 1.0.23
+
+2024-07-17 15:51
+
+#### FIXED
+
+- Environment variable escaping was hyperactive, only escape includes array
+
 ### 1.0.22
 
 2024-07-16 12:30

data/lib/conductor/env.rb

@@ -14,7 +14,7 @@ module Conductor
           home: ENV["HOME"],
           css_path: ENV["MARKED_CSS_PATH"],
           ext: ENV["MARKED_EXT"],
-          includes: ENV["MARKED_INCLUDES"],
+          includes: Shellwords.shellsplit(ENV["MARKED_INCLUDES"]),
           origin: ENV["MARKED_ORIGIN"],
           filepath: ENV["MARKED_PATH"],
           filename: File.basename(ENV["MARKED_PATH"]),
@@ -56,12 +56,12 @@ module Conductor
         "MARKED_CSS_PATH" => @env[:css_path],
         "MARKED_EXT" => @env[:ext],
         "MARKED_ORIGIN" => @env[:origin],
-        "MARKED_INCLUDES" => @env[:includes],
+        "MARKED_INCLUDES" => Shellwords.join(@env[:includes]),
         "MARKED_PATH" => @env[:filepath],
         "MARKED_PHASE" => @env[:phase],
         "OUTLINE" => @env[:outline],
         "PATH" => @env[:path]
-      }.map { |k, v| %(#{k}="#{Shellwords.escape(v)}") }.join(" ")
+      }.map { |k, v| %(#{k}="#{v}") }.join(" ")
     end
   end
 end

data/lib/conductor/filter.rb

@@ -2,6 +2,19 @@
 
 # String helpers
 class ::String
+  def find_file_in(paths, filename, ext)
+    return filename if File.exist?(filename)
+
+    filename = File.basename(filename, ".#{ext}")
+
+    paths.each do |path|
+      exp = File.join(File.expand_path('~/.config/conductor/'), path, "#{filename}.#{ext}")
+      return exp if File.exist?(exp)
+    end
+
+    "#{filename}.#{ext}"
+  end
+
   def normalize_filter
     parts = match(/(?<filter>[\w_]+)(?:\((?<paren>.*?)\))?$/i)
     filter = parts["filter"].downcase.gsub(/_/, "")
@@ -9,6 +22,11 @@ class ::String
     [filter, params]
   end
 
+  ##
+  ## Determine type of metadata (yaml, mmd, none)
+  ##
+  ## @return     [Symbol] metadata type
+  ##
   def meta_type
     lines = split(/\n/)
     case lines[0]
@@ -124,7 +142,8 @@ class ::String
   end
 
   def insert_stylesheet(path)
-    inject_after_meta(%(<link rel="stylesheet" href="#{ERB::Util.url_encode(path.strip)}">))
+    path = find_file_in(['css', 'styles'], path, 'css') unless path =~ /^http/
+    inject_after_meta(%(<link rel="stylesheet" href="#{path.strip}">))
   end
 
   def insert_css(path)
@@ -514,6 +533,11 @@ class Filter < String
     content = Conductor.stdin
 
     case @filter
+    when /(insert|add|inject)stylesheet/
+      @params.each do |sheet|
+        content = content.insert_stylesheet(sheet)
+      end
+      content
     when /(insert|add|inject)(css|style)/
       @params.each do |css|
         content = content.insert_css(css)

data/lib/conductor/version.rb

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

metadata

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