tty-table 0.1.0 → 0.2.0

data/lib/tty/table/operation/alignment.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+module TTY
+  class Table
+    module Operation
+      # A class which responsiblity is to align table rows and header.
+      class Alignment
+        DEFAULT = :left
+
+        # Initialize an Alignment operation
+        #
+        # @api private
+        def initialize(alignments, widths = nil)
+          @alignments = alignments
+          @widths     = widths
+        end
+
+        # Evaluate alignment of the provided row
+        #
+        # @param [Array] row
+        #  the table row
+        # @param [Hash] options
+        #  the table options
+        #
+        # @return [TTY::Table::Field]
+        #
+        # @api public
+        def call(field, row, col)
+          align_field(field, col)
+        end
+
+        private
+
+        attr_reader :alignments
+
+        attr_reader :widths
+
+        # Align each field in a row
+        #
+        # @param [TTY::Table::Field] field
+        #   the table field
+        #
+        # @param [Integer] co
+        #   the table column index
+        #
+        # @param [Hash] options
+        #
+        # @return [TTY::Table::Field]
+        #
+        # @api private
+        def align_field(field, col)
+          column_width = widths[col]
+          direction    = field.alignment || alignments[col] || DEFAULT
+          Verse.align(field.content, column_width, direction)
+        end
+      end # Alignment
+    end # Operation
+  end # Table
+end # TTY

data/lib/tty/table/operation/escape.rb

@@ -20,7 +20,7 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          field.value = field.value.to_s.gsub(/(\t|\r|\n)/) do |val|
+          field.content.gsub(/(\t|\r|\n)/) do |val|
             val.dump.gsub('"', '')
           end
         end

data/lib/tty/table/operation/filter.rb

@@ -26,7 +26,7 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          field.value = @filter.call(field.value, row, col)
+          @filter.call(field.content, row, col)
         end
       end # Filter
     end # Operation

data/lib/tty/table/operation/padding.rb

@@ -1,36 +1,25 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 
 module TTY
   class Table
     module Operation
-
       # A class responsible for padding field with whitespace
+      #
+      # Used internally by {Table::Renderer}
       class Padding
 
-        attr_reader :padding_top
-
-        attr_reader :padding_right
-
-        attr_reader :padding_bottom
-
-        attr_reader :padding_left
-
-        attr_reader :padding_width
-
-        attr_reader :multiline
+        attr_reader :widths
 
         # Initialize a Padding operation
         #
-        # @param [TTY::Table::Padder]
+        # @param [TTY::Table::Padder] padding
+        #
+        # @param [Array[Integer]] widths
         #
         # @api public
-        def initialize(padding, multiline)
-          @padding_top    = "\n" * padding.top
-          @padding_right  = ' '  * padding.right
-          @padding_bottom = "\n" * padding.bottom
-          @padding_left   = ' '  * padding.left
-          @padding_width  = padding.left + padding.right
-          @multiline      = multiline
+        def initialize(padding, widths)
+          @padding = padding
+          @widths  = widths
         end
 
         # Apply padding to a field
@@ -48,47 +37,9 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          text      = field.value.to_s
-
-          text = multiline ?  pad_multi_line(text) : pad_single_line(text)
-          text.insert(0, padding_top).insert(-1, padding_bottom)
-
-          field.value = text
+          column_width = widths[col]
+          Verse.pad(field.content, @padding)
         end
-
-        # Apply padding to multi line text
-        #
-        # @param [String] text
-        #
-        # @return [String]
-        #
-        # @api private
-        def pad_multi_line(text)
-          text.split("\n", -1).map { |part| pad_around(part) }.join("\n")
-        end
-
-        # Apply padding to single line text
-        #
-        # @param [String] text
-        #
-        # @return [String]
-        #
-        # @api private
-        def pad_single_line(text)
-          pad_around(text.strip)
-        end
-
-        # Apply padding to left and right side of string
-        #
-        # @param [String] text
-        #
-        # @return [String]
-        #
-        # @api private
-        def pad_around(text)
-          text.insert(0, padding_left).insert(-1, padding_right)
-        end
-
       end # Padding
     end # Operation
   end # Table

data/lib/tty/table/operation/truncation.rb

@@ -32,8 +32,8 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          width       = widths[col] || field.width
-          field.value = Verse.truncate(field.value, width)
+          width = widths[col] || field.width
+          Verse.truncate(field.content, width)
         end
       end # Truncation
     end # Operation

data/lib/tty/table/operation/wrapped.rb

@@ -9,14 +9,11 @@ module TTY
       class Wrapped
         attr_reader :widths
 
-        attr_reader :padding
-
         # Initialize a Wrapped
         #
         # @api public
-        def initialize(widths, padding)
+        def initialize(widths)
           @widths  = widths
-          @padding = padding.padding
         end
 
         # Apply wrapping to a field
@@ -35,7 +32,7 @@ module TTY
         # @api public
         def call(field, row, col)
           width = widths[col] || field.width
-          field.value = Verse.wrap(field.value, width, padding: padding)
+          Verse.wrap(field.content, width)
         end
       end # Wrapped
     end # Operation

data/lib/tty/table/operations.rb

@@ -6,19 +6,6 @@ module TTY
     #
     # @api private
     class Operations
-      # The table
-      #
-      # @api private
-      attr_reader :table
-      private :table
-
-      # Available operations
-      #
-      # @return [Hash]
-      #
-      # @api public
-      attr_reader :operations
-
       # Initialize Operations
       #
       # @param [TTY::Table] table
@@ -46,7 +33,19 @@ module TTY
         operations[operation_type] << object
       end
 
-      # Apply operations to a table row
+      # Lookup operation
+      #
+      # @param [Symbol] operation
+      #
+      # @return [Object]
+      #   the operation
+      #
+      # @api public
+      def [](operation)
+        operations[operation]
+      end
+
+      # Apply operations to a table data
       #
       # @param [Array[Symbol]] types
       #  the operation types
@@ -58,12 +57,31 @@ module TTY
       # @api public
       def run_operations(*args)
         operation_types = args
-        table.each_with_index do |val, row, col|
-          operation_types.each do |type|
-            operations[type].each { |op| op.call(val, row, col) }
+        table.data.each_with_index do |row, row_i|
+          row.fields.each_with_index do |field, col_i|
+            field.reset!
+            operation_types.each do |type|
+              operations[type].each do |operation|
+                field.content = operation.call(field, row_i, col_i)
+              end
+            end
           end
         end
       end
+
+      private
+
+      # The table
+      #
+      # @api private
+      attr_reader :table
+
+      # Available operations
+      #
+      # @return [Hash]
+      #
+      # @api public
+      attr_reader :operations
     end # Operations
   end # Table
 end # TTY

data/lib/tty/table/orientation/vertical.rb

@@ -23,12 +23,12 @@ module TTY
         #
         # @api public
         def slice(table)
-          header   = table.header
-          row_size = table.row_size
+          header    = table.header
+          rows_size = table.rows_size
 
-          head = header ? header : (0..row_size).map { |n| (n + 1).to_s }
+          head = header ? header : (0..rows_size).map { |n| (n + 1).to_s }
 
-          (0...row_size).reduce([]) do |array, index|
+          (0...rows_size).reduce([]) do |array, index|
             array + head.zip(table.rows[index]).map { |row| table.to_row(row) }
           end
         end

data/lib/tty/table/renderer.rb

@@ -8,22 +8,16 @@ module TTY
     #
     # @api private
     class Renderer
-      autoload :ASCII,   'tty/table/renderer/ascii'
-      autoload :Basic,   'tty/table/renderer/basic'
-      autoload :Color,   'tty/table/renderer/color'
-      autoload :Unicode, 'tty/table/renderer/unicode'
-
       RENDERER_MAPPER = {
         ascii:   TTY::Table::Renderer::ASCII,
         basic:   TTY::Table::Renderer::Basic,
-        color:   TTY::Table::Renderer::Color,
         unicode: TTY::Table::Renderer::Unicode
       }
 
       # Select renderer class based on string name.
       #
       # The possible values for renderer are
-      # [:basic, :ascii, :unicode, :color]
+      #   [:basic, :ascii, :unicode]
       #
       # @param [Symbol] renderer
       #   the renderer used for displaying table

data/lib/tty/table/renderer/basic.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'tty/table/validatable'
-
 module TTY
   class Table
     class Renderer
@@ -11,14 +9,6 @@ module TTY
       class Basic
         include TTY::Table::Validatable
 
-        # Table to be rendered
-        #
-        # @return [TTY::Table]
-        #
-        # @api public
-        attr_reader :table
-        # private :table
-
         # Table border to be rendered
         #
         # @return [TTY::Table::Border]
@@ -38,12 +28,7 @@ module TTY
         # @return [Array]
         #
         # @api private
-        attr_accessor :column_aligns
-
-        # The table operations applied to rows
-        #
-        # @api public
-        attr_reader :operations
+        attr_accessor :alignments
 
         # A callable object used for formatting field content
         #
@@ -63,7 +48,7 @@ module TTY
         # @return [Integer]
         #
         # @api public
-        attr_accessor :indent
+        attr_reader :indent
 
         # The table totabl width
         #
@@ -91,8 +76,10 @@ module TTY
         # Initialize a Renderer
         #
         # @param [Hash] options
-        # @option options [String] :column_aligns
+        # @option options [String] :alignments
         #   used to format table individual column alignment
+        # @option options [Hash[Symbol]] :border
+        #   the border options
         # @option options [String] :column_widths
         #   used to format table individula column width
         # @option options [Integer] :indent
@@ -106,17 +93,16 @@ module TTY
         def initialize(table, options = {})
           @table         = assert_table_type(table)
           @multiline     = options.fetch(:multiline) { false }
