table-formatter 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c879cf9f1dbc62005f469f7bb47ba97db0a5b1aa
-  data.tar.gz: 6bd2c0898902a152862529836da885c07e20c62f
+  metadata.gz: 1f6a98e686c8d03b85eb0ba220988a354cd432e3
+  data.tar.gz: 98ec59477c8a5c39fbd879533f2eb4750335fb94
 SHA512:
-  metadata.gz: 88615ee2dbe61020008b9bb1e8c6229ca5542636a8f501eb214447c54b8789189bb5e67384e168f5ee8363246bd0830c53ec421abab7b205922f14268cd0657e
-  data.tar.gz: 7c744c2bf61b9d41e5110506b4b90c3e45380af3b898c8b098d101ad1ddb72c41f2b8a2aabdab775b9b569f83fdf32d29820692af1a4a14fd27bfcc91d0cc9c7
+  metadata.gz: ad30b923559dd72717a87ec8451a1f3959fd78c851b9e1ef132efc21192bf9f1c47ab07e4ce1c3af653360952dad38b17e430f57db29d624d2d238c79a9238a3
+  data.tar.gz: 1c63d521280423e4b66f91b7eb4d37f4ad0f29be0ade538c117466015be1a7deecafd02a937b4d03d23b5a97c77ce4fbed32fd45ae1616db777ccb4ec9e19698

data/lib/table-formatter.rb

@@ -4,7 +4,7 @@
 
 class TableFormatter
 
-  attr_accessor :source, :labels, :border, :divider, :markdown
+  attr_accessor :source, :labels, :border, :divider, :markdown, :col_justify
   
   def initialize(source: nil, labels: nil, border: true, wrap: true, 
                  divider: nil, markdown: false)    
@@ -20,10 +20,30 @@ class TableFormatter
     
   end
   
-  def display(width=nil, widths: nil, markdown: @markdown)
+  def justify(s, ajust)
+    
+    a = s.split('|')
     
-    return display_markdown(@source, @labels) if markdown
+    a2 = ajust.map.with_index do |x,i|
+      
+      s = a[i+1]
+
+      case x
+      when :r
+        '-' * (s.length - 1) + ':'
+      when :l
+        ':' + '-' * (s.length - 1)
+      when
+        ':' + '-' * (s.length - 2) + ':'
+      end
+    end
 
+    "|%s|\n" % a2.join('|')    
+
+  end
+  
+  def display(width=nil, widths: nil, markdown: @markdown)
+    
     if @labels then
 
       @align_cols, labels = [], []
@@ -36,6 +56,12 @@ class TableFormatter
       end
 
     end
+        
+    @col_justify = @align_cols.map do |col|
+      {ljust: :l, rjust: :r, center: :c}[col]
+    end
+
+    return display_markdown(@source, labels) if markdown    
 
     #width ||= @maxwidth
     @width = width
@@ -65,8 +91,11 @@ class TableFormatter
   def display_markdown(a, fields)
     
     print_row = -> (row, widths) do
-      '| ' + row.map\
-          .with_index {|y,i| y.to_s.ljust(widths[i])}.join(' | ') + " |\n"
+      
+      '| ' + 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
 
     print_thline = -> (row, widths) do
@@ -83,8 +112,10 @@ class TableFormatter
     th = print_row.call(fields, widths)
     th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths
 
+    th_line2 = justify(th_line, @col_justify)
+
     tb = print_rows.call(a, widths)
-    table = th + th_line + tb
+    table = th + th_line2 + tb
   end
   
   def fetch_column_widths(a)
@@ -153,7 +184,7 @@ class TableFormatter
   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.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   3N7fAlUbFYq1qPg9cSfZni7dwYupZfs1vLjUbKCYyF3LGUR1jnLn4hkP1lFClWwy
   wGnSddXdhZVZSQ==
   -----END CERTIFICATE-----
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk