yummi 0.5.2 → 0.6.0

data/lib/yummi/table_builder.rb

@@ -34,24 +34,20 @@ module Yummi
     
       @repositories[:formatters] = [Yummi::Formatters]    
       @repositories[:colorizers] = [Yummi::Colorizers]    
-      @repositories[:row_based_colorizers] = [Yummi::Colorizers]    
-      @repositories[:using_row_colorizers] = [Yummi::Colorizers]
+      @repositories[:row_colorizers] = [Yummi::Colorizers]    
     end
 
     def defaults
-      component [:color, :colorize], :repository => :colorizers,
-                                     :invoke     => :colorize
+      component [:color, :colorize, :state, :health], :repository => :colorizers,
+                                                      :invoke     => :colorize
 
       component :format, :repository => :formatters,
                          :invoke     => :format
 
-      component [:row_color, :colorize_row], :repository => :row_based_colorizers,
+      component [:row_color, :colorize_row], :repository => :row_colorizers,
                                              :invoke     => :colorize_row,
                                              :row_based  => true
 
-      component [:state, :health], :repository => :using_row_colorizers,
-                                   :invoke     => :colorize,
-                                   :using_row  => true
       self
     end
 
@@ -75,11 +71,14 @@ module Yummi
       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
+
+      [:bottom, :top].each do |context|
+        contexts = config[context]
+        if contexts
+          contexts.each do |context_config|
+            table.send context, context_config do
+              build_components table, context_config
+            end
           end
         end
       end
@@ -90,13 +89,7 @@ module Yummi
     def build_components(table, config)
       components.each do |key, component_config|
         block = lambda do |params|
-          if component_config[:using_row]
-            table.using_row do
-              table.send component_config[:invoke], *params
-            end
-          else
-            table.send component_config[:invoke], *params
-          end
+          table.send component_config[:invoke], *params
         end
         if component_config[:row_based]
           parse_row_based_component config[key], component_config, &block

data/lib/yummi/text_box.rb

@@ -20,28 +20,49 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'ostruct'
+
 module Yummi
 
   # A box to decorate texts
   class TextBox
-    # The border color
-    attr_accessor :color
     # The box content
     attr_accessor :content
-    # The box width (leave it null to manually manage the width)
-    attr_accessor :width
-    # The default alignment to use
-    attr_accessor :default_align
-    # The default separator parameters to use. Use the :pattern: key to set the pattern
-    # and the keys supported in #self#separator
-    attr_accessor :default_separator
+    #
+    # Holds the style information for this box. Supported properties are:
+    # 
+    # width: the box width (default: none)
+    # align: the default alignment to use (default: left)
+    # separator: the style for separators, defined as a hash
+    #   color: separator color (default: none)
+    #   pattern: separator pattern (default: '-')
+    #   width: separator width (default: box width)
+    # 
+    attr_reader :style    
 
     def initialize
       @color = :white
       @content = []
-      @default_separator = {
-        :pattern => '-'
-      }
+      @style = OpenStruct::new
+      @style.separator = {}
+      @style.separator[:pattern] = '-'
+      @style.separator[:width] = nil
+      @style.separator[:align] = :left
+
+      @style.border = {}
+      @style.border[:color] = nil
+      @style.border[:top] = '-'
+      @style.border[:bottom] = '-'
+      @style.border[:left] = '|'
+      @style.border[:right] = '|'
+      @style.border[:top_left] = '+'
+      @style.border[:top_right] = '+'
+      @style.border[:bottom_left] = '+'
+      @style.border[:bottom_right] = '+'
+    end
+
+    def no_border
+      @style.border = nil
     end
 
     #
@@ -60,8 +81,8 @@ module Yummi
     #
     def add (text, params = {})
       params = {
-        :width => @width,
-        :align => @default_align
+        :width => style.width,
+        :align => style.align
       }.merge! params
       if params[:width]
         width = params[:width]
@@ -99,26 +120,21 @@ module Yummi
     #
     # === Args
     #
-    # +pattern+::
-    #   The pattern to build the line
     # +params+::
     #   A hash of parameters. Currently supported are:
+    #     pattern: the pattern to build the line
     #     color: the separator color (see #Yummi#COLORS)
     #     width: the separator width (#self#width will be used if unset)
     #     align: the separator alignment (see #Yummi#Aligner)
     #
-    def separator (pattern = @default_separator[:pattern], params = {})
-      unless pattern.is_a? String
-        params = pattern
-        pattern = @default_separator[:pattern]
-      end
-      params = @default_separator.merge params
-      width = (params[:width] or @width)
-      if @width and width < @width
-        params[:width] = @width
-      end
-      line = pattern * width
-      add line[0...width], params
+    def separator (params = {})
+      params = style.separator.merge! params
+      params[:width] ||= style.width
+      raise Exception::new("Define a width for using separators") unless params[:width]
+      line = fill(params[:pattern], params[:width])
+      #replace the width with the box width to align the separator
+      params[:width] = style.width
+      add line, params
     end
 
     # Adds a line break to the text.
@@ -133,33 +149,66 @@ module Yummi
 
     def to_s
       width = 0
-      sizes = []
+      sizes = [] # the real size of each line
       content.each do |line|
         size = (Yummi::Color::raw line.chomp).size
         sizes << size
         width = [width, size].max
       end
-      border = Yummi.colorize('+' + ('-' * width) + '+', color) + $/
-      pipe = Yummi.colorize '|', color
       buff = ''
-      buff << border
       i = 0
       content.each do |line|
         diff = width - sizes[i]
-        buff << pipe << line.chomp << (' ' * diff) << pipe << $/
+        buff << line.chomp << (' ' * diff) << $/
         i += 1
       end
-      buff << border
+      buff = add_border buff, width if style.border
       buff
     end
 
     private
 
+    def add_border (text, width)
+      border = style.border
+      color = border[:color]
+      left = fill(border[:left], content.size).split(//).collect do |c|
+        Yummi.colorize(c, color)
+      end
+      right = fill(border[:right], content.size).split(//).collect do |c|
+        Yummi.colorize(c, color)
+      end
+      result = Yummi.colorize(
+        border[:top_left] + fill(border[:top], width) + border[:top_right],
+        color
+      ) + $/
+      text.each_line do |line|
+        result << left.shift.to_s
+        result << line.chomp
+        result << right.shift.to_s
+        result << $/
+      end
+      result << Yummi.colorize(
+          border[:bottom_left] + fill(border[:bottom], width) + border[:bottom_right],
+          color
+        )
+      result << $/
+    end
+
     def _add_ (text, params)
       if params[:align] and params[:width]
         text = Yummi::Aligner.align params[:align], text, params[:width]
       end
-      @content << Yummi.colorize(text, params[:color])
+      @content << Yummi.colorize(truncate(text), params[:color])
+    end
+
+    def truncate (text, width = style.width)
+      return text[0...width] if width
+      text
+    end
+
+    def fill (text, width = style.width)
+      width = [width, style.width].min if style.width
+      truncate text * width, width
     end
 
   end

data/lib/yummi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yummi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,13 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies: []
 description: A tool to colorize your console application.
 email:
 - ataxexe@gmail.com
 executables:
-- colorize
+- yummi
 extensions: []
 extra_rdoc_files: []
 files:
@@ -25,7 +25,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/colorize
+- bin/yummi
 - examples/cash_flow_table.rb
 - examples/cash_flow_table.yaml
 - examples/cash_flow_table_data.csv