mdless 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e50c4e915aa31ffff9b159763d18828ffb1f639588773b45a3aa7528a897cf3
-  data.tar.gz: b6de738b4cd1f6fd6aa208d4a6607354faa143a5a7f2943147f2a244ba9204b1
+  metadata.gz: ccc91a0517db5cc507c8b0ff8c25eb6973374d8754c1b9e0eaa5c0b87c756c2b
+  data.tar.gz: 7fcb9c187a276e2b599c1446df99592b506f82fe808e896c2d12611619d1c666
 SHA512:
-  metadata.gz: 7df9141901628641895a5d3ac76d37c5af99c30cc94f8fd7e2a1e506b62e9da48267c8173418de66fe139456b120e3b082437d497eb32609a2e4105b1bfa969e
-  data.tar.gz: eabe40a67402c2a9db8488f74b33b7d48295190e6788690375f71a121b934a6659b10e3c8d8e05c5ae9b1de0aa791ea5d405cf85340c913d317e2d3f50fb7392
+  metadata.gz: e0875e8f64bbd79ca3d24a5510ea4a1a7034a2799a468b9d21a67dec592e56a766e4d622ea8c944928ef24e2ad8cf444922a1db2d99522b6662208980e9c8206
+  data.tar.gz: 5e8c1982080a3e273e1c0f9be224d9b9a5f8e4e059ae74f621d114e3a12371937beb4f141090103a4d25dc925d134c4a72abcf8b5b211376bc96ca0aedec7e34

data/lib/mdless/console.rb

@@ -530,17 +530,21 @@ module Redcarpet
           @log.info('Found YAML')
           # YAML
           in_yaml = true
-          input.sub!(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/) do
+          input.sub!(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/m) do
             m = Regexp.last_match
             @log.info('Processing YAML Header')
-            m[0].split(/\n/).map do |line|
+            lines = m[0].split(/\n/)
+            longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
+            longest = longest < @cols ? longest + 1 : @cols
+            lines.map do |line|
               if line =~ /^[-.]{3}\s*$/
-                line = "#{color('metadata marker')}%% #{color('metadata border')}#{line}"
+                line = "#{color('metadata marker')}#{'%' * longest }"
               else
                 line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-                line = "#{color('metadata marker')}%% #{color('metadata color')}#{line}"
+                line = "#{color('metadata color')}#{line}"
               end
-              line += ' ' * (@cols - line.uncolor.size) if (@cols - line.uncolor.size).positive?
+
+              line += ("\u00A0" * (longest - line.uncolor.strip.length) ) + xc
               line
             end.join("\n") + "#{xc}\n"
           end
@@ -549,12 +553,15 @@ module Redcarpet
         if !in_yaml && input.gsub(/\n/, ' ') =~ /(?i-m)^[\w ]+:\s+\S+/
           @log.info('Found MMD Headers')
           input.sub!(/(?i-m)^([\S ]+:[\s\S]*?)+(?=\n\n)/) do |mmd|
-            mmd.split(/\n/).map do |line|
+            lines = mmd.split(/\n/)
+            longest = lines.inject { |memo, word| memo.length > word.length ? memo : word }.length
+            longest = longest < @cols ? longest + 1 : @cols
+            lines.map do |line|
               line.sub!(/^(.*?:)[ \t]+(\S)/, '\1 \2')
-              line = "#{color('metadata marker')}%% #{color('metadata color')}#{line}"
-              line += ' ' * (@cols - line.uncolor.size) if (@cols - line.uncolor.size).positive?
-              line
-            end.join("\n") + "#{' ' * @cols}#{xc}\n"
+              line = "#{color('metadata color')}#{line}"
+              line += "\u00A0" * (longest - line.uncolor.strip.length )
+              line + xc
+            end.join("\n") + "#{"\u00A0" * longest}#{xc}\n"
           end
 
         end

data/lib/mdless/converter.rb

@@ -234,9 +234,10 @@ module CLIMarkdown
       end
     end
 
-    def get_headers(input)
+    def get_headers(string)
       unless @headers && !@headers.empty?
         @headers = []
+        input = string.sub(/(?i-m)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/m, '')
         headers = input.scan(/^((?!#!)(\#{1,6})\s*([^#]+?)(?: #+)?\s*|(\S.+)\n([=-]+))$/i)
 
         headers.each do |h|

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Brett Terpstra