tty-table 0.1.0 → 0.2.0

data/lib/tty/table/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Table
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end # TTY

data/spec/spec_helper.rb

@@ -44,8 +44,7 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 end
 
-class String
-  def normalize
-    gsub(/^[ \t]*/, '').chomp
-  end
+def unindent(string)
+  prefix = string.scan(/^[ \t]+(?=\S)/).min
+  string.gsub(/^#{prefix}/, '').chomp
 end

data/spec/unit/access_spec.rb

@@ -17,11 +17,11 @@ RSpec.describe TTY::Table, 'access' do
   context 'when array like access' do
     it { expect(table[0,0]).to eq('a1') }
 
-    it { expect(table[0]).to eq(rows[0]) }
+    it { expect(table[0]).to eq(['a1','a2']) }
 
     it { expect(table[5]).to eq(nil) }
 
-    it { expect(table[-1]).to eq(rows[-1]) }
+    it { expect(table[-1]).to eq(['b1','b2']) }
 
     it { expect(table[5,5]).to eq(nil) }
 
@@ -46,9 +46,9 @@ RSpec.describe TTY::Table, 'access' do
 
     it 'yields row at index' do
       yields = []
-      expect { table.row(1).each { |el| yields << el } }.to change { yields }.
-        from( [] ).
-        to( rows[1] )
+      expect {
+        table.row(1).each { |el| yields << el }
+      }.to change { yields }.from( [] ).to( rows[1] )
     end
   end
 
@@ -78,9 +78,9 @@ RSpec.describe TTY::Table, 'access' do
 
     it 'yields column at index' do
       yields = []
-      expect { table.column(1).each { |el| yields << el } }.to change { yields }.
-        from( [] ).
-        to( ['a2', 'b2'])
+      expect {
+        table.column(1).each { |el| yields << el }
+      }.to change { yields }.from( [] ).to( ['a2', 'b2'])
     end
   end
 end

data/spec/unit/{operation/alignment_set → alignment_set}/each_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe TTY::Table::Operation::AlignmentSet, '#each' do
+RSpec.describe TTY::Table::AlignmentSet, '#each' do
   let(:alignments) { [:left, :center, :right] }
   let(:yields)     { [] }
   let(:object)     { described_class.new alignments }

data/spec/unit/{operation/alignment_set → alignment_set}/new_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-RSpec.describe TTY::Table::Operation::AlignmentSet, '#new' do
+RSpec.describe TTY::Table::AlignmentSet, '#new' do
   let(:object) { described_class }
 
-  subject { object.new(argument) }
+  subject(:alignment_set) { object.new(argument) }
 
   context 'with no argument' do
     let(:argument) { [] }
@@ -14,7 +14,7 @@ RSpec.describe TTY::Table::Operation::AlignmentSet, '#new' do
 
     it { is_expected.to be_instance_of(object) }
 
-    it { expect(subject.alignments).to eq([]) }
+    it { expect(alignment_set.to_a).to eq([]) }
   end
 
   context 'with argument' do
@@ -22,6 +22,6 @@ RSpec.describe TTY::Table::Operation::AlignmentSet, '#new' do
 
     it { is_expected.to be_instance_of(object) }
 
-    it { expect(subject.alignments).to eq(argument) }
+    it { expect(alignment_set.to_a).to eq(argument) }
   end
 end

data/spec/unit/{operation/alignment_set → alignment_set}/to_ary_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe TTY::Table::Operation::AlignmentSet, '#to_ary' do
+RSpec.describe TTY::Table::AlignmentSet, '#to_ary' do
   let(:argument) { [:center, :left] }
   let(:object)   { described_class.new argument }
 

data/spec/unit/alignment_spec.rb

@@ -0,0 +1,71 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe TTY::Table, 'alignment' do
+  it "aligns table columns when rendering" do
+    table = TTY::Table.new ['header1', 'header2'], [['a1','a2'],['b1','b2']]
+    expect(table.render(alignments: [:right, :center])).to eql([
+      "header1 header2",
+      "     a1   a2   ",
+      "     b1   b2   "
+    ].join("\n"))
+  end
+
+  it "uses default alignment when too few alignments provided" do
+    table = TTY::Table.new ['header1', 'header2'], [['a1','a2'],['b1','b2']]
+    expect(table.render(alignments: [:right])).to eql([
+      "header1 header2",
+      "     a1 a2     ",
+      "     b1 b2     "
+    ].join("\n"))
+  end
+
+  it "aligns table columns without header when rendering" do
+    table = TTY::Table.new [['aaaaa1','a2'],['b1','bbbbb2']]
+    expect(table.render(alignments: [:right, :center])).to eql([
+      "aaaaa1   a2  ",
+      "    b1 bbbbb2"
+    ].join("\n"))
+  end
+
+  it "aligns individual fields when rendering" do
+    table = TTY::Table.new header: ['header1', 'header2']
+    table << ['a1', {value: 'a2', alignment: :center}]
+    table << [{value: 'b1', alignment: :right}, 'b2']
+    expect(table.render).to eql([
+      "header1 header2",
+      "a1        a2   ",
+      "     b1 b2     "
+    ].join("\n"))
+  end
+
+  it "prioritizes individual field options over table rendering options" do
+    table = TTY::Table.new header: ['header1', 'header2']
+    table << [{value: 'a1', alignment: :center},'a2']
+    table << ['b1','b2']
+    expect(table.render(alignments: [:right, :center])).to eql([
+      "header1 header2",
+      "  a1      a2   ",
+      "     b1   b2   "
+    ].join("\n"))
+  end
+
+  it "allows to align all columns at once" do
+    table = TTY::Table.new ['header1', 'header2'], [['a1','a2'],['b1','b2']]
+    expect(table.render(alignment: [:center])).to eql([
+      "header1 header2",
+      "  a1      a2   ",
+      "  b1      b2   "
+    ].join("\n"))
+  end
+
+  xit "aligns specific column" do
+    table = TTY::Table.new ['header1', 'header2'], [['a1','a2'],['b1','b2']]
+    expect(table.render(column_alignment: [1, :center])).to eql([
+      "header1 header2",
+      "a1        a2   ",
+      "b1        b2   "
+    ].join("\n"))
+  end
+end

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

@@ -4,26 +4,26 @@ require 'spec_helper'
 
 RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
 
-  subject { described_class.new(column_widths) }
+  subject(:border) { described_class.new(column_widths, [0,0,0,0]) }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }
     let(:column_widths) { [] }
 
     it 'draws top line' do
-      expect(subject.top_line).to eq("++")
+      expect(border.top_line).to eq("++")
     end
 
     it 'draws middle line' do
-      expect(subject.separator).to eq("++")
+      expect(border.separator).to eq("++")
     end
 
     it 'draw bottom line' do
-      expect(subject.bottom_line).to eq("++")
+      expect(border.bottom_line).to eq("++")
     end
 
     it 'draws row line' do
-      expect(subject.row_line(row)).to eq("||")
+      expect(border.row_line(row)).to eq("||")
     end
   end
 
@@ -32,19 +32,19 @@ RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
     let(:row) { TTY::Table::Row.new(['a1', 'a2', 'a3']) }
 
     it 'draws top line' do
-      expect(subject.top_line).to eq("+--+--+--+")
+      expect(border.top_line).to eq("+--+--+--+")
     end
 
     it 'draw middle line' do
-      expect(subject.separator).to eq("+--+--+--+")
+      expect(border.separator).to eq("+--+--+--+")
     end
 
     it 'draw bottom line' do
-      expect(subject.bottom_line).to eq("+--+--+--+")
+      expect(border.bottom_line).to eq("+--+--+--+")
     end
 
     it 'draws row line' do
-      expect(subject.row_line(row)).to eq("|a1|a2|a3|")
+      expect(border.row_line(row)).to eq("|a1|a2|a3|")
     end
   end
 
@@ -55,7 +55,7 @@ RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
       let(:row) { TTY::Table::Row.new(["a1\nb1\nc1", 'a2', 'a3']) }
 
       it 'draws row line' do
-        expect(subject.row_line(row)).to eq <<-EOS.normalize
+        expect(border.row_line(row)).to eq unindent(<<-EOS)
           |a1|a2|a3|
           |b1|  |  |
           |c1|  |  |
