tty-table 0.9.0 → 0.10.0

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

@@ -4,7 +4,7 @@ require_relative '../border/unicode'
 
 module TTY
   class Table
-    class Renderer
+    module Renderer
       # Unicode representation of table renderer
       #
       # @api private

data/lib/tty/table/version.rb

@@ -1,7 +1,5 @@
-# coding: utf-8
-
 module TTY
   class Table
-    VERSION = "0.9.0"
+    VERSION = '0.10.0'.freeze
   end # Table
 end # TTY

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
 
-  subject(:border) { described_class.new(column_widths, [0,0,0,0]) }
+  subject(:border) { described_class.new(column_widths) }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe TTY::Table::Border::Null, '#rendering' do
   let(:border) { nil }
 
-  subject { described_class.new column_widths, [0,0,0,0], border }
+  subject { described_class.new column_widths, border }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe TTY::Table::Border::Unicode, '#rendering' do
 
-  subject(:border) { described_class.new(column_widths, [0,0,0,0]) }
+  subject(:border) { described_class.new(column_widths) }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }

data/spec/unit/column_constraint/enforce_spec.rb

@@ -25,9 +25,9 @@ RSpec.describe TTY::Table::ColumnConstraint, '#enforce' do
     let(:options) { { width: 11, resize: true }}
 
     it 'raises error when table width is too small' do
-      allow(columns).to receive(:expand)
+      allow(columns).to receive(:expand_column_widths)
       columns.enforce
-      expect(columns).to have_received(:expand)
+      expect(columns).to have_received(:expand_column_widths)
     end
   end
 

data/spec/unit/columns/extract_widths_spec.rb

@@ -6,33 +6,29 @@ RSpec.describe TTY::Table::Columns, '#extract_widths' do
   it 'extract widths' do
     header = ['h1', 'h2', 'h3']
     rows   = [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']]
-    table = TTY::Table.new header, rows
-    column_set = TTY::Table::Columns.new(table)
-    expect(column_set.extract_widths).to eql([2,2,2])
+    table = TTY::Table.new(header, rows)
+    expect(described_class.extract_widths(table.data)).to eql([2,2,2])
   end
 
   it "extracts widths from utf" do
     header = ['h1', 'うなじ']
     rows   = [['こんにちは', 'a2'], ['b1','選択']]
-    table  = TTY::Table.new header, rows
-    column_set = TTY::Table::Columns.new(table)
-    expect(column_set.extract_widths).to eql([10,6])
+    table  = TTY::Table.new(header, rows)
+    expect(described_class.extract_widths(table.data)).to eql([10,6])
   end
 
   it "extracts widths from multiline text" do
     table = TTY::Table.new
     table << ["Multi\nLine\nContent", "Text\nthat\nwraps"]
     table << ["Some\nother\ntext", 'Simple']
-    column_set = TTY::Table::Columns.new(table)
-    expect(column_set.extract_widths).to eq([7,6])
+    expect(described_class.extract_widths(table.data)).to eq([7,6])
   end
 
   it "extracts widths from multiline text" do
     table = TTY::Table.new
     table << ["Multi\\nLine\\nContent", "Text\\nthat\\nwraps"]
     table << ["Some\\nother\\ntext", 'Simple']
-    column_set = TTY::Table::Columns.new(table)
-    expect(column_set.extract_widths).to eq([20, 17])
+    expect(described_class.extract_widths(table.data)).to eq([20, 17])
   end
 
   it "extracts widths from ANSI text" do
@@ -40,7 +36,6 @@ RSpec.describe TTY::Table::Columns, '#extract_widths' do
     table = TTY::Table.new header: header
     table << [color.green.on_blue('a1'), 'a2']
     table << ['b1', color.red.on_yellow('b2')]
-    column_set = TTY::Table::Columns.new(table)
-    expect(column_set.extract_widths).to eq([2,2])
+    expect(described_class.extract_widths(table.data)).to eq([2,2])
   end
 end

data/spec/unit/columns/total_width_spec.rb

@@ -1,13 +1,12 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 RSpec.describe TTY::Table::Columns, '#extract_widths!' do
   let(:header) { ['h1', 'h2', 'h3'] }
   let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
-  let(:table)  { TTY::Table.new header, rows }
-
-  subject { described_class.new table }
 
   it 'extract widths' do
-    expect(subject.total_width).to eql(6)
+    table = TTY::Table.new(header, rows)
+    expect(described_class.total_width(table.data)).to eql(6)
   end
 end

data/spec/unit/indentation/indent_spec.rb

@@ -3,19 +3,15 @@
 require 'spec_helper'
 
 RSpec.describe TTY::Table::Indentation, '.indent' do
-  let(:indent) { 2 }
-
-  subject(:indentation) { described_class.new(indent) }
-
   context 'when enumerable' do
     it 'inserts indentation for each element' do
-      expect(indentation.indent(['line1'])).to eql(['  line1'])
+      expect(described_class.indent(['line1'], 2)).to eql(['  line1'])
     end
   end
 
   context 'when string' do
     it 'inserts indentation' do
-      expect(indentation.indent('line1')).to eql('  line1')
+      expect(described_class.indent('line1', 2)).to eql('  line1')
     end
   end
 end

data/spec/unit/operations/new_spec.rb

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-require 'spec_helper'
-
 RSpec.describe TTY::Table::Operations, '#new' do
   let(:object) { described_class }
   let(:row)    { [1,2,3] }
@@ -15,7 +13,7 @@ RSpec.describe TTY::Table::Operations, '#new' do
   }
   let(:instance) { callable.new }
 
