colorful_tables 0.1.0 → 0.2.0

data/lib/colorful_tables/version.rb

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

data/lib/column.rb

@@ -2,6 +2,10 @@ module ColorfulTables
 
   class Column
 
+    DEFAULT_OPTIONS = {
+      :data_color   => :light_blue
+    }
+
     attr_accessor :header, :data, :options
 
     attr_reader :width
@@ -9,7 +13,7 @@ module ColorfulTables
     def initialize(header, data, options = {})
       @header  = header
       @data    = data
-      @options = options
+      @options = DEFAULT_OPTIONS.merge(options)
       @width ||= calculate_width
     end
 

data/lib/table.rb

@@ -1,20 +1,28 @@
+# Colors from colorize gem:
+# [:black, :red, :green, :light_blue, :blue, :magenta, :cyan, :light_blue, :default, :light_black, :light_red, :light_blue, :light_light_blue, :light_blue, :light_magenta, :light_blue, :light_light_blue]
+# String.colors.each { |s| puts s.to_s.colorize(s) }
+
 module ColorfulTables
 
   class Table
 
-    attr_accessor :data, :options
+    DEFAULT_OPTIONS = {
+      :border_color => :light_blue
+    }
 
-    attr_reader :columns_width
+    attr_accessor :data, :options
 
     def initialize(data, options = {})
       raise RuntimeError, "data must be an array of columns" unless is_an_array_of_columns?(data)
       @data    = data
-      @options = options
-      @columns_width ||= calculate_columns_width
+      @options = DEFAULT_OPTIONS.merge(options)
+      @border_chars   ||= calculate_border_chars
+      @columns_width  ||= calculate_columns_width
+      @columns_options ||= calculate_columns_options
     end
 
     def to_s
-      t = header
+      t = "\r" + header
       self.data.map(&:data).transpose.each do |row|
         t += format(row)
       end
@@ -22,7 +30,7 @@ module ColorfulTables
       t
     end
 
-    #private
+    private
 
     def is_an_array_of_columns?(data)
       array_of_booleans = data.try(:map) { |i| i.is_a? Column }
@@ -33,9 +41,13 @@ module ColorfulTables
       @data.map(&:width)
     end
 
+    def calculate_columns_options
+      @data.map(&:options)
+    end
+
     def separator
       # + 2 is because we have to add an space at the begining and another at the end inside a cell
-      self.data.inject('+') { |s, column| s += (('-' * (column.width + 2)) + '+') } + "\n"
+      self.data.inject("#{@border_chars[:cross]}") { |s, column| s += (("#{@border_chars[:horizontal]}" * (column.width + 2)) + "#{@border_chars[:cross]}") } + "\n"
     end
 
     def header
@@ -43,7 +55,15 @@ module ColorfulTables
     end
 
     def format(row_elements)
-      row_elements.inject_with_index('|') { |s, element, index| s += " #{element.to_s.rjust(@columns_width[index])} |" } + "\n"
+      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"
+    end
+
+    def calculate_border_chars
+      color = @options[:border_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: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Javier Vidal