@@ -67,7 +67,7 @@ RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
       let(:row) { TTY::Table::Row.new(["a1\n\n", "\na2\n", "\n\na3"]) }
 
       it 'draws row line' do
-        expect(subject.row_line(row)).to eq <<-EOS.normalize
+        expect(border.row_line(row)).to eq unindent(<<-EOS)
           |a1|  |  |
           |  |a2|  |
           |  |  |a3|
@@ -79,7 +79,7 @@ RSpec.describe TTY::Table::Border::ASCII, '#rendering' do
       let(:row) { TTY::Table::Row.new(["\na1\n", "\na2\n", "\na3\n"]) }
 
       it 'draws row line' do
-        expect(subject.row_line(row)).to eq <<-EOS.normalize
+        expect(border.row_line(row)).to eq unindent(<<-EOS)
           |  |  |  |
           |a1|a2|a3|
           |  |  |  |

data/spec/unit/border/new_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe TTY::Table::Border, '#new' do
   let(:row) { [] }
 
-  subject(:instance) { klass.new row }
+  subject(:instance) { klass.new row, [0,0,0,0] }
 
   context 'when abstract' do
     let(:klass) { described_class }
@@ -16,7 +16,7 @@ RSpec.describe TTY::Table::Border, '#new' do
   context 'when concrete' do
     let(:klass) {
       Class.new do
-        def initialize(row); end
+        def initialize(row, padding); end
       end
     }
 

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, border }
+  subject { described_class.new column_widths, [0,0,0,0], border }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }
@@ -56,7 +56,7 @@ RSpec.describe TTY::Table::Border::Null, '#rendering' do
       let(:row) { TTY::Table::Row.new(["a1\nb1\nc1", 'a2', 'a3']) }
 
       it 'draws row line' do
-        expect(subject.row_line(row)).to eq <<-EOS.normalize
+        expect(subject.row_line(row)).to eq unindent(<<-EOS)
           a1 a2 a3
           b1      
           c1      

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

@@ -4,26 +4,26 @@ require 'spec_helper'
 
 RSpec.describe TTY::Table::Border::Unicode, '#rendering' do
 
-  subject { described_class.new(column_widths) }
+  subject(:border) { described_class.new(column_widths, [0,0,0,0]) }
 
   context 'with empty row' do
     let(:row) { TTY::Table::Row.new([]) }
     let(:column_widths) { [] }
 
     it 'draws top line' do
-      expect(subject.top_line).to eq("┌┐")
+      expect(border.top_line).to eq("┌┐")
     end
 
     it 'draws middle line' do
-      expect(subject.separator).to eq("├┤")
+      expect(border.separator).to eq("├┤")
     end
 
     it 'draw bottom line' do
-      expect(subject.bottom_line).to eq("└┘")
+      expect(border.bottom_line).to eq("└┘")
     end
 
     it 'draws row line' do
-      expect(subject.row_line(row)).to eq("││")
+      expect(border.row_line(row)).to eq("││")
     end
   end
 
@@ -32,19 +32,19 @@ RSpec.describe TTY::Table::Border::Unicode, '#rendering' do
     let(:column_widths) { [2,2,2] }
 
     it 'draws top line' do
-      expect(subject.top_line).to eq("┌──┬──┬──┐")
+      expect(border.top_line).to eq("┌──┬──┬──┐")
     end
 
     it 'draw middle line' do
-      expect(subject.separator).to eq("├──┼──┼──┤")
+      expect(border.separator).to eq("├──┼──┼──┤")
     end
 
     it 'draw bottom line' do
-      expect(subject.bottom_line).to eq("└──┴──┴──┘")
+      expect(border.bottom_line).to eq("└──┴──┴──┘")
     end
 
     it 'draws row line' do
-      expect(subject.row_line(row)).to eq("│a1│a2│a3│")
+      expect(border.row_line(row)).to eq("│a1│a2│a3│")
     end
   end
 
@@ -53,7 +53,7 @@ RSpec.describe TTY::Table::Border::Unicode, '#rendering' do
     let(:column_widths) { [2,2,2] }
 
     it 'draws row line' do
-      expect(subject.row_line(row)).to eq <<-EOS.normalize
+      expect(border.row_line(row)).to eq unindent(<<-EOS)
         │a1│a2│a3│
         │b1│  │  │
         │c1│  │  │

data/spec/unit/{columns → column_constraint}/enforce_spec.rb

@@ -2,20 +2,21 @@
 
 require 'spec_helper'
 
-RSpec.describe TTY::Table::Columns, '#enforce' do
+RSpec.describe TTY::Table::ColumnConstraint, '#enforce' do
   let(:header) { ['h1', 'h2', 'h3', 'h4'] }
   let(:rows)   { [['a1', 'a2', 'a3', 'a4'], ['b1', 'b2', 'b3', 'b4']] }
   let(:table)  { TTY::Table.new(header, rows) }
-  let(:object) { described_class.new(renderer) }
 
-  subject { object.enforce }
+  subject(:columns) { described_class.new(table, renderer) }
 
   context 'with width contraint' do
     let(:renderer) { TTY::Table::Renderer::Basic.new(table, options) }
     let(:options) { { width: 5 }}
 
     it 'raises error when table width is too small' do
-      expect { subject }.to raise_error(TTY::Table::ResizeError)
+      expect {
+        columns.enforce
+      }.to raise_error(TTY::Table::ResizeError)
     end
   end
 
@@ -24,8 +25,9 @@ RSpec.describe TTY::Table::Columns, '#enforce' do
     let(:options) { { width: 11, resize: true }}
 
     it 'raises error when table width is too small' do
-      expect(object).to receive(:expand)
-      subject
+      allow(columns).to receive(:expand)
+      columns.enforce
+      expect(columns).to have_received(:expand)
     end
   end
 
@@ -36,8 +38,9 @@ RSpec.describe TTY::Table::Columns, '#enforce' do
       let(:options) { { width: 8, resize: true } }
 
       it 'calls shrink' do
-        expect(object).to receive(:shrink)
-        subject
+        allow(columns).to receive(:shrink)
+        columns.enforce
+        expect(columns).to have_received(:shrink)
       end
     end
 
@@ -47,10 +50,10 @@ RSpec.describe TTY::Table::Columns, '#enforce' do
       it 'changes table orientation to vertical' do
         allow(Kernel).to receive(:warn)
         expect(renderer.column_widths).to eql([2,2,2,2])
-        expect(renderer.table.orientation.name).to eql(:horizontal)
-        subject
-        expect(renderer.column_widths).to eq([2,2])
-        expect(renderer.table.orientation.name).to eql(:vertical)
+        expect(table.orientation.name).to eql(:horizontal)
+        column_widths = columns.enforce
+        expect(column_widths).to eq([2,2])
+        expect(table.orientation.name).to eql(:vertical)
       end
     end
   end

data/spec/unit/{columns → column_constraint}/widths_spec.rb

@@ -2,22 +2,22 @@
 
 require 'spec_helper'
 
-RSpec.describe TTY::Table::Columns, 'column widths' do
+RSpec.describe TTY::Table::ColumnConstraint, 'column widths' do
   let(:header) { ['h1', 'h2', 'h3', 'h4'] }
   let(:rows)   { [['a1', 'a2', 'a3', 'a4'], ['b1', 'b2', 'b3', 'b4']] }
   let(:table)  { TTY::Table.new(header, rows) }
 
-  subject { described_class.new(renderer) }
+  subject(:columns) { described_class.new(table, renderer) }
 
   context 'with basic renderer' do
     let(:renderer) { TTY::Table::Renderer::Basic.new(table) }
 
     it 'calculates columns natural width' do
-      expect(subject.natural_width).to eq(11)
+      expect(columns.natural_width).to eq(11)
     end
 
     it 'calculates miminimum columns width' do
-      expect(subject.minimum_width).to eq(7)
+      expect(columns.minimum_width).to eq(7)
     end
   end
 
@@ -25,11 +25,11 @@ RSpec.describe TTY::Table::Columns, 'column widths' do
     let(:renderer) { TTY::Table::Renderer::ASCII.new(table) }
 
     it 'calculates columns natural width' do
-      expect(subject.natural_width).to eq(13)
+      expect(columns.natural_width).to eq(13)
     end
 
     it 'calculates miminimum columns width' do
-      expect(subject.minimum_width).to eq(9)
+      expect(columns.minimum_width).to eq(9)
     end
   end
 end