mdless 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a843ef78c0e58862a1f83169447bbd48be24bb
-  data.tar.gz: e54b45a682cbcb09b5640666c6f1bd9640093db8
+  metadata.gz: 4fcccb4da5a1692b5452b814fd4741b7ab95b2e9
+  data.tar.gz: 6225634e845e46cfd9bebd9f0726454d379bce6a
 SHA512:
-  metadata.gz: cadebc38a068ff7681852c5208d972fafe4d623bf2015ffce03171b85ec453440c27e55cc809f38e6407da6bbf61675118341bc3edef515fe31fc25649057e2b
-  data.tar.gz: a0715246a5e6fe0788866a409bdad42b56270828f6ae754d0147443701b10709db7126eb63247ab48766ffdb98a642924c2c1b9b43d287a544b46a98c8fe48b8
+  metadata.gz: be0b61b2ef4802e06dc425acd67bc7280207880ffc3b87676631e21f4575023d6c588b3438e6640e7cb633f7b0475520f4d3439d8c5fe56b2e9cba42517474b5
+  data.tar.gz: 2f1be952a4c5f84a54b1a7cb9170095522363c1cc4e91b2168298c71f4db3c5129d8d90c99086ae5f4b1af77082931cb55c7db945ddef18dd1146f520b3c83e2

data/lib/mdless/converter.rb

@@ -113,6 +113,7 @@ module CLIMarkdown
           rescue
             input = IO.read(file)
           end
+          input.gsub!(/\r?\n/,"\n")
           if @options[:list]
             list_headers(input)
           else
@@ -127,6 +128,7 @@ module CLIMarkdown
         rescue
           input = STDIN.read
         end
+        input.gsub!(/\r?\n/,"\n")
         if @options[:list]
           list_headers(input)
         else
@@ -206,7 +208,7 @@ module CLIMarkdown
       }.join("\n")
     end
 
-    def table_cleanup(input)
+    def cleanup_tables(input)
       in_table = false
       header_row = false
       all_content = []
@@ -224,7 +226,7 @@ module CLIMarkdown
           orig_table.push(line)
         else
           if in_table
-            if this_table.length > 3
+            if this_table.length > 2
               # if there's no header row, add one, cleanup requires it
               unless header_row
                 cells = this_table[0].sub(/^\|/,'').scan(/.*?\|/).length
@@ -232,14 +234,15 @@ module CLIMarkdown
                 this_table.insert(1, cell_row)
               end
 
-              table = this_table.join("\n")
+              table = this_table.join("\n").strip
               begin
-                res = clean_table(table)
+                formatted = MDTableFormatter.new(table)
+                res = formatted.to_md
                 res = color_table(res)
               rescue
                 res = orig_table.join("\n")
               end
-              all_content.push("\n" + res)
+              all_content.push(res)
             else
               all_content.push(orig_table.join("\n"))
             end
@@ -255,27 +258,7 @@ module CLIMarkdown
     end
 
     def clean_table(input)
-      dir = File.dirname(__FILE__)
-      lib = File.expand_path(dir + '/../../lib')
-      script = File.join(lib, 'helpers/formattables.py')
 
-      if File.exists?(script) and File.executable?(script)
-        begin
-
-          res, s = Open3.capture2(script, :stdin_data=>input.strip)
-
-          if s.success?
-            res
-          else
-            input
-          end
-        rescue => e
-          @log.error(e)
-          input
-        end
-      else
-        input
-      end
     end
 
     def clean_markers(input)
@@ -738,7 +721,7 @@ module CLIMarkdown
         Process.exit
       end
 
-      out = table_cleanup(out)
+      out = cleanup_tables(out)
       out = clean_markers(out)
       out = out.gsub(/\n+{2,}/m,"\n\n") + "\n#{xc}\n\n"
 

data/lib/mdless/tables.rb

@@ -0,0 +1,130 @@
+module CLIMarkdown
+  class MDTableFormatter
+
+    def initialize(string)
+      @doc = string
+      @format_row = []
+      parse
+    end
+
+    def parse
+      @table = []
+      format = []
+      cols = 0
+      rows = @doc.split(/\r?\n/)
+      rows.each do |row|
+        row.strip!
+        row.sub!(/^\s*\|?/,'').sub!(/\|?\s*$/,'')
+        row_array = row.split(/\|/)
+        row_array.map! { |cell| cell.strip }
+        if row =~ /^[\|:\- ]+$/
+          format = row_array
+        else
+          @table.push row_array
+        end
+        cols = row_array.length if row_array.length > cols
+      end
+
+      format.each_with_index {|cell, i|
+        f = 'left'
+        if cell =~ /^:.*?:$/
+          f = 'center'
+        elsif cell =~ /:$/
+          f = 'right'
+        else
+          f = 'just'
+        end
+        @format_row.push(f)
+      }
+
+      if @format_row.length < cols
+        (cols - @format_row.length).times do
+          @format_row.push('left')
+        end
+      end
+
+      @table.map! do |row|
+        if row.length < cols
+          (cols - row.length).times do
+            row.push("")
+          end
+        end
+        row
+      end
+      @table
+    end
+
+    def table
+      @table ||= parse
+    end
+
+    def column_width(i)
+      @widths ||= column_widths
+      @widths[i]
+    end
+
+    def column_widths
+      @widths = []
+      @format_row.length.times do
+        @widths.push(0)
+      end
+
+      table.each do |row|
+        @format_row.each_with_index do |cell, i|
+          length = row[i].strip.length
+          @widths[i] = length if length > @widths[i]
+        end
+      end
+
+      @widths
+    end
+
+    def pad(string,type,length)
+      string.strip!
+      if type == 'center'
+        string.center(length, ' ')
+      elsif type == 'right'
+        string.rjust(length, ' ')
+      elsif type == 'left'
+        string.ljust(length, ' ')
+      else
+        string.ljust(length, ' ')
+      end
+    end
+
+    def separator(length, alignment)
+      out = "".ljust(length,'-')
+      case alignment
+      when 'left'
+        out = ':' + out + '-'
+      when 'right'
+        out = '-' + out + ':'
+      when 'center'
+        out = ":#{out}:"
+      else
+        out = "-#{out}-"
+      end
+      out
+    end
+
+    def header_separator_row
+      output = []
+      @format_row.each_with_index do |column, i|
+        output.push separator(column_width(i), column)
+      end
+      "|#{output.join('|')}|"
+    end
+
+    def to_md
+      output = []
+      t = table.clone
+
+      t.each_with_index do |row, index|
+        row.map!.with_index { |cell, i| cell = pad(cell, @format_row[i], column_width(i)) }
+        output.push("| #{row.join(' | ').lstrip} |")
+      end
+      output.insert(1, header_separator_row)
+      output.join("\n")
+    end
+  end
+end

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/mdless.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'logger'
 require 'mdless/version.rb'
 require 'mdless/colors'
+require 'mdless/tables'
 require 'mdless/converter'
 
 module CLIMarkdown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,10 +69,10 @@ extra_rdoc_files:
 files:
 - README.md
 - bin/mdless
-- lib/helpers/formattables.py
 - lib/mdless.rb
 - lib/mdless/colors.rb
 - lib/mdless/converter.rb
+- lib/mdless/tables.rb
 - lib/mdless/version.rb
 homepage: http://brettterpstra.com/project/mdless/
 licenses:

data/lib/helpers/formattables.py

@@ -1,105 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import re
-
-def just(string, type, n):
-    "Justify a string to length n according to type."
-
-    if type == '::':
-        return string.center(n)
-    elif type == '-:':
-        return string.rjust(n)
-    elif type == ':-':
-        return string.ljust(n)
-    else:
-        return string
-
-
-def normtable(text):
-    "Aligns the vertical bars in a text table."
-
-    # Start by turning the text into a list of lines.
-    lines = text.splitlines()
-    rows = len(lines)
-
-    # Figure out the cell formatting.
-    # First, find the separator line.
-    for i in range(rows):
-        if set(lines[i]).issubset('|:.-'):
-            formatline = lines[i]
-            formatrow = i
-            break
-
-    # Delete the separator line from the content.
-    del lines[formatrow]
-
-    # Determine how each column is to be justified.
-    formatline = formatline.strip(' ')
-    if formatline[0] == '|': formatline = formatline[1:]
-    if formatline[-1] == '|': formatline = formatline[:-1]
-    fstrings = formatline.split('|')
-    justify = []
-    for cell in fstrings:
-        ends = cell[0] + cell[-1]
-        if ends == '::':
-            justify.append('::')
-        elif ends == '-:':
-            justify.append('-:')
-        else:
-            justify.append(':-')
-
-    # Assume the number of columns in the separator line is the number
-    # for the entire table.
-    columns = len(justify)
-
-    # Extract the content into a matrix.
-    content = []
-    for line in lines:
-        line = line.strip(' ')
-        if line[0] == '|': line = line[1:]
-        if line[-1] == '|': line = line[:-1]
-        cells = line.split('|')
-        # Put exactly one space at each end as "bumpers."
-        linecontent = [ ' ' + x.strip() + ' ' for x in cells ]
-        content.append(linecontent)
-
-    # Append cells to rows that don't have enough.
-    rows = len(content)
-    for i in range(rows):
-        while len(content[i]) < columns:
-            content[i].append('')
-
-    # Get the width of the content in each column. The minimum width will
-    # be 2, because that's the shortest length of a formatting string and
-    # because that matches an empty column with "bumper" spaces.
-    widths = [2] * columns
-    for row in content:
-        for i in range(columns):
-            widths[i] = max(len(row[i]), widths[i])
-
-    # Add whitespace to make all the columns the same width and
-    formatted = []
-    for row in content:
-        formatted.append('|' + '|'.join([ just(s, t, n) for (s, t, n) in zip(row, justify, widths) ]) + '|')
-
-    # Recreate the format line with the appropriate column widths.
-    formatline = '|' + '|'.join([ s[0] + '-'*(n-2) + s[-1] for (s, n) in zip(justify, widths) ]) + '|'
-
-    # Insert the formatline back into the table.
-    formatted.insert(formatrow, formatline)
-
-    # Return the formatted table.
-    return '\n'.join(formatted)
-
-space_cleaner = r'''(?s)[ \t]*(?P<value>[\|:])[ \t]*'''
-
-def whitespaceProcess(group_object):
-    return group_object.group('value')
-
-
-# Read the input, process, and print.
-unformatted = sys.stdin.read()
-unformatted = re.sub(space_cleaner, whitespaceProcess, unformatted, flags=re.DOTALL)
-
-print normtable(unformatted)