mdless 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e50c4e915aa31ffff9b159763d18828ffb1f639588773b45a3aa7528a897cf3
-  data.tar.gz: b6de738b4cd1f6fd6aa208d4a6607354faa143a5a7f2943147f2a244ba9204b1
+  metadata.gz: 2153423a3c896ca8522fd330478ce3125fd68a2bcc6a8a4c52b0efea31033484
+  data.tar.gz: 4b039579d2315650038408b954d00689929530c322441aacca52c13e77f4065f
 SHA512:
-  metadata.gz: 7df9141901628641895a5d3ac76d37c5af99c30cc94f8fd7e2a1e506b62e9da48267c8173418de66fe139456b120e3b082437d497eb32609a2e4105b1bfa969e
-  data.tar.gz: eabe40a67402c2a9db8488f74b33b7d48295190e6788690375f71a121b934a6659b10e3c8d8e05c5ae9b1de0aa791ea5d405cf85340c913d317e2d3f50fb7392
+  metadata.gz: 40fbf0a45ede5519964948b6fc83b1f2f7dd6beea06f2faec2be9b8606d1bfe8d1f176597e49a318a205cae66b1ad855afc0951ec29f0e39f6f662d34535c816
+  data.tar.gz: c2adc031a649dfbc3cfd4254df7acfb990f2b86a31bea7f4d58405a7c2853122431b5057dfe5cd225b6510e206a45b2b999f10a372f00e6128b74cce66cf6978

data/lib/mdless/console.rb

@@ -9,6 +9,8 @@ module Redcarpet
       @@listid = 0
       @@footnotes = []
       @@headers = []
+      @@links = []
+      @@footer_links = []
 
       def xc
         x + color('text')
@@ -393,11 +395,11 @@ module Redcarpet
         end
       end
 
-      def linebreak()
-        "\n"
+      def linebreak
+        "  \n"
       end
 
-      def link(link, title, content)
+      def color_link(link, title, content)
         [
           color('link brackets'),
           '[',
@@ -414,6 +416,50 @@ module Redcarpet
         ].join
       end
 
+      def color_link_reference(link, idx, content)
+        [
+          color('link brackets'),
+          '[',
+          color('link text'),
+          content,
+          color('link brackets'),
+          '][',
+          color('link url'),
+          idx,
+          color('link brackets'),
+          ']',
+          xc
+        ].join
+      end
+
+      def color_reference_link(link, title, content)
+        [
+          color('link brackets'),
+          '[',
+          color('link text'),
+          content,
+          color('link brackets'),
+          ']:',
+          color('text'),
+          ' ',
+          color('link url'),
+          link,
+          title.nil? ? '' : %( "#{title}"),
+          xc
+        ].join
+      end
+
+      def link(link, title, content)
+        res = color_link(link, title, content)
+        @@links << {
+          link: res,
+          url: link,
+          title: title,
+          content: content
+        }
+        res
+      end
+
       def color_tags(html)
         html.gsub(%r{(<\S+( .*?)?/?>)}, "#{color('html brackets')}\\1#{xc}")
       end
@@ -530,17 +576,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 +599,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
@@ -619,6 +672,51 @@ module Redcarpet
         end
       end
 
+      def color_links(input)
+        input.gsub(/(?mi)(?<!\\e)\[(?<text>[^\[]+)\]\((?<url>\S+)(?: +"(?<title>.*?)")?\)/) do
+          m = Regexp.last_match
+          color_link(m['url'].uncolor, m['title']&.uncolor, m['text'].uncolor)
+        end
+      end
+
+      def reference_links(input)
+        grafs = input.split(/\n{2,}/)
+        counter = 1
+
+        grafs.map! do |graf|
+          next if graf =~ /^$/
+
+          links_added = false
+
+          @@links.each do |link|
+            if graf =~ /#{Regexp.escape(link[:link])}/
+              url = link[:url].uncolor
+              content = link[:content]
+              title = link[:title]&.uncolor
+              graf.gsub!(/#{Regexp.escape(link[:link])}/, color_link_reference(url, counter, content))
+              if @options[:links] == :paragraph
+                if links_added
+                  graf += "\n#{color_reference_link(url, title, counter)}"
+                else
+                  graf = "#{graf}\n\n#{color_reference_link(url, title, counter)}"
+                  links_added = true
+                end
+              else
+                @@footer_links << color_reference_link(url, title, counter)
+              end
+              counter += 1
+            end
+          end
+          "\n#{graf}\n"
+        end
+
+        if @options[:links] == :paragraph
+          grafs.join("\n")
+        else
+          grafs.join("\n") + "\n#{@@footer_links.join("\n")}\n"
+        end
+      end
+
       def postprocess(input)
         if @options[:inline_footnotes]
           input = insert_footnotes(input)
@@ -646,6 +744,10 @@ module Redcarpet
         end
         # misc html
         input.gsub!(%r{<br */?>}, "\n")
+        # format links
+        if @options[:links] == :reference || @options[:links] == :paragraph
+          input = reference_links(input)
+        end
         # lists
         fix_lists(input, 0)
       end

data/lib/mdless/converter.rb

@@ -73,8 +73,15 @@ module CLIMarkdown
 
         @options[:links] ||= :inline
         opts.on('--links=FORMAT',
-                'Link style ([inline, reference], default inline) [NOT CURRENTLY IMPLEMENTED]') do |format|
-          @options[:links] = :reference if format =~ /^r/i
+                'Link style ([inline, reference, paragraph], default inline, "paragraph" will position reference links after each paragraph)') do |fmt|
+          @options[:links] = case fmt
+                             when /^:?r/i
+                               :reference
+                             when /^:?p/i
+                               :paragraph
+                             else
+                               :inline
+                             end
         end
 
         @options[:list] ||= false
@@ -234,9 +241,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|
@@ -274,6 +282,7 @@ module CLIMarkdown
       @headers = get_headers(input)
       last_level = 0
       headers_out = []
+      len = (@headers.count + 1).to_s.length
       @headers.each_with_index do |h, idx|
         level = h[0].length - 1
         title = h[1]
@@ -294,7 +303,7 @@ module CLIMarkdown
                  else
                    '  '
                  end
-        headers_out.push format('%<d>d: %<s>s',
+        headers_out.push format("%<d>#{len}d: %<s>s",
                                 d: idx + 1,
                                 s: "#{c(%i[x black])}#{'.' * level}#{c(%i[x yellow])}#{subdoc}#{title.strip}#{xc}")
       end

data/lib/mdless/version.rb

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

metadata

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