marked-conductor 1.0.32 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db6a6044dabe2b2487ae53119d385822269ef5a188727e37976310e5b47e54e
-  data.tar.gz: 6d054087984dcd36038705e7ae7fd4b9fc94cc2194899a9e3eb01903ee44f93f
+  metadata.gz: 31042fe7c5635982e15c551493cf380e0d3aabae92051871144172e5890e2328
+  data.tar.gz: 8ea8a81fb13a5342332e5c3ac779fea2dced77b34318f1e43210d1d5c388dd54
 SHA512:
-  metadata.gz: acd13153ea7b8401fd2e602f3935178eceee61359d8a32e1f228f1adbb4459b76330a4d98440511dca85cd92ae7ff731725102a39e56cd68327f9c756904cc62
-  data.tar.gz: 60c139677c180c043c5aaeddf9cfe6df338e9f62e6eb8ef0384c15accc1f666763259b3f94abd5374b86a60fa486f67b821ddd484edc1112e78fa3f9c05a553e
+  metadata.gz: d8bea2c1c42bf3bf95819b1371368ad73a810860725fc2e86ccf2803c11de5de826740cd32723c5b67ccf2423e7bebb15442888e163c1fe5188924988c9b15f3
+  data.tar.gz: b8a3881c29831dae7b37b7eeafb31acf5c34ccaf79c99e9b2bed2252a71f82575417dfe8941ba9c2d6629fad6c10511dacff6d40dd05a5022c91804720568c96

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 1.0.35
+
+2024-08-22 10:14
+
+#### IMPROVED
+
+- Code cleanup
+- Cleaner UTF-8 string encoding
+
+### 1.0.34
+
+2024-08-22 10:13
+
+#### IMPROVED
+
+- Code cleanup
+- Cleaner UTF-8 string encoding
+
+### 1.0.33
+
+2024-08-22 06:35
+
+#### IMPROVED
+
+- Clean up string encoding in filters
+
 ### 1.0.32
 
 2024-07-31 11:12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marked-conductor (1.0.28)
+    marked-conductor (1.0.33)
       chronic (~> 0.10.2)
       tty-which (~> 0.5.0)
 

data/bin/conductor

@@ -1,65 +1,29 @@
-#!/usr/bin/env ruby -W1
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
-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
-  end
-
-  opts.on("-h", "--help", "Display this screen") do
-    puts opts
-    exit
+#
+# This file was generated by Bundler.
+#
+# The application 'conductor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
   end
 end
 
-optparse.parse!
+require "rubygems"
+require "bundler/setup"
 
-config = Conductor::Config.new
-config.config_file = options[:config_file] if options[:config_file]
-res = config.configure
-
-Process.exit 0 unless res
-
-Conductor.stdin
-Conductor.original_input = Conductor.stdin
-
-tracks = config.tracks
-res, condition = Conductor.conduct(tracks)
-
-##
-## Clean up conditions for output
-##
-## @param      condition  The condition
-##
-def clean_condition(condition)
-  condition.join("").sub(/ *(->|,) *$/, "")
-end
-
-if res.nil?
-  warn "No conditions satisfied"
-  # puts Conductor::Env
-  puts "NOCUSTOM"
-elsif res == Conductor.original_input
-  warn "No change in output"
-  puts "NOCUSTOM"
-else
-  warn "Met condition: #{clean_condition(condition)}"
-  puts res
-end
+load Gem.bin_path("marked-conductor", "conductor")

data/lib/conductor/command.rb

@@ -67,7 +67,7 @@ module Conductor
       end
 
       if use_stdin
-        `echo #{Shellwords.escape(stdin.force_encoding("utf-8"))} | #{Env} #{path} #{args}`
+        `echo #{Shellwords.escape(stdin.utf8)} | #{Env} #{path} #{args}`
       else
         `#{Env} #{path} #{args}`
       end

data/lib/conductor/filter.rb

@@ -42,7 +42,7 @@ class ::String
   ## @return     [Symbol] metadata type
   ##
   def meta_type
-    lines = split(/\n/)
+    lines = utf8.split(/\n/)
     case lines[0]
     when /^--- *$/
       :yaml
@@ -65,7 +65,7 @@ class ::String
 
     case meta_type
     when :yaml
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines.shift
       lines.each_with_index do |line, idx|
         next unless line =~ /^(\.\.\.|---) *$/
@@ -74,7 +74,7 @@ class ::String
         break
       end
     when :mmd
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines.each_with_index do |line, idx|
         next if line =~ /^ *[ \w]+: +\S+/
 
@@ -82,7 +82,7 @@ class ::String
         break
       end
     when :pandoc
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines.each_with_index do |line, idx|
         next if line =~ /^% +\S/
 
@@ -101,7 +101,7 @@ class ::String
   ##
   def first_h1
     first = nil
-    split(/\n/).each_with_index do |line, idx|
+    utf8.split(/\n/).each_with_index do |line, idx|
       if line =~ /^(# *[^#]|={2,} *$)/
         first = idx
         break
@@ -118,7 +118,7 @@ class ::String
   def first_h2
     first = nil
     meta_end = meta_insert_point
-    split(/\n/).each_with_index do |line, idx|
+    utf8.split(/\n/).each_with_index do |line, idx|
       next if idx <= meta_end
 
       if line =~ /^(## *[^#]|-{2,} *$)/
@@ -177,7 +177,7 @@ class ::String
   ## @return     [String] content with TOC tag added
   ##
   def insert_toc(max = nil, after = :h1)
-    lines = split(/\n/)
+    lines = utf8.split(/\n/)
     max = max.to_i&.positive? ? " max#{max}" : ""
     line = case after.to_sym
            when :h2
@@ -238,7 +238,7 @@ class ::String
     if File.exist?(path)
       content = IO.read(path)
       yui = YuiCompressor::Yui.new
-      content = yui.compress(content.force_encoding('utf-8'))
+      content = yui.compress(content.utf8)
       inject_after_meta(content.wrap_style)
     else
       warn "File not found (#{path})"
@@ -254,7 +254,7 @@ class ::String
   ## @return     [String] string with content injected
   ##
   def inject_after_meta(content)
-    lines = split(/\n/)
+    lines = utf8.split(/\n/)
     insert_point = meta_insert_point
     insert_at = insert_point.positive? ? insert_point + 1 : 0
     lines.insert(insert_at, "#{content}\n\n")
@@ -294,10 +294,10 @@ class ::String
       inject_after_meta(out)
     when :h1
       h1 = first_h1.nil? ? 0 : first_h1 + 1
-      split(/\n/).insert(h1, out).join("\n")
+      utf8.split(/\n/).insert(h1, out).join("\n")
     when :h2
       h2 = first_h2.nil? ? 0 : first_h2 + 1
-      split(/\n/).insert(h2, out).join("\n")
+      utf8.split(/\n/).insert(h2, out).join("\n")
     else
       "#{self}\n#{out}"
     end
@@ -393,7 +393,7 @@ class ::String
       yaml = YAML.load(m[0])
       title = yaml["title"]
     when :mmd
-      split(/\n/).each do |line|
+      utf8.split(/\n/).each do |line|
         if line =~ /^ *title: *(\S.*?)$/i
           title = Regexp.last_match(1)
           break
@@ -401,7 +401,7 @@ class ::String
       end
     when :pandoc
       title = nil
-      split(/\n/).each do |line|
+      utf8.split(/\n/).each do |line|
         if line =~ /^% +(.*?)$/
           title = Regexp.last_match(1)
           break
@@ -419,7 +419,7 @@ class ::String
   end
 
   def insert_title(shift: 0)
-    content = dup
+    content = dup.utf8
     title = read_title
     content.increase_headers!(shift) if shift.positive?
     lines = content.split(/\n/)
@@ -441,7 +441,7 @@ class ::String
   end
 
   def ensure_mmd_meta_newline
-    split(/\n/).insert(meta_insert_point, "\n\n").join("\n")
+    utf8.split(/\n/).insert(meta_insert_point, "\n\n").join("\n")
   end
 
   def add_yaml(key, value)
@@ -466,7 +466,7 @@ class ::String
     if match(/(\A|\n) *#{key}: *\S+/i)
       sub(/^ *#{key}:.*?\n/i, "#{key}: #{value}\n")
     else
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines.insert(meta_insert_point, "#{key}: #{value}")
       "#{lines.join("\n")}\n"
     end
@@ -484,7 +484,7 @@ class ::String
     if comment?(key)
       sub(/ *#{key}: .*?$/, "#{key}: #{value}")
     else
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines.insert(meta_insert_point + 1, "\n<!--\n#{key}: #{value}\n-->")
       lines.join("\n")
     end
@@ -506,10 +506,10 @@ class ::String
     when :yaml
       sub(/^---.*?(---|\.\.\.)/m, "")
     when :mmd
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines[meta_insert_point..].join("\n")
     when :pandoc
-      lines = split(/\n/)
+      lines = utf8.split(/\n/)
       lines[meta_insert_point..].join("\n")
     else
       gsub(/(\n|^)<!--\n[\w\d\s]+: ([\w\d\s]+)\n-->\n/m, '')
@@ -574,7 +574,7 @@ class ::String
   ##
   def ensure_h1
     headers = to_enum(:scan, /(\#{1,6})([^#].*?)$/m).map { Regexp.last_match }
-    return self if headers.select { |h| h[1].size == 1 }.count.positive?
+    return self unless headers.select { |h| h[1].size == 1 }.empty?
 
     lowest_header = headers.min_by { |h| h[1].size }
     return self if lowest_header.nil?

data/lib/conductor/script.rb

@@ -72,7 +72,7 @@ module Conductor
       end
 
       if use_stdin
-        `echo #{Shellwords.escape(stdin.force_encoding("utf-8"))} | #{Env} #{@path} #{@args}`
+        `echo #{Shellwords.escape(stdin.utf8)} | #{Env} #{@path} #{@args}`
       else
         `#{Env} #{@path} #{@args}`
       end

data/lib/conductor/string.rb

@@ -199,4 +199,40 @@ class ::String
   def to_pattern
     gsub(/\$(\d+)/, '\\\\\1').gsub(/(^["']|["']$)/, "")
   end
+
+  ##
+  ## Discard invalid characters and output a UTF-8 String
+  ##
+  ## @return     [String] UTF-8 encoded string
+  ##
+  def utf8
+    encode('utf-16', invalid: :replace).encode('utf-8')
+  end
+
+  ##
+  ## Destructive version of #utf8
+  ##
+  ## @return     [String] UTF-8 encoded string, in place
+  ##
+  def utf8!
+    replace scrub
+  end
+
+  ##
+  ## Get a clean UTF-8 string by forcing an ISO encoding and then re-encoding
+  ##
+  ## @return     [String] UTF-8 string
+  ##
+  def clean_encode
+    force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
+  end
+
+  ##
+  ## Destructive version of #clean_encode
+  ##
+  ## @return     [String] UTF-8 string, in place
+  ##
+  def clean_encode!
+    replace clean_encode
+  end
 end

data/lib/conductor/version.rb

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

data/lib/conductor/yui_compressor.rb

@@ -137,7 +137,7 @@ module YuiCompressor
     ##
     ## @return [String] css text with strings replaced
     def process_comments_and_strings(css_text)
-      css = css_text.dup.force_encoding("ISO-8859-1").encode("utf-8", replace: nil)
+      css = css_text.dup.clean_encode
 
       start_index = 0
       token = ""
@@ -155,7 +155,7 @@ module YuiCompressor
       end
 
       # preserve strings so their content doesn't get accidentally minified
-      css.gsub!(/("([^\\"]|\\.|\\)*")|('([^\\']|\\.|\\)*')/) do |match|
+      css = css.gsub(/("([^\\"]|\\.|\\)*")|('([^\\']|\\.|\\)*')/) do |match|
         quote = match[0, 1]
         string = match.slice(1..-2)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.35
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A custom processor manager for Marked 2 (Mac)