table-formatter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3b96eba902e550087ee77b0701fc50b2b3ff1c
-  data.tar.gz: 3eff237f64d0ee0472315d71e7c27272df8802cc
+  metadata.gz: 0805b84d0db329574a5c68407627d3dd7111341a
+  data.tar.gz: e266cc44ee6b7dd22d397e99c81b3ea3b95bdea3
 SHA512:
-  metadata.gz: 898014ae59081c32c8ea468e222a397eb56e99f47f9ebf25ca824e76c602d0ff288cebb6e26b817a41282eb7fdbf2ef6e239bd906afd81237dda593b2c25a7af
-  data.tar.gz: ee444b16ede63b45b3d02a9c37f8e35769d405682972d35a69eca587efc79210544a094b5790e70b769919477ca747c0056c5e27bd7f12f042a3824f9a486b7e
+  metadata.gz: 24e961e95697e189e1ae00498a7222d4fea64a4525e0a2a51de8a1d41a5ca554597546eaf0a2c837d34d55095aa884466fc1e0df0c428ca506fc8379485299ff
+  data.tar.gz: ce50714ba2e0576bfe31af6e51868c0f452825015d659d0b9f58d5fd9c25148377897fca7751170aadbf408c0e47829a3f60246dd2c9697fabcf8d4621121e6b

data/lib/table-formatter.rb

@@ -7,16 +7,30 @@ class TableFormatter
   attr_accessor :source, :labels, :border
   
   def initialize(opt={})    
+
     o = {source: nil, labels: nil, border: true}.merge(opt)
     super()
     @source = o[:source]
-    @labels = o[:labels]
+    @raw_labels = o[:labels]
     @border = o[:border]
     @maxwidth = 60
   end
   
   def display(width=nil)
-    
+
+    if @raw_labels then
+
+      @align_cols, @labels = [], []
+
+      @raw_labels.each do |raw_label|
+
+        col_just, label = just(raw_label)
+        @align_cols << col_just
+        @labels << label
+      end
+
+    end
+
     #width ||= @maxwidth
     @width = width
     @maxwidth = width if width
@@ -38,12 +52,12 @@ class TableFormatter
 
   alias to_s display
 
-  private
-  
-  def tabulate(a)
-    a[0].zip(a.length > 2 ? tabulate(a[1..-1]) : a[-1])
+  def labels=(a)
+    @raw_labels = a
   end
 
+  private
+  
   def fetch_column_widths(a)
 
     d = tabulate(a).map &:flatten
@@ -56,7 +70,7 @@ class TableFormatter
     bar = border == true ? '|' : ' '
     buffer = bar
     row.each_with_index do |col, i|
-      buffer += ' ' + col.ljust(col_widths[i] + 2) + bar    
+      buffer += ' ' + col.method(@align_cols[i]).call(col_widths[i] + 2) + bar
     end
     buffer
   end
@@ -78,6 +92,24 @@ class TableFormatter
     a.map {|row| format_cols(row, col_widths)}
   end
 
+  def just(x)
+
+    case x
+      when /^:.*:$/
+        [:center, x[1..-2]]
+      when /:$/
+        [:rjust, x[0..-2]]
+      when /^:/
+        [:ljust, x[1..-1]]
+      else
+        [:ljust, x]
+    end
+  end
+
+  def tabulate(a)
+    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") 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Robertson