table-formatter 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8938d067b2f19935a1bb9d11a4fe5c563415fc2
-  data.tar.gz: 8746fc35347518325a855234973096384e4aed4e
+SHA256:
+  metadata.gz: c7e3972d61d31bb0e5f4a8530f98bf4a76f8000985e0fddc646d200df5c3bd8c
+  data.tar.gz: c12315a1c23b7900bfa0afc3150948cccd7072c50643d2089ca156d5f9a52937
 SHA512:
-  metadata.gz: cd992b5a66bfe5e7c9637a31a828b5017fac34ca1025449cb12e64207d3cac80567c5d53cd5f9248d15d5a4108239feda977217a35cccbf6b6553376beecd30f
-  data.tar.gz: d1b6e130f0d119c7b64e08a9af7013e2675cbb60f9f855d4386ea39e6eb870d676767225809e78813f85da011febcc10a6e4063e14209fdda709cf55096d3546
+  metadata.gz: ecb25c9968b96b7d472bae86d05aac743756ad20f974b70732fb672cc3430a7102b9535ebecda1f21740a69dc0ad736596e25afa4eb1eb8a7e79bd1649392efc
+  data.tar.gz: 4215518c58acfe6e2513b30cfc65fa4b3090ef38f8b17e2e78bbebf9b386665cde4d8eee424abd877697eff7e529456f94b1617a88aee65736428d154e3426a3

data/lib/table-formatter.rb

@@ -2,14 +2,15 @@
 
 # file: table-formatter.rb
 
+require 'c32'
 require 'rdiscount'
 
-
 class TableFormatter
+  using ColouredText
 
   attr_accessor :source, :labels, :border, :divider, :markdown, :col_justify
-  
-  def initialize(source: nil, labels: nil, border: true, wrap: true, 
+
+  def initialize(source: nil, labels: nil, border: true, wrap: true,
              divider: nil, markdown: false, innermarkdown: false, debug: false)
 
     super()
@@ -22,15 +23,15 @@ class TableFormatter
     @markdown = markdown
     @innermarkdown = innermarkdown
     @debug = debug
-    
+
   end
-  
+
   def justify(s, ajust)
-    
+
     a = s.split('|')
-    
+
     a2 = ajust.map.with_index do |x,i|
-      
+
       s = a[i+1]
 
       case x
@@ -43,13 +44,15 @@ class TableFormatter
       end
     end
 
-    "|%s|\n" % a2.join('|')    
+    "|%s|\n" % a2.join('|')
 
   end
-  
+
   def display(width=nil, widths: nil, markdown: @markdown)
-    
+
     @align_cols = []
+    @labels ||= [''] * @source.first.length
+
     if @labels then
 
       labels = []
@@ -66,12 +69,14 @@ class TableFormatter
       {ljust: :l, rjust: :r, center: :c}[col]
     end
 
-    return display_markdown(@source, labels) if markdown    
+    return display_markdown(@source, labels) if markdown
 
     #width ||= @maxwidth
     @width = width
     @maxwidth = width if width
-    a = @source.map {|x| x.map{|y| y.length > 0 ? y : ' ' }}.to_a
+    a = @source.map do |x|
+      x.map{|y| col = y.to_s; col.length > 0 ? col : ' ' }
+    end.to_a
 
     column_widths = widths ? widths : fetch_column_widths(a)
 
@@ -81,7 +86,7 @@ class TableFormatter
 
     div =  (border == true ? '-' : '') * records[0].length + "\n"
     label_buffer = ''
-    
+
     label_buffer = format_cols(labels, column_widths) + "\n" + div if labels
 
     div + label_buffer + records.join("\n") + "\n" + div
@@ -92,35 +97,35 @@ class TableFormatter
 
 
   private
-  
+
   def display_markdown(a, fields)
-    
+
       print_row = -> (row, widths) do
         '| ' + row.map\
             .with_index {|y,i| y.to_s.ljust(widths[i])}.join(' | ') + " |\n"
-      end         
+      end
 
       print_thline = -> (row, widths) do
         '|:' + row.map\
             .with_index {|y,i| y.to_s.ljust(widths[i])}.join('|:') + "|\n"
       end
-      
+
       if @debug then
-        
+
         puts '@labels: ' + @labels.inspect
         puts 'thline: ' + print_thline.inspect
-        
+
       end
-      
+
       print_rows = -> (rows, widths) do
         rows.map {|x| print_row.call(x,widths)}.join
       end
 
-      
+
       raw_vals = a
 
       # create Markdown hyperlinks for any URLs
-      
+
       vals = raw_vals.map do |row|
 
         row.map do |col|
@@ -136,46 +141,49 @@ class TableFormatter
             url_title = (a.join('.') + path)[0..39] + '...'
 
             "[%s](%s)" % [url_title, col]
-            
+
           else
-            
-            if @innermarkdown then 
-              "{::nomarkdown}" + 
+
+            if @innermarkdown then
+              "{::nomarkdown}" +
                   RDiscount.new(col).to_html.strip.gsub("\n",'') + "{:/}"
             else
 
               col
-              
+
             end
-            
+
           end
-          
+
           r
         end
-      end      
+      end
 
-      widths = ([(fields + ['']).take(a.first.length)] + 
+      puts ('fields: ' + fields.inspect).debug if @debug
+      if fields then
+        widths = ([(fields + ['']).take(a.first.length)] +
                 vals).transpose.map{|x| x.max_by(&:length).length}
+      end
 
-      th = if @labels then        
+      th = if @labels.map(&:strip).join.length > 0 then
         print_row.call(fields, widths)
       else
         ''
       end
-      
-      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths        
-      tb = print_rows.call(vals, widths)      
-      th_line2 = justify(th_line, @col_justify)  
-      
-      table = th + th_line2 + tb    
+
+      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths
+      tb = print_rows.call(vals, widths)
+      th_line2 = justify(th_line, @col_justify)
+
+      table = th + th_line2 + tb
   end
 
   def display_markdown2(a, fields)
-    
+
     print_row = -> (row, widths) do
-      
-      '| ' + row.map.with_index do |y,i| 
-          align = @align_cols ? @align_cols[i] : :ljust        
+
+      '| ' + row.map.with_index do |y,i|
+          align = @align_cols ? @align_cols[i] : :ljust
           y.to_s.method(align).call(widths[i])
       end.join(' | ') + " |\n"
     end
@@ -199,9 +207,9 @@ class TableFormatter
     tb = print_rows.call(a, widths)
     table = th + th_line2 + tb
   end
-  
+
   def fetch_column_widths(a)
-    
+
     puts 'a: ' + a.inspect if @debug
     d = tabulate(a).map &:flatten
     puts 'd: ' + d.inspect if @debug
@@ -209,16 +217,18 @@ class TableFormatter
     d.map{|x| x.max_by(&:length).length}
 
   end
-  
+
   def format_cols(row, col_widths, bar='')
 
-    outer_bar, inner_spacer = '', ''
-    (outer_bar = bar = '|'; inner_spacer = ' ') if border == true
+    outer_bar = ''
+    inner_spacer = border ? ' ' : ''
+    outer_bar = border ? '|' : ''
+    #(outer_bar = bar = '|'; inner_spacer = ' ') if border == true
     col_spacer = @divider ? 0 : 2
-    
+
     buffer = outer_bar
 
-    
+
     row.each_with_index do |col, i|
 
       align = @align_cols.any? ? @align_cols[i] : :ljust
@@ -230,45 +240,46 @@ class TableFormatter
       end
 
       buffer += inner_spacer + val + next_bar.to_s
-    end    
-    
+      puts 'buffer: ' + buffer.inspect if @debug
+    end
+
     buffer
 
-  end  
+  end
 
   def format_rows(raw_a, col_widths)
 
     @width = col_widths.inject(&:+)
 
     col_widths[-1] -= col_widths.inject(&:+) - @maxwidth if @width > @maxwidth
-   
+
     a = if @wrap == true then
-    
+
       raw_a.map do |raw_row|
 
         rowx = raw_row.map.with_index do |col, i|
           col.chars.each_slice(col_widths[i]).map(&:join)
-        end    
-        
+        end
+
         max_len = rowx.max_by {|x| x.length}.length
-        
-        rowx.each do |x| 
+
+        rowx.each do |x|
           len = x.length
           x.concat ([''] * (max_len - len)) if len < max_len
         end
-        
+
         rowx.transpose
       end.flatten(1)
     else
       raw_a
     end
-    
+
     a.map {|row| format_cols(row, col_widths, divider) }
 
   end
 
   def just(x)
-    
+
     case x
       when /^:.*:$/
         [:center, x[1..-2]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,29 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDkwNjExNTY0OFoXDTE4MDkwNjExNTY0OFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANMzRKAQ4QqtTKx2TzuG01Qkl29pye6ODCkt934jWLMI8jiWZf6UIbvi4kz4
-  KAq6XX4wGdR0q2K11csEDH1HtNXBma57f5Y3utj3KJ/KPOit8nAv2DrRiQHcuQuk
-  d7N1dL1u1aK6yirKoNYpqkoYrYWxjCmWBxWPcqy5cCaijUqgg5++a4e1RZD+jDzB
-  u4m1guS3MR4Jw8XObIRudqHUDuSYRA1lERaB/qjALQyF4PLBA1L3nDPdWSym6qq2
-  SIoHpCYbiZhAldcBApyKiOYmtk315+l9ZzzQKM7Vp+kq7GiHl/bkSKq6KSpUIhDF
-  Z7An8TcS5bIM/4FGx7OsiZ1mN90CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU7/J23xpZAHhVPNxsDL92DfgZ3BowJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAC2ebp88P
-  7fgjYcmIvIHP3wTedCAeScJQVNEv5RDOlz5vMFzoZ/aLaytEaRxqMGkPieSwH3Z5
-  NpLGgyMyk3AneVN1JPtYExGfLYakVJ+x50rizAZirYdVBINTi44M1ZkuQGvFmldp
-  89PRQvVuvpuYtAz0R94jC4zV3aC044vElu4FDMeMZRKBus4EFfaijZd7kPqRlzpa
-  uRCZ4WsmyKOap1NS0U7ZiXnJRvo0O5iptjFcbl/3rSTSRCIof+a35uCJppcSjhGZ
-  HGsLe8SKG8DXaaZxtrfB5toes3L8kzgWrblCbrvE10LDGRcRXwMSshNtb9iyK1mh
-  pR4QFidc/b8Rlw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAxMjM1MTM1WhcN
+  MjMwMjAxMjM1MTM1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDRoaWP
+  0NrTIlcCA5Q2IJ79w1bSxVb05eCW8tTxnwXR7fuTEzmDsItLuc315nDK6KxzuoEb
+  qS3vcpHRufLTCg75pNIDA8OERS7yYlruoES5yejWeIBc/pFheNOSipzeycSYKhpD
+  6boMU8RUZKUa82cxqOl+Ixqt5LROC2QCdF6MPOP9naTPDoyqdo3+D0gXs90Ubx4A
+  QkQxInLt2dcE/LjbIUGhpoSgEm7DljXM/ylKJuP8VT8Y6OOdIR4C3IE65boyZqoT
+  e0ir5FbS3wu2WwEm2XVtMjOrIqL8kWptevf8jw2NEwnwzkoJT7QVoOYwKPK1cFT3
+  9mHmssU7FZJuqozDFfd2C71aVg+gR8uK0yvSz9WYuPQaHJp9F8BhVtQxMhjtQbe4
+  f7YEX8jF7t53jvr5TczqvCn/E+IwAZc9kKJJ2ChrTyAZkDKkXwXNCezDLLV2Hhos
+  SUrpdHzbEJBFRkcbn83XiDd/WvCSKr6Gn+HQYce9TqP5BrSaNqMu71Bqn6ECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUCp9H2cjN
+  7dFxm9LZ1h0eSifIogIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEArEvFpox3voeTOscJ9T02WzrSojgiLGuSp3SKgtXP
+  Kflf5O9a0epZ0FuFqDBk/uZma75LYmtjKsreZvyV5jrVJfBdkoPtAchxMA40kGJ3
+  yUoNTYUgts4mzW9qpCEtiEpGhKCobTSBPrhWtVe763p3NlcWRBx576RWJzCKTQmj
+  HwqpV7NqliEJMyrntCbPGzJ9xkLt9est6N1BZvjUvWxW51/qZk8lvcyrbYUdeorr
+  nZZZo4Tie4hpHvjlAc0j0gbLrjIi7RrZU6qVzYwAm/kbe0GcssatoUGXJt5Xc7PP
+  S35fv/YUDZBVcNxhMXRlxrwt3HQOWTJ4OgPbmUy3mECUiwS4zmd6gMBB4fnHu8Co
+  TtQHVdjMbM3o4LP7R8QX2j3EnNZujKWpnDV+rD584HGXY9KQJkyf3t/lhNFHrK+c
+  l3i5J/pMO13Qwr0Pdbd4P0pc/8KEBKZelhuzCHkpFbe0QjLtR5QEiQ50B6CZeLAx
+  0ZbFvuQZbFmrQk1+kPjecIT9
   -----END CERTIFICATE-----
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: c32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: table-formatter prints a table in plain text format or Markdown format from