-          @operations    = TTY::Table::Operations.new(table)
-          @operations.add(:escape, Operation::Escape.new)
           @border        = TTY::Table::BorderOptions.from(options.delete(:border))
           @column_widths = options.fetch(:column_widths, nil)
-          @column_aligns = Array(options.delete(:column_aligns)).map(&:to_sym)
+          alignment      = Array(options[:alignment]) * table.columns_size
+          @alignments    = TTY::Table::AlignmentSet.new(options[:alignments] || alignment)
           @filter        = options.fetch(:filter) { proc { |val, _| val } }
           @width         = options.fetch(:width) { TTY::Screen.width }
           @border_class  = options.fetch(:border_class) { Border::Null }
           @indent        = options.fetch(:indent) { 0 }
           @resize        = options.fetch(:resize) { false }
-          @padding       = TTY::Table::Padder.parse(options[:padding])
+          @padding       = Verse::Padder.parse(options[:padding])
         end
 
         # Parses supplied column widths, if not present
@@ -147,40 +133,16 @@ module TTY
           end
           @border
         end
+        alias_method :border=, :border
 
-        # Initialize and add operations
-        #
-        # @api private
-        def add_operations
-          operations.add(:alignment,  Operation::AlignmentSet.new(column_aligns,
-                                                                  column_widths))
-          operations.add(:filter,     Operation::Filter.new(filter))
-          operations.add(:truncation, Operation::Truncation.new(column_widths))
-          operations.add(:wrapping,   Operation::Wrapped.new(column_widths, padding))
-          operations.add(:padding,    Operation::Padding.new(padding, multiline))
-        end
-
-        # Initializes indentation
+        # Change the value of indentation
         #
-        # @return [TTY::Table::Indentation]
-        #
-        # @api private
-        def indentation
-          @indentation ||= TTY::Table::Indentation.new(self)
-        end
-
-        # Delegate indentation insertion
+        # @param [Integer]
+        #   the indentation value
         #
         # @api public
-        def insert_indent(line)
-          indentation.insert_indent(line)
-        end
-
-        # Return column contraints
-        #
-        # @api private
-        def columns_constraints
-          TTY::Table::Columns.new(self)
+        def indent=(value)
+          @indentation.indentation = value
         end
 
         # Sets the output padding,
@@ -190,37 +152,81 @@ module TTY
         #
         # @api public
         def padding=(value)
-          @padding = TTY::Table::Padder.parse(value)
+          @padding = Verse::Padder.parse(value)
         end
 
-        # Renders table
+        # Renders table as string with border
         #
-        # @return [String] string representation of table
+        # @example
+        #   renderer = TTY::Table::Renderer::Basic.new(table)
+        #   renderer.render
+        #
+        # @return [String]
+        #   the string representation of table
         #
         # @api public
         def render
           return if table.empty?
 
-          operations.run_operations(:escape) unless multiline
-          columns_constraints.enforce
-          add_operations
-          ops = [:alignment]
-          ops << :padding unless padding.empty?
-          multiline ? ops << :wrapping : ops << :truncation
+          @operations = TTY::Table::Operations.new(table)
+          @operations.add(:escape, Operation::Escape.new)
+          @operations.run_operations(:escape) unless multiline
+          column_constraint = ColumnConstraint.new(table, self)
+          @column_widths = column_constraint.enforce
+          add_operations(@column_widths)
+          ops = []
+          ops << :escape unless multiline
+          ops << :alignment
+          ops << (multiline ? :wrapping : :truncation)
+          ops << :padding
           ops << :filter
-          operations.run_operations(*ops)
+          @operations.run_operations(*ops)
 
           render_data.compact.join("\n")
         end
 
+        # Initialize and add operations
+        #
+        # @api private
+        def add_operations(widths)
+          @operations.add(:alignment,  Operation::Alignment.new(alignments, widths))
+          @operations.add(:filter,     Operation::Filter.new(filter))
+          @operations.add(:truncation, Operation::Truncation.new(widths))
+          @operations.add(:wrapping,   Operation::Wrapped.new(widths))
+          @operations.add(:padding,    Operation::Padding.new(padding, widths))
+        end
+
         private
 
+        # Table to be rendered
+        #
+        # @return [TTY::Table]
+        #
+        # @api public
+        attr_reader :table
+
+        # Initializes indentation
+        #
+        # @return [TTY::Table::Indentation]
+        #
+        # @api private
+        def indentation
+          @indentation ||= TTY::Table::Indentation.new(indent)
+        end
+
+        # Delegate indentation insertion
+        #
+        # @api public
+        def insert_indent(line)
+          indentation.indent(line)
+        end
+
         # Render table data
         #
         # @api private
         def render_data
           first_row        = table.first
-          data_border      = border_class.new(column_widths, border)
+          data_border      = border_class.new(column_widths, padding, border)
           header           = render_header(first_row, data_border)
           rows_with_border = render_rows(data_border)
           bottom_line      = data_border.bottom_line