colorful_tables 0.2.0 → 0.3.0

data/lib/colorful_tables/version.rb

@@ -1,3 +1,3 @@
 module ColorfulTables
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/colorful_tables.rb

@@ -1,8 +1,11 @@
 module ColorfulTables
+
   require 'colorize'
   require 'object'
   require 'enumerable'
   require 'errors'
   require 'table'
   require 'column'
+  require 'misc'
+
 end

data/lib/column.rb

@@ -22,7 +22,7 @@ module ColorfulTables
     def calculate_width
       # We have to add the header in the calculation
       data_and_header = self.data + [self.header]
-      data_and_header.map { |c| c.to_s.length }.max
+      data_and_header.map { |cell| ColorfulTables.truncate_if_float(cell).to_s.length }.max
     end
 
   end

data/lib/misc.rb

@@ -0,0 +1,11 @@
+module ColorfulTables
+
+  DIGITS_AFTER_DECIMAL_POINT = 2
+
+  class << self
+    def truncate_if_float(element)
+      element.is_a?(Float) ? ( "%.#{DIGITS_AFTER_DECIMAL_POINT}f" % element ) : element
+    end
+  end
+
+end

data/lib/table.rb

@@ -55,15 +55,19 @@ module ColorfulTables
     end
 
     def format(row_elements)
-      row_elements.inject_with_index(@border_chars[:vertical]) { |s, element, index| s += " #{element.to_s.rjust(@columns_width[index]).colorize(@columns_options[index][:data_color])} #{@border_chars[:vertical]}" } + "\n"
+      output = row_elements.inject_with_index(@border_chars[:vertical]) do |s, element, index|
+        value = ColorfulTables.truncate_if_float(element)
+        color = @columns_options[index][:data_color].is_a?(Proc) ? @columns_options[index][:data_color].call(value) : @columns_options[index][:data_color]
+        s += " #{value.to_s.rjust(@columns_width[index]).colorize(color)} #{@border_chars[:vertical]}"
+      end
+      output + "\n"
     end
 
     def calculate_border_chars
       color = @options[:border_color]
-      {:vertical =>   '|'.colorize(color),
-       :horizontal => '-'.colorize(color),
-       :cross =>      '+'.colorize(color)
-      }
+      { :vertical =>   '|'.colorize(color),
+        :horizontal => '-'.colorize(color),
+        :cross =>      '+'.colorize(color) }
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: colorful_tables
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Javier Vidal
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 +02:00
+date: 2011-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - lib/column.rb
 - lib/enumerable.rb
 - lib/errors.rb
+- lib/misc.rb
 - lib/object.rb
 - lib/table.rb
 has_rdoc: true