tty-table 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bcfc9c4c4f7d6855d4873722744d74857e12de3
-  data.tar.gz: 9850f499486fdb55fec0114f5b136d0237be61c6
+  metadata.gz: c5a7d889fe3c0a30613340ff98741bdf6fe60e59
+  data.tar.gz: 41477fe8e7edddf80275eb253c5505efcde49b1b
 SHA512:
-  metadata.gz: 9d879801c732179591cba77d527c2330679d9edc029966ffd08a0afaeac65db2b5e9a5089787881132f336573b5ea8ef9a230c9a6783d8d218db9f403ec23dc7
-  data.tar.gz: cb944ee39fa02cba0a77d885c42d7f80d1b6133a51ae96d8f368ce755d462cfce1fdcefa1ea3dcaed80d19e69318137e3bb108d4f6ee314ddc4539010506ef0c
+  metadata.gz: 28d1f65541cd25ba4dab63f85cdc66294a67e485ca88424ddf0386824b2a28744d2b5143c0880a7eb6d7ba51597a85d4df3c5bf824285f782961c6964d39c6fc
+  data.tar.gz: 30e29bacb151c98f5cb41f0b09a53ac3cb53e1cbb030493362713522d7ffc7f2fce6a8cca00edde189e940626cf6848614394365f55af3dd34c5b5b1ff88f651

data/.travis.yml

@@ -8,9 +8,10 @@ script: "bundle exec rake ci"
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.1
+  - 2.2.8
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
   - jruby-9.1.1.0
   - jruby-head

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change log
 
+## [v0.10.0] - 2018-02-18
+
+### Changed
+* Change to limit Ruby version to 2.0
+* Change to use strings instead of verse
+* Change Field to rely on Strings#display_width
+* Change Operations to stop accepting table at initialization
+* Change Operations#run_operations to #apply_to
+* Change Border to remove padding configuration
+* Change ColumnSet class to Columns stateless module
+* Change Indentation class to stateless module
+
+### Fixed
+* Fix :resize option to honour :padding values
+
 ## [v0.9.0] - 2017-11-04
 
 ### Changed
@@ -76,6 +91,7 @@
 
 * Initial implementation and release
 
+[v0.10.0]: https://github.com/piotrmurach/tty-table/compare/v0.9.0...v0.10.0
 [v0.9.0]: https://github.com/piotrmurach/tty-table/compare/v0.8.0...v0.9.0
 [v0.8.0]: https://github.com/piotrmurach/tty-table/compare/v0.7.0...v0.8.0
 [v0.7.0]: https://github.com/piotrmurach/tty-table/compare/v0.6.0...v0.7.0

data/Gemfile

@@ -3,15 +3,15 @@ source 'https://rubygems.org'
 gemspec
 
 group :tools do
-  gem 'yard',    '~> 0.8.7'
+  gem 'yard', '~> 0.9.12'
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.8.2'
-  gem 'simplecov', '~> 0.10.0'
+  gem 'coveralls', '~> 0.8.21'
+  gem 'simplecov', '~> 0.14.1'
   gem 'yardstick', '~> 0.9.9'
 end
 
 group :benchmarks do
-  gem 'benchmark_suite', '~> 1.0.0'
+  gem 'benchmark-ips', '~> 2.7.2'
 end

data/README.md

@@ -432,7 +432,7 @@ table.render(:ascii)
 To print border around data table you need to specify `renderer` type out of `basic`, `ascii`, `unicode`. By default `basic` is used. For instance, to output unicode border:
 
 ```ruby
-table = TTY::Table.new ['header1', 'header2'], [['a1', 'a2'], ['b1', 'b2']
+table = TTY::Table.new ['header1', 'header2'], [['a1', 'a2'], ['b1', 'b2']]
 table.render :unicode
 # =>
 #  ┌───────┬───────┐
@@ -554,7 +554,7 @@ All [supported colors](https://github.com/piotrmurach/pastel#3-supported-colors)
 You can define filters that will modify individual table fields value before they are rendered. A filter can be a callable such as proc. Here's an example that formats
 
 ```ruby
-table = TTY::Table.new ['header1', 'header2'], [['a1', 'a2'], ['b1', 'b2']
+table = TTY::Table.new ['header1', 'header2'], [['a1', 'a2'], ['b1', 'b2']]
 table.render do |renderer|
   renderer.filter = Proc.new do |val, row_index, col_index|
     if col_index == 1 and !(row_index == 0)
@@ -710,4 +710,4 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 ## Copyright
 
-Copyright (c) 2015-2017 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2015-2018 Piotr Murach. See LICENSE for further details.

data/appveyor.yml

@@ -17,3 +17,5 @@ environment:
     - ruby_version: "22-x64"
     - ruby_version: "23"
     - ruby_version: "23-x64"
+    - ruby_version: "24"
+    - ruby_version: "24-x64"

data/benchmarks/speed.rb

@@ -1,17 +1,15 @@
 # coding: utf-8
 
-# Benchmark speed of table operations
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'tty-table'
 require 'benchmark'
 require 'benchmark/ips'
 
+require_relative '../lib/tty-table'
+
 header = [:name, :color]
 rows   = (1..100).map { |n| ["row#{n}", "red"] }
 table  = TTY::Table.new(header, rows)
 
+# Benchmark speed of table operations
 Benchmark.ips do |r|
   r.report("Ruby #to_s") do
     rows.to_s

data/examples/alignment.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty-table'
+require_relative '../lib/tty-table'
 
-table = TTY::Table.new header: ['header1', 'header2', 'header3']
+table = TTY::Table.new header: ['right align', 'center align', 'left align']
 table << ['a1', 'a2', 'a3']
 table << ['b1','b2', 'b3']
 table << ['c1', 'c2', 'c3']

data/examples/basic.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty-table'
+require_relative '../lib/tty-table'
 
 table = TTY::Table.new ['header1','header2'], [['a1', 'a2'], ['b1', 'b2']]
 puts table.render(:basic)

data/examples/orientation.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "../lib/tty-table"
+
+table = TTY::Table.new(header: ["Column 1", "Column 2", "Column 3"]) do |t|
+  t << [ "r1 c1", "r1 c2", "r1 c3" ]
+  t << [ "r2 c1", "r2 c2", "r2 c3" ]
+  t << [ "r3 c1", "r3 c2", "r3 c3" ]
+end
+
+table.orientation = :vertical
+
+puts table.render(:ascii)

data/examples/padding.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'pastel'
+require_relative "../lib/tty-table"
+
+pastel = Pastel.new
+yellow = pastel.yellow.detach
+
+table = TTY::Table.new(header: [ yellow.("Column 1"), yellow.("Column 2"), yellow.("Column 3")]) do |t|
+  t << [ "11", "12", "13" ]
+  t << [ "21", "22", "23" ]
+  t << [ "31", "32", "33" ]
+end
+
+puts table.render(:ascii, padding: [1, 2, 1, 2])

data/examples/resize.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'pastel'
+require_relative "../lib/tty-table"
+
+pastel = Pastel.new
+yellow = pastel.yellow.detach
+
+table = TTY::Table.new(header: [ yellow.("Column 1"), yellow.("Column 2"), yellow.("Column 3")]) do |t|
+  t << [ "11", "12", "13" ]
+  t << [ "21", "22", "23" ]
+  t << [ "31", "32", "33" ]
+end
+
+puts table.render(:ascii, resize: true, padding: [1, 2, 1, 2])

data/lib/tty/table.rb

@@ -339,6 +339,7 @@ module TTY
     def columns_size
       rows.size > 0 ? rows[0].size : 0
     end
+    alias columns_count columns_size
 
     # Return the number of rows
     #
@@ -370,7 +371,7 @@ module TTY
     #
     # @api public
     def width
-      Columns.new(self).total_width
+      Columns.total_width(data)
     end
 
     # Return true if this is an empty table, i.e. if the number of

data/lib/tty/table/border.rb

@@ -2,7 +2,7 @@
 
 require 'equatable'
 require 'pastel'
-require 'verse'
+require 'strings'
 
 require_relative 'border_options'
 require_relative 'border_dsl'
@@ -39,12 +39,11 @@ module TTY
       # @return [Object]
       #
       # @api private
-      def initialize(column_widths, padding, options = nil)
+      def initialize(column_widths, options = nil)
         if self.class == Border
           fail NotImplementedError, "#{self} is an abstract class"
         else
           @widths = column_widths
-          @padding = Verse::Padder.parse(padding)
           @border_options = TTY::Table::BorderOptions.from options
           @color  = Pastel.new
         end
@@ -166,11 +165,6 @@ module TTY
       # @api private
       attr_reader :border_options
 
-      # The padding to apply to each field
-      #
-      # @api private
-      attr_reader :padding
-
       # Separate multiline string into individual rows with border.
       #
       # @param [TTY::Table::Row] row
@@ -206,7 +200,7 @@ module TTY
         line.left + row.fields.each_with_index.map do |field, index|
           direction     = field.alignment || :left
           field_content = field.lines[line_index] || SPACE_CHAR * field.length
-          Verse.align(field_content, widths[index], direction)
+          Strings.align(field_content, widths[index], direction: direction)
         end.join(line.center) + line.right
       end
 
@@ -237,9 +231,7 @@ module TTY
       #
       # @api private
       def render_line(line, left, right, intersection)
-        left + widths.map do |width|
-          line * (padding.left + width + padding.right)
-        end.join(intersection) + right
+        left + widths.map { |width| line * width }.join(intersection) + right
       end
     end # Border
   end # Table

data/lib/tty/table/column_constraint.rb

@@ -57,7 +57,7 @@ module TTY
       # @api public
       def padding_size
         padding = renderer.padding
-        (padding.left + padding.right) * (table.columns_size - 1)
+        (padding.left + padding.right) * table.columns_count
       end
 
       # Estimate minimum table width to be able to display content
@@ -86,9 +86,16 @@ module TTY
       # @api public
       def enforce
         assert_minimum_width
+        padding = renderer.padding
 
         if natural_width <= renderer.width
-          renderer.resize ? expand : renderer.column_widths
+          if renderer.resize
+            expand_column_widths
+          else
+            renderer.column_widths.map do |width|
+              padding.left + width + padding.right
+            end
+          end
         else
           if renderer.resize
             shrink
@@ -115,12 +122,13 @@ module TTY
       # Expand column widths to match the requested width
       #
       # @api private
-      def expand
-        column_size = table.columns_size
-        ratio       = ((renderer.width - natural_width) / column_size.to_f).floor
+      def expand_column_widths
+        columns_count = table.columns_count
+        max_width     = renderer.width
+        extra_column_width = ((max_width - natural_width) / columns_count.to_f).floor
 
-        widths = (0...column_size).reduce([]) do |lengths, col|
-          lengths + [renderer.column_widths[col] + ratio]
+        widths = (0...columns_count).reduce([]) do |lengths, col|
+          lengths << renderer.column_widths[col] + extra_column_width
         end
         distribute_extra_width(widths)
       end

data/lib/tty/table/columns.rb

@@ -1,66 +1,55 @@
 # encoding: utf-8
-
-require 'equatable'
+# frozen_string_literal: true
 
 require_relative 'error'
 
 module TTY
   class Table
-    # A class that represents table column properties.
+    # A module for calculating table data column widths
     #
     # Used by {Table} to manage column sizing.
     #
     # @api private
-    class Columns
-      include Equatable
-
-      # Initialize Columns
-      #
-      # @param [Array[Array[Object]]] data
-      #
-      # @api public
-      def initialize(table)
-        @data = table.data
-      end
-
+    module Columns
       # Calculate total table width
       #
       # @return [Integer]
       #
       # @api public
-      def total_width
-        extract_widths.reduce(:+)
+      def total_width(data)
+        extract_widths(data).reduce(:+)
       end
+      module_function :total_width
 
       # Calcualte maximum column widths
       #
       # @return [Array] column widths
       #
       # @api private
-      def extract_widths
+      def extract_widths(data)
         colcount = data.max { |row_a, row_b| row_a.size <=> row_b.size }.size
-        find_maximas(colcount)
+        (0...colcount).reduce([]) do |maximas, col_index|
+          maximas << find_maximum(data, col_index)
+          maximas
+        end
       end
+      module_function :extract_widths
 
-      # Assert data integrity for column widths
-      #
-      # @param [Array] column_widths
+      # Find a maximum column width. The calculation takes into account
+      # wether the content is escaped or not.
       #
-      # @param [Integer] table_widths
+      # @param [Integer] index
+      #   the column index
       #
-      # @raise [TTY::InvalidArgument]
+      # @return [Integer]
       #
-      # @api public
-      def self.assert_widths(column_widths, table_widths)
-        if column_widths.empty?
-          fail InvalidArgument, 'Value for :column_widths must be ' \
-                                 'a non-empty array'
-        end
-        if column_widths.size != table_widths
-          fail InvalidArgument, 'Value for :column_widths must match ' \
-                                 'table column count'
-        end
+      # @api private
+      def find_maximum(data, index)
+        data.map do |row|
+          (field = row.call(index)) ? field.length : 0
+        end.max
       end
+      module_function :find_maximum
 
       # Converts column widths to array format or infers default widths
       #
@@ -71,7 +60,7 @@ module TTY
       # @return [Array[Integer]]
       #
       # @api public
-      def self.widths_from(table, column_widths = nil)
+      def widths_from(table, column_widths = nil)
         case column_widths
         when Array
           assert_widths(column_widths, table.columns_size)
@@ -79,48 +68,33 @@ module TTY
         when Numeric
           Array.new(table.columns_size, column_widths)
         when NilClass
-          new(table).extract_widths
+          extract_widths(table.data)
         else
           fail TypeError, 'Invalid type for column widths'
         end
       end
+      module_function :widths_from
 
-      private
-
-      attr_reader :data
-
-      # Find maximum widths for each row and header if present.
-      #
-      # @param [Integer] colcount
-      #   number of columns
-      #
-      # @return [Array[Integer]]
+      # Assert data integrity for column widths
       #
-      # @api private
-      def find_maximas(colcount)
-        maximas = []
-        start   = 0
-
-        start.upto(colcount - 1) do |col_index|
-          maximas << find_maximum(col_index)
-        end
-        maximas
-      end
-
-      # Find a maximum column width. The calculation takes into account
-      # wether the content is escaped or not.
+      # @param [Array] column_widths
       #
-      # @param [Integer] index
-      #   the column index
+      # @param [Integer] table_widths
       #
-      # @return [Integer]
+      # @raise [TTY::InvalidArgument]
       #
-      # @api private
-      def find_maximum(index)
-        data.map do |row|
-          (field = row.call(index)) ? field.length : 0
-        end.max
+      # @api public
+      def assert_widths(column_widths, table_widths)
+        if column_widths.empty?
+          fail InvalidArgument, 'Value for :column_widths must be ' \
+                                 'a non-empty array'
+        end
+        if column_widths.size != table_widths
+          fail InvalidArgument, 'Value for :column_widths must match ' \
+                                 'table column count'
+        end
       end
-    end # ColumnSet
+      module_function :assert_widths
+    end # Columns
   end # Table
 end # TTY