yummi 0.5.0 → 0.5.1

data/examples/cash_flow_table.rb

@@ -35,7 +35,8 @@ tablebuilder = Yummi::TableBuilder::new('cash_flow_table.yaml')
                ['Withdraw', -50.23, 50.35, true, "34ERDTF6GYU"],
                ['Withdraw', -100, -49.65, true, "2344EDRFT5"],
                ['Deposit', 50, 0.35, false, nil],
-               ['Deposit', 600, 600.35, false, nil]]
+               ['Deposit', 600, 600.35, false, nil],
+               ['Total', nil, 600.35, nil, nil]]
 
 opt.on '--layout LAYOUT', 'Defines the table layout (horizontal or vertical)' do |layout|
   @table.layout = layout.to_sym

data/examples/cash_flow_table.yaml

@@ -33,4 +33,14 @@ color:
   undefined:
     with: red
 row_color:
-  blessed_income: white
+  blessed_income: yellow
+
+contexts:
+  - format:
+      total:
+        numeric:
+          positive: "%.2f"
+          zero: "%.2f"
+          negative: "%.2f"
+    row_color:
+      with: white

data/examples/cash_flow_table_data.csv

@@ -3,4 +3,5 @@ Deposit, 100.58, 100.58, true, QAWSEDRFTGH535
 Withdraw, -50.23, 50.35, true, 34ERDTF6GYU
 Withdraw, -100, -49.65, true, 2344EDRFT5
 Deposit, 50, 0.35, false
-Deposit, 600, 600.35, false
+Deposit, 600, 600.35, false
+Total, , 600.35

data/examples/cash_flow_table_data.yaml

@@ -28,3 +28,8 @@
   - 600.35
   - false
   - 
+- - Total
+  -
+  - 600.35
+  -
+  -

data/examples/list_files.rb

@@ -39,11 +39,19 @@ opt = OptionParser::new
 opt.on '--color TYPE', 'Specify the color type (zebra,file,none)' do |type|
   case type
     when 'zebra'
-      @table.row_colorizer Yummi::Colorizers.stripe :intense_gray, :intense_white
+      @table.colorize_row :using => Yummi::Colorizers.stripe(:intense_gray, :intense_white)
+      @table.context do 
+        @table.colorize_row :with => :intense_blue
+        @table.format :size, :using => Yummi::Formatters.byte
+      end
     when 'file'
-      @table.row_colorizer do |data| # or |data, index| if you need the index
+      @table.colorize_row do |data| # or |data, index| if you need the index
         data[:directory] ? :intense_gray : :intense_white
       end
+      @table.context do 
+        @table.colorize_row :with => :intense_blue
+        @table.format :size, :using => Yummi::Formatters.byte
+      end
     when 'none'
       @table.no_colors
     else
@@ -64,4 +72,6 @@ files.each do |f|
   data << [f, File.size(f), File.directory?(f)] # the last value will not be printed
 end
 @table.data = data
+@table << ["Total", @table.column(:size).inject(:+)]
+
 @table.print

data/examples/monitor_table.rb

@@ -31,8 +31,12 @@ opt = OptionParser::new
 # sets the title
 @table.title = 'Server Runtime Info'
 # formats memory info for easily reading
-@table.format :max_memory, :using => Yummi::Formatters.byte
-@table.format :free_memory, :using => Yummi::Formatters.byte
+@table.format [:max_memory, :free_memory], :using => Yummi::Formatters.byte
+
+@table.context do
+  @table.format [:max_memory, :free_memory], :using => Yummi::Formatters.byte
+  @table.colorize_row :with => :white
+end
 
 # colorizer for memory
 memory_colorizer = Yummi::Colorizers.percentage :max => :max_memory, :free => :free_memory
@@ -48,8 +52,9 @@ thread_colorizer = Yummi::Colorizers.percentage :max => :max_threads,
 opt.on '--color TYPE', 'Specify the color type (zebra,cell,none)' do |type|
   case type
     when 'zebra'
-      @table.row_colorizer Yummi::Colorizers.stripe :yellow, :purple
+      @table.colorize_row :using => Yummi::Colorizers.stripe(:yellow, :purple)
     when 'cell'
+      @table.colorize :server_name, :with => :purple
       @table.using_row do
         @table.colorize :free_memory, :using => memory_colorizer
         @table.colorize :in_use_threads, :using => thread_colorizer
@@ -80,26 +85,32 @@ opt.parse ARGV
 
 # sets the table data
 @table.data = [
-  ['Server 1', 1_000_000, 750_000, 200, 170],
-  ['Server 2', 1_000_000, 700_000, 200, 180],
-  ['Server 3', 1_000_000, 50_000, 200, 50],
-  ['Server 4', 1_000_000, 200_000, 200, 50],
-  ['Server 5', 1_000_000, 5_000, 200, 50],
-  ['Server 6', 1_000_000, 750_000, 200, 50],
+  ['Server 1', 1_000_000_000, 750_000_000, 200, 170],
+  ['Server 2', 1_000_000_000, 700_000_000, 200, 180],
+  ['Server 3', 1_000_000_000, 50_000_000, 200, 50],
+  ['Server 4', 1_000_000_000, 200_000_000, 200, 50],
+  ['Server 5', 1_000_000_000, 5_000_000, 200, 50],
+  ['Server 6', 1_000_000_000, 750_000_000, 200, 50],
 ]
 
 @table.add :server_name => 'Server 7',
-          :max_memory => 1_000_000,
-          :free_memory => 200_000,
+          :max_memory => 1_000_000_000,
+          :free_memory => 200_000_000,
           :max_threads => 200,
           :in_use_threads => 170
 
 @table.add :server_name => 'Server 8',
-          :max_memory => 1_000_000,
-          :free_memory => 5_000,
+          :max_memory => 1_000_000_000,
+          :free_memory => 5_000_000,
           :max_threads => 200,
           :in_use_threads => 180
 
+@table.add :server_name => 'Total',
+          :max_memory => @table.column(:max_memory).inject(:+),
+          :free_memory => @table.column(:free_memory).inject(:+),
+          :max_threads => @table.column(:max_threads).inject(:+),
+          :in_use_threads => @table.column(:in_use_threads).inject(:+)
+
 if @box
   @box << @table
   @box.print

data/lib/yummi.rb

@@ -165,16 +165,19 @@ module Yummi
 
     # Aligns the text to the right
     def self.right text, width
+      text = text.to_s unless text.is_a? String
       text.rjust(width)
     end
 
     # Aligns the text to the left
     def self.left text, width
+      text = text.to_s unless text.is_a? String
       text.ljust(width)
     end
 
     # Aligns the text to the center
     def self.center text, width
+      text = text.to_s unless text.is_a? String
       return text if text.size >= width
       size = width - text.size
       left_size = size / 2
@@ -184,6 +187,7 @@ module Yummi
 
     # Aligns the text to both sides
     def self.justify text, width
+      text = text.to_s unless text.is_a? String
       extra_spaces = width - text.size
       return text unless extra_spaces > 0
       words = text.split ' '

data/lib/yummi/table.rb

@@ -48,7 +48,7 @@ module Yummi
     attr_reader :layout
     # The table header
     attr_reader :header
-
+    
     # Creates a new table with the default attributes:
     #
     # * Title color: intense_yellow
@@ -74,12 +74,11 @@ module Yummi
       @aliases = []
 
       @align = [:left]
-      @formatters = []
-      @colorizers = []
-      @row_colorizer = nil
-
-      @predicated_formatters = nil
-      @predicated_colorizers = nil
+      @components = {}
+      #@contexts = []
+      @context_rows = []
+      _define_ :default
+      @current_context = :default
     end
 
     # Indicates that the table should not use colors.
@@ -92,6 +91,20 @@ module Yummi
       @no_colors = true
     end
 
+    def context params = {}
+      params ||= {}
+      index = @context_rows.size #@contexts.size
+      _define_ index
+      #@contexts.insert(index, context)
+      @context_rows.insert(index, (params[:rows] or 1))
+
+      @current_context = index
+      yield if block_given?
+      @current_context = :default
+    end
+
+
+    # Sets the table print layout.
     def layout=(layout)
       @layout = layout
       case layout
@@ -104,6 +117,21 @@ module Yummi
       end
     end
 
+    # Retrieves the row at the given index
+    def row(index)
+      @data[index]
+    end
+
+    # Retrieves the column at the given index. Aliases can be used
+    def column(index)
+      index = parse_index(index)
+      columns = []
+      @data.each do |row|
+        columns << row[index]
+      end
+      columns
+    end
+
     #
     # Sets the table header. If no aliases are defined, they will be defined as the texts
     # in lowercase with line breaks and spaces replaced by underscores.
@@ -158,10 +186,11 @@ module Yummi
     #
     # === Example
     #
-    #   table.row_colorizer { |i, row| :red if row[:value] < 0 }
+    #   table.colorize_row { |i, row| :red if row[:value] < 0 }
     #
-    def row_colorizer (colorizer = nil, &block)
-      @row_colorizer = (colorizer or block)
+    def colorize_row (params = nil, &block)
+      obj = extract_component(params, &block)
+      component[:row_colorizer] = obj
     end
 
     #
@@ -177,7 +206,7 @@ module Yummi
     #
     def using_row
       @using_row = true
-      yield
+      yield if block_given?
       @using_row = false
     end
 
@@ -224,8 +253,8 @@ module Yummi
       [*indexes].each do |index|
         index = parse_index(index)
         if index
-          obj = (params[:using] or block or (proc { |v| params[:with] }))
-          @colorizers[index] = {:use_row => @using_row, :component => obj}
+          obj = extract_component(params, &block)
+          component[:colorizers][index] = {:use_row => @using_row, :component => obj}
         else
           colorize_null params, &block
         end
@@ -243,8 +272,8 @@ module Yummi
     #     - :with defines the format to use
     #
     def colorize_null (params = {}, &block)
-      @null_colorizer = (params[:using] or block)
-      @null_colorizer ||= proc do |value|
+      component[:null_colorizer] = (params[:using] or block)
+      component[:null_colorizer] ||= proc do |value|
         params[:with]
       end
     end
@@ -274,8 +303,8 @@ module Yummi
       [*indexes].each do |index|
         index = parse_index(index)
         if index
-          @formatters[index] = (params[:using] or block)
-          @formatters[index] ||= proc do |value|
+          component[:formatters][index] = (params[:using] or block)
+          component[:formatters][index] ||= proc do |value|
             params[:with] % value
           end
         else
@@ -295,8 +324,8 @@ module Yummi
     #     - :with defines the format to use
     #
     def format_null (params = {}, &block)
-      @null_formatter = (params[:using] or block)
-      @null_formatter ||= proc do |value|
+      component[:null_formatter] = (params[:using] or block)
+      component[:null_formatter] ||= proc do |value|
         params[:with] % value
       end
     end
@@ -326,6 +355,26 @@ module Yummi
       string << content(table_data)
     end
 
+    private
+
+    def extract_component params, &block
+      if params[:using]
+        params[:using]
+      elsif params[:with]
+        proc { |v| params[:with] }
+      else
+        block
+      end
+    end
+
+    def _define_ context
+      @components[context] = {
+        :formatters => [],
+        :colorizers => [],
+        :row_colorizer => nil,
+      }
+    end
+
     #
     # Gets the content string for the given color map and content
     #
@@ -373,8 +422,18 @@ module Yummi
     #
     def build_data_output
       output = []
