tty 0.0.9 → 0.0.10

data/spec/tty/table/renderer/basic/render_spec.rb

@@ -5,155 +5,53 @@ require 'spec_helper'
 describe TTY::Table::Renderer::Basic, '#render' 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 }
+  subject { described_class.new(table) }
 
-  context 'without border' do
+  context 'with rows' do
+    let(:table) { TTY::Table.new rows }
 
     it 'displays table without styling' do
-      table = TTY::Table.new rows
-      subject.render(table).should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         a1 a2 a3
         b1 b2 b3
       EOS
     end
+  end
 
+  context 'with header and rows' do
     it 'displays table with header' do
-      table = TTY::Table.new header, rows
-      subject.render(table).should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         h1 h2 h3
         a1 a2 a3
         b1 b2 b3
       EOS
     end
+  end
+
+  context 'with short header' do
+    let(:header) { ['h1', 'h2'] }
+    let(:rows)   { [['aaa1', 'a2'], ['b1', 'bb1']] }
 
     it 'displays table according to widths' do
-      header = ['h1', 'h2']
-      rows = [['aaa1', 'a2'], ['b1', 'bb1']]
-      table = TTY::Table.new header, rows
-      subject.render(table).should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         h1   h2 
         aaa1 a2 
         b1   bb1
       EOS
     end
+  end
+
+  context 'with long header' do
+    let(:header)  { ['header1', 'header2', 'header3'] }
 
     it 'header greater than row sizes' do
-      header = ['header1', 'header2', 'header3']
-      table = TTY::Table.new header, rows
-      subject.render(table).should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         header1 header2 header3
         a1      a2      a3     
         b1      b2      b3     
       EOS
     end
-
   end
-
-  context 'with ASCII border' do
-    let(:border) { TTY::Table::Border::ASCII }
-
-    it 'display table rows' do
-      table = TTY::Table.new rows
-      subject.render(table, border).should == <<-EOS.normalize
-        +--+--+--+
-        |a1|a2|a3|
-        |b1|b2|b3|
-        +--+--+--+
-      EOS
-    end
-
-    it 'displays table with header' do
-      table = TTY::Table.new header, rows
-      subject.render(table, border).should == <<-EOS.normalize
-        +--+--+--+
-        |h1|h2|h3|
-        +--+--+--+
-        |a1|a2|a3|
-        |b1|b2|b3|
-        +--+--+--+
-      EOS
-    end
-
-    it 'displays table according to widths' do
-      header = ['h1', 'h2']
-      rows = [['aaa1', 'a2'], ['b1', 'bb1']]
-      table = TTY::Table.new header, rows
-      subject.render(table, border).should == <<-EOS.normalize
-       +----+---+
-       |h1  |h2 |
-       +----+---+
-       |aaa1|a2 |
-       |b1  |bb1|
-       +----+---+
-      EOS
-    end
-
-    it 'header greater than row sizes' do
-      header = ['header1', 'header2', 'header3']
-      table = TTY::Table.new header, rows
-      subject.render(table, border).should == <<-EOS.normalize
-       +-------+-------+-------+
-       |header1|header2|header3|
-       +-------+-------+-------+
-       |a1     |a2     |a3     |
-       |b1     |b2     |b3     |
-       +-------+-------+-------+
-      EOS
-    end
-  end
-
-  context 'with Unicode border' do
-    let(:border) { TTY::Table::Border::Unicode }
-
-    it 'display table rows' do
-      table = TTY::Table.new rows
-      subject.render(table, border).should == <<-EOS.normalize
-        ┌──┬──┬──┐
-        │a1│a2│a3│
-        │b1│b2│b3│
-        └──┴──┴──┘
-      EOS
-    end
-
-    it 'displays table with header' do
-      table = TTY::Table.new header, rows
-      subject.render(table, border).should == <<-EOS.normalize
-        ┌──┬──┬──┐
-        │h1│h2│h3│
-        ├──┼──┼──┤
-        │a1│a2│a3│
-        │b1│b2│b3│
-        └──┴──┴──┘
-      EOS
-    end
-
-    it 'displays table according to widths' do
-      header = ['h1', 'h2']
-      rows = [['aaa1', 'a2'], ['b1', 'bb1']]
-      table = TTY::Table.new header, rows
-      subject.render(table, border).should == <<-EOS.normalize
-        ┌────┬───┐
-        │h1  │h2 │
-        ├────┼───┤
-        │aaa1│a2 │
-        │b1  │bb1│
-        └────┴───┘
-      EOS
-    end
-
-    it 'header greater than row sizes' do
-      header = ['header1', 'header2', 'header3']
-      table = TTY::Table.new header, rows
-      subject.render(table, border).to_s.should == <<-EOS.normalize
-        ┌───────┬───────┬───────┐
-        │header1│header2│header3│
-        ├───────┼───────┼───────┤
-        │a1     │a2     │a3     │
-        │b1     │b2     │b3     │
-        └───────┴───────┴───────┘
-      EOS
-    end
-  end
-
 end

data/spec/tty/table/renderer/basic/separator_spec.rb

@@ -2,35 +2,36 @@
 
 require 'spec_helper'
 
-describe TTY::Table, 'with separator' do
+describe TTY::Table::Renderer::Basic, 'with separator' do
   let(:header) { ['h1', 'h2', 'h3'] }
-  let(:rows) { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:table)  { TTY::Table.new(header, rows) }
 
-  subject(:table) { described_class.new header, rows, :renderer => renderer }
+  let(:object) { described_class.new table }
 
-  context 'when default' do
-    let(:renderer) { :basic }
+  subject(:renderer) { object }
 
+  context 'when default' do
     it "sets through hash" do
-      table.border :separator => :each_row
-      expect(table.border.separator).to eql(:each_row)
+      renderer.border :separator => :each_row
+      expect(renderer.border.separator).to eql(:each_row)
     end
 
     it "sets through attribute" do
-      table.border.separator= :each_row
-      expect(table.border.separator).to eql(:each_row)
+      renderer.border.separator= :each_row
+      expect(renderer.border.separator).to eql(:each_row)
     end
 
     it "sets through block" do
-      table.border do
+      renderer.border do
         separator :each_row
       end
-      expect(table.border.separator).to eql(:each_row)
+      expect(renderer.border.separator).to eql(:each_row)
     end
 
     it "renders each row" do
-      table.border.separator= :each_row
-      table.to_s.should == <<-EOS.normalize
+      renderer.border.separator= :each_row
+      renderer.render.should == <<-EOS.normalize
         h1 h2 h3
 
         a1 a2 a3
@@ -39,39 +40,4 @@ describe TTY::Table, 'with separator' do
       EOS
     end
   end
-
-  context 'when ascii' do
-    let(:renderer) { :ascii }
-
-    it "renders each row" do
-      table.border.separator= :each_row
-      table.to_s.should == <<-EOS.normalize
-        +--+--+--+
-        |h1|h2|h3|
-        +--+--+--+
-        |a1|a2|a3|
-        +--+--+--+
-        |b1|b2|b3|
-        +--+--+--+
-      EOS
-    end
-  end
-
-  context 'when unicode' do
-    let(:renderer) { :unicode }
-
-    it "renders each row" do
-      table.border.separator= :each_row
-      table.to_s.should == <<-EOS.normalize
-        ┌──┬──┬──┐
-        │h1│h2│h3│
-        ├──┼──┼──┤
-        │a1│a2│a3│
-        ├──┼──┼──┤
-        │b1│b2│b3│
-        └──┴──┴──┘
-      EOS
-    end
-  end
-
 end

data/spec/tty/table/renderer/basic/truncation_spec.rb

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Renderer::Basic, 'truncation' do
+  let(:header) { ['header1', 'head2', 'h3'] }
+  let(:rows) { [['a1111111', 'a222', 'a3333333'], ['b111', 'b2222222', 'b333333']]}
+  let(:table) { TTY::Table.new header, rows }
+
+  subject { described_class.new(table, options) }
+
+  context 'without column widths' do
+    let(:options) { {} }
+
+    it "doesn't shorten the fields" do
+      subject.render.should == <<-EOS.normalize
+        header1  head2    h3      
+        a1111111 a222     a3333333
+        b111     b2222222 b333333 
+      EOS
+    end
+  end
+
+  context 'with column widths' do
+    let(:options) { { column_widths: [3, 5, 7] } }
+
+    it 'shortens the fields' do
+      subject.render.should == <<-EOS.normalize
+        he… head2 h3     
+        a1… a222  a33333…
+        b1… b222… b333333
+      EOS
+    end
+  end
+end

data/spec/tty/table/renderer/basic/wrapping_spec.rb

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Renderer::Basic, 'wrapping' do
+  let(:header) { ['header1', 'head2', 'h3'] }
+  let(:rows) { [['a1111111', 'a222', 'a3333333'], ['b111', 'b2222222', 'b333333']]}
+  let(:table) { TTY::Table.new header, rows }
+
+  subject { described_class.new(table, options) }
+
+  context 'without column widths' do
+    let(:options) { {multiline: true} }
+
+    it 'doesn\'t wrap the fields' do
+      subject.render.should == <<-EOS.normalize
+        header1  head2    h3      
+        a1111111 a222     a3333333
+        b111     b2222222 b333333 
+      EOS
+    end
+  end
+
+  context 'with column widths' do
+    let(:options) { { column_widths: [3, 5, 7], multiline: true} }
+
+    it 'wraps the fields' do
+      subject.render.should == <<-EOS.normalize
+        hea head2 h3     
+        der              
+        1                
+        a11 a222  a333333
+        111       3      
+        11               
+        b11 b2222 b333333
+        1   222          
+      EOS
+    end
+  end
+end

data/spec/tty/table/{border_spec.rb → renderer/border_spec.rb}

@@ -2,38 +2,36 @@
 
 require 'spec_helper'
 
-describe TTY::Table, '#border' do
+describe TTY::Table::Renderer, '#border' do
   let(:header) { ['h1', 'h2', 'h3'] }
-  let(:rows) { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
   let(:border) { nil }
 
-  subject(:table) { described_class.new header, rows, :renderer => renderer, :border => border }
+  let(:table) { TTY::Table.new(header, rows) }
+
+  subject { described_class.select(renderer).new(table) }
 
   context 'when default' do
     let(:renderer) { :basic }
     let(:border) { { :characters => {'top' => '-'}, :style => :red } }
 
-    it 'specifies border at initialization' do
-      expect(table.border.style).to eql(:red)
-    end
-
     it 'specifies border in hash' do
-      table.border border
-      expect(table.border.characters['top']).to eql('-')
+      subject.border border
+      expect(subject.border.characters['top']).to eql('-')
     end
 
     it 'specifies border in characters attribute' do
-      table.border.characters = {'top' => '-'}
-      expect(table.border.characters['top']).to eql('-')
+      subject.border.characters = {'top' => '*'}
+      expect(subject.border.characters['top']).to eql('*')
     end
 
     it 'specifies border in block' do
-      table.border do
+      subject.border do
         mid          '='
         mid_mid      ' '
       end
 
-      table.to_s.should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         h1 h2 h3
         == == ==
         a1 a2 a3
@@ -46,14 +44,14 @@ describe TTY::Table, '#border' do
     let(:renderer) { :ascii }
 
     it 'specifies border in block' do
-      table.border do
+      subject.border do
         mid          '='
         mid_mid      '='
         mid_left     '='
         mid_right    '='
       end
 
-      table.to_s.should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         +--+--+--+
         |h1|h2|h3|
         ==========
@@ -64,14 +62,14 @@ describe TTY::Table, '#border' do
     end
 
     it 'specifies border as hash' do
-      table.border({ :characters => {
+      subject.border({ :characters => {
         'mid'       => '=',
         'mid_mid'   => '=',
         'mid_left'  => '=',
         'mid_right' => '=',
       }})
 
-      table.to_s.should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         +--+--+--+
         |h1|h2|h3|
         ==========
@@ -86,14 +84,14 @@ describe TTY::Table, '#border' do
     let(:renderer) { :unicode }
 
     it 'specifies border in block' do
-      table.border do
+      subject.border do
         mid          '='
         mid_mid      '='
         mid_left     '='
         mid_right    '='
       end
 
-      table.to_s.should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         ┌──┬──┬──┐
         │h1│h2│h3│
         ==========
@@ -103,5 +101,4 @@ describe TTY::Table, '#border' do
       EOS
     end
   end
-
 end # border

data/spec/tty/table/renderer/select_spec.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Renderer, '#select' do
+  let(:klass) { ::Class.new }
+  let(:instance) { described_class }
+
+  subject { instance.select(renderer) }
+
+  context 'with basic' do
+    let(:renderer) { :basic }
+
+    it { should be(TTY::Table::Renderer::Basic) }
+  end
+
+  context 'with unicode' do
+    let(:renderer) { :unicode }
+
+    it { should be(TTY::Table::Renderer::Unicode) }
+  end
+end

data/spec/tty/table/{border → renderer}/style_spec.rb

@@ -2,27 +2,28 @@
 
 require 'spec_helper'
 
-describe TTY::Table, 'with style' do
+describe TTY::Table::Renderer, 'with style' do
   let(:header) { ['h1', 'h2', 'h3'] }
-  let(:rows) { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:table)  { TTY::Table.new(header, rows) }
 
-  subject(:table) { described_class.new header, rows, :renderer => renderer }
+  subject { described_class.select(renderer).new(table) }
 
   context 'when default' do
     let(:renderer) { :basic }
 
     it "sets through hash" do
-      table.border :style => :red
-      expect(table.border.style).to eql :red
+      subject.border style: :red
+      expect(subject.border.style).to eql(:red)
     end
 
     it "sets through attribute" do
-      table.border.style = :red
-      expect(table.border.style).to eql :red
+      subject.border.style = :red
+      expect(subject.border.style).to eql :red
     end
 
     it "renders without color" do
-      table.to_s.should == <<-EOS.normalize
+      subject.render.should == <<-EOS.normalize
         h1 h2 h3
         a1 a2 a3
         b1 b2 b3
@@ -36,9 +37,8 @@ describe TTY::Table, 'with style' do
     let(:clear) { "\e[0m" }
 
     it "renders border in color" do
-      table.border.style= :red
-
-      table.to_s.should == <<-EOS.normalize
+      subject.border.style= :red
+      subject.render.should == <<-EOS.normalize
         #{red}+--+--+--+#{clear}
         #{red}|#{clear}h1#{red}|#{clear}h2#{red}|#{clear}h3#{red}|#{clear}
         #{red}+--+--+--+#{clear}
@@ -55,8 +55,8 @@ describe TTY::Table, 'with style' do
     let(:clear) { "\e[0m" }
 
     it "renders each row" do
-      table.border.style= :red
-      table.to_s.should == <<-EOS.normalize
+      subject.border.style= :red
+      subject.render.should == <<-EOS.normalize
         #{red}┌──┬──┬──┐#{clear}
         #{red}│#{clear}h1#{red}│#{clear}h2#{red}│#{clear}h3#{red}│#{clear}
         #{red}├──┼──┼──┤#{clear}
@@ -66,5 +66,4 @@ describe TTY::Table, 'with style' do
       EOS
     end
   end
-
 end

data/spec/tty/table/renderer/unicode/render_spec.rb

@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Renderer::Unicode, '#render' 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) }
+
+  context 'with rows only' do
+    let(:table) { TTY::Table.new rows }
+
+    it 'display table rows' do
+      subject.render.should == <<-EOS.normalize
+        ┌──┬──┬──┐
+        │a1│a2│a3│
+        │b1│b2│b3│
+        └──┴──┴──┘
+      EOS
+    end
+  end
+
+  context 'with header' do
+    it 'displays table with header' do
+      subject.render.should == <<-EOS.normalize
+        ┌──┬──┬──┐
+        │h1│h2│h3│
+        ├──┼──┼──┤
+        │a1│a2│a3│
+        │b1│b2│b3│
+        └──┴──┴──┘
+      EOS
+    end
+  end
+
+  context 'with short header' do
+    let(:header) { ['h1', 'h2'] }
+    let(:rows)   { [['aaa1', 'a2'], ['b1', 'bb1']] }
+
+    it 'displays table according to widths' do
+      subject.render.should == <<-EOS.normalize
+        ┌────┬───┐
+        │h1  │h2 │
+        ├────┼───┤
+        │aaa1│a2 │
+        │b1  │bb1│
+        └────┴───┘
+      EOS
+    end
+  end
+
+  context 'with long header' do
+    let(:header) { ['header1', 'header2', 'header3'] }
+
+    it 'header greater than row sizes' do
+      subject.render.to_s.should == <<-EOS.normalize
+        ┌───────┬───────┬───────┐
+        │header1│header2│header3│
+        ├───────┼───────┼───────┤
+        │a1     │a2     │a3     │
+        │b1     │b2     │b3     │
+        └───────┴───────┴───────┘
+      EOS
+    end
+  end
+end

data/spec/tty/table/renderer/unicode/separator_spec.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Renderer::Unicode, 'with separator' do
+  let(:header) { ['h1', 'h2', 'h3'] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:table)  { TTY::Table.new(header, rows) }
+
+  let(:object) { described_class.new table }
+
+  subject(:renderer) { object }
+
+  it "renders each row" do
+    renderer.border.separator= :each_row
+    renderer.render.should == <<-EOS.normalize
+      ┌──┬──┬──┐
+      │h1│h2│h3│
+      ├──┼──┼──┤
+      │a1│a2│a3│
+      ├──┼──┼──┤
+      │b1│b2│b3│
+      └──┴──┴──┘
+    EOS
+  end
+end

data/spec/tty/table/rotate_spec.rb

@@ -22,8 +22,7 @@ describe TTY::Table, '#rotate' do
 
     context 'with header' do
       it 'preserves orientation' do
-        expect(subject.header).to eql header
-        expect(subject.rotate.to_a).to eql rows
+        expect(subject.rotate.to_a).to eql [header] + rows
       end
     end
   end
@@ -66,7 +65,7 @@ describe TTY::Table, '#rotate' do
       subject.rotate
       expect(subject.orientation).to be_a TTY::Table::Orientation::Vertical
       subject.orientation = :horizontal
-      expect(subject.rotate.to_a).to eql rows
+      expect(subject.rotate.to_a).to eql [header] + rows
       expect(subject.header).to eql header
     end
   end

data/spec/tty/table/row/call_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe TTY::Table::Row, '#call' do
   let(:object) { described_class.new(data) }
 
-  subject { object.call(attribute) }
+  subject { object[attribute] }
 
   context 'when integer' do
     let(:data) { ['a', 'b'] }