-  subject { object.new table }
+  subject { object.new }
 
   before { subject.add(:alignment, instance) }
 
@@ -23,8 +21,8 @@ RSpec.describe TTY::Table::Operations, '#new' do
     expect(subject[:alignment]).to include(instance)
   end
 
-  it 'runs selected operations' do
-    subject.run_operations(:alignment)
+  it 'applies selected operations' do
+    subject.apply_to(table, :alignment)
     expect(table.data[0]).to eql([2,3,4])
   end
 end

data/spec/unit/renderer/ascii/padding_spec.rb

@@ -85,4 +85,33 @@ RSpec.describe TTY::Table::Renderer::ASCII, 'padding' do
       EOS
     end
   end
+
+  context "with resize option" do
+    it "pads fields correctly" do
+      table = TTY::Table.new(header: [ "Column 1", "Column 2", "Column 3"]) do |t|
+        t << [ "11", "12", "13" ]
+        t << [ "21", "22", "23" ]
+        t << [ "31", "32", "33" ]
+      end
+
+      renderer = TTY::Table::Renderer::ASCII.new(table, padding: [1,1,1,1], resize: true, width: 50)
+      expect(renderer.render).to eql unindent(<<-EOS)
+        +----------------+---------------+---------------+
+        |                |               |               |
+        | Column 1       | Column 2      | Column 3      |
+        |                |               |               |
+        +----------------+---------------+---------------+
+        |                |               |               |
+        | 11             | 12            | 13            |
+        |                |               |               |
+        |                |               |               |
+        | 21             | 22            | 23            |
+        |                |               |               |
+        |                |               |               |
+        | 31             | 32            | 33            |
+        |                |               |               |
+        +----------------+---------------+---------------+
+      EOS
+    end
+  end
 end

data/tty-table.gemspec

@@ -22,10 +22,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'equatable',   '~> 0.5.0'
   spec.add_dependency 'necromancer', '~> 0.4.0'
-  spec.add_dependency 'pastel',      '~> 0.7.0'
-  spec.add_dependency 'tty-screen',  '~> 0.6.0'
-  spec.add_dependency 'verse',       '~> 0.5.0'
-  spec.add_dependency 'unicode-display_width','~> 1.1.0'
+  spec.add_dependency 'pastel',      '~> 0.7.2'
+  spec.add_dependency 'tty-screen',  '~> 0.6.4'
+  spec.add_dependency 'strings',     '~> 0.1.0'
 
   spec.add_development_dependency 'bundler', '>= 1.5.0', '< 2.0'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-table
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -44,56 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: verse
+  name: strings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: unicode-display_width
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +148,9 @@ files:
 - benchmarks/speed.rb
 - examples/alignment.rb
 - examples/basic.rb
+- examples/orientation.rb
+- examples/padding.rb
+- examples/resize.rb
 - lib/tty-table.rb
 - lib/tty/table.rb
 - lib/tty/table/alignment_set.rb
@@ -425,4 +414,3 @@ test_files:
 - spec/unit/utf_spec.rb
 - spec/unit/validatable/validate_options_spec.rb
 - spec/unit/validatable_spec.rb
-has_rdoc: