table-formatter 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0805b84d0db329574a5c68407627d3dd7111341a
-  data.tar.gz: e266cc44ee6b7dd22d397e99c81b3ea3b95bdea3
+  metadata.gz: f189f28298623d39cbc5dfe7472e6e1b0004d74a
+  data.tar.gz: d1b8388ef949406c43c754c3f28ece615927f0b4
 SHA512:
-  metadata.gz: 24e961e95697e189e1ae00498a7222d4fea64a4525e0a2a51de8a1d41a5ca554597546eaf0a2c837d34d55095aa884466fc1e0df0c428ca506fc8379485299ff
-  data.tar.gz: ce50714ba2e0576bfe31af6e51868c0f452825015d659d0b9f58d5fd9c25148377897fca7751170aadbf408c0e47829a3f60246dd2c9697fabcf8d4621121e6b
+  metadata.gz: 5d9bdb0fa2d4bc236616f71dd5c773b43a375d83d0eaa890ec3df8a74539325205b7cb3ff565f5be2c4ebd0c308626cdc9bd396650679bea2471da820f8714d9
+  data.tar.gz: 7542f4ed68995942f3b16501dc88b696fbcea78551c51ad22982175acbd28eab0611ddd8e3d602b63301d2e8aea70b42fff0ae2eb31de5ebb0f32edacfd97038

data/lib/table-formatter.rb

@@ -4,15 +4,17 @@
 
 class TableFormatter
 
-  attr_accessor :source, :labels, :border
+  attr_accessor :source, :labels, :border, :divider
   
   def initialize(opt={})    
 
-    o = {source: nil, labels: nil, border: true}.merge(opt)
+    o = {source: nil, labels: nil, border: true, nowrap: false}.merge(opt)
     super()
     @source = o[:source]
-    @raw_labels = o[:labels]
+    @raw_labels = o[:labels] if o[:labels]
     @border = o[:border]
+    @nowrap = o[:nowrap]
+    @divider = o[:divider] if o[:divider]
     @maxwidth = 60
   end
   
@@ -36,14 +38,16 @@ class TableFormatter
     @maxwidth = width if width
     a = @source.map {|x| x.map.to_a}.to_a
     labels = @labels
+
     column_widths = fetch_column_widths(a)
 
     column_widths[-1] -= column_widths.inject(&:+) - width if width
 
     records = format_rows(a, column_widths)
 
-    div =  (border == true ? '-' : ' ') * records[0].length + "\n"
-    label_buffer = ''    
+    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
@@ -67,11 +71,17 @@ class TableFormatter
   end
 
   def format_cols(row, col_widths)
-    bar = border == true ? '|' : ' '
-    buffer = bar
+    bar = ''
+    bar = '|' if border == true
+    bar = divider if divider
+
+    buffer = divider ? '' : bar #unless divider
     row.each_with_index do |col, i|
-      buffer += ' ' + col.method(@align_cols[i]).call(col_widths[i] + 2) + bar
+
+      align = @align_cols ? @align_cols[i] : :ljust
+      buffer += col.method(align).call(col_widths[i] + 2) + bar
     end
+    buffer.sub!(/#{bar}$/,'') if divider
     buffer
   end
 
@@ -82,7 +92,7 @@ class TableFormatter
     col_widths[-1] -= col_widths.inject(&:+) - @maxwidth if @width > @maxwidth
 
     a.each_with_index do |x,i|
-      col_rows = wrap(x[-1], col_widths[-1]).split(/\n/)
+      col_rows = @nowrap == false ? wrap(x[-1], col_widths[-1]).split(/\n/) : [x[-1]]
       if col_rows.length > 1 then
         x[-1] = col_rows[0]
         col_rows[1..-1].map.with_index {|y,j| a.insert(i+1+j, Array.new(x.length - 1,'') + [y])}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   87MJlDPDYzp5yHAWkCW+L5wNO0Z0kdkibE/RZ9yGgZ7rSPRUUBqwsxNfwvyVh8Gl
   Ld73E8JjE0JpECfuT5M6ch5PUBtf1txl
   -----END CERTIFICATE-----
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk