tty 0.0.9 → 0.0.10

data/lib/tty/table/column_set.rb

@@ -6,12 +6,12 @@ module TTY
     # A class that represents table columns properties.
     class ColumnSet
       include Equatable
-      extend Delegatable
 
       attr_reader :table
 
-      delegatable_method :table, :column_widths
-
+      # Initialize a ColumnSet
+      #
+      # @api public
       def initialize(table)
         @table = table
       end
@@ -22,7 +22,7 @@ module TTY
       #
       # @api public
       def total_width
-        column_widths.reduce(:+)
+        extract_widths.reduce(:+)
       end
 
       # Calcualte maximum column widths
@@ -30,15 +30,11 @@ module TTY
       # @return [Array] column widths
       #
       # @api private
-      def extract_widths!
-        return column_widths if (column_widths && !column_widths.empty?)
-
-        rows     = table.to_a
-        data     = table.header ? rows + [table.header] : rows
+      def extract_widths
+        data     = table.data
         colcount = data.max { |row_a, row_b| row_a.size <=> row_b.size }.size
 
-        table.column_widths = find_maximas colcount, data
-        self
+        self.class.find_maximas(colcount, data)
       end
 
       private
@@ -51,25 +47,28 @@ module TTY
       #   the table's header and rows
       #
       # @api private
-      def find_maximas(colcount, data)
+      def self.find_maximas(colcount, data)
         maximas = []
         start   = 0
 
-        start.upto(colcount - 1) do |index|
-          maximas << find_maximum(data, index)
+        start.upto(colcount - 1) do |col_index|
+          maximas << find_maximum(data, col_index)
         end
         maximas
       end
 
-      # Find a maximum column width.
+      # Find a maximum column width. The calculation takes into account
+      # wether the content is escaped or not.
       #
       # @param [Array] data
+      #   the table data
       #
       # @param [Integer] index
+      #   the column index
       #
       # @api private
-      def find_maximum(data, index)
-        data.map { |row| row[index] ? (row[index].to_s.size) : 0 }.max
+      def self.find_maximum(data, index)
+        data.map { |row| (value=row.call(index)) ? value.length : 0 }.max
       end
 
     end # ColumnSet

data/lib/tty/table/field.rb

@@ -69,20 +69,40 @@ module TTY
         @height
       end
 
-      def height
-        lines.size
-      end
-
-      # Return number of lines this value spans
+      # Return number of lines this value spans. A distinction is being made
+      # between escaped and non-escaped strings.
+      #
+      # @return [Array[String]]
       #
+      # @api public
       def lines
-        value.to_s.split(/\n/)
+        escaped = value.to_s.scan(/(\\n|\\t|\\r)/)
+        escaped.empty? ? value.to_s.split(/\n/) : [value.to_s]
       end
 
-      def longest_line
+      # If the string contains unescaped new lines then the longest token
+      # deterimines the actual field length.
+      #
+      # @return [Integer]
+      #
+      # @api public
+      def length
         lines.max_by(&:length).size
       end
 
+      # Extract the number of lines this value spans
+      #
+      # @return [Integer]
+      #
+      # @api public
+      def height
+        lines.size
+      end
+
+      def chars
+        value.chars
+      end
+
       # Render value inside this field box
       #
       # @api public

data/lib/tty/table/header.rb

@@ -28,6 +28,7 @@ module TTY
       #
       # @api private
       attr_reader :attributes
+      alias :fields :attributes
 
       # Initialize a Header
       #
@@ -46,13 +47,6 @@ module TTY
         Field.new(options)
       end
 
-      # Filter header names including styling background,
-      # text color and capitalization
-      #
-      #
-      def filter
-      end
-
       # Lookup a column in the header given a name
       #
       # @api public
@@ -66,7 +60,13 @@ module TTY
           end
         end
       end
-      alias :call :[]
+
+      # Lookup attribute without evaluation
+      #
+      # @api public
+      def call(attribute)
+        @attributes[attribute]
+      end
 
       # Set value at index
       #
@@ -86,11 +86,20 @@ module TTY
       end
       alias :length :size
 
+      # Find maximum header height
+      #
+      # @return [Integer]
+      #
+      # @api public
+      def height
+        attributes.map { |field| field.height }.max
+      end
+
       # Convert the Header into an Array
       #
       # @api public
       def to_ary
-        attributes.map { |attr| attr.value if attr.value }
+        attributes.map { |attr| attr.value if attr }
       end
 
       # Check if this header is equivalent to another header

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

@@ -7,6 +7,13 @@ module TTY
       # A class which responsiblity is to align table rows and header.
       class AlignmentSet < Vector
 
+        attr_reader :widths
+
+        def initialize(aligns, widths=nil)
+          @elements = convert_to_array(aligns)
+          @widths   = widths
+        end
+
         # Lookup an alignment by index
         #
         # @param [Integer]
@@ -34,44 +41,32 @@ module TTY
         # @param [Hash] options
         #  the table options
         #
-        # @return [Array[String]]
+        # @return [TTY::Table::Field]
         #
         # @api public
-        def call(row, options={})
-          align_row(row, options)
-        end
-
-        # Align the supplied rows with the correct alignment.
-        #
-        # @param [Array] rows
-        #
-        # @return [Array[Array]]
-        #   the aligned rows
-        #
-        # @api private
-        def align_rows(rows, options={})
-          rows.map { |row| align_row(row, options) }
+        def call(field, row, col)
+          align_field(field, col)
         end
 
       private
 
         # Align each field in a row
         #
-        # @param [Object] row
+        # @param [TTY::Table::Field] field
+        #   the table field
+        #
+        # @param [Integer] col
+        #   the table column index
         #
         # @param [Hash] options
         #
-        # @return [Array[String]]
+        # @return [TTY::Table::Field]
         #
         # @api private
-        def align_row(row, options={})
-          index = 0
-          row.map! do |field|
-            column_width = options[:column_widths][index]
-            alignment    = Alignment.new(field.align || self[index])
-            index += 1
-            alignment.format(field, column_width)
-          end
+        def align_field(field, col)
+          column_width = widths[col]
+          alignment    = Alignment.new(field.align || self[col])
+          field.value  = alignment.format(field, column_width)
         end
 
       end # AlignmentSet

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

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+    module Operation
+
+      # A class responsible for escaping special chars in a table field
+      class Escape
+
+        # Escape special characters in a table field
+        #
+        # @param [TTY::Table::Field] field
+        #
+        # @param [Integer] row
+        #   the field row index
+        #
+        # @param [Integer] col
+        #   the field column index
+        #
+        # @api public
+        def call(field, row, col)
+          field.value = field.value.gsub(/(\t|\r|\n)/) do |val|
+            val.dump.gsub('"', '')
+          end
+        end
+
+      end # Escape
+    end # Operation
+  end # Table
+end # TTY

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

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+    module Operation
+
+      # A class responsible for transforming table field
+      class Filter
+
+        # Initialize a Filter
+        #
+        # @api public
+        def initialize(filter)
+          @filter = filter
+        end
+
+        # Apply filer to the provided table field
+        #
+        # @param [TTY::Table::Field] field
+        #
+        # @param [Integer] row
+        #   the field row index
+        #
+        # @param [Integer] col
+        #   the field column index
+        #
+        # @api public
+        def call(field, row, col)
+          field.value = @filter.call(field.value, row, col)
+        end
+
+      end # Filter
+
+    end # Operation
+  end # Table
+end # TTY

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

@@ -7,21 +7,32 @@ module TTY
       # A class responsible for shortening text.
       class Truncation
 
-        # Apply truncation to a row
+        attr_reader :widths
+
+        # Initialize a Truncation
+        #
+        # @api public
+        def initialize(widths)
+          @widths = widths
+        end
+
+        # Apply truncation to a field
+        #
+        # @param [TTY::Table::Field] field
+        #   the table field
+        #
+        # @param [Integer] row
+        #   the field row index
         #
-        # @param [Array] row
-        #   the table row
+        # @param [Integer] col
+        #   the field column index
         #
-        # @return [Array[String]]
+        # @return [TTY::Table::Field]
         #
         # @api public
-        def call(row, options={})
-          index = 0
-          row.map! do |field|
-            width = options.fetch(:column_widths, {})[index] || field.width
-            index += 1
-            field.value = truncate(field.value, width)
-          end
+        def call(field, row, col)
+          width       = widths[col] || field.width
+          field.value = truncate(field.value, width)
         end
 
         # Shorten given string with traling character.

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

@@ -7,21 +7,32 @@ module TTY
       # A class responsible for wrapping text.
       class Wrapped
 
-        # Apply truncation to a row
+        attr_reader :widths
+
+        # Initialize a Wrapped
+        #
+        # @api public
+        def initialize(widths)
+          @widths = widths
+        end
+
+        # Apply wrapping to a field
+        #
+        # @param [TTY::Table::Field] field
+        #   the table field
+        #
+        # @param [Integer] row
+        #   the field row index
         #
-        # @param [Array] row
-        #   the table row
+        # @param [Integer] col
+        #   the field column index
         #
         # @return [Array[String]]
         #
         # @api public
-        def call(row, options={})
-          index = 0
-          row.map! do |field|
-            width = options.fetch(:column_widths, {})[index] || field.width
-            index += 1
-            field.value = wrap(field.value, width)
-          end
+        def call(field, row, col)
+          width = widths[col] || field.width
+          field.value = wrap(field.value, width)
         end
 
         # Wrap a long string according to the width.

data/lib/tty/table/operations.rb

@@ -49,19 +49,21 @@ module TTY
 
       # Apply operations to a table row
       #
-      # @param [Symbol] type
-      #  the operation type
-      # @param [#to_ary, Row] row
-      #   the row to apply operation to
+      # @param [Array[Symbol]] types
+      #  the operation types
       # @param [Hash] options
       #   the options for the row
       #
-      # @return [Hash]
+      # @return [TTY::Table]
       #
       # @api public
-      def run_operations(type, row, options={})
-        options.merge!(:column_widths => table.column_widths)
-        operations[type].each { |op| op.call(row, options) }
+      def run_operations(*args)
+        types = args
+        table.each_with_index do |val, row, col|
+          types.each do |type|
+            operations[type].each { |op| op.call(val, row, col) }
+          end
+        end
       end
 
     end # Operations

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

@@ -14,6 +14,6 @@ module TTY
 
       end # Horizontal
 
-   end # Orientation
+    end # Orientation
   end # Table
 end # TTY

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

@@ -2,11 +2,11 @@
 
 module TTY
   class Table
-    module Renderer
+    class Renderer
       class ASCII < Basic
 
-        def render(table)
-          super table, TTY::Table::Border::ASCII
+        def initialize(table, options={})
+          super(table, options.merge(:border_class => TTY::Table::Border::ASCII))
         end
 
       end # ASCII