table-formatter 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11aeadab532d39ee1c8223f4cbc20181d7ab701b
-  data.tar.gz: 5d2bcbaa2b5a69ba0112aeca54f501748105195a
+  metadata.gz: 35630fef5882d3f10725cf89cf97629e288cf83a
+  data.tar.gz: c242dd193ffbf9a2d9a1a77c825d4a9f8a58f8b0
 SHA512:
-  metadata.gz: b4d8ab9210ad4ee09403665cb4cab7e5edc17703bd49c028a5c7416c4adc9df5134c19677fa3b68d8896ee9212184da7983e797f85bca425fa140eab142bd594
-  data.tar.gz: 8a49ec0725fb6e238c543a92a7e98391c15e61521f3aff03a07f1f7dac15008ae52d797f5cf89b3dfca56ca181034cfae7fa2ef1ca59b63b4013e217d327f247
+  metadata.gz: ba7e6dba293803906167489a270b6d2124a810311bd136a3d245199f4eeecb56f3d94eaed9659a3698af152e6a24eaf239b99ffa949fe34958e924f2567d95d6
+  data.tar.gz: bb4a5a6adef0397a7093ad5cfaf0b053ff26f77762a71ef40d36b09b222aed471a3e7b787ccc72630052c6163f3b8440294a6d6a47c278dfe8b2766e6570a0b1

data/lib/table-formatter.rb

@@ -6,18 +6,18 @@ class TableFormatter
 
   attr_accessor :source, :labels, :border, :divider
   
-  def initialize(source: nil, labels: nil, border: true, nowrap: false, divider: nil)    
+  def initialize(source: nil, labels: nil, border: true, wrap: true, divider: nil)    
 
     super()
     @source = source
     @raw_labels = labels
     @border = border
-    @nowrap = nowrap
+    @wrap = wrap
     @divider = divider
     @maxwidth = 60
   end
   
-  def display(width=nil)
+  def display(width=nil, widths: nil)
 
     if @raw_labels then
 
@@ -38,7 +38,7 @@ class TableFormatter
     a = @source.map {|x| x.map.to_a}.to_a
     labels = @labels
 
-    column_widths = fetch_column_widths(a)
+    column_widths = widths ? widths : fetch_column_widths(a)
 
     column_widths[-1] -= column_widths.inject(&:+) - width if width
 
@@ -46,7 +46,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
@@ -68,15 +68,16 @@ class TableFormatter
     # find the maximum lengths
     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
     col_spacer = @divider ? 0 : 2
     
     buffer = outer_bar
 
+    
     row.each_with_index do |col, i|
 
       align = @align_cols ? @align_cols[i] : :ljust
@@ -86,27 +87,41 @@ class TableFormatter
       else
         [col.method(align).call(col_widths[i] + col_spacer).rstrip, '']
       end
-    
-      buffer += inner_spacer + val + next_bar
-    end
 
+      buffer += inner_spacer + val + next_bar.to_s
+    end    
+    
     buffer
-  end
 
-  def format_rows(a, col_widths)
+  end  
+
+  def format_rows(raw_a, col_widths)
 
     @width = col_widths.inject(&:+)
 
     col_widths[-1] -= col_widths.inject(&:+) - @maxwidth if @width > @maxwidth
-
-    a.each_with_index do |x,i|
-      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])}
-      end
+   
+    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    
+        
+        max_len = rowx.max_by {|x| x.length}.length
+        
+        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
@@ -129,9 +144,4 @@ class TableFormatter
     a[0].zip(a.length > 2 ? tabulate(a[1..-1]) : a[-1])
   end
 
-  def wrap(s, col=@maxwidth)
-    s.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/,
-      "\\1\\3\n") 
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDMyNTIxMDUxNVoXDTE1MDMyNTIxMDUxNVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDcwMzE5MjA0MloXDTE2MDcwMjE5MjA0MlowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAOXdjaMKyhp+NrAreBd7rhk4gaA0tLVHXyFZBjGJItv7df4aXrWoVApeat5p
-  v4bvGWVL4mLfWETs5z+vtWDTvicz3qX+V1KDAZDDq+wQ4h1WSSZkGFfF3M7aJUNG
-  vAiGwDltwsWiY2AYlAdvfwk2GNW4tqX99+XzAzuGCdvInIUChviC2ai1BHcInPY9
-  xmc4ZA5oI4T59xMXsapT4jN8Wljy1IWcKlan1JDjY34TBJI9XC6IqHvJkkVcD9cr
-  uZpSRVAAFs/sKHBoE1037QTnECh6KSxKLxFel7zOoBcjOQDab2PyJpC5UNrdbF6R
-  t6PYTY5cjMOGKkNj2b4/kQ28A6UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUI97NPNbdiCYSclmyMqKJr7LtpEYwJgYDVR0RBB8w
+  ggEBANT1YzpsNgKn73Jgp0dXfO4equ1i3K9gj4V8Mic2kt7m6OgVjdtwxSf3UVX0
+  3Bro1ni/q0sylxme3IOwRsJfC3tEKZIOaGVM5UzZZimqgUoKMAsK5UMd2lUL/S+t
+  mLxYaREIa2me6iIt+rfmhCDQJ9UAfuxMavtpV7UrJNK6KnQ8IiFtcDWb1YfvMVT+
+  le3NCdB1R4yNMt7cm64Xx4527/otov7GLHaT9yPVzcs44KYU0eCuqTEnPGke5bv4
+  ASp09e3Dg0wfB4pQ8ntZnGph9OS+Ojlvs4bVsnf7/fjEYWttgddMELnPu36keBVD
+  zbmLL30iHPLvNxmJvwotGZBfaUECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUTGa3431RT6+BW+SKTnFdT+VhDZowJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAswyKuUaQ
-  zaalcas2asWXnUh5T/zbKVmymHIEG9kvXH0rMA51P4sRVEXpvqlYPBZioEzCn5f0
-  re+bscYJS5XmScGZHjTH9Gr5eahV6AWQTpBFdI5d416db4RuOtHZ8Ek+qr2us0VD
-  Kxqfb7yOCHMxQVNUD42DSBIsK+n2uX0++ltsnW8o8ZQvL4nrUdxMBUF28m3Z+V3o
-  ZWtCoj2zbSQLZzmPNIy9RAzn4Z64XB651zDe432QymDfLSEVi6n5YKixjsDOfa91
-  xMYZkElOttvQm8M6uUy483IxDueFvAWV/BnpYc9uzT6Rb9VtyMgUXX9pi/WwGjoF
-  0vXd6ZyRHRSlpQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEATbhZQVe7
+  k3QW2Bdql+CNYT3pSJIFCZXAVrvHY3Joh54B5E/065KXNDJT35XZIYZxcTkFTfg5
+  dqsYFj4vESvrFXVDJqD48Q/alpHp/I+Wuh9X1spDlnGmeHfN4AnZf9f/tFAdAv4Q
+  BVqRZcC11Jxce32fMHHntaM+4DUIc4QApXMSq+kwXXqDmWM4jQYHFbljhqzBceSp
+  50TsDKjDj5qq05S4tS/Sowmk9Z+AmRGeyeJDu5d/PGBHoHyP7YTVfGfsEVZs9Yy2
+  vnFODZUU2Pg5P/ClR8sD4YDz54LpnVtYeMR++l8KXUMW+QG+q13SRxmlz/4irtLj
+  UArbhzcwzsMfVQ==
   -----END CERTIFICATE-----
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -52,7 +52,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: table-formatter prints a table in plain text format from an array