tty-table 0.9.0 → 0.10.0

data/lib/tty/table/field.rb

@@ -2,7 +2,7 @@
 
 require 'equatable'
 require 'pastel'
-require 'unicode/display_width'
+require 'strings'
 
 module TTY
   class Table
@@ -104,7 +104,7 @@ module TTY
       #
       # @api public
       def width
-        @width || display_width(@content)
+        @width || Strings::Align.display_width(@content)
       end
 
       # Return number of lines this value spans.
@@ -127,7 +127,7 @@ module TTY
       # @api public
       def length
         (lines.map do |line|
-          display_width(self.class.color.strip(line))
+          Strings::Align.display_width(line)
         end << 0).max
       end
 
@@ -152,16 +152,6 @@ module TTY
       def to_s
         content
       end
-
-      # @api public
-      def self.color
-        @color ||= Pastel.new(enabled: true)
-      end
-
-      # @api public
-      def display_width(string)
-        Unicode::DisplayWidth.of(string)
-      end
     end # Field
   end # Table
 end # TTY

data/lib/tty/table/indentation.rb

@@ -1,36 +1,24 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table
-    # A class responsible for indenting table representation
-    class Indentation
-      # The amount of indentation
-      #
-      # @api public
-      attr_accessor :indentation
-
-      # Initialize an Indentation
-      #
-      # @api public
-      def initialize(indentation)
-        @indentation = indentation
-      end
-
+    # A module responsible for indenting table representation
+    module Indentation
       # Return a table part with indentation inserted
       #
       # @param [#map, #to_s] part
       #   the rendered table part
       #
       # @api public
-      def indent(part)
+      def indent(part, indentation)
         if part.respond_to?(:to_a)
-          part.map { |line| insert_indentation(line) }
+          part.map { |line| insert_indentation(line, indentation) }
         else
-          insert_indentation(part)
+          insert_indentation(part, indentation)
         end
       end
-
-      private
+      module_function :indent
 
       # Insert indentation into a table renderd line
       #
@@ -38,10 +26,11 @@ module TTY
       #   the rendered table line
       #
       # @api public
-      def insert_indentation(line)
+      def insert_indentation(line, indentation)
         line = line.is_a?(Array) ? line[0] : line
         line.insert(0, ' ' * indentation) if line
       end
+      module_function :insert_indentation
     end # Indentation
   end # Table
 end # TTY

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'verse'
+require 'strings'
 
 module TTY
   class Table
@@ -53,7 +53,7 @@ module TTY
         def align_field(field, col)
           column_width = widths[col]
           direction    = field.alignment || alignments[col] || DEFAULT
-          Verse.align(field.content, column_width, direction)
+          Strings.align(field.content, column_width, direction: direction)
         end
       end # Alignment
     end # Operation

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

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'verse'
+require 'strings'
 
 module TTY
   class Table
@@ -11,7 +11,7 @@ module TTY
       class Padding
         # Initialize a Padding operation
         #
-        # @param [Verse::Padder] padding
+        # @param [Strings::Padder] padding
         #
         # @param [Array[Integer]] widths
         #
@@ -35,7 +35,7 @@ module TTY
         #
         # @api public
         def call(field, *)
-          Verse.pad(field.content, padding)
+          Strings.pad(field.content, padding)
         end
 
         protected

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'verse'
+require 'strings'
 
 module TTY
   class Table
@@ -34,8 +34,8 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          width = widths[col] || field.width
-          Verse.truncate(field.content, width)
+          column_width = widths[col] || field.width
+          Strings.truncate(field.content, column_width)
         end
       end # Truncation
     end # Operation

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'verse'
+require 'strings'
 
 module TTY
   class Table
@@ -33,8 +33,8 @@ module TTY
         #
         # @api public
         def call(field, row, col)
-          width = widths[col] || field.width
-          Verse.wrap(field.content, width)
+          column_width = widths[col] || field.width
+          Strings.wrap(field.content, column_width)
         end
       end # Wrapped
     end # Operation

data/lib/tty/table/operations.rb

@@ -8,14 +8,8 @@ module TTY
     class Operations
       # Initialize Operations
       #
-      # @param [TTY::Table] table
-      #   the table to perform operations on
-      #
-      # @return [Object]
-      #
       # @api public
-      def initialize(table)
-        @table      = table
+      def initialize
         @operations = Hash.new { |hash, key| hash[key] = [] }
       end
 
@@ -55,14 +49,14 @@ module TTY
       # @return [TTY::Table]
       #
       # @api public
-      def run_operations(*args)
+      def apply_to(table, *args)
         operation_types = args
         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)
+                field.content = operation.(field, row_i, col_i)
               end
             end
           end
@@ -71,11 +65,6 @@ module TTY
 
       protected
 
-      # The table
-      #
-      # @api private
-      attr_reader :table
-
       # Available operations
       #
       # @return [Hash]

data/lib/tty/table/renderer.rb

@@ -7,12 +7,12 @@ require_relative 'renderer/unicode'
 
 module TTY
   class Table
-    # A class responsible for rendering tabular data
+    # A module responsible for selecting tabule data renderer
     #
     # Used internally by {Table} to render table content out.
     #
     # @api private
-    class Renderer
+    module Renderer
       RENDERER_MAPPER = {
         ascii:   TTY::Table::Renderer::ASCII,
         basic:   TTY::Table::Renderer::Basic,
@@ -30,9 +30,10 @@ module TTY
       # @return [TTY::Table::Renderer]
       #
       # @api private
-      def self.select(type)
+      def select(type)
         RENDERER_MAPPER[type || :basic]
       end
+      module_function :select
 
       # Raises an error if provided border class is of wrong type or has invalid
       # implementation
@@ -44,7 +45,7 @@ module TTY
       #   raised when border class does not implement core methods
       #
       # @api public
-      def self.assert_border_class(border_class)
+      def assert_border_class(border_class)
         return unless border_class
         unless border_class <= TTY::Table::Border
           fail TypeError,
@@ -55,6 +56,27 @@ module TTY
                "#{border_class} should implement def_border"
         end
       end
+      module_function :assert_border_class
+
+      # Render a given table and return the string representation.
+      #
+      # @param [TTY::Table] table
+      #   the table to be rendered
+      #
+      # @param [Hash] options
+      #   the options to render the table with
+      # @option options [String] :renderer
+      #   used to format table output
+      #
+      # @return [String]
+      #
+      # @api public
+      def render(table, options = {}, &block)
+        renderer = select(options[:renderer]).new(table, options)
+        yield renderer if block_given?
+        renderer.render
+      end
+      module_function :render
 
       # Add custom border for the renderer
       #
@@ -71,30 +93,12 @@ module TTY
       #   raise if the klass does not implement def_border
       #
       # @api public
-      def self.render_with(border_class, table, options = {}, &block)
+      def render_with(border_class, table, options = {}, &block)
         assert_border_class(border_class)
         options[:border_class] = border_class if border_class
         render(table, options, &block)
       end
-
-      # Render a given table and return the string representation.
-      #
-      # @param [TTY::Table] table
-      #   the table to be rendered
-      #
-      # @param [Hash] options
-      #   the options to render the table with
-      # @option options [String] :renderer
-      #   used to format table output
-      #
-      # @return [String]
-      #
-      # @api public
-      def self.render(table, options = {}, &block)
-        renderer = select(options[:renderer]).new(table, options)
-        yield renderer if block_given?
-        renderer.render
-      end
+      module_function :render_with
     end # Renderer
   end # Table
 end # TTY

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

@@ -5,7 +5,7 @@ require_relative '../renderer/basic'
 
 module TTY
   class Table
-    class Renderer
+    module Renderer
       class ASCII < Basic
         # Create ASCII renderer
         #

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'tty-screen'
-require 'verse'
+require 'strings'
 
 require_relative '../alignment_set'
 require_relative '../border_dsl'
@@ -22,7 +22,7 @@ require_relative '../validatable'
 
 module TTY
   class Table
-    class Renderer
+    module Renderer
       # Renders table without any border styles.
       #
       # @api private
@@ -70,7 +70,7 @@ module TTY
         # @api public
         attr_reader :indent
 
-        # The table totabl width
+        # The table total width
         #
         # @return [Integer]
         #
@@ -122,7 +122,7 @@ module TTY
           @border_class  = options.fetch(:border_class) { Border::Null }
           @indent        = options.fetch(:indent) { 0 }
           @resize        = options.fetch(:resize) { false }
-          @padding       = Verse::Padder.parse(options[:padding])
+          @padding       = Strings::Padder.parse(options[:padding])
         end
 
         # Parses supplied column widths, if not present
@@ -162,7 +162,7 @@ module TTY
         #
         # @api public
         def indent=(value)
-          @indentation.indentation = value
+          @indent = value
         end
 
         # Sets the output padding,
@@ -172,7 +172,7 @@ module TTY
         #
         # @api public
         def padding=(value)
-          @padding = Verse::Padder.parse(value)
+          @padding = Strings::Padder.parse(value)
         end
 
         # Renders table as string with border
@@ -188,32 +188,48 @@ module TTY
         def render
           return if table.empty?
 
-          @operations = TTY::Table::Operations.new(table)
-          @operations.add(:escape, Operation::Escape.new)
-          @operations.run_operations(:escape) unless multiline
+          operations = TTY::Table::Operations.new
+          operations.add(:escape, Operation::Escape.new)
+          operations.apply_to(table, :escape) unless multiline
+
           column_constraint = ColumnConstraint.new(table, self)
           @column_widths = column_constraint.enforce
-          add_operations(@column_widths)
+          widths_without_padding = @column_widths.map do |_width|
+                                    _width - padding.left - padding.right
+                                  end
+          create_operations(widths_without_padding).each do |op|
+            operations.add(*op)
+          end
+          operations.apply_to(table, *select_operations)
+
+          render_data.compact.join("\n")
+        end
+
+        # Select applicable operations for this table
+        #
+        # @api private
+        def select_operations
           ops = []
           ops << :escape unless multiline
           ops << :alignment
           ops << (multiline ? :wrapping : :truncation)
           ops << :padding
           ops << :filter
-          @operations.run_operations(*ops)
-
-          render_data.compact.join("\n")
         end
 
-        # Initialize and add operations
+        # Initialize operations
+        #
+        # @return [Array[String, Operation]]
         #
         # @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))
+        def create_operations(widths)
+          [
+            [:alignment,  Operation::Alignment.new(alignments, widths)],
+            [:filter,     Operation::Filter.new(filter)],
+            [:truncation, Operation::Truncation.new(widths)],
+            [:wrapping,   Operation::Wrapped.new(widths)],
+            [:padding,    Operation::Padding.new(padding)]
+          ]
         end
 
         protected
@@ -225,33 +241,17 @@ module TTY
         # @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, padding, border)
+          data_border      = border_class.new(column_widths, border)
           header           = render_header(first_row, data_border)
           rows_with_border = render_rows(data_border)
           bottom_line      = data_border.bottom_line
 
-          insert_indent(bottom_line) if bottom_line
+          Indentation.indent(bottom_line, @indent) if bottom_line
 
           [header, rows_with_border, bottom_line].compact
         end
@@ -271,7 +271,7 @@ module TTY
           top_line = data_border.top_line
           if row.is_a?(TTY::Table::Header)
             header = [top_line, data_border.row_line(row), data_border.separator]
-            insert_indent(header.compact)
+            Indentation.indent(header.compact, @indent)
           else
             top_line
           end
@@ -309,10 +309,11 @@ module TTY
           row_line  = data_border.row_line(row)
 
           if (border.separator == TTY::Table::Border::EACH_ROW) && is_last_row
-            insert_indent([row_line, separator])
+            line = [row_line, separator]
           else
-            insert_indent(row_line)
+            line = row_line
           end
+          Indentation.indent(line, @indent)
         end
       end # Basic
     end # Renderer