tty-table 0.1.0 → 0.2.0

data/spec/unit/renderer/basic/options_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe TTY::Table::Renderer::Basic, 'options' do
   let(:object) { described_class }
   let(:table)  { TTY::Table.new(rows) }
   let(:widths) { nil }
-  let(:aligns) { [] }
+  let(:alignments) { [] }
   let(:options) {
     {
-      :column_widths => widths,
-      :column_aligns  => aligns,
-      :renderer => :basic
+      column_widths: widths,
+      alignments: alignments,
+      renderer: :basic
     }
   }
 
@@ -22,9 +22,9 @@ RSpec.describe TTY::Table::Renderer::Basic, 'options' do
 
   it { expect(renderer.column_widths).to eql([2,2]) }
 
-  it { expect(renderer.column_aligns).to eql(aligns) }
+  it { expect(renderer.alignments.to_a).to eql(alignments) }
 
-  it { expect(renderer.column_aligns.to_a).to be_empty }
+  it { expect(renderer.alignments.to_a).to be_empty }
 
   context '#column_widths' do
     let(:widths) { [10, 10] }
@@ -42,11 +42,11 @@ RSpec.describe TTY::Table::Renderer::Basic, 'options' do
     }
   end
 
-  context '#column_aligns' do
-    let(:aligns) { [:center, :center] }
+  context '#alignments' do
+    let(:alignments) { [:center, :center] }
 
     it 'unwraps original array' do
-      expect(renderer.column_aligns.to_a).to eq(aligns)
+      expect(renderer.alignments.to_a).to eq(alignments)
     end
   end
 end

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

@@ -21,7 +21,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'padding' do
   end
 
   context 'with top & bottom padding' do
-    let(:options) { {padding: [1,0,1,0], multiline: true} }
+    let(:options) { {padding: [1,0,1,0]} }
 
     it 'pads each field' do
       expect(renderer.render).to eql <<-EOS.chomp
@@ -36,7 +36,7 @@ EOS
   end
 
   context 'with full padding' do
-    let(:options) { {padding: [1,1,1,1], multiline: true} }
+    let(:options) { {padding: [1,1,1,1]} }
 
     it 'pads each field' do
       expect(renderer.render).to eql <<-EOS.chomp
@@ -49,4 +49,28 @@ EOS
       EOS
     end
   end
+
+  context "with multiline content padding" do
+    it "pads around fields" do
+      padding = [1,2,1,2]
+      table = TTY::Table.new header: ['header1', 'header2']
+      table << ["a1\na1\na1",'a2']
+      table << ["b1","b2\nb2"]
+      renderer = TTY::Table::Renderer::Basic.new(table, padding: padding, multiline: true)
+      expect(renderer.render).to eql <<-EOS.chomp
+                       
+  header1     header2  
+                       
+                       
+  a1          a2       
+  a1                   
+  a1                   
+                       
+                       
+  b1          b2       
+              b2       
+                       
+      EOS
+    end
+  end
 end

data/spec/unit/renderer/basic/render_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::Basic, '#render' do
     let(:table) { TTY::Table.new rows }
 
     it 'displays table without styling' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         a1 a2 a3
         b1 b2 b3
       EOS
@@ -22,7 +22,7 @@ RSpec.describe TTY::Table::Renderer::Basic, '#render' do
 
   context 'with header and rows' do
     it 'displays table with header' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         h1 h2 h3
         a1 a2 a3
         b1 b2 b3
@@ -35,7 +35,7 @@ RSpec.describe TTY::Table::Renderer::Basic, '#render' do
     let(:rows)   { [['aaa1', 'a2'], ['b1', 'bb1']] }
 
     it 'displays table according to widths' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         h1   h2 
         aaa1 a2 
         b1   bb1
@@ -47,7 +47,7 @@ RSpec.describe TTY::Table::Renderer::Basic, '#render' do
     let(:header)  { ['header1', 'header2', 'header3'] }
 
     it 'header greater than row sizes' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         header1 header2 header3
         a1      a2      a3     
         b1      b2      b3     

data/spec/unit/renderer/basic/resizing_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'resizing' do
       let(:options) { {width: 16, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
+        expect(renderer.render).to eql unindent(<<-EOS)
           h1    h2    h3  
           a1    a2    a3  
           b1    b2    b3  
@@ -28,7 +28,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'resizing' do
       let(:options) { {width: 21, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
+        expect(renderer.render).to eql unindent(<<-EOS)
           h1    h2    h3   h4  
           a1    a2    a3   a4  
           b1    b2    b3   b4  
@@ -42,7 +42,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'resizing' do
       let(:options) { {width: 32, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
+        expect(renderer.render).to eql unindent(<<-EOS)
           h1        h2       h3           
           aaa1      aa2      aaaaaaa3     
           b1        b2       b3           
@@ -56,25 +56,25 @@ RSpec.describe TTY::Table::Renderer::Basic, 'resizing' do
     let(:rows)    { [['aaaa1','aaaa2',], ['bbbb1','bbbb2']] }
 
     context 'even columns' do
-      let(:options) { {width: 7, resize: true} }
+      let(:options) { {width: 8, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
-          he… he…
-          aa… aa…
-          bb… bb…
+        expect(renderer.render).to eql unindent(<<-EOS)
+          he…  h… 
+          aa…  a… 
+          bb…  b… 
         EOS
       end
     end
 
     context 'even columns with extra width' do
-      let(:options) { {width: 8, resize: true} }
+      let(:options) { {width: 9, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
-          hea… he…
-          aaa… aa…
-          bbb… bb…
+        expect(renderer.render).to eql unindent(<<-EOS)
+          he…  he… 
+          aa…  aa… 
+          bb…  bb… 
         EOS
       end
     end
@@ -82,13 +82,13 @@ RSpec.describe TTY::Table::Renderer::Basic, 'resizing' do
     context 'uneven columns' do
       let(:header)  { ['head1', 'head2', 'head3'] }
       let(:rows)    { [['aaa1', 'aa2', 'aaaaaaa3'], ['b1', 'b2', 'b3']] }
-      let(:options) { {width: 15, resize: true} }
+      let(:options) { {width: 16, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
-          hea… he… head3 
-          aaa1 aa2 aaaaa…
-          b1   b2  b3    
+        expect(renderer.render).to eql unindent(<<-EOS)
+          he…  he…  head3 
+          aaa1 aa2  aaaa… 
+          b1   b2   b3    
         EOS
       end
     end

data/spec/unit/renderer/basic/separator_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'with separator' do
 
     it "renders each row" do
       renderer.border.separator= :each_row
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         h1 h2 h3
 
         a1 a2 a3

data/spec/unit/renderer/basic/truncation_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'truncation' do
     let(:options) { {} }
 
     it "doesn't shorten the fields" do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         header1  head2    h3      
         a1111111 a222     a3333333
         b111     b2222222 b333333 
@@ -22,13 +22,13 @@ RSpec.describe TTY::Table::Renderer::Basic, 'truncation' do
   end
 
   context 'with column widths' do
-    let(:options) { { column_widths: [3, 5, 7] } }
+    let(:options) { { column_widths: [4, 5, 7] } }
 
     it 'shortens the fields' do
-      expect(renderer.render).to eq <<-EOS.normalize
-        he… head2 h3     
-        a1… a222  a33333…
-        b1… b222… b333333
+      expect(renderer.render).to eq unindent(<<-EOS)
+        he…  head2 h3     
+        a1…  a222  a3333… 
+        b111 b22…  b333333
       EOS
     end
   end

data/spec/unit/renderer/basic/wrapping_spec.rb

@@ -12,8 +12,8 @@ RSpec.describe TTY::Table::Renderer::Basic, 'wrapping' do
   context 'without column widths' do
     let(:options) { {multiline: true} }
 
-    it 'doesn\'t wrap the fields' do
-      expect(renderer.render).to eq <<-EOS.normalize
+    it "doesn't wrap the fields" do
+      expect(renderer.render).to eq unindent(<<-EOS)
         header1  head2    h3      
         a1111111 a222     a3333333
         b111     b2222222 b333333 
@@ -25,7 +25,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'wrapping' do
     let(:options) { { column_widths: [3, 5, 7], multiline: true} }
 
     it 'wraps the fields' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         hea head2 h3     
         der              
         1                

data/spec/unit/renderer/border_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe TTY::Table::Renderer, '#border' do
         mid_mid      ' '
       end
 
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         h1 h2 h3
         == == ==
         a1 a2 a3
@@ -51,7 +51,7 @@ RSpec.describe TTY::Table::Renderer, '#border' do
         mid_right    '='
       end
 
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         +--+--+--+
         |h1|h2|h3|
         ==========
@@ -69,7 +69,7 @@ RSpec.describe TTY::Table::Renderer, '#border' do
         'mid_right' => '=',
       }})
 
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         +--+--+--+
         |h1|h2|h3|
         ==========
@@ -91,7 +91,7 @@ RSpec.describe TTY::Table::Renderer, '#border' do
         mid_right    '='
       end
 
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         ┌──┬──┬──┐
         │h1│h2│h3│
         ==========

data/spec/unit/renderer/unicode/coloring_spec.rb

@@ -0,0 +1,70 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe TTY::Table::Renderer::Unicode, 'coloring' do
+
+  let(:color)  { Pastel.new(enabled: true) }
+
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
+  context 'when border' do
+    it "colors border" do
+      table = TTY::Table.new header: ['header1', 'header2']
+      table << ['a1', 'a2']
+      table << ['b1', 'b2']
+      renderer = described_class.new(table)
+      renderer.border = {style: :green }
+
+      expect(renderer.render).to eq unindent(<<-EOS)
+        #{color.green('┌───────┬───────┐')}
+        #{color.green('│')}header1#{color.green('│')}header2#{color.green('│')}
+        #{color.green('├───────┼───────┤')}
+        #{color.green('│')}a1     #{color.green('│')}a2     #{color.green('│')}
+        #{color.green('│')}b1     #{color.green('│')}b2     #{color.green('│')}
+        #{color.green('└───────┴───────┘')}
+      EOS
+    end
+  end
+
+  context 'when content' do
+    it "colors individual field" do
+      header = [color.yellow('header1'), 'header2']
+      table = TTY::Table.new header: header
+      table << [color.green.on_blue('a1'), 'a2']
+      table << ['b1', color.red.on_yellow('b2')]
+      renderer = described_class.new(table)
+
+      expect(renderer.render).to eq unindent(<<-EOS)
+        ┌───────┬───────┐
+        │#{color.yellow('header1')}│header2│
+        ├───────┼───────┤
+        │#{color.green.on_blue('a1')}     │a2     │
+        │b1     │#{color.red.on_yellow('b2')}     │
+        └───────┴───────┘
+      EOS
+    end
+
+    it "colors multiline content" do
+      header = [color.yellow("Multi\nHeader"), 'header2']
+      table = TTY::Table.new header: header
+      table << [color.green.on_blue("Multi\nLine\nContent"), 'a2']
+      table << ['b1', color.red.on_yellow("Multi\nLine\nContent")]
+      renderer = described_class.new(table, multiline: true)
+
+      expect(renderer.render).to eq unindent(<<-EOS)
+        ┌───────┬───────┐
+        │#{color.yellow('Multi  ')}│header2│
+        │#{color.yellow('Header')} │       │
+        ├───────┼───────┤
+        │#{color.green.on_blue('Multi  ')}│a2     │
+        │#{color.green.on_blue('Line   ')}│       │
+        │#{color.green.on_blue('Content')}│       │
+        │b1     │#{color.red.on_yellow("Multi  ")}│
+        │       │#{color.red.on_yellow("Line   ")}│
+        │       │#{color.red.on_yellow("Content")}│
+        └───────┴───────┘
+      EOS
+    end
+  end
+end

data/spec/unit/renderer/unicode/indentation_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, 'indentation' do
 
   context 'when default' do
     it 'indents by value' do
-      expect(renderer.render).to eql <<-EOS.chomp
+      expect(renderer.render).to eq <<-EOS.chomp
   ┌──┬──┬──┐
   │h1│h2│h3│
   ├──┼──┼──┤

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

@@ -13,12 +13,12 @@ RSpec.describe TTY::Table::Renderer::Unicode, 'padding' do
     let(:options) { {padding: [0,1,0,1]} }
 
     it 'pads each field' do
-      expect(renderer.render).to eql <<-EOS.chomp
-┌───────┬─────────┬──────┬─────┬─────────┬───────┐
-│ Field │ Type    │ Null │ Key │ Default │ Extra │
-├───────┼─────────┼──────┼─────┼─────────┼───────┤
-│ id    │ int(11) │ YES  │ nil │ NULL    │       │
-└───────┴─────────┴──────┴─────┴─────────┴───────┘
+      expect(renderer.render).to eql unindent(<<-EOS)
+        ┌───────┬─────────┬──────┬─────┬─────────┬───────┐
+        │ Field │ Type    │ Null │ Key │ Default │ Extra │
+        ├───────┼─────────┼──────┼─────┼─────────┼───────┤
+        │ id    │ int(11) │ YES  │ nil │ NULL    │       │
+        └───────┴─────────┴──────┴─────┴─────────┴───────┘
       EOS
     end
   end
@@ -27,16 +27,16 @@ RSpec.describe TTY::Table::Renderer::Unicode, 'padding' do
     let(:options) { {padding: [1,0,1,0], multiline: true} }
 
     it 'pads each field' do
-      expect(renderer.render).to eql <<-EOS.chomp
-┌─────┬───────┬────┬───┬───────┬─────┐
-│     │       │    │   │       │     │
-│Field│Type   │Null│Key│Default│Extra│
-│     │       │    │   │       │     │
-├─────┼───────┼────┼───┼───────┼─────┤
-│     │       │    │   │       │     │
-│id   │int(11)│YES │nil│NULL   │     │
-│     │       │    │   │       │     │
-└─────┴───────┴────┴───┴───────┴─────┘
+      expect(renderer.render).to eql unindent(<<-EOS)
+        ┌─────┬───────┬────┬───┬───────┬─────┐
+        │     │       │    │   │       │     │
+        │Field│Type   │Null│Key│Default│Extra│
+        │     │       │    │   │       │     │
+        ├─────┼───────┼────┼───┼───────┼─────┤
+        │     │       │    │   │       │     │
+        │id   │int(11)│YES │nil│NULL   │     │
+        │     │       │    │   │       │     │
+        └─────┴───────┴────┴───┴───────┴─────┘
       EOS
     end
   end
@@ -45,16 +45,16 @@ RSpec.describe TTY::Table::Renderer::Unicode, 'padding' do
     let(:options) { {padding: [1,1,1,1], multiline: true} }
 
     it 'pads each field' do
-      expect(renderer.render).to eql <<-EOS.chomp
-┌───────┬─────────┬──────┬─────┬─────────┬───────┐
-│       │         │      │     │         │       │
-│ Field │ Type    │ Null │ Key │ Default │ Extra │
-│       │         │      │     │         │       │
-├───────┼─────────┼──────┼─────┼─────────┼───────┤
-│       │         │      │     │         │       │
-│ id    │ int(11) │ YES  │ nil │ NULL    │       │
-│       │         │      │     │         │       │
-└───────┴─────────┴──────┴─────┴─────────┴───────┘
+      expect(renderer.render).to eql unindent(<<-EOS)
+        ┌───────┬─────────┬──────┬─────┬─────────┬───────┐
+        │       │         │      │     │         │       │
+        │ Field │ Type    │ Null │ Key │ Default │ Extra │
+        │       │         │      │     │         │       │
+        ├───────┼─────────┼──────┼─────┼─────────┼───────┤
+        │       │         │      │     │         │       │
+        │ id    │ int(11) │ YES  │ nil │ NULL    │       │
+        │       │         │      │     │         │       │
+        └───────┴─────────┴──────┴─────┴─────────┴───────┘
       EOS
     end
   end