tty-table 0.1.0 → 0.2.0

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

@@ -45,16 +45,43 @@ RSpec.describe TTY::Table::Renderer::ASCII, '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
+
+  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 = described_class.new(table, padding: padding, multiline: true)
+      expect(renderer.render).to eql unindent(<<-EOS)
+        +-----------+-----------+
+        |           |           |
+        |  header1  |  header2  |
+        |           |           |
+        +-----------+-----------+
+        |           |           |
+        |  a1       |  a2       |
+        |  a1       |           |
+        |  a1       |           |
+        |           |           |
+        |           |           |
+        |  b1       |  b2       |
+        |           |  b2       |
+        |           |           |
+        +-----------+-----------+
       EOS
     end
   end

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

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '#render' do
     let(:table) { TTY::Table.new rows }
 
     it 'display table rows' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         +--+--+--+
         |a1|a2|a3|
         |b1|b2|b3|
@@ -24,7 +24,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '#render' do
 
   context 'with header' do
     it 'displays table with header' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         +--+--+--+
         |h1|h2|h3|
         +--+--+--+
@@ -40,7 +40,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '#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 |
         +----+---+
@@ -55,7 +55,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '#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|
       +-------+-------+-------+

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

@@ -14,7 +14,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '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  |
         +----+----+----+
@@ -31,7 +31,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '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  |
          +----+----+----+----+
@@ -48,7 +48,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, '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          |
         +---------+-------+------------+
@@ -65,31 +65,31 @@ RSpec.describe TTY::Table::Renderer::ASCII, 'resizing' do
     let(:rows)    { [['aaaa1','aaaa2',], ['bbbb1','bbbb2']] }
 
     context 'even columns' do
-      let(:options) { {width: 7, resize: true} }
+      let(:options) { {width: 9, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
-         +--+--+
-         |h…|h…|
-         +--+--+
-         |a…|a…|
-         |b…|b…|
-         +--+--+
+        expect(renderer.render).to eql unindent(<<-EOS)
+         +---+---+
+         |h… |h… |
+         +---+---+
+         |a… |a… |
+         |b… |b… |
+         +---+---+
         EOS
       end
     end
 
     context 'even columns with extra width' do
-      let(:options) { {width: 8, resize: true} }
+      let(:options) { {width: 10, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
-         +---+--+
-         |he…|h…|
-         +---+--+
-         |aa…|a…|
-         |bb…|b…|
-         +---+--+
+        expect(renderer.render).to eql unindent(<<-EOS)
+         +----+---+
+         |he… |h… |
+         +----+---+
+         |aa… |a… |
+         |bb… |b… |
+         +----+---+
         EOS
       end
     end
@@ -100,11 +100,11 @@ RSpec.describe TTY::Table::Renderer::ASCII, 'resizing' do
       let(:options) { {width: 15, resize: true} }
 
       it 'resizes each column' do
-        expect(renderer.render).to eql <<-EOS.normalize
+        expect(renderer.render).to eql unindent(<<-EOS)
          +---+---+-----+
-         |he…|he…|head3|
+         |h… |h… |head3|
          +---+---+-----+
-         |aa…|aa2|aaaa…|
+         |a… |aa2|aaa… |
          |b1 |b2 |b3   |
          +---+---+-----+
         EOS

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

@@ -14,7 +14,7 @@ RSpec.describe TTY::Table::Renderer::ASCII, 'with separator' do
   context 'when ascii' 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|
         +--+--+--+

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

@@ -5,18 +5,18 @@ require 'spec_helper'
 RSpec.describe TTY::Table::Renderer::Basic, 'alignment' do
   let(:header)  { ['h1', 'h2', 'h3'] }
   let(:rows)    { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
-  let(:options) { { column_aligns: column_aligns } }
+  let(:options) { { alignments: alignments } }
   let(:table)   { TTY::Table.new(header, rows) }
 
   subject(:renderer) { described_class.new table, options }
 
   context 'with default' do
-    let(:header)        { ['h1', 'h2'] }
-    let(:rows)          { [['aaaaa', 'a'], ['b', 'bbbbb']] }
-    let(:column_aligns) { nil }
+    let(:header)     { ['h1', 'h2'] }
+    let(:rows)       { [['aaaaa', 'a'], ['b', 'bbbbb']] }
+    let(:alignments) { nil }
 
     it 'aligns left by default' do
-      expect(renderer.render).to eql <<-EOS.normalize
+      expect(renderer.render).to eql unindent(<<-EOS)
         h1    h2   
         aaaaa a    
         b     bbbbb
@@ -25,11 +25,11 @@ RSpec.describe TTY::Table::Renderer::Basic, 'alignment' do
   end
 
   context 'with different headers' do
-    let(:header)        { ['header1', 'head2', 'h3'] }
-    let(:column_aligns) { [:left, :center, :right] }
+    let(:header)     { ['header1', 'head2', 'h3'] }
+    let(:alignments) { [:left, :center, :right] }
 
     it 'aligns headers' do
-      expect(renderer.render).to eql <<-EOS.normalize
+      expect(renderer.render).to eql unindent(<<-EOS)
         header1 head2 h3
         a1       a2   a3
         b1       b2   b3
@@ -38,12 +38,12 @@ RSpec.describe TTY::Table::Renderer::Basic, 'alignment' do
   end
 
   context 'with different aligns' do
-    let(:header)         { nil }
-    let(:rows)           { [['aaaaa', 'a'], ['b', 'bbbbb']] }
-    let(:column_aligns)  { [:left, :right] }
+    let(:header)     { nil }
+    let(:rows)       { [['aaaaa', 'a'], ['b', 'bbbbb']] }
+    let(:alignments) { [:left, :right] }
 
     it 'aligns table rows' do
-      expect(renderer.render.to_s).to eql <<-EOS.normalize
+      expect(renderer.render.to_s).to eql unindent(<<-EOS)
         aaaaa     a
         b     bbbbb
       EOS
@@ -51,19 +51,19 @@ RSpec.describe TTY::Table::Renderer::Basic, 'alignment' do
   end
 
   context 'with individual field aligns' do
-    let(:header)        { ['header1', 'header2', 'header3'] }
-    let(:column_aligns) { [:left, :center, :right] }
-    let(:options)       { {column_aligns: column_aligns} }
+    let(:header)     { ['header1', 'header2', 'header3'] }
+    let(:alignments) { [:left, :center, :right] }
+    let(:options)    { {alignments: alignments} }
     let(:table) {
       TTY::Table.new header: header do |t|
         t << ['a1', 'a2', 'a3']
-        t << ['b1', {value: 'b2', align: :right}, 'b3']
-        t << ['c1', 'c2', {value: 'c3', align: :center}]
+        t << ['b1', {value: 'b2', alignment: :right}, 'b3']
+        t << ['c1', 'c2', {value: 'c3', alignment: :center}]
       end
     }
 
     it "takes individual fields over global aligns" do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         header1 header2 header3
         a1        a2         a3
         b1           b2      b3
@@ -74,11 +74,11 @@ RSpec.describe TTY::Table::Renderer::Basic, 'alignment' do
 
   context 'with aligned header' do
     let(:rows)    { [['aaaaa1', 'a2', 'aaa3'], ['b1', 'bbbb2', 'bb3']] }
-    let(:header)  {['h1', {:value => 'h2', :align => :right}, {:value => 'h3', :align => :center}] }
+    let(:header)  {['h1', {value: 'h2', alignment: :right}, {value: 'h3', alignment: :center}] }
     let(:options) { { renderer: :basic } }
 
     it "aligns headres" do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         h1        h2  h3 
         aaaaa1 a2    aaa3
         b1     bbbb2 bb3 

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

@@ -3,43 +3,58 @@
 require 'spec_helper'
 
 RSpec.describe TTY::Table::Renderer::Basic, 'coloring' do
-  let(:header)   { ['h1', 'h2'] }
-  let(:rows)     { [['a1', 'a2'], ['b1', 'b2']] }
   let(:clear)    { "\e[0m" }
-  let(:options)  { {filter: filter } }
-  let(:table)    { TTY::Table.new(header, rows) }
   let(:color)    { Pastel.new(enabled: true) }
 
-  subject(:renderer) { described_class.new(table, options) }
-
   before { allow(Pastel).to receive(:new).and_return(color) }
 
-  context 'with filter on all fields' do
-    let(:filter) {
-      proc { |val, row, col| color.decorate val, :blue, :on_green }
-    }
-
-    it 'colors all elements' do
-      expect(renderer.render).to eql <<-EOS.normalize
-        \e[34;42mh1#{clear} \e[34;42mh2#{clear}
-        \e[34;42ma1#{clear} \e[34;42ma2#{clear}
-        \e[34;42mb1#{clear} \e[34;42mb2#{clear}
+  context 'when border ' do
+    it "doesn't color" 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 eql unindent(<<-EOS)
+        header1 header2
+        a1      a2     
+        b1      b2     
       EOS
     end
   end
 
-  context 'with filter only on header' do
-    let(:filter) {
-      proc { |val, row, col|
-        row.zero? ?  color.decorate(val, :blue, :on_green) : val
-      }
-    }
-
-    it 'colors only header' do
-      expect(renderer.render).to eql <<-EOS.normalize
-        \e[34;42mh1#{clear} \e[34;42mh2#{clear}
-        a1 a2
-        b1 b2
+  context 'when content' do
+    it "colors individual field" do
+      header = [color.green('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.green('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

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

@@ -17,7 +17,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'filter' do
       }
 
       it 'filters only rows' do
-        expect(renderer.render).to eq <<-EOS.normalize
+        expect(renderer.render).to eq unindent(<<-EOS)
           h1 h2 h3
           a1 A2 a3
           b1 B2 b3
@@ -29,7 +29,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'filter' do
       let(:filter) { Proc.new { |val, row, col| col == 1 ? val.capitalize : val }}
 
       it 'filters only rows' do
-        expect(renderer.render).to eq <<-EOS.normalize
+        expect(renderer.render).to eq unindent(<<-EOS)
           h1 H2 h3
           a1 A2 a3
           b1 B2 b3
@@ -44,7 +44,7 @@ RSpec.describe TTY::Table::Renderer::Basic, 'filter' do
     let(:filter) { Proc.new { |val, row, col| col == 1 ?  val.capitalize : val } }
 
     it 'filters only rows' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         a1 A2 a3
         b1 B2 b3
       EOS

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

@@ -0,0 +1,74 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe TTY::Table::Renderer::Basic, 'multiline content' do
+  context 'with escaping' do
+    it "renders multiline as single line" do
+      rows = [ ["First", '1'], ["Multiline\nContent", '2'], ["Third", '3']]
+      table = TTY::Table.new rows
+      renderer = described_class.new(table, multiline: false)
+      expect(renderer.render).to eq unindent(<<-EOS)
+        First              1
+        Multiline\\nContent 2
+        Third              3
+      EOS
+    end
+
+    it "truncates multiline content" do
+      rows = [ ["First", '1'], ["Multiline\nContent", '2'], ["Third", '3']]
+      table = TTY::Table.new rows
+      renderer = described_class.new(table, multiline: false, column_widths: [8,1])
+      expect(renderer.render).to eq unindent(<<-EOS)
+        First    1
+        Multil…  2
+        Third    3
+      EOS
+    end
+  end
+
+  context 'without escaping' do
+    it "renders every line" do
+      rows = [["First", '1'],
+              ["Multi\nLine\nContent", '2'],
+              ["Third", "Multi\nLine"]]
+      table = TTY::Table.new rows
+      renderer = described_class.new(table, multiline: true)
+      expect(renderer.render).to eq unindent(<<-EOS)
+        First   1    
+        Multi   2    
+        Line         
+        Content      
+        Third   Multi
+                Line 
+      EOS
+    end
+
+    it "renders multiline with column widths" do
+      rows = [["First", '1'], ["Multi\nLine\nContent", '2'], ["Third", '3']]
+      table = TTY::Table.new rows
+      renderer = described_class.new(table, multiline: true, column_widths: [8,1])
+      expect(renderer.render).to eq unindent(<<-EOS)
+        First    1
+        Multi    2
+        Line      
+        Content   
+        Third    3
+      EOS
+    end
+
+    it 'wraps multi line' do
+      rows = [["First", '1'], ["Multi\nLine\nContent", '2'], ["Third", '3']]
+      table = TTY::Table.new rows
+      renderer = described_class.new(table, multiline: true, column_widths: [5,1])
+      expect(renderer.render).to eq unindent(<<-EOS)
+        First 1
+        Multi 2
+        Line   
+        Conte  
+        nt     
+        Third 3
+      EOS
+    end
+  end
+end