mdless 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6335a8f0eb1e43af37924810a1e8e6b94f5b2da35b745824f3ce735536777d
-  data.tar.gz: 54643d669cfef096d92405e4b1ed2a216c749a67c3fb2f03dc32ad91e7a5f98a
+  metadata.gz: 4dc58e8318fcc9ffc8a4b148f902a71bc5ef7179098b2b58f210cb1f2e4e0bc3
+  data.tar.gz: 0c57011d06d423819b0766b77813134af58c85d539fcd177eb5eff08c55ea635
 SHA512:
-  metadata.gz: 8a3d3fc7ee471da0cd3b882deba060a19728492a2493c06cca461029ce7d664940e8e0f602a324c71ede7d8e0b617365e7375cb4702cd7b19a91d440fda32a24
-  data.tar.gz: be3fc65aca571dcc96af250f8bc0faf0e5c8be3a7ed1a2b30229fd5fd501e6087a8990bcc43f5d8f60b21599167833f55381a759a54e7765a3be4db729e16de4
+  metadata.gz: 6161f939a995dde611d4c8ce6dbdf75a97a4c42f051f24c2486812e994b74c5eaf67548c4f308c5b01f64df9b00cc6c1ba2699928e788817e5a8f38c5c09772e
+  data.tar.gz: b63230e50bf1c9b8e4e502282928c3d3d56867269a1c61abe73a0e0b3c3ad2b6b174f7767a046c858210a606084d3c41f6dda15852ede26f58ae97a8026b1b13

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.1.10
+: Spinner while processing to indicate working
+: Image links can now be converted to reference format, with correct coloring
+: Render image links before reference link conversion
+
 2.1.9
 : Code block prefix configurable, can be left empty to make more copyable code blocks
 : Remove empty lines from block quotes

data/lib/mdless/console.rb

@@ -358,25 +358,6 @@ module Redcarpet
         "#{pre_element}#{color('highlight')}#{text}#{xc}#{post_element}"
       end
 
-      def color_image_tag(link, title, alt_text)
-        [
-          color('image bang'),
-          '!',
-          color('image brackets'),
-          '[',
-          color('image title'),
-          alt_text,
-          color('image brackets'),
-          '](',
-          color('image url'),
-          link,
-          title.nil? ? '' : %( "#{title}"),
-          color('image brackets'),
-          ')',
-          xc,
-        ].join
-      end
-
       def image(link, title, alt_text)
         "<<img>>#{link}||#{title}||#{alt_text}<</img>>"
       end
@@ -404,6 +385,37 @@ module Redcarpet
         ].join
       end
 
+      def color_image_tag(link, title, alt_text)
+        image = [
+          color('image brackets'),
+          '[',
+          color('image title'),
+          alt_text,
+          color('image brackets'),
+          '](',
+          color('image url'),
+          link,
+          title.nil? ? '' : %( "#{title}"),
+          color('image brackets'),
+          ')'
+        ].join
+
+        @@links << {
+          link: image,
+          url: link,
+          title: title,
+          content: alt_text,
+          image: true
+        }
+
+        [
+          color('image bang'),
+          '!',
+          image,
+          xc
+        ].join
+      end
+
       def color_link_reference(link, idx, content)
         [
           pre_element,
@@ -422,7 +434,7 @@ module Redcarpet
         ].join
       end
 
-      def color_reference_link(link, title, content)
+      def color_reference_link(link, title, content, image: false)
         [
           color('link brackets'),
           '[',
@@ -432,13 +444,31 @@ module Redcarpet
           ']:',
           color('text'),
           ' ',
-          color('link url'),
+          image ? color('image url') : color('link url'),
           link,
           title.nil? ? '' : %( "#{title}"),
           xc
         ].join
       end
 
+      def color_image_reference(idx, content)
+        [
+          pre_element,
+          color('image brackets'),
+          '[',
+          color('image title'),
+          content,
+          color('image brackets'),
+          '][',
+          color('link url'),
+          idx,
+          color('image brackets'),
+          ']',
+          xc,
+          post_element
+        ].join
+      end
+
       def link(link, title, content)
         res = color_link(link, title&.strip, content&.strip)
         @@links << {
@@ -785,7 +815,7 @@ module Redcarpet
       end
 
       def color_links(input)
-        input.gsub(/(?mi)(?<!\\e)\[(?<text>[^\[]+)\]\((?<url>\S+)(?: +"(?<title>.*?)")?\)/) do
+        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
@@ -805,16 +835,18 @@ module Redcarpet
               url = link[:url].uncolor
               content = link[:content]
               title = link[:title]&.uncolor
-              graf.gsub!(/#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/, color_link_reference(url, counter, content))
+              image = link.key?(:image) && link[:image] ? true : false
+              colored_link = image ? color_image_reference(counter, content) : color_link_reference(url, counter, content)
+              graf.gsub!(/#{Regexp.escape(link[:link].gsub(/\n/, ' '))}/, colored_link)
               if MDLess.options[:links] == :paragraph
                 if links_added
-                  graf += "\n#{color_reference_link(url, title, counter)}"
+                  graf += "\n#{color_reference_link(url, title, counter, image: image)}"
                 else
-                  graf = "#{graf}\n\n#{color_reference_link(url, title, counter)}"
+                  graf = "#{graf}\n\n#{color_reference_link(url, title, counter, image: image)}"
                   links_added = true
                 end
               else
-                @@footer_links << color_reference_link(url, title, counter)
+                @@footer_links << color_reference_link(url, title, counter, image: image)
               end
               counter += 1
             end
@@ -997,11 +1029,12 @@ module Redcarpet
         input = fix_equations(input)
         # misc html
         input.gsub!(%r{<br */?>}, "#{pre_element}\n#{post_element}")
+        # render images
+        input = render_images(input) if MDLess.options[:local_images]
         # format links
         input = reference_links(input) if MDLess.options[:links] == :reference || MDLess.options[:links] == :paragraph
         # lists
         input = fix_lists(input)
-        input = render_images(input) if MDLess.options[:local_images]
         input = highlight_tags(input) if MDLess.options[:at_tags] || MDLess.options[:taskpaper]
         fix_colors(input)
       end

data/lib/mdless/converter.rb

@@ -287,20 +287,58 @@ module CLIMarkdown
                                          tables: true,
                                          underline: false)
 
+      spinner = TTY::Spinner.new("[:spinner] Processing ...", format: :dots_3, clear: true)
+
       if !args.empty?
         files = args.delete_if { |f| !File.exist?(f) }
         files.each do |file|
-          MDLess.log.info(%(Processing "#{file}"))
-          MDLess.file = file
+          spinner.run do |spinner|
+            MDLess.log.info(%(Processing "#{file}"))
+            MDLess.file = file
+
+            begin
+              input = IO.read(file).force_encoding('utf-8')
+            rescue StandardError
+              input = IO.read(file)
+            end
+            raise 'Nil input' if input.nil?
+
+            input.scrub!
+            input.gsub!(/\r?\n/, "\n")
+
+            if MDLess.options[:taskpaper] == :auto
+              MDLess.options[:taskpaper] = if CLIMarkdown::TaskPaper.is_taskpaper?(input)
+                                             MDLess.log.info('TaskPaper detected')
+                                             true
+                                           else
+                                             false
+                                           end
+            end
 
-          begin
-            input = IO.read(file).force_encoding('utf-8')
-          rescue StandardError
-            input = IO.read(file)
+            if MDLess.options[:list]
+              if MDLess.options[:taskpaper]
+                puts CLIMarkdown::TaskPaper.list_projects(input)
+              else
+                puts list_headers(input)
+              end
+              Process.exit 0
+            else
+              if MDLess.options[:taskpaper]
+                input = input.color_meta(MDLess.cols)
+                input = CLIMarkdown::TaskPaper.highlight(input)
+                @output = input.highlight_tags
+              else
+                @output = markdown.render(input)
+              end
+            end
           end
-          raise 'Nil input' if input.nil?
-
-          input.scrub!
+        end
+        printout
+      elsif !$stdin.isatty
+        MDLess.log.info(%(Processing STDIN))
+        spinner.run do |spinner|
+          MDLess.file = nil
+          input = $stdin.read.scrub
           input.gsub!(/\r?\n/, "\n")
 
           if MDLess.options[:taskpaper] == :auto
@@ -330,37 +368,6 @@ module CLIMarkdown
           end
         end
         printout
-      elsif !$stdin.isatty
-        MDLess.file = nil
-        input = $stdin.read.scrub
-        input.gsub!(/\r?\n/, "\n")
-
-        if MDLess.options[:taskpaper] == :auto
-          MDLess.options[:taskpaper] = if CLIMarkdown::TaskPaper.is_taskpaper?(input)
-                                         MDLess.log.info('TaskPaper detected')
-                                         true
-                                       else
-                                         false
-                                       end
-        end
-
-        if MDLess.options[:list]
-          if MDLess.options[:taskpaper]
-            puts CLIMarkdown::TaskPaper.list_projects(input)
-          else
-            puts list_headers(input)
-          end
-          Process.exit 0
-        else
-          if MDLess.options[:taskpaper]
-            input = input.color_meta(MDLess.cols)
-            input = CLIMarkdown::TaskPaper.highlight(input)
-            @output = input.highlight_tags
-          else
-            @output = markdown.render(input)
-          end
-        end
-        printout
       else
         warn 'No input'
         Process.exit 1

data/lib/mdless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CLIMarkdown
-  VERSION = '2.1.9'
+  VERSION = '2.1.10'
 end

data/lib/mdless.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'logger'
 require 'tty-which'
 require 'tty-screen'
+require 'tty-spinner'
 require 'mdless/version.rb'
 require 'mdless/colors'
 require 'mdless/tables'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Brett Terpstra
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement