yummi 0.5.2 → 0.6.0

data/lib/yummi/color_mapping.rb

@@ -22,39 +22,27 @@
 
 Yummi::Color::load_color_map(
   :default => {
-    :key_code => 0,
+    :key_code => '0;3',
     :schema => Yummi::Color::Schema::NORMAL_COLORS
   },
-  :intense => {
-    :key_code => 1,
-    :schema => Yummi::Color::Schema::ALTERNATE_COLORS
-  },
-  :strong => {
-    :key_code => 1,
-    :schema => Yummi::Color::Schema::ALTERNATE_COLORS
-  },
-  :underscore => {
-    :key_code => 4,
+  :reverse => {
+    :key_code => '0;4',
     :schema => Yummi::Color::Schema::NORMAL_COLORS
   },
-  :underscored => {
-    :key_code => 4,
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
-  },
-  :blink => {
-    :key_code => 5,
-    :schema => Yummi::Color::Schema::NORMAL_COLORS
+  [:intense, :strong, :bold] => {
+    :key_code => '1;3',
+    :schema => Yummi::Color::Schema::ALTERNATE_COLORS
   },
-  :blinking => {
-    :key_code => 5,
+  [:underline, :underscore, :underscored] => {
+    :key_code => '4;3',
     :schema => Yummi::Color::Schema::NORMAL_COLORS
   },
-  :highlight => {
-    :key_code => 7,
+  [:blink, :blinking] => {
+    :key_code => '5;3',
     :schema => Yummi::Color::Schema::NORMAL_COLORS
   },
-  :highlighted => {
-    :key_code => 7,
+  [:highlight, :highlighted] => {
+    :key_code => '7;3',
     :schema => Yummi::Color::Schema::NORMAL_COLORS
   }
 )

data/lib/yummi/colorizers.rb

@@ -36,12 +36,11 @@ module Yummi
     #
     # === Args
     #
-    # An array of arguments that will be passed to :call: method to get the color. By
-    # convention, the first argument must be the object to colorize (to_s is called on it
-    # for getting the text to colorize).
+    # A context or a value.
     #
-    def colorize (*args)
-      Yummi.colorize args.first.to_s, color_for(args)
+    def colorize (arg)
+      arg = Yummi::Context::new(arg) unless arg.is_a? Context
+      Yummi.colorize arg.value.to_s, color_for(arg)
     end
 
     #
@@ -49,11 +48,11 @@ module Yummi
     #
     # === Args
     #
-    # An array of arguments that will be passed to :call: method to get the color. By
-    # convention, the first argument must be the object to colorize (to_s is called on it
-    # for getting the text to colorize).#
-    def color_for (*args)
-      call(*args)
+    # A context or a value.
+    # 
+    def color_for (arg)
+      arg = Yummi::Context::new(arg) unless arg.is_a? Context
+      call(arg)
     end
 
   end
@@ -80,16 +79,6 @@ module Yummi
       join.extend Colorizer
     end
 
-    # Returns a new instance of #DataEvalColorizer
-    def self.by_data_eval &block
-      DataEvalColorizer::new(&block)
-    end
-
-    # Returns a new instance of #EvalColorizer
-    def self.by_eval &block
-      EvalColorizer::new(&block)
-    end
-
     # Returns a new instance of #StripeColorizer
     def self.stripe *colors
       StripeColorizer::new(*colors)
@@ -104,13 +93,14 @@ module Yummi
     # A colorizer that uses the given color.
     #
     def self.with color
-      Yummi::to_colorize do |value|
+      Yummi::to_colorize do |ctx|
         color
       end
     end
 
     def self.when params
-      Yummi::to_colorize do |value|
+      Yummi::to_colorize do |ctx|
+        value = ctx.value
         color = params[value]
         return color if color
         if value.respond_to? :to_sym
@@ -133,7 +123,8 @@ module Yummi
     #   - if_false: color used if the value is false (defaults to yellow)
     #
     def self.boolean params = {}
-      Yummi::to_colorize do |value|
+      Yummi::to_colorize do |ctx|
+        value = ctx.value
         if value.to_s.downcase == "true"
           (params[:if_true] or :green)
         else
@@ -149,10 +140,21 @@ module Yummi
     #   - MINIMUN_VALUE: COLOR_TO_USE
     #
     def self.threshold params
-      colorizer = lambda do |value|
-        params.sort.reverse_each do |limit, color|
-          return color if value > limit
+      params = params.dup
+      mode = (params.delete(:mode) or :min)
+      colorizer = lambda do |ctx|
+        value = ctx.value
+        case mode.to_sym
+        when :min
+          params.sort.reverse_each do |limit, color|
+            return color if value >= limit
+          end
+        when :max
+          params.sort.each do |limit, color|
+            return color if value <= limit
+          end
         end
+        nil
       end
       Yummi::to_colorize(&colorizer)
     end
@@ -162,7 +164,8 @@ module Yummi
     end
 
     def self.numeric params
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         if params[:negative] and value < 0
           params[:negative]
         elsif params[:positive] and value > 0
@@ -177,29 +180,34 @@ module Yummi
       include Yummi::Colorizer
 
       def initialize(params)
-        @max = params[:max]
+        @max = params[:max].to_sym
         @free = params[:free]
         @using = params[:using]
-        @color = params[:color] || {
+        color = {
           :bad => :red,
           :warn => :yellow,
           :good => :green
-        }
-        @threshold = params[:threshold] || {
+        }.merge!(params[:colors] || {})
+        threshold = {
           :warn => 0.30,
-          :bad => 0.15
-        }
+          :bad => 0.15,
+          :good => 1
+        }.merge!(params[:threshold] || {})
+
+        threshold_params = { :mode => :max }
+        color.each do |type, name|
+          threshold_params[threshold[type]] = name
+        end
+        @threshold = Yummi::Colorizers.threshold threshold_params
       end
 
       def call(data)
-        max = data[@max.to_sym].to_f
+        max = data[@max].to_f
         free = @using ? max - data[@using.to_sym].to_f : data[@free.to_sym].to_f
 
         percentage = free / max
 
-        return @color[:bad] if percentage <= @threshold[:bad]
-        return @color[:warn] if percentage <= @threshold[:warn]
-        @color[:good]
+        @threshold.color_for(percentage)
       end
 
     end
@@ -254,8 +262,8 @@ module Yummi
         @last_color = nil
       end
 
-      def call *args
-        line = args.first.to_s
+      def call ctx
+        line = ctx.value.to_s
         @patterns.each do |regex, color|
           if regex.match(line)
             @last_color = color
@@ -284,81 +292,6 @@ module Yummi
 
     end
 
-    #
-    # A colorizer that evaluates a main block and returns a color based on other blocks.
-    #
-    # The main block must be compatible with the colorizing type (receiving a column
-    # value in case of a table column colorizer or the row index and row value in case
-    # of a table row colorizer).
-    #
-    # === Example
-    #
-    #   # assuming that the table has :max and :current aliases
-    #   colorizer = DataEvalColorizer::new { |index, data| data[:current] / data[:max] }
-    #   # the result of the expression above will be passed to this block
-    #   colorizer.use(:red) { |value| value >= 0.9 }
-    #
-    #   table.using_row.colorize :current, :using => colorizer
-    #
-    class EvalColorizer
-      include Yummi::Colorizer
-
-      def initialize (&block)
-        @block = block
-        @colors = []
-        @eval_blocks = []
-      end
-
-      #
-      # Uses the given color if the given block returns something when evaluated with the
-      # result of main block.
-      #
-      # An objtect that responds to :call may also be used.
-      #
-      def use (color, component = nil, &eval_block)
-        @colors << color
-        @eval_blocks << (component or eval_block)
-      end
-
-      # Resolves the value using the main block and given arguments
-      def resolve_value (*args)
-        @block.call(*args)
-      end
-
-      def call (*args)
-        value = resolve_value(*args)
-        @eval_blocks.each_index do |i|
-          return @colors[i] if @eval_blocks[i].call(value)
-        end
-        nil
-      end
-
-    end
-
-    #
-    # A colorizer that evaluates a main block and returns a color based on other blocks.
-    #
-    # The main block can receive any parameters and the names must be aliases the current
-    # evaluated data.
-    #
-    # === Example
-    #
-    #   # assuming that the table has :max and :current aliases
-    #   colorizer = DataEvalColorizer::new { |max, current| current / max }
-    #   # the result of the expression above will be passed to this block
-    #   colorizer.use(:red) { |value| value >= 0.9 }
-    #
-    #   table.using_row.colorize :current, :using => colorizer
-    #
-    class DataEvalColorizer < EvalColorizer
-      include Yummi::BlockHandler, Yummi::Colorizer
-
-      def resolve_value (*args)
-        block_call args.first, &@block # by convention, the first arg is data
-      end
-
-    end
-
   end
 
 end

data/lib/yummi/formatters.rb

@@ -26,7 +26,8 @@ module Yummi
   module FormatterBlock
 
     # Calls the :call: method
-    def format (value)
+    def format (arg)
+      arg = Yummi::Context::new(arg) unless arg.is_a? Context
       call value
     end
 
@@ -49,7 +50,8 @@ module Yummi
     # :if_false => String to use when value is false
     #
     def self.boolean params = {}
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         if value.to_s.downcase == "true"
           (params[:if_true] or "Yes")
         else 
@@ -60,14 +62,16 @@ module Yummi
 
     # A formatter to round float values
     def self.round precision
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         "%.#{precision}f" % value
       end
     end
 
     # A formatter that uses the given format
     def self.with format
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         format % value
       end
     end
@@ -82,7 +86,8 @@ module Yummi
     # :positive => format to use when value is positive
     #
     def self.numeric params
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         if params[:negative] and value < 0
           params[:negative] % value.abs
         elsif params[:positive] and value > 0
@@ -100,7 +105,8 @@ module Yummi
     #   The precision to use (defaults to 3)
     #
     def self.percentage precision = 3
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         "%.#{precision}f%%" % (value * 100)
       end
     end
@@ -130,7 +136,8 @@ module Yummi
     # See #BYTE_MODES
     #
     def self.byte params = {}
-      Yummi::to_format do |value|
+      Yummi::to_format do |ctx|
+        value = ctx.value
         value = value.to_i if value.is_a? String
         mode = (params[:mode] or :iec)
         range = BYTE_MODES[mode][:range]

data/lib/yummi/logger.rb

@@ -60,7 +60,7 @@ module Yummi
         @colors = {
           :debug => nil,
           :info => :green,
-          :warn => :brown,
+          :warn => :yellow,
           :error => :red,
           :fatal => :intense_red,
           :any => :intense_gray

data/lib/yummi/mappings/weblogic11g.yaml

@@ -8,5 +8,5 @@ patterns:
   Warning   : yellow
   Error     : red
   Critical  : intense_red
-  Alert     : highlight_red
-  Emergency : blink_red
+  Alert     : intense_underline_red
+  Emergency : highlight_red

data/lib/yummi/table.rb

@@ -23,8 +23,6 @@
 module Yummi
   # A Table that supports colorizing title, header, values and also formatting the values.
   class Table
-    # The table data. It holds a two dimensional array.
-    attr_accessor :data
     # The table title
     attr_accessor :title
     # The table description
@@ -75,8 +73,7 @@ module Yummi
 
       @align = [:left]
       @components = {}
-      #@contexts = []
-      @context_rows = []
+      @contexts = [:default]
       _define_ :default
       @current_context = :default
     end
@@ -91,18 +88,50 @@ 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
+    #
+    # Groups definitions for a specified group of rows at the bottom of the table.
+    # Every customization can be used (formatter/colorizer for null values, for rows
+    # and columns). Customizations must be done in the given block.
+    #
+    # Subsequent calls to this method creates different groups. 
+    #
+    # === Args
+    #   +:rows+:: The number of rows to group using the customizations in the block
+    #
+    # === Examples
+    #
+    #   table.bottom :rows => 3 do
+    #     table.colorize :subtotal, :with => :green
+    #     table.format :approved, :using => Yummi::Formatters::boolean
+    #   end
+    #   table.bottom { table.colorize :total, :with => :white }
+    #
+    def bottom params = {}, &block
+      index = @contexts.size
+      _context_ index, params, &block
     end
 
+    #
+    # Groups definitions for a specified group of rows at the top of the table.
+    # Every customization can be used (formatter/colorizer for null values, for rows
+    # and columns). Customizations must be done in the given block.
+    #
+    # Subsequent calls to this method creates different groups. 
+    #
+    # === Args
+    #   +:rows+:: The number of rows to group using the customizations in the block
+    #
+    # === Examples
+    #
+    #   table.top :rows => 3 do
+    #     table.colorize :subtotal, :with => :green
+    #     table.format :approved, :using => Yummi::Formatters::boolean
+    #   end
+    #   table.top { table.colorize :total, :with => :white }
+    #
+    def top params = {}, &block
+      _context_ 0, params, &block
+    end
 
     # Sets the table print layout.
     def layout=(layout)
@@ -127,7 +156,7 @@ module Yummi
       index = parse_index(index)
       columns = []
       @data.each do |row|
-        columns << row[index]
+        columns << row_to_array(row)[index].value
       end
       columns
     end
@@ -193,39 +222,20 @@ module Yummi
       component[:row_colorizer] = obj
     end
 
-    #
-    # Indicates that the column colorizer (#colorize) should receive the entire row as the
-    # argument instead of just the column value for all definitions inside of the given
-    # block.
-    #
-    # === Example
-    #
-    #   table.using_row do
-    #     table.colorize(:value) { |row| :red if row[:value] < row[:average] }
-    #   end
-    #
-    def using_row
-      @using_row = true
-      yield if block_given?
-      @using_row = false
+    # Sets the table data
+    def data= (data)
+      @data = data
     end
 
     #
     # Adds the given data as a row. If the argument is a hash, its keys will be used
     # to match header alias for building the row data.
     #
-    def << (row)
-      if row.is_a? Hash
-        array = []
-        aliases.each do |header_alias|
-          array << row[header_alias]
-        end
-        row = array
-      end
+    def add (row)
       @data << row
     end
 
-    alias_method :add, :<<
+    alias_method :<<, :add
 
     #
     # Sets a component to colorize a column.
@@ -254,7 +264,7 @@ module Yummi
         index = parse_index(index)
         if index
           obj = extract_component(params, &block)
-          component[:colorizers][index] = {:use_row => @using_row, :component => obj}
+          component[:colorizers][index] = obj
         else
           colorize_null params, &block
         end
@@ -375,6 +385,18 @@ module Yummi
       }
     end
 
+    def _context_ index, params, &block
+      params ||= {}
+      rows = (params[:rows] or 1)
+      ctx = @contexts.size
+      _define_ ctx
+      @contexts.insert(index, {:id => ctx, :rows => rows})
+
+      @current_context = ctx
+      block.call if block
+      @current_context = :default
+    end
+
     #
     # Gets the content string for the given color map and content
     #
@@ -388,7 +410,7 @@ module Yummi
           width = max_width data, j
           alignment = (@align[j] or @default_align)
           value = Aligner.align alignment, column[:value].to_s, width
-          value = Color.colorize value, column[:color] unless @no_colors
+          value = Yummi.colorize value, column[:color] unless @no_colors
           string << value
           string << (' ' * @colspan)
         end
@@ -415,6 +437,30 @@ module Yummi
       output
     end
 
+    # maps the context for each row
+    def build_row_contexts
+      rows = @data.size
+      row_contexts = [:default] * rows
+      offset = 0
+      @contexts.each do |ctx|
+        if ctx == :default
+          break
+        end
+        size = ctx[:rows]
+        row_contexts[offset...(size + offset)] = [ctx[:id]] * size
+        offset += size
+      end
+      @contexts.reverse_each do |ctx|
+        if ctx == :default
+          break
+        end
+        size = ctx[:rows]
+        row_contexts[(rows - size)...rows] = [ctx[:id]] * size
+        rows -= size
+      end
+      row_contexts
+    end
+
     #
     # Builds the data output for this table.
     #
@@ -422,21 +468,12 @@ 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
+      row_contexts = build_row_contexts
       @data.each_index do |row_index|
         # sets the current context
         @current_context = row_contexts[row_index]
-        row = @data[row_index]
+        row = row_to_array(@data[row_index], row_index)
         _row_data = []
-        row = row.to_a if row.is_a? Range
         row.each_index do |col_index|
           next if not @header.empty? and @header[0].size < col_index + 1
           color = nil
@@ -446,21 +483,19 @@ module Yummi
           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)
+            color = colorizer.call(column)
           else
             color = @colors[:value]
           end
           formatter = component[:formatters][col_index]
           formatter = component[:null_formatter] if column.nil? and @null_formatter
-          value = (formatter ? formatter.call(column) : column)
+          value = (formatter ? formatter.call(column) : column.value)
 
           _row_data << {:value => value, :color => color}
         end
         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.first
           _row_data.collect! { |data| data[:color] = row_color; data } if row_color
         end
 
@@ -480,6 +515,46 @@ module Yummi
       output
     end
 
+    def row_to_array (row, row_index = nil)
+      array = []
+      row = row.to_a if row.is_a? Range
+      if row.is_a? Hash
+        @aliases.each_index do |column_index|
+          obj = TableContext::new(
+            :obj => row,
+            :row_index => row_index,
+            :column_index => column_index,
+            :value => row[@aliases[column_index]]
+          )
+          array << obj
+        end
+      elsif row.is_a? Array
+        row.each_index do |column_index|
+          obj = TableContext::new(
+            :obj => IndexedData::new(@aliases, row),
+            :row_index => row_index,
+            :column_index => column_index,
+            :value => row[column_index]
+          )
+          array << obj
+        end
+      else
+        @aliases.each_index do |column_index|
+          obj = TableContext::new(
+            :obj => row,
+            :row_index => row_index,
+            :column_index => column_index,
+            :value => row.send(@aliases[column_index])
+          )
+          def obj.[] (index)
+            obj.send(index)
+          end
+          array << obj
+        end
+      end
+      array
+    end
+
     def component
       @components[@current_context]
     end
@@ -534,4 +609,17 @@ module Yummi
 
   end
 
+  class TableContext < Yummi::Context
+
+    attr_reader :row_index, :column_index
+
+    def initialize params
+      @row_index = params[:row_index]
+      @column_index = params[:column_index]
+      @value = params[:value]
+      @obj = params[:obj]
+    end
+
+  end
+
 end