marked-conductor 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a78acbdf0f9693636a7456265dca72cf53cfa771aaa4fe0e2ad848c4b3526612
-  data.tar.gz: c913dc807337b977cc0caa4b843512991df890f48cff913a06fe660831aa0f53
+  metadata.gz: 07cc317b99e30de42235572b6444e09b6a958b79bc2eda7fdb8fa9b88d608b3f
+  data.tar.gz: 31b568475ab2a17c310d5279e8c356d10d4c8217ecb112a667edde4e6a6425a5
 SHA512:
-  metadata.gz: b2c6979fcb015ac31d51895772ed83c9aad4644bb8b3f151f31e6e5015ca0fda4ca0b1a994adef1c388fe5c557747cd787da8a9325a2bb543295ac3bcaddbb18
-  data.tar.gz: c4759af9e3af7495e659464018eaf8eb858d6d10fdb93ed8b137c85c01b71fec23d3d062b91ba1deedcc4859b6ee832064e91a476929cb89e5898d62fbdba469
+  metadata.gz: cb5b28f08d4de3b9e2574564302f390d519dbeab569b84e08a6eac7f432053235a53bf6cf31f9742384eb978618b5cf73d24661f22fc1f9b91e1e18a4686d7eb
+  data.tar.gz: 9067a2196bf46d104bc62a0152908a14cee90e1b7c27434a24452d85a2da20abcfd19499947e65503fdde7051e9e023a3c5829930e0451b28041c5fdf4d1713a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.18
+
+2024-07-02 11:08
+
+#### NEW
+
+- InsertScript or insertCSS arguments that are URLs will be inserted properly
+
+#### FIXED
+
+- When prepending styles/files/titles, always inject AFTER existing metadata (YAML or MMD)
+
 ### 1.0.17
 
 2024-07-02 10:27

data/README.md

@@ -170,6 +170,8 @@ For `insertScript`, if path is just a filename it will look for a match in `~/.c
 
 For `insertCSS`, if path is just a filename (with or without .css extension), the file will be searched for in `~/.config/conductor/css` or `~/.config/conductor/files` and injected. CSS will be compressed using the YUI algorithm and inserted at the top of the document, but after any existing metadata.
 
+If the path for `insertScript` or `insertCSS` is a URL instead of a filename, the URL will be properly inserted instead of a file path. Inserted scripts will be surrounded with `<div>` tags, which fixes a quirk with javascript in Marked.
+
 For all of the prepend/append file filters, you can store files in `~/.config/conductor/files` and reference them with just a filename. Otherwise a full path will be assumed.
 
 For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`.

data/lib/conductor/filter.rb

@@ -78,7 +78,7 @@ class ::String
            when :h1
              first_h1.positive? ? first_h1 + 1 : 0
            else
-             0
+             meta_insert_point.positive? ? meta_insert_point + 1 : 0
            end
 
     lines.insert(line, "\n<!--toc#{max}-->\n").join("\n")
@@ -92,7 +92,13 @@ class ::String
     end
   end
 
+  def insert_stylesheet(path)
+    inject_after_meta(%(<link rel="stylesheet" href="#{path.strip}">))
+  end
+
   def insert_css(path)
+    return insert_stylesheet(path) if path.strip =~ /^http/
+
     path.sub!(/(\.css)?$/, '.css')
 
     if path =~ %r{^[~/]}
@@ -109,17 +115,21 @@ class ::String
       content = IO.read(path)
       yui = YuiCompressor::Yui.new
       content = yui.compress(content)
-      lines = split(/\n/)
-      insert_point = meta_insert_point
-      insert_at = insert_point.positive? ? insert_point + 1 : 0
-      lines.insert(insert_at, "#{content.wrap_style}\n\n")
-      lines.join("\n")
+      inject_after_meta(content.wrap_style)
     else
       warn "File not found (#{path})"
       self
     end
   end
 
+  def inject_after_meta(content)
+    lines = split(/\n/)
+    insert_point = meta_insert_point
+    insert_at = insert_point.positive? ? insert_point + 1 : 0
+    lines.insert(insert_at, "#{content}\n\n")
+    lines.join("\n")
+  end
+
   def insert_file(path, type = :file, position = :end)
     path.strip!
 
@@ -142,7 +152,7 @@ class ::String
 
     case position
     when :start
-      "#{out}\n#{self}"
+      inject_after_meta(out)
     when :h1
       split(/\n/).insert(first_h1 + 1, out).join("\n")
     else
@@ -154,9 +164,19 @@ class ::String
     "#{self}\n#{string}"
   end
 
+  def append!(string)
+    replace append(string)
+  end
+
+  def insert_javascript(path)
+    %(#{self}\n<script type="javascript" src="#{path.strip}"></script>\n)
+  end
+
   def insert_script(path)
     path.strip!
-    path = "#{path}.js" unless path =~ /\.js$/
+    return insert_javascript(path) if path =~ /^http/
+
+    path.sub!(/(\.js)?$/, '.js')
 
     if path =~ %r{^[~/]}
       path = File.expand_path(path)
@@ -172,7 +192,7 @@ class ::String
       path = new_path if File.exist?(new_path)
     end
 
-    %(#{self}\n<script type="javascript" src="#{path}"></script>\n)
+    insert_javascript(path)
   end
 
   def title_from_slug
@@ -297,12 +317,12 @@ class ::String
     gsub(regex.to_rx, pattern.to_pattern)
   end
 
-  def replace(regex, pattern)
+  def replace_one(regex, pattern)
     sub(regex.to_rx, pattern.to_pattern)
   end
 
   def autolink
-    gsub(%r{(?mi)(?<!\(|]: )\b((?:[\w-]+?://)[-a-zA-Z0-9@:%._+~#=]{2,256}\b(?:[-a-zA-Z0-9@:%_+.~#?&/=]*))},
+    gsub(%r{(?mi)(?<!\(|\]: |")\b((?:[\w-]+?://)[-a-zA-Z0-9@:%._+~#=]{2,256}\b(?:[-a-zA-Z0-9@:%_+.~#?&/=]*))},
          '<\1>')
   end
 
@@ -343,7 +363,7 @@ class Filter < String
     when /(insert|add|inject)title/
       content.insert_title
     when /(insert|add|inject)script/
-      content = content.append("\n\n<div>")
+      content.append!("\n\n<div>")
       @params.each do |script|
         content = content.insert_script(script)
       end
@@ -352,19 +372,19 @@ class Filter < String
       m = Regexp.last_match
 
       position = if @params.count == 2
-        @params[1].normalize_position
-      else
-        m[1].normalize_position
-      end
+                   @params[1].normalize_position
+                 else
+                   m[1].normalize_position
+                 end
       content.insert_file(@params[0], m[2].normalize_include_type, position)
     when /inserttoc/
       max = @params.count.positive? ? @params[0] : nil
 
-      if @params.count == 2
-        after = @params[1] =~ /2/ ? :h2 : :h1
-      else
-        after = :start
-      end
+      after = if @params.count == 2
+                @params[1] =~ /2/ ? :h2 : :h1
+              else
+                :start
+              end
 
       content.insert_toc(max, after)
     when /(add|set)meta/
@@ -377,7 +397,7 @@ class Filter < String
       # should recognize yaml and mmd
       content.set_meta(@params[0], @params[1], style: content.meta_type)
     when /(strip|remove|delete)meta/
-      if @params&.count.positive?
+      if @params.count.positive?
         content.delete_meta(@params[0])
       else
         content.strip_meta
@@ -398,7 +418,7 @@ class Filter < String
         return content
       end
 
-      content.replace(@params[0], @params[1])
+      content.replace_one(@params[0], @params[1])
     when /(auto|self)link/
       content.autolink
     end

data/lib/conductor/version.rb

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

data/src/_README.md

@@ -170,6 +170,8 @@ For `insertScript`, if path is just a filename it will look for a match in `~/.c
 
 For `insertCSS`, if path is just a filename (with or without .css extension), the file will be searched for in `~/.config/conductor/css` or `~/.config/conductor/files` and injected. CSS will be compressed using the YUI algorithm and inserted at the top of the document, but after any existing metadata.
 
+If the path for `insertScript` or `insertCSS` is a URL instead of a filename, the URL will be properly inserted instead of a file path. Inserted scripts will be surrounded with `<div>` tags, which fixes a quirk with javascript in Marked.
+
 For all of the prepend/append file filters, you can store files in `~/.config/conductor/files` and reference them with just a filename. Otherwise a full path will be assumed.
 
 For `autoLink`, any URL that's not contained in parenthesis or following a `[]: url` pattern will be autolinked (surrounded by angle brackets). URLs must contain `//` to be recognized, but any protocol will work, e.g. `x-marked://refresh`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Brett Terpstra
@@ -204,66 +204,6 @@ files:
 - README.rdoc
 - Rakefile
 - bin/conductor
-- html/Array.html
-- html/Conductor.html
-- html/Conductor/Command.html
-- html/Conductor/Condition.html
-- html/Conductor/Config.html
-- html/Conductor/Env.html
-- html/Conductor/Script.html
-- html/FalseClass.html
-- html/Filter.html
-- html/Hash.html
-- html/Object.html
-- html/README_rdoc.html
-- html/String.html
-- html/TrueClass.html
-- html/YuiCompressor.html
-- html/YuiCompressor/Yui.html
-- html/created.rid
-- html/css/fonts.css
-- html/css/rdoc.css
-- html/fonts/Lato-Light.ttf
-- html/fonts/Lato-LightItalic.ttf
-- html/fonts/Lato-Regular.ttf
-- html/fonts/Lato-RegularItalic.ttf
-- html/fonts/SourceCodePro-Bold.ttf
-- html/fonts/SourceCodePro-Regular.ttf
-- html/images/add.png
-- html/images/arrow_up.png
-- html/images/brick.png
-- html/images/brick_link.png
-- html/images/bug.png
-- html/images/bullet_black.png
-- html/images/bullet_toggle_minus.png
-- html/images/bullet_toggle_plus.png
-- html/images/date.png
-- html/images/delete.png
-- html/images/find.png
-- html/images/loadingAnimation.gif
-- html/images/macFFBgHack.png
-- html/images/package.png
-- html/images/page_green.png
-- html/images/page_white_text.png
-- html/images/page_white_width.png
-- html/images/plugin.png
-- html/images/ruby.png
-- html/images/tag_blue.png
-- html/images/tag_green.png
-- html/images/transparent.png
-- html/images/wrench.png
-- html/images/wrench_orange.png
-- html/images/zoom.png
-- html/index.html
-- html/js/darkfish.js
-- html/js/navigation.js
-- html/js/navigation.js.gz
-- html/js/search.js
-- html/js/search_index.js
-- html/js/search_index.js.gz
-- html/js/searcher.js
-- html/js/searcher.js.gz
-- html/table_of_contents.html
 - images/preferences.jpg
 - lib/conductor.rb
 - lib/conductor/array.rb
@@ -280,7 +220,6 @@ files:
 - lib/conductor/yui-compressor.rb
 - marked-conductor.gemspec
 - src/_README.md
-- test.md
 - test.sh
 homepage: https://github.com/ttscoff/marked-conductor
 licenses:

data/html/Array.html

@@ -1,160 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<meta charset="UTF-8">
-
-<title>class Array - Marked Conductor</title>
-
-<script type="text/javascript">
-  var rdoc_rel_prefix = "./";
-  var index_rel_prefix = "./";
-</script>
-
-<script src="./js/navigation.js" defer></script>
-<script src="./js/search.js" defer></script>
-<script src="./js/search_index.js" defer></script>
-<script src="./js/searcher.js" defer></script>
-<script src="./js/darkfish.js" defer></script>
-
-<link href="./css/fonts.css" rel="stylesheet">
-<link href="./css/rdoc.css" rel="stylesheet">
-
-
-<body id="top" role="document" class="class">
-<nav role="navigation">
-  <div id="project-navigation">
-    <div id="home-section" role="region" title="Quick navigation" class="nav-section">
-  <h2>
-    <a href="./index.html" rel="home">Home</a>
-  </h2>
-
-  <div id="table-of-contents-navigation">
-    <a href="./table_of_contents.html#pages">Pages</a>
-    <a href="./table_of_contents.html#classes">Classes</a>
-    <a href="./table_of_contents.html#methods">Methods</a>
-  </div>
-</div>
-
-    <div id="search-section" role="search" class="project-section initially-hidden">
-  <form action="#" method="get" accept-charset="utf-8">
-    <div id="search-field-wrapper">
-      <input id="search-field" role="combobox" aria-label="Search"
-             aria-autocomplete="list" aria-controls="search-results"
-             type="text" name="search" placeholder="Search (/) for a class, method, ..." spellcheck="false"
-             title="Type to search, Up and Down to navigate, Enter to load">
-    </div>
-
-    <ul id="search-results" aria-label="Search Results"
-        aria-busy="false" aria-expanded="false"
-        aria-atomic="false" class="initially-hidden"></ul>
-  </form>
-</div>
-
-  </div>
-
-  
-
-  <div id="class-metadata">
-    
-    
-<div id="parent-class-section" class="nav-section">
-  <h3>Parent</h3>
-
-  <p class="link"><a href="Object.html">Object</a>
-</div>
-
-    
-    
-    
-<!-- Method Quickref -->
-<div id="method-list-section" class="nav-section">
-  <h3>Methods</h3>
-
-  <ul class="link-list" role="directory">
-    <li ><a href="#method-i-symbolize_keys">#symbolize_keys</a>
-    <li ><a href="#method-i-symbolize_keys-21">#symbolize_keys!</a>
-  </ul>
-</div>
-
-  </div>
-</nav>
-
-<main role="main" aria-labelledby="class-Array">
-  <h1 id="class-Array" class="class">
-    class Array
-  </h1>
-
-  <section class="description">
-    
-  </section>
-
-  <section id="5Buntitled-5D" class="documentation-section">
-
-
-
-
-
-     <section id="public-instance-5Buntitled-5D-method-details" class="method-section">
-       <header>
-         <h3>Public Instance Methods</h3>
-       </header>
-
-      <div id="method-i-symbolize_keys" class="method-detail ">
-        <div class="method-header">
-          <div class="method-heading">
-            <span class="method-name">symbolize_keys</span><span
-              class="method-args">()</span>
-            <span class="method-click-advice">click to toggle source</span>
-          </div>
-        </div>
-
-        <div class="method-description">
-          
-
-          <div class="method-source-code" id="symbolize_keys-source">
-            <pre><span class="ruby-comment"># File lib/conductor/array.rb, line 8</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">symbolize_keys</span>
-  <span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">h</span><span class="ruby-operator">|</span> <span class="ruby-identifier">h</span>.<span class="ruby-identifier">symbolize_keys</span> }
-<span class="ruby-keyword">end</span></pre>
-          </div>
-        </div>
-
-
-      </div>
-
-      <div id="method-i-symbolize_keys-21" class="method-detail ">
-        <div class="method-header">
-          <div class="method-heading">
-            <span class="method-name">symbolize_keys!</span><span
-              class="method-args">()</span>
-            <span class="method-click-advice">click to toggle source</span>
-          </div>
-        </div>
-
-        <div class="method-description">
-          
-
-          <div class="method-source-code" id="symbolize_keys-21-source">
-            <pre><span class="ruby-comment"># File lib/conductor/array.rb, line 4</span>
-<span class="ruby-keyword">def</span> <span class="ruby-identifier ruby-title">symbolize_keys!</span>
-  <span class="ruby-identifier">replace</span> <span class="ruby-identifier">symbolize_keys</span>
-<span class="ruby-keyword">end</span></pre>
-          </div>
-        </div>
-
-
-      </div>
-
-    </section>
-
-  </section>
-</main>
-
-
-<footer id="validator-badges" role="contentinfo">
-  <p><a href="https://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="https://ruby.github.io/rdoc/">RDoc</a> 6.7.0.
-  <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
-</footer>
-