formatador 0.1.3 → 0.1.4

data/README.rdoc

@@ -24,6 +24,7 @@ You use tags, similar to html, to set formatting options:
 == Extensions
 
 * display_table: takes an array of hashes. Each hash is a row, with the keys being the headers and values being the data. An optional second argument can specify which headers/columns to include and in what order they should appear.
+* display_compact_table: Same as display_table, execpt that split lines are not drawn by default in the body of the table. If you need a split line, put a :split constant in the body array.
 * redisplay_progressbar: takes the current and total values as its first two arguments and redisplays a progressbar (until current = total and then it display_lines). An optional third argument represents the start time and will add an elapsed time counter.
 
 == Indentation

data/formatador.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '0.1.3'
-  s.date              = '2011-04-03'
+  s.version           = '0.1.4'
+  s.date              = '2011-05-20'
   s.rubyforge_project = 'formatador'
 
   ## Make sure your summary is short. The description may be as long

data/lib/formatador.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
 
 class Formatador
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 
   STYLES = {
     :"\/"             => "0",
@@ -103,7 +103,7 @@ class Formatador
     nil
   end
 
-  %w{display display_line display_lines display_table indent parse redisplay redisplay_progressbar}.each do |method|
+  %w{display display_line display_lines display_table display_compact_table indent parse redisplay redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         Thread.current[:formatador] ||= new

data/lib/formatador/table.rb

@@ -1,6 +1,13 @@
 class Formatador
-
   def display_table(hashes, keys = nil, &block)
+    new_hashes = hashes.inject([]) do |accum,item|
+      accum << :split unless accum.empty?
+      accum << item
+    end
+    display_compact_table(new_hashes, keys, &block)
+  end
+
+  def display_compact_table(hashes, keys = nil, &block)
     headers = keys || []
     widths = {}
     if hashes.empty? && keys
@@ -9,11 +16,13 @@ class Formatador
       end
     else
       for hash in hashes
+        next unless hash.respond_to?(:keys)
+
         for key in hash.keys
           unless keys
             headers << key
           end
-          widths[key] = [key.to_s.length, widths[key] || 0, hash[key] && hash[key].to_s.length || 0].max
+          widths[key] = [ length(key), widths[key] || 0, hash[key] && length(hash[key]) || 0].max
         end
         headers = headers.uniq
       end
@@ -30,7 +39,7 @@ class Formatador
       split << '--+'
     else
       for header in headers
-        widths[header] ||= header.to_s.length
+        widths[header] ||= length(header)
         split << ('-' * (widths[header] + 2)) << '+'
       end
     end
@@ -44,15 +53,26 @@ class Formatador
     display_line(split)
 
     for hash in hashes
-      columns = []
-      for header in headers
-        datum = hash[header] || ''
-        columns << "#{datum}#{' ' * (widths[header] - datum.to_s.length)}"
+      if hash.respond_to? :keys
+        columns = []
+        for header in headers
+          datum = hash[header] || ''
+          columns << "#{datum}#{' ' * (widths[header] - length(datum))}"
+        end
+        display_line("| #{columns.join(' | ')} |")
+      else
+        if hash == :split
+          display_line(split)
+        end 
       end
-      display_line("| #{columns.join(' | ')} |")
-      display_line(split)
+      nil
     end
-    nil
+    display_line(split)
   end
 
-end
+  private
+
+  def length(value)
+    value.to_s.gsub(PARSE_REGEX, '').length
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formatador
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -04:00
+date: 2011-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency