table-formatter 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a4c83a58f33e614548562f0343f2fe5274718b
-  data.tar.gz: 5f92da132883f92fb39d3397a6a975fd28fd7a88
+  metadata.gz: 9d81e18e59664d73f4f1e940937bb7d722095997
+  data.tar.gz: 120fff26f7a93e8214aca2bce747a0cde83e9653
 SHA512:
-  metadata.gz: 05d9086ee08f11fbbea30d348d1e444f24df3ced4586ff34acdd951693e99ee653f617028548b0d5ae96dd2821e3f99a69a024035d55be8dbdb50ac83f3608ff
-  data.tar.gz: 1ab0a258255809694fb233386da7c5222f30956da2544c27a819a7a4030ad56c6a289f413dd0d4017958a4ed18bd0bded992620c404490663db6ac15144cbe50
+  metadata.gz: beea41dbb8cf175cf127e6126c7579628a35933a84fa01e3fb7676a4c682ef10ed9ae3f9f0a0b00f55dd3ebd30e0f71c5c7ac692e5edc622099a0e9a8633b3fc
+  data.tar.gz: f9547ef046aa0dc183818d8fa3583d041784a161e8ed93681e19a8dada5ce5fbc9f8e8d89bee3292dc56929cd0344f9781337ad3d4e3db9dd6bb94f6f3ba5e2c

data/lib/table-formatter.rb

@@ -7,7 +7,7 @@ class TableFormatter
   attr_accessor :source, :labels, :border, :divider, :markdown, :col_justify
   
   def initialize(source: nil, labels: nil, border: true, wrap: true, 
-                 divider: nil, markdown: false)    
+                 divider: nil, markdown: false, innermarkdown: false)    
 
     super()
     @source = source
@@ -17,6 +17,7 @@ class TableFormatter
     @divider = divider
     @maxwidth = 60
     @markdown = markdown
+    @innermarkdown = innermarkdown
     
   end
   
@@ -87,9 +88,78 @@ 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
+
+      print_thline = -> (row, widths) do
+        '|:' + row.map\
+            .with_index {|y,i| y.to_s.ljust(widths[i])}.join('|:') + "|\n"
+      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|
+
+          found_match = col.match(/^https?:\/\/([^\/]+)(.*)/)
+
+          r = if found_match then
+
+            domain, path = found_match.captures
+
+            a = domain.split('.')
+            a.shift if a.length > 2
+            url_title = (a.join('.') + path)[0..39] + '...'
+
+            "[%s](%s)" % [url_title, col]
+            
+          else
+            
+            if @innermarkdown then 
+              "{::nomarkdown}" + 
+                  RDiscount.new(col).to_html.strip.gsub("\n",'') + "{:/}"
+            else
+
+              col
+              
+            end
+            
+          end
+          
+          r
+        end
+      end      
+
+      widths = ([(fields + ['']).take(a.first.length)] + 
+                vals).transpose.map{|x| x.max_by(&:length).length}
+
+      th = if @labels then        
+        print_row.call(@labels, widths)
+      else
+        ''
+      end
+      
+      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths        
+      tb = print_rows.call(vals, widths)      
+        
+      table = th + th_line + tb    
+  end
+
+  def display_markdown2(a, fields)
+    
     print_row = -> (row, widths) do
       
       '| ' + row.map.with_index do |y,i| 
@@ -124,6 +194,7 @@ class TableFormatter
 
     # find the maximum lengths
     d.map{|x| x.max_by(&:length).length}
+
   end
   
   def format_cols(row, col_widths, bar='')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDcxMjE3MDUyNloXDTE3MDcxMjE3MDUyNlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MDkwNjExNTY0OFoXDTE4MDkwNjExNTY0OFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMHvCAviVO+ls3i2lZPbHl982EOKMXIgrIYRWJx/oxjwgdXexyqgfbS7T+fc
-  GxiGxxTBsBv1FU9but4o2QrTiHnk8dqL36lmk6bT3kID+WHg+zOc4RJ5QRCsucCw
-  u7H4C2B+WN/Txy/jJMTJNTz+/5W2kj5oY/2chjl370FvyRZRLQAdjKcrutJzkApQ
-  PtPkqrRBN3d7WZghsRR59OSolUbnkvJ/smFMwwjL8NACq+MTeHZEWoERgJtbk53g
-  JFicdXEoDwwSH1cfHOMt94oDYk8bd17VRWWVl0yNB8b3dJwnZB63fNEJItC/f3nl
-  TS9iIGgUFCTOuPAK36+ibGqPxz0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUQunHeoGoIoYOcBq6sJ7U7WmMxCcwJgYDVR0RBB8w
+  ggEBANMzRKAQ4QqtTKx2TzuG01Qkl29pye6ODCkt934jWLMI8jiWZf6UIbvi4kz4
+  KAq6XX4wGdR0q2K11csEDH1HtNXBma57f5Y3utj3KJ/KPOit8nAv2DrRiQHcuQuk
+  d7N1dL1u1aK6yirKoNYpqkoYrYWxjCmWBxWPcqy5cCaijUqgg5++a4e1RZD+jDzB
+  u4m1guS3MR4Jw8XObIRudqHUDuSYRA1lERaB/qjALQyF4PLBA1L3nDPdWSym6qq2
+  SIoHpCYbiZhAldcBApyKiOYmtk315+l9ZzzQKM7Vp+kq7GiHl/bkSKq6KSpUIhDF
+  Z7An8TcS5bIM/4FGx7OsiZ1mN90CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU7/J23xpZAHhVPNxsDL92DfgZ3BowJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAD82ILMdg
-  +aSp0sLXD4J3RVxXq4FwEp1qc2YzOD/bq3hjEMOIpaUTn4mDgpBZHTi+Im27abmC
-  IOOExDOuJyMiPf9tqAumOaPkRqLiejQN1C8b6oGM3+iaJJ/RVJRa8RA9FfbwuBWV
-  Ls4X+NVJNZjCGJdfyUVlD+4TvyVqqJw5ZojdZV1Gg4CfweBYq9R674yg41EaeNOh
-  Wo2B+S/H8f/hpJ2VKPkq6jf3l4Qt7/d+cFstruyVfkHotwvGP8Z+Xh3zDrxU6xFg
-  3N7fAlUbFYq1qPg9cSfZni7dwYupZfs1vLjUbKCYyF3LGUR1jnLn4hkP1lFClWwy
-  wGnSddXdhZVZSQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAC2ebp88P
+  7fgjYcmIvIHP3wTedCAeScJQVNEv5RDOlz5vMFzoZ/aLaytEaRxqMGkPieSwH3Z5
+  NpLGgyMyk3AneVN1JPtYExGfLYakVJ+x50rizAZirYdVBINTi44M1ZkuQGvFmldp
+  89PRQvVuvpuYtAz0R94jC4zV3aC044vElu4FDMeMZRKBus4EFfaijZd7kPqRlzpa
+  uRCZ4WsmyKOap1NS0U7ZiXnJRvo0O5iptjFcbl/3rSTSRCIof+a35uCJppcSjhGZ
+  HGsLe8SKG8DXaaZxtrfB5toes3L8kzgWrblCbrvE10LDGRcRXwMSshNtb9iyK1mh
+  pR4QFidc/b8Rlw==
   -----END CERTIFICATE-----
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu