tty-table 0.10.0 → 0.11.0

data/lib/tty/table/indentation.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module TTY
@@ -27,8 +26,8 @@ module TTY
       #
       # @api public
       def insert_indentation(line, indentation)
-        line = line.is_a?(Array) ? line[0] : line
-        line.insert(0, ' ' * indentation) if line
+        line = Array(line)[0]
+        ' ' * indentation + line.to_s if line
       end
       module_function :insert_indentation
     end # Indentation

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'strings'
 
@@ -19,10 +19,14 @@ module TTY
 
         # Evaluate alignment of the provided row
         #
+        # @param [TTY::Table::Field] field
+        #   the table field
+        #
         # @param [Array] row
         #  the table row
-        # @param [Hash] options
-        #  the table options
+        #
+        # @param [Integer] col
+        #   the table column index
         #
         # @return [TTY::Table::Field]
         #
@@ -42,11 +46,9 @@ module TTY
         # @param [TTY::Table::Field] field
         #   the table field
         #
-        # @param [Integer] co
+        # @param [Integer] col
         #   the table column index
         #
-        # @param [Hash] options
-        #
         # @return [TTY::Table::Field]
         #
         # @api private

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table

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

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'strings'
 
@@ -13,8 +13,6 @@ module TTY
         #
         # @param [Strings::Padder] padding
         #
-        # @param [Array[Integer]] widths
-        #
         # @api public
         def initialize(padding)
           @padding = padding
@@ -25,12 +23,6 @@ module TTY
         # @param [TTY::Table::Field] field
         #   the table field
         #
-        # @param [Integer] row
-        #   the field row index
-        #
-        # @param [Integer] col
-        #   the field column index
-        #
         # @return [TTY::Table::Field]
         #
         # @api public

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'strings'
 

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'strings'
 

data/lib/tty/table/operations.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table

data/lib/tty/table/options.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'delegate'
 

data/lib/tty/table/orientation.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'orientation/horizontal'
 require_relative 'orientation/vertical'

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table

data/lib/tty/table/renderer.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'error'
 require_relative 'renderer/basic'
@@ -21,11 +21,11 @@ module TTY
 
       # Select renderer class based on string name.
       #
-      # The possible values for renderer are
+      # The possible values for type are
       #   [:basic, :ascii, :unicode]
       #
-      # @param [Symbol] renderer
-      #   the renderer used for displaying table
+      # @param [Symbol] type
+      #   the renderer type used for displaying table
       #
       # @return [TTY::Table::Renderer]
       #

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../border/ascii'
 require_relative '../renderer/basic'

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'tty-screen'
 require 'strings'
@@ -151,6 +151,7 @@ module TTY
           elsif !not_set
             @border = TTY::Table::BorderOptions.from(options)
           end
+          @border.separator ||= @table.separators unless @table.separators.empty?
           @border
         end
         alias_method :border=, :border
@@ -251,7 +252,7 @@ module TTY
           rows_with_border = render_rows(data_border)
           bottom_line      = data_border.bottom_line
 
-          Indentation.indent(bottom_line, @indent) if bottom_line
+          bottom_line = Indentation.indent(bottom_line, @indent) if bottom_line
 
           [header, rows_with_border, bottom_line].compact
         end
@@ -261,7 +262,7 @@ module TTY
         # @param [TTY::Table::Row, TTY::Table::Header] row
         #   the first row in the table
         #
-        # @param [TTY::Table::Border] data_boder
+        # @param [TTY::Table::Border] data_border
         #   the border for this table
         #
         # @return [String]
@@ -269,17 +270,15 @@ module TTY
         # @api private
         def render_header(row, data_border)
           top_line = data_border.top_line
-          if row.is_a?(TTY::Table::Header)
-            header = [top_line, data_border.row_line(row), data_border.separator]
-            Indentation.indent(header.compact, @indent)
-          else
-            top_line
-          end
+          return top_line unless row.is_a?(TTY::Table::Header)
+          separator = data_border.separator if !border.separator || border.separator?(0)
+          header = [top_line, data_border.row_line(row), separator]
+          Indentation.indent(header.compact, @indent)
         end
 
         # Format the rows
         #
-        # @param [TTY::Table::Border] data_boder
+        # @param [TTY::Table::Border] data_border
         #   the border for this table
         #
         # @return [Arrays[String]]
@@ -288,8 +287,9 @@ module TTY
         def render_rows(data_border)
           rows = table.rows
           size = rows.size
+          offset = table.first.is_a?(TTY::Table::Header) ? 1 : 0
           rows.each_with_index.map do |row, index|
-            render_row(row, data_border, size != (index += 1))
+            render_row(row, index+offset, data_border, size != (index + 1))
           end
         end
 
@@ -298,21 +298,20 @@ module TTY
         # @param [Array] row
         #   a row to decorate
         #
-        # @param [TTY::Table::Border] data_boder
+        # @param [TTY::Table::Border] data_border
         #   the border for this table
         #
-        # @param [Boolean] is_last_row
+        # @param [Boolean] is_not_last_row
         #
         # @api private
-        def render_row(row, data_border, is_last_row)
+        def render_row(row, index, data_border, is_not_last_row)
           separator = data_border.separator
           row_line  = data_border.row_line(row)
-
-          if (border.separator == TTY::Table::Border::EACH_ROW) && is_last_row
-            line = [row_line, separator]
-          else
-            line = row_line
-          end
+          line = if border.separator?(index) && is_not_last_row
+                   [row_line, separator]
+                 else
+                   row_line
+                 end
           Indentation.indent(line, @indent)
         end
       end # Basic

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../border/unicode'
 

data/lib/tty/table/row.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'forwardable'
 
@@ -101,7 +101,7 @@ module TTY
       # Lookup a value in the row given an attribute allowing for Array or
       # Hash like indexing
       #
-      # @exmaple
+      # @example
       #   row[1]
       #   row[:id]
       #   row.call(:id)

data/lib/tty/table/transformation.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table
@@ -26,7 +26,7 @@ module TTY
 
       # Group hash keys into header and values into rows
       #
-      # @params [Hash] value
+      # @param [Hash] value
       #
       # @api public
       def self.group_header_and_rows(value)

data/lib/tty/table/validatable.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'error'
 

data/lib/tty/table/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module TTY
   class Table
-    VERSION = '0.10.0'.freeze
+    VERSION = "0.11.0"
   end # Table
 end # TTY

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 if ENV['COVERAGE'] || ENV['TRAVIS']
   require 'simplecov'

data/spec/unit/access_spec.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table, 'access' do
   let(:header) { [:head1, :head2] }

data/spec/unit/add_row_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table, '#<<' do
   let(:rows) { ['a', 'b', 'c'] }

data/spec/unit/alignment_set/each_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::AlignmentSet, '#each' do
   let(:alignments) { [:left, :center, :right] }

data/spec/unit/alignment_set/new_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::AlignmentSet, '#new' do
   let(:object) { described_class }

data/spec/unit/alignment_set/to_ary_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::AlignmentSet, '#to_ary' do
   let(:argument) { [:center, :left] }

data/spec/unit/alignment_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table, 'alignment' do
   it "aligns table columns when rendering" do

data/spec/unit/border/ascii/rendering_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
 

data/spec/unit/border/new_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::Border, '#new' do
   let(:row) { [] }

data/spec/unit/border/null/rendering_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::Border::Null, '#rendering' do
   let(:border) { nil }

data/spec/unit/border/options/from_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::BorderOptions, '#from' do
 

data/spec/unit/border/options/new_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::BorderOptions, '.new' do
 

data/spec/unit/border/unicode/rendering_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::Border::Unicode, '#rendering' do
 

data/spec/unit/border_options/new_spec.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::BorderOptions do
 

data/spec/unit/border_options/update_spec.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-require 'spec_helper'
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::BorderOptions, '.update' do