colorful_tables 0.4.0 → 0.5.0

data/lib/colorful_tables/column.rb

@@ -4,7 +4,8 @@ module ColorfulTables
 
     DEFAULT_OPTIONS = {
       :data_color   => :light_blue,
-      :header_color => :light_blue
+      :header_color => :light_blue,
+      :digits_after_decimal_point => 4
     }
 
     attr_accessor :header, :data, :options
@@ -14,7 +15,7 @@ module ColorfulTables
     def initialize(header, data, options = {})
       @header  = header
       @data    = data
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = options.reverse_merge!(DEFAULT_OPTIONS)
       @width ||= calculate_width
     end
 
@@ -23,7 +24,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 { |cell| ColorfulTables.truncate_if_float(cell).to_s.length }.max
+      data_and_header.map { |cell| ColorfulTables.truncate_if_decimals(cell, @options[:digits_after_decimal_point]).to_s.length }.max
     end
 
   end

data/lib/colorful_tables/misc.rb

@@ -1,10 +1,8 @@
 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
+    def truncate_if_decimals(element, digits_after_decimal_point)
+      (element.is_a?(Float) || element.is_a?(BigDecimal)) ? ( "%.#{digits_after_decimal_point}f" % element ) : element
     end
   end
 

data/lib/colorful_tables/table.rb

@@ -7,7 +7,8 @@ module ColorfulTables
   class Table
 
     DEFAULT_OPTIONS = {
-      :border_color => :light_blue
+      :border_color               => :light_blue,
+      :digits_after_decimal_point => 4
     }
 
     attr_accessor :data, :options
@@ -15,11 +16,11 @@ module ColorfulTables
     def initialize(data, options = {})
       #raise RuntimeError, "data must be an array of columns" unless is_an_array_of_columns?(data)
       @data            = data
-      @options         = DEFAULT_OPTIONS.merge(options)
+      @options         = options.reverse_merge!(DEFAULT_OPTIONS)
       @border_chars    ||= calculate_border_chars
       @columns_width   ||= calculate_columns_width
       @columns_options ||= calculate_columns_options
-      @terminal_heigth ||= ColorfulTables.detect_terminal_size[1]
+      @terminal_height ||= ColorfulTables.detect_terminal_size[1]
       @transposed_data ||= self.data.map(&:data).transpose
     end
 
@@ -56,7 +57,7 @@ module ColorfulTables
     end
 
     def separator
-      # + 2 is because we have to add an space at the begining and another at the end inside a cell
+      # + 2 is because we have to add an space at the beginning and another at the end inside a cell
       self.data.inject("#{@border_chars[:cross]}") { |s, column| s += (("#{@border_chars[:horizontal]}" * (column.width + 2)) + "#{@border_chars[:cross]}") } + "\n"
     end
 
@@ -66,7 +67,7 @@ module ColorfulTables
 
     def format(row_elements, in_header = false)
       output = row_elements.inject_with_index(@border_chars[:vertical]) do |s, element, index|
-        value = ColorfulTables.truncate_if_float(element)
+        value = ColorfulTables.truncate_if_decimals(element, @options[:digits_after_decimal_point])
         color = if in_header
           @columns_options[index][:header_color]
         else
@@ -91,7 +92,7 @@ module ColorfulTables
     end
 
     def rows_per_page
-      @terminal_heigth - 5
+      @terminal_height - 5
     end
 
     def total_rows

data/lib/colorful_tables/version.rb

@@ -1,3 +1,3 @@
 module ColorfulTables
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: colorful_tables
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Javier Vidal
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 +02:00
-default_executable: 
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: colorize
@@ -55,7 +54,6 @@ files:
 - lib/colorful_tables/table.rb
 - lib/colorful_tables/util.rb
 - lib/colorful_tables/version.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -85,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: colorful_tables
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Print colorful tables