formatador 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/formatador.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formatador}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-20}
   s.description = %q{STDOUT text formatting}
   s.email = %q{wbeary@engineyard.com}
   s.extra_rdoc_files = [

data/lib/formatador.rb

@@ -65,23 +65,36 @@ class Formatador
     print("\n")
   end
 
-  def display_table(data)
-    widths = []
-    data.each do |row|
-      row.length.times do |column|
-        widths[column] = [(widths[column] || 0), row[column].to_s.length].max
+  def display_table(hashes, keys = nil)
+    headers = keys || []
+    widths = {}
+    for hash in hashes
+      for key, value in hash.keys
+        unless keys
+          headers << key
+        end
+        widths[key] = [key.to_s.length, widths[key] || 0, hash[key] && hash[key].length || 0].max
       end
+      headers = headers.uniq
     end
 
-    display_line("+#{widths.map{|width| '-' * (width.to_s.length + 2)}.join('+')}+")
-    data.length.times do |row|
+    split = "+"
+    for header in headers
+      split << ('-' * (widths[header] + 2)) << '+'
+    end
+
+    display_line(split)
+    display_line("| #{headers.join(' | ')} |")
+    display_line(split)
+
+    for hash in hashes
       columns = []
-      widths.length.times do |column|
-        value = data[row][column] || ''
-        columns << "#{value}#{' ' * (widths[column] - value.to_s.length)}"
+      for header in headers
+        datum = hash[header] || ''
+        columns << "#{datum}#{' ' * (widths[header] - datum.length)}"
       end
       display_line("| #{columns.join(' | ')} |")
-      display_line("+#{widths.map{|width| '-' * (width.to_s.length + 2)}.join('+')}+")
+      display_line(split)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formatador
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Wesley Beary
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -08:00
+date: 2010-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency