tty 0.0.9 → 0.0.10

data/spec/tty/table/border/null/rendering_spec.rb

@@ -5,10 +5,11 @@ require 'spec_helper'
 describe TTY::Table::Border::Null, '#rendering' do
   let(:border) { nil }
 
-  subject { described_class.new row, border }
+  subject { described_class.new column_widths, border }
 
   context 'with empty row' do
-    let(:row) { [] }
+    let(:row) { TTY::Table::Row.new([]) }
+    let(:column_widths) { [] }
 
     it 'draws top line' do
       subject.top_line.should be_nil
@@ -23,12 +24,13 @@ describe TTY::Table::Border::Null, '#rendering' do
     end
 
     it 'draws row line' do
-      subject.row_line.should == ''
+      subject.row_line(row).should == ''
     end
   end
 
   context 'with row' do
-    let(:row) { ['a1', 'a2', 'a3'] }
+    let(:row) { TTY::Table::Row.new(['a1', 'a2', 'a3']) }
+    let(:column_widths) { [2,2,2] }
 
     it 'draws top line' do
       subject.top_line.should be_nil
@@ -43,12 +45,26 @@ describe TTY::Table::Border::Null, '#rendering' do
     end
 
     it 'draws row line' do
-      subject.row_line.should == 'a1 a2 a3'
+      subject.row_line(row).should == 'a1 a2 a3'
+    end
+  end
+
+  context 'with multiline row' do
+    let(:row) { TTY::Table::Row.new(["a1\nb1\nc1", 'a2', 'a3']) }
+    let(:column_widths) { [2,2,2] }
+
+    it 'draws row line' do
+      subject.row_line(row).should == <<-EOS.normalize
+        a1 a2 a3
+        b1      
+        c1      
+      EOS
     end
   end
 
   context 'with border' do
-    let(:row) { ['a1', 'a2', 'a3'] }
+    let(:row) { TTY::Table::Row.new(['a1', 'a2', 'a3']) }
+    let(:column_widths) { [2,2,2] }
     let(:border) { { :characters => {
       'top'          => '=',
       'top_mid'      => '=',
@@ -67,6 +83,7 @@ describe TTY::Table::Border::Null, '#rendering' do
       'right'        => '='
     } } }
 
+
     it 'draws top line' do
       expect(subject.top_line).to eql '=========='
     end
@@ -80,8 +97,7 @@ describe TTY::Table::Border::Null, '#rendering' do
     end
 
     it 'draws row line' do
-      expect(subject.row_line).to eql '=a1=a2=a3='
+      expect(subject.row_line(row)).to eql '=a1=a2=a3='
     end
   end
-
 end

data/spec/tty/table/border/unicode/rendering_spec.rb

@@ -4,10 +4,11 @@ require 'spec_helper'
 
 describe TTY::Table::Border::Unicode, '#rendering' do
 
-  subject { described_class.new row }
+  subject { described_class.new(column_widths) }
 
   context 'with empty row' do
-    let(:row) { [] }
+    let(:row) { TTY::Table::Row.new([]) }
+    let(:column_widths) { [] }
 
     it 'draws top line' do
       subject.top_line.should == "┌┐"
@@ -22,12 +23,13 @@ describe TTY::Table::Border::Unicode, '#rendering' do
     end
 
     it 'draws row line' do
-      subject.row_line.should == "││"
+      subject.row_line(row).should == "││"
     end
   end
 
   context 'with row' do
-    let(:row) { ['a1', 'a2', 'a3'] }
+    let(:row) { TTY::Table::Row.new(['a1', 'a2', 'a3']) }
+    let(:column_widths) { [2,2,2] }
 
     it 'draws top line' do
       subject.top_line.should == "┌──┬──┬──┐"
@@ -42,8 +44,20 @@ describe TTY::Table::Border::Unicode, '#rendering' do
     end
 
     it 'draws row line' do
-      subject.row_line.should == "│a1│a2│a3│"
+      subject.row_line(row).should == "│a1│a2│a3│"
     end
   end
 
+  context 'with multiline row' do
+    let(:row) { TTY::Table::Row.new(["a1\nb1\nc1", 'a2', 'a3']) }
+    let(:column_widths) { [2,2,2] }
+
+    it 'draws row line' do
+      subject.row_line(row).should == <<-EOS.normalize
+        │a1│a2│a3│
+        │b1│  │  │
+        │c1│  │  │
+      EOS
+    end
+  end
 end

data/spec/tty/table/column_set/extract_widths_spec.rb

@@ -3,24 +3,13 @@
 require 'spec_helper'
 
 describe TTY::Table::ColumnSet, '#extract_widths!' do
-
   let(:header) { ['h1', 'h2', 'h3'] }
-  let(:rows) { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
-
-  let(:table) {
-    stub(:table, :column_widths => column_widths,
-     :header => header, :to_a => rows).as_null_object
-  }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:table)  { TTY::Table.new header, rows }
 
   subject { described_class.new table }
 
-  context 'with column_widths' do
-    let(:column_widths) { [5,5,5] }
-
-    it '' do
-      subject.extract_widths!
-      subject.column_widths.should == column_widths
-    end
-
+  it 'extract widths' do
+    expect(subject.extract_widths).to eql([2,2,2])
   end
 end

data/spec/tty/table/column_set/total_width_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::ColumnSet, '#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)
+  end
+end

data/spec/tty/table/data_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table, '#data' do
+  let(:header) { ['h1', 'h2', 'h3'] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+
+  subject { described_class.new header, rows }
+
+  it 'gets all table data' do
+    expect(subject.data).to eql([header] + rows)
+  end
+end

data/spec/tty/table/each_spec.rb

@@ -4,8 +4,9 @@ require 'spec_helper'
 
 describe TTY::Table, '#each' do
   let(:object) { described_class.new header, rows }
-  let(:header) { ['Header1', 'Header2'] }
-  let(:rows) { [['a1', 'a2'], ['b1', 'b2']] }
+  let(:header) { ['Header1'] }
+  let(:rows)   { [['a1'], ['b1']] }
+  let(:field)  { TTY::Table::Field }
 
   context 'with no block' do
     subject { object.each }
@@ -18,13 +19,25 @@ describe TTY::Table, '#each' do
   end
 
   context 'with block' do
-    subject { object.each { |row| yields << row } }
     let(:yields) { [] }
 
+    subject { object.each { |row| yields << row } }
+
+    it 'yields header and rows' do
+      subject
+      expect(yields.first).to be_instance_of(TTY::Table::Header)
+      expect(yields.last).to be_instance_of(TTY::Table::Row)
+    end
+
+    it 'yields header and rows with expected attributes' do
+      subject
+      expect(yields).to eql(object.data)
+    end
+
     it 'yields each row' do
       expect { subject }.to change { yields }.
         from( [] ).
-        to( rows )
+        to( object.data )
     end
   end
 end

data/spec/tty/table/each_with_index_spec.rb

@@ -2,10 +2,14 @@
 
 require 'spec_helper'
 
+def to_field(value)
+end
+
 describe TTY::Table, '#each_with_index' do
   let(:object) { described_class.new header, rows }
   let(:header) { ['Header1', 'Header2'] }
   let(:rows) { [['a1', 'a2'], ['b1', 'b2']] }
+  let(:field) { TTY::Table::Field }
 
   context 'with no block' do
     subject { object.each_with_index }
@@ -17,14 +21,38 @@ describe TTY::Table, '#each_with_index' do
   end
 
   context 'with block' do
-    subject { object.each_with_index { |el, row, col| yields << [el, row, col]}}
     let(:yields) { [] }
-    let(:expected) { [['a1', 0, 0], ['a2', 0, 1], ['b1', 1, 0], ['b2', 1, 1]] }
 
-    it "" do
-      expect { subject }.to change { yields }.
-        from( [] ).
-        to( expected )
+    subject { object.each_with_index { |el, row, col| yields << [el, row, col]}}
+
+    context 'without header' do
+      let(:header) { nil }
+
+      let(:expected) {
+        [ [field.new('a1'), 0, 0], [field.new('a2'), 0, 1],
+          [field.new('b1'), 1, 0], [field.new('b2'), 1, 1] ]
+      }
+
+      it "yields rows with expected data" do
+        expect { subject }.to change { yields }.
+          from( [] ).
+          to( expected )
+      end
+    end
+
+    context 'with header' do
+
+      let(:expected) {
+        [ [field.new('Header1'), 0, 0], [field.new('Header2'), 0, 1],
+          [field.new('a1'), 1, 0], [field.new('a2'), 1, 1],
+          [field.new('b1'), 2, 0], [field.new('b2'), 2, 1] ]
+      }
+
+      it "yields header and rows with expected data" do
+        expect { subject }.to change { yields }.
+          from( [] ).
+          to( expected )
+      end
     end
   end
 end

data/spec/tty/table/field/length_spec.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Field, '#lines' do
+  let(:object) { described_class.new value }
+
+  subject { object.length }
+
+  context 'with escaped value' do
+    let(:value) { "Multi\nLine" }
+
+    it { should eql(5) }
+  end
+
+  context 'with unescaped value' do
+    let(:value) { "Multi\\nLine" }
+
+    it { should eql(11) }
+  end
+end

data/spec/tty/table/field/lines_spec.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Field, '#lines' do
+  let(:object) { described_class.new value }
+
+  subject { object.lines }
+
+  context 'with escaped value' do
+    let(:value) { "Multi\nLine" }
+
+    it { should eql(["Multi", "Line"]) }
+  end
+
+  context 'with unescaped value' do
+    let(:value) { "Multi\\nLine" }
+
+    it { should eql(["Multi\\nLine"]) }
+  end
+end

data/spec/tty/table/filter_spec.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table, '#filter' do
+  let(:header) { ['h1', 'h2', 'h3'] }
+  let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
+  let(:table)  { described_class.new(header, rows) }
+  let(:filter) { Proc.new { |val, row, col|
+      (col == 1 and row > 0) ? val.capitalize : val
+    }
+  }
+
+  it 'filters rows' do
+    table.render do |renderer|
+      renderer.filter = filter
+    end.should == <<-EOS.normalize
+      h1 h2 h3
+      a1 A2 a3
+      b1 B2 b3
+    EOS
+  end
+end

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

@@ -6,7 +6,7 @@ describe TTY::Table::Header, '#call' do
   let(:object) { described_class.new(attributes) }
   let(:attributes) { [:id, :name, :age] }
 
-  subject { object.call(attribute) }
+  subject { object[attribute] }
 
   context 'with a known attribute' do
     context 'when symbol' do

data/spec/tty/table/header/height_spec.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Header, '#height' do
+  let(:object) { described_class.new header }
+
+  subject { object.height }
+
+  context 'single row' do
+    let(:header) { ['h1', 'h1'] }
+
+    it { expect(subject).to eql(1) }
+  end
+
+  context 'non escaped multiline' do
+    let(:header) { ["h1\nh1\nh1", 'h2'] }
+
+    it { expect(subject).to eql(3)}
+  end
+
+  context 'escaped multiline' do
+    let(:header) { ["h1\\h1\\h1", 'h2'] }
+
+    it { expect(subject).to eql(1) }
+  end
+end

data/spec/tty/table/initialize_spec.rb

@@ -15,12 +15,12 @@ describe TTY::Table, '#initialize' do
   context 'with rows only' do
     it 'initializes with rows as arguments' do
       table = TTY::Table[*rows]
-      table.to_a.should == rows
+      expect(table.to_a).to eql rows
     end
 
     it 'initializes with rows' do
       table = TTY::Table.new rows
-      table.to_a.should == rows
+      expect(table.to_a).to eql(rows)
     end
 
     it 'initializes table rows as an option' do
@@ -69,20 +69,20 @@ describe TTY::Table, '#initialize' do
   context 'with header and rows' do
     it 'initializes header as an option' do
       table = TTY::Table.new :header => header
-      table.header.should == header
+      expect(table.header).to eql header
     end
 
     it 'initializes table rows as an argument' do
       table = TTY::Table.new header, rows
-      table.header.should == header
-      table.to_a.should == rows
+      expect(table.header).to eql(header)
+      expect(table.rows).to eql(rows)
     end
   end
 
   context 'coercion' do
     it 'converts row arguments from hash to array' do
       table = TTY::Table.new :rows => {:a => 1, :b => 2}
-      table.to_a.should include [:a, 1 ]
+      expect(table.to_a).to include [:a, 1 ]
     end
   end
 end

data/spec/tty/table/operation/alignment_set/call_spec.rb

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Operation::AlignmentSet, '#call' do
+  let(:object)  { described_class.new alignments, widths }
+  let(:value) { 'a1' }
+  let(:field) { TTY::Table::Field.new(value)}
+
+  subject { object.call(field, 0, 0) }
+
+  context 'aligned with column widths and no alignments' do
+    let(:alignments) { [] }
+    let(:widths) { [4, 4] }
+
+    it { should == "#{value}  " }
+  end
+
+  context 'aligned with column widths and alignments' do
+    let(:alignments) { [:right, :left] }
+    let(:widths) { [4, 4] }
+
+    it { should == "  #{value}" }
+  end
+
+  context 'aligned with no column widths and no alignments' do
+    let(:alignments) { [] }
+    let(:widths) { [] }
+
+    it { should == "#{value}" }
+  end
+
+  context 'aligned with no column widths and alignments' do
+    let(:alignments) { [:right, :left] }
+    let(:widths) { [] }
+
+    it { should == "#{value}" }
+  end
+end

data/spec/tty/table/operation/escape/call_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Operation::Escape, '#call' do
+  let(:object) { described_class }
+  let(:text)   { "太丸\nゴシ\tック体\r" }
+  let(:field)  { TTY::Table::Field.new(text) }
+
+  subject { object.new }
+
+  it 'changes field value' do
+    subject.call(field, 0, 0)
+    expect(field.value).to eql("太丸\\nゴシ\\tック体\\r")
+  end
+end

data/spec/tty/table/operation/filter/call_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Table::Operation::Filter, '#call' do
+  let(:object) { described_class }
+  let(:field)  { TTY::Table::Field.new('a1') }
+  let(:filter) { Proc.new { |val, row, col| 'new' } }
+  let(:value)  { 'new' }
+
+  subject { object.new(filter) }
+
+  it 'changes field value' do
+    subject.call(field, 0, 0)
+    expect(field.value).to eql(value)
+  end
+end

data/spec/tty/table/operation/truncation/call_spec.rb

@@ -3,25 +3,30 @@
 require 'spec_helper'
 
 describe TTY::Table::Operation::Truncation, '#call' do
-  let(:object) { described_class.new }
-  let(:text) { '太丸ゴシック体' }
-  let(:row) { [TTY::Table::Field.new(text), TTY::Table::Field.new(text)] }
+  let(:object) { described_class.new column_widths }
+  let(:text)   { '太丸ゴシック体' }
+  let(:field)  { TTY::Table::Field.new(text) }
 
   context 'without column width' do
+    let(:column_widths) { [] }
+
     it "truncates string" do
-      object.call(row)
-      expect(row[0]).to eql(text)
-      expect(row[1]).to eql(text)
+      object.call(field, 0, 0)
+      expect(field.value).to eql(text)
     end
   end
 
   context 'with column width ' do
     let(:column_widths) { [3, 6] }
 
-    it "truncates string" do
-      object.call(row, :column_widths => column_widths)
-      expect(row[0]).to eql('太丸…')
-      expect(row[1]).to eql('太丸ゴシッ…')
+    it "truncates string for 0 column" do
+      object.call(field, 0, 0)
+      expect(field.value).to eql('太丸…')
+    end
+
+    it "truncates string for 1 column" do
+      object.call(field, 0, 1)
+      expect(field.value).to eql('太丸ゴシッ…')
     end
   end
 end

data/spec/tty/table/operation/truncation/truncate_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe TTY::Table::Operation::Truncation, '#truncate' do
-  let(:instance) { described_class.new }
+  let(:instance) { described_class.new [] }
   let(:text) { '太丸ゴシック体' }
 
   subject { instance.truncate(text, width) }

data/spec/tty/table/operation/wrapped/call_spec.rb

@@ -3,25 +3,30 @@
 require 'spec_helper'
 
 describe TTY::Table::Operation::Wrapped, '#call' do
-  let(:object) { described_class.new }
-  let(:text) { 'ラドクリフ、マラソン五輪代表に1万m出場にも含み' }
-  let(:row) { [TTY::Table::Field.new(text), TTY::Table::Field.new(text)] }
+  let(:object) { described_class.new column_widths }
+  let(:text)   { 'ラドクリフ、マラソン五輪代表に1万m出場にも含み' }
+  let(:field)  { TTY::Table::Field.new(text) }
 
   context 'without column width' do
+    let(:column_widths) { [] }
+
     it "doesn't wrap string" do
-      object.call(row)
-      expect(row[0]).to eql(text)
-      expect(row[1]).to eql(text)
+      object.call(field, 0, 0)
+      expect(field.value).to eql(text)
     end
   end
 
   context 'with column width' do
     let(:column_widths) { [12, 14] }
 
-    it "truncates string" do
-      object.call(row, :column_widths => column_widths)
-      expect(row[0]).to eql("ラドクリフ、マラソン五輪\n代表に1万m出場にも含み")
-      expect(row[1]).to eql("ラドクリフ、マラソン五輪代表\nに1万m出場にも含み")
+    it "wraps string for 0 column" do
+      object.call(field, 0, 0)
+      expect(field.value).to eql("ラドクリフ、マラソン五輪\n代表に1万m出場にも含み")
+    end
+
+    it "wraps string for 1 column" do
+      object.call(field, 0, 1)
+      expect(field.value).to eql("ラドクリフ、マラソン五輪代表\nに1万m出場にも含み")
     end
   end
 end

data/spec/tty/table/operation/wrapped/wrap_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe TTY::Table::Operation::Wrapped, '#wrap' do
-  let(:instance) { described_class.new }
+  let(:instance) { described_class.new [] }
   let(:text) { 'ラドクリフ、マラソン五輪代表に1万m出場にも含み' }
 
   subject { instance.wrap(text, width) }

data/spec/tty/table/operations/new_spec.rb

@@ -8,8 +8,8 @@ describe TTY::Table::Operations, '#new' do
   let(:table) { TTY::Table.new :rows => [row] }
   let(:callable) {
     Class.new do
-      def call(row, options)
-        row.map! { |r| r + 1}
+      def call(val, row, col)
+        val.value= val.value + 1
       end
     end
   }
@@ -26,7 +26,7 @@ describe TTY::Table::Operations, '#new' do
   end
 
   it 'runs selected operations' do
-    subject.run_operations(:alignment, row)
-    expect(row).to eql([2,3,4])
+    subject.run_operations(:alignment)
+    expect(table.data[0]).to eql([2,3,4])
   end
 end

data/spec/tty/table/options_spec.rb

@@ -21,33 +21,5 @@ describe TTY::Table, 'options' do
 
   its(:rows) { should == rows }
 
-  its(:border) { should be_kind_of TTY::Table::BorderOptions }
-
   its(:orientation) { should be_kind_of TTY::Table::Orientation::Horizontal }
-
-  its(:column_widths) { should be_empty }
-
-  its(:column_aligns) { should eql(aligns) }
-
-  it { subject.column_aligns.to_a.should be_empty }
-
-  context '#column_widths' do
-    let(:widths) { [10, 10] }
-
-    its(:column_widths) { should == widths }
-  end
-
-  context '#column_widths empty' do
-    let(:widths) { [] }
-
-    it { expect { subject }.to raise_error(TTY::InvalidArgument) }
-  end
-
-  context '#column_aligns' do
-    let(:aligns) { [:center, :center] }
-
-    it 'unwraps original array' do
-      subject.column_aligns.to_a.should == aligns
-    end
-  end
 end