-
+      rows = @data.size
+      # maps the context for each row
+      row_contexts = [:default] * rows
+      i = 1
+      @context_rows.reverse_each do |size|
+        row_contexts[(rows - size)...rows] = [@context_rows.size - i] * size
+        rows -= size
+        i += 1
+      end
       @data.each_index do |row_index|
+        # sets the current context
+        @current_context = row_contexts[row_index]
         row = @data[row_index]
         _row_data = []
         row = row.to_a if row.is_a? Range
@@ -383,34 +442,37 @@ module Yummi
           color = nil
           value = nil
           column = row[col_index]
-          colorizer = @colorizers[col_index]
-          if @null_colorizer and column.nil?
-            color = @null_colorizer.call(column)
+          colorizer = component[:colorizers][col_index]
+          if component[:null_colorizer] and column.nil?
+            color = component[:null_colorizer].call(column)
           elsif colorizer
             arg = colorizer[:use_row] ? IndexedData::new(@aliases, row) : column
             color = colorizer[:component].call(arg)
           else
             color = @colors[:value]
           end
-          formatter = @formatters[col_index]
-          formatter = @null_formatter if column.nil? and @null_formatter
+          formatter = component[:formatters][col_index]
+          formatter = component[:null_formatter] if column.nil? and @null_formatter
           value = (formatter ? formatter.call(column) : column)
 
           _row_data << {:value => value, :color => color}
         end
-        if @row_colorizer
+        row_colorizer = component[:row_colorizer]
+        if row_colorizer
           row_data = IndexedData::new @aliases, row
-          row_color = @row_colorizer.call row_data, row_index
+          row_color = row_colorizer.call row_data, row_index
           _row_data.collect! { |data| data[:color] = row_color; data } if row_color
         end
 
-        _row_data = normalize(_row_data,
-                              :extract => proc do |data|
-                                data[:value].to_s
-                              end,
-                              :new => proc do |value, data|
-                                {:value => value, :color => data[:color]}
-                              end)
+        _row_data = normalize(
+          _row_data,
+          :extract => proc do |data|
+            data[:value].to_s
+          end,
+          :new => proc do |value, data|
+            {:value => value, :color => data[:color]}
+          end
+        )
         _row_data.each do |_row|
           output << _row
         end
@@ -418,7 +480,9 @@ module Yummi
       output
     end
 
-    private
+    def component
+      @components[@current_context]
+    end
 
     def normalize(row, params = {})
       params[:extract] ||= proc do |value|

data/lib/yummi/table_builder.rb

@@ -46,7 +46,7 @@ module Yummi
                          :invoke     => :format
 
       component [:row_color, :colorize_row], :repository => :row_based_colorizers,
-                                             :invoke     => :row_colorizer,
+                                             :invoke     => :colorize_row,
                                              :row_based  => true
 
       component [:state, :health], :repository => :using_row_colorizers,
@@ -74,6 +74,20 @@ module Yummi
       table.header = config[:header] if config[:header]
       table.layout = config[:layout].to_sym if config[:layout]
 
+      build_components table, config
+      contexts = config[:contexts]
+      if contexts
+        contexts.each do |context_config|
+          table.context context_config do
+            build_components table, context_config
+          end
+        end
+      end
+
+      table
+    end
+
+    def build_components(table, config)
       components.each do |key, component_config|
         block = lambda do |params|
           if component_config[:using_row]
@@ -90,8 +104,6 @@ module Yummi
           parse_component config[key], component_config, &block
         end
       end
-
-      table
     end
 
     def parse_component(definitions, config)
@@ -111,13 +123,12 @@ module Yummi
       if definitions
         if definitions.is_a? Hash
           definitions.each do |component_name, params|
-            yield(create_component({component_name => params}, config))
+            component = create_component({component_name => params}, config)
+            yield([{:using => component}])
           end
         else
-          puts definitions
           component = create_component(definitions, config)
-          puts component
-          yield(component)
+          yield([{:using => component}])
         end
       end
     end

data/lib/yummi/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Yummi
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
 description: A tool to colorize your console application.
 email: