terminal-table 1.4.3 → 1.4.4

data/lib/terminal-table/version.rb

@@ -1,6 +1,6 @@
 
 module Terminal
   class Table
-    VERSION = '1.4.3'
+    VERSION = '1.4.4'
   end
 end

data/spec/cell_spec.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'term/ansicolor'
+
+class String; include Term::ANSIColor; end
 
 require File.dirname(__FILE__) + '/spec_helper'
 
@@ -5,14 +9,46 @@ describe Terminal::Table do
   Cell = Terminal::Table::Cell
   
   it "should default alignment to the left" do
-    cell = Cell.new 0, 'foo'
+    cell = Cell.new :value => 'foo', :table => Terminal::Table.new, :index => 0
     cell.value.should == 'foo'
     cell.alignment.should == :left
   end
 
   it "should allow overriding of alignment" do
-    cell = Cell.new 0, :value => 'foo', :alignment => :center
+    cell = Cell.new :value => 'foo', :alignment => :center, :table => Terminal::Table.new, :index => 0
     cell.value.should == 'foo'
     cell.alignment.should == :center
   end
+  
+  it "should allow :left, :right and :center for alignment" do
+    @cell = Cell.new :value => 'foo', :table => Terminal::Table.new, :index => 0
+    @cell.alignment = :left
+    @cell.alignment = :right
+    @cell.alignment = :center
+    lambda { @cell.alignment = "foo" }.should raise_error
+  end
+  
+  it "should allow multiline content" do
+    cell = Cell.new :value => "foo\nbarrissimo", :table => Terminal::Table.new, :index => 0
+    cell.value.should == "foo\nbarrissimo"
+    cell.lines.should == ['foo', 'barrissimo']
+    cell.value_for_column_width_recalc.should == 'barrissimo'
+    cell.render(1).should == " barrissimo "
+  end
+  
+  it "should allow colorized content" do
+    cell = Cell.new :value => "foo".red, :table => Terminal::Table.new, :index => 0
+    cell.value.should == "\e[31mfoo\e[0m"
+    cell.value_for_column_width_recalc.should == 'foo'
+    cell.render.should == " \e[31mfoo\e[0m "
+  end
+  
+  it "should render padding properly" do
+    @table = Terminal::Table.new(:rows => [['foo', '2'], ['3', '4']], :style => {:padding_right => 3})
+    cell = @table.rows.first.cells.first
+    cell.value.should == 'foo'
+    cell.alignment.should == :left
+    cell.render.should == " foo   "
+  end
+
 end

data/spec/spec_helper.rb

@@ -3,6 +3,6 @@ require File.dirname(__FILE__) + '/../lib/terminal-table'
 
 class String
   def deindent
-    gsub /^ */, ''
+    strip.gsub(/^ */, '')
   end
 end

data/spec/table_spec.rb

@@ -19,16 +19,16 @@ module Terminal
       @table.column_with_headings(2).should == [3,6]
     end
 
-    it "should select the columns with colspans > 1 in the index" do
-      @table << [1,{:value => 2, :colspan => 2}]
-      @table << [{:value => 3, :colspan => 2}, 4]
-    end
+    #it "should select the columns with colspans > 1 in the index" do
+    #  @table << [1,{:value => 2, :colspan => 2}]
+    #  @table << [{:value => 3, :colspan => 2}, 4]
+    #end
 
     it "should account for the colspan when selecting columns" do
       @table << [1,2,3]
       @table << [{:value => "4,5", :colspan => 2}, 6]
-      @table.column_with_headings(0).should == [1,{:start_index => 0, :value => "4,5", :colspan => 2}]
-      @table.column_with_headings(1).should == [2,{:start_index => 0, :value => "4,5", :colspan => 2}]
+      @table.column_with_headings(0).should == [1,"4,5"]
+      @table.column_with_headings(1).should == [2,"4,5"]
       @table.column_with_headings(2).should == [3,6]
     end
 
@@ -45,11 +45,6 @@ module Terminal
       EOF
     end
 
-    it "should convert rows to indexes" do
-      @table << [{:value => '7', :colspan => 2}, 88]
-      @table.row_to_index(@table.rows[0], 1).should == 2
-    end
-
     it "should count columns" do
       @table << [1, 2, 3]
       @table.number_of_columns.should == 3
@@ -71,64 +66,27 @@ module Terminal
     it "should select columns when using hashes" do
       @table.headings = ['one', 'two']
       @table.rows = [[{ :value => 'a', :align => :left }, 1], ['b', 2], ['c', 3]]
-      @table.column(0).should == [{ :value => 'a', :align => :left }, 'b', 'c']
-    end
-
-    it "should determine length of largest cell in a column" do
-      @table << ['foo', 'bar']
-      @table << ['big foo', 'big foo bar']
-      @table.length_of_largest_cell_in_column(1).should == 11
-    end
-
-    it "should determine length of largest cell in a column with multi-column rows" do
-      @table << [1,2]
-      @table << [{:value => '123456789', :colspan => 2}]
-      # +-----+-----+
-      # | 1   | 2   |
-      # | 123456789 |
-      #
-      @table.length_of_largest_cell_in_column(0).should == 3
-      @table.length_of_largest_cell_in_column(1).should == 3
-
-      @table.render.should == <<-EOF.deindent
-        +-----+-----+
-        | 1   | 2   |
-        | 123456789 |
-        +-----+-----+
-      EOF
-    end
-
-    it "should determine length of largest cell in a column with multi-column rows, rounding up" do
-      @table << [1,2]
-      @table << [{:value => '1234567890', :colspan => 2}]
-      @table.length_of_largest_cell_in_column(0).should == 4
-      @table.length_of_largest_cell_in_column(1).should == 4
-
-      @table.render.should == <<-EOF.deindent
-        +------+------+
-        | 1    | 2    |
-        | 1234567890  |
-        +------+------+
-      EOF
+      @table.column(0).should == ['a', 'b', 'c']
     end
 
     it "should find column length" do
       @table << ['foo', 'bar', 'a']
       @table << ['big foo', 'big foo bar']
-      @table.length_of_column(1).should == 11
+      @table.column_width(1).should == 11
     end
 
     it "should find column length with headings" do
       @table.headings = ['one', 'super long heading']
       @table << ['foo', 'bar', 'a']
       @table << ['big foo', 'big foo bar']
-      @table.length_of_column(1).should == 18
+      @table.column_width(1).should == 18
     end
 
     it "should render separators" do
       @table.headings = ['Char', 'Num']
       @table << ['a', 1]
-      @table.separator.should == '+------+-----+'
+      separator = Terminal::Table::Separator.new(@table)
+      separator.render.should == '+------+-----+'
     end
 
     it "should add separator" do
@@ -136,11 +94,13 @@ module Terminal
       @table.add_separator
       @table << ['b', 2]
       @table.rows.size.should == 2
-      @table.all_rows.size.should == 3
     end
 
-    it "should bitch and complain when you have no rows" do
-      lambda { @table.render }.should raise_error(Terminal::Table::Error)
+    it "should render an empty table properly" do
+      @table.render.should == <<-EOF.deindent
+        ++
+        ++
+      EOF
     end
 
     it "should render properly" do
@@ -159,6 +119,60 @@ module Terminal
       EOF
     end
 
+    it "should render styles properly" do
+      @table.headings = ['Char', 'Num']
+      @table.style = {:border_x => "=", :border_y => ":", :border_i => "x", :padding_left => 0, :padding_right => 2}
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.style.padding_right.should == 2
+      @table.render.should == <<-EOF.deindent
+        x======x=====x
+        :Char  :Num  :
+        x======x=====x
+        :a     :1    :
+        :b     :2    :
+        :c     :3    :
+        x======x=====x
+      EOF
+    end
+
+    it "should render width properly" do
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.style.width = 21
+      @table.render.should == <<-EOF.deindent
+        +---------+---------+
+        | Char    | Num     |
+        +---------+---------+
+        | a       | 1       |
+        | b       | 2       |
+        | c       | 3       |
+        +---------+---------+
+      EOF
+    end
+
+    it "should render title properly" do
+      @table.title = "Title"
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.render.should == <<-EOF.deindent
+        +-------+-----+
+        |    Title    |
+        +-------+-----+
+        | Char  | Num |
+        +-------+-----+
+        | a     | 1   |
+        | b     | 2   |
+        | c     | 3   |
+        +-------+-----+
+      EOF
+    end
+
     it "should render properly without headings" do
       @table << ['a', 1]
       @table << ['b', 2]
@@ -307,13 +321,13 @@ module Terminal
         t.should == t
       end
 
-      it "should be equal with two empty tables" do
-        table_one = Table.new
-        table_two = Table.new
-
-        table_one.should == table_two
-        table_two.should == table_one
-      end
+     # it "should be equal with two empty tables" do
+     #   table_one = Table.new
+     #   table_two = Table.new
+     # 
+     #   table_one.should == table_two
+     #   table_two.should == table_one
+     # end
 
       it "should not be equal with different headings" do
         table_one = Table.new
@@ -329,8 +343,6 @@ module Terminal
         table_one = Table.new
         table_two = Table.new
 
-        table_one.add_row "a"
-
         table_one.should_not == table_two
         table_two.should_not == table_one
       end
@@ -447,5 +459,67 @@ module Terminal
         +------+---+---+---+
       EOF
     end
+    
+    it "should handle multiple colspan" do
+      @table.headings = [
+        'name',
+        { :value => 'Values', :alignment => :right, :colspan => 2},
+        { :value => 'Other values', :alignment => :right, :colspan => 2},
+        { :value => 'Column 3', :alignment => :right, :colspan => 2}
+      ]
+
+      3.times do |row_index|
+        row = ["row ##{row_index+1}"]
+        6.times do |i|
+          row << row_index*6 + i
+        end
+        @table.add_row(row)
+      end
+
+      @table.render.should == <<-EOF.deindent
+        +--------+----+----+-------+-------+-----+-----+
+        | name   |  Values |  Other values |  Column 3 |
+        +--------+----+----+-------+-------+-----+-----+
+        | row #1 | 0  | 1  | 2     | 3     | 4   | 5   |
+        | row #2 | 6  | 7  | 8     | 9     | 10  | 11  |
+        | row #3 | 12 | 13 | 14    | 15    | 16  | 17  |
+        +--------+----+----+-------+-------+-----+-----+
+      EOF
+    end
+    
+    it "should render a table with only X cell borders" do
+      @table.style = {:border_x => "-", :border_y => "", :border_i => ""}
+
+      @table.headings = ['name', { :value => 'values', :alignment => :right, :colspan => 3}]
+      @table.headings = ['name', { :value => 'values', :colspan => 3}]
+      @table.rows = [['a', 1, 2, 3], ['b', 4, 5, 6], ['c', 7, 8, 9]]
+
+      @table.render.should == <<-EOF.strip
+---------------
+ name  values  
+---------------
+ a     1  2  3 
+ b     4  5  6 
+ c     7  8  9 
+---------------
+      EOF
+    end
+    
+    it "should render a table without cell borders" do
+      @table.style = {:border_x => "", :border_y => "", :border_i => ""}
+
+      @table.headings = ['name', { :value => 'values', :alignment => :right, :colspan => 3}]
+      @table.headings = ['name', { :value => 'values', :colspan => 3}]
+      @table.rows = [['a', 1, 2, 3], ['b', 4, 5, 6], ['c', 7, 8, 9]]
+
+      @table.render.should == <<-EOF
+
+ name  values  
+
+ a     1  2  3 
+ b     4  5  6 
+ c     7  8  9 
+      EOF
+    end
   end
 end

data/terminal-table.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.4.3"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk", "Scott J. Goldman"]
-  s.date = %q{2011-10-13}
+  s.date = %q{2011-11-07}
   s.description = %q{Simple, feature rich ascii table generation library}
   s.email = %q{tj@vision-media.ca}
-  s.extra_rdoc_files = ["README.rdoc", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/heading.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
-  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "Todo.rdoc", "examples/examples.rb", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/heading.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "spec/cell_spec.rb", "spec/core_ext_spec.rb", "spec/import_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/table_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "terminal-table.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/row.rb", "lib/terminal-table/separator.rb", "lib/terminal-table/style.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
+  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "Todo.rdoc", "examples/examples.rb", "lib/terminal-table.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/core_ext.rb", "lib/terminal-table/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "lib/terminal-table/cell.rb", "lib/terminal-table/row.rb", "lib/terminal-table/separator.rb", "lib/terminal-table/style.rb", "spec/cell_spec.rb", "spec/core_ext_spec.rb", "spec/import_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/table_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "terminal-table.gemspec"]
   s.homepage = %q{http://github.com/visionmedia/terminal-table}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Terminal-table", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-table
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies: []
 description: Simple, feature rich ascii table generation library
 email: tj@vision-media.ca
@@ -21,11 +21,13 @@ extra_rdoc_files:
 - lib/terminal-table.rb
 - lib/terminal-table/cell.rb
 - lib/terminal-table/core_ext.rb
-- lib/terminal-table/heading.rb
 - lib/terminal-table/import.rb
 - lib/terminal-table/table.rb
 - lib/terminal-table/table_helper.rb
 - lib/terminal-table/version.rb
+- lib/terminal-table/row.rb
+- lib/terminal-table/separator.rb
+- lib/terminal-table/style.rb
 - tasks/docs.rake
 - tasks/gemspec.rake
 - tasks/spec.rake
@@ -39,11 +41,13 @@ files:
 - lib/terminal-table.rb
 - lib/terminal-table/cell.rb
 - lib/terminal-table/core_ext.rb
-- lib/terminal-table/heading.rb
 - lib/terminal-table/import.rb
 - lib/terminal-table/table.rb
 - lib/terminal-table/table_helper.rb
 - lib/terminal-table/version.rb
+- lib/terminal-table/row.rb
+- lib/terminal-table/separator.rb
+- lib/terminal-table/style.rb
 - spec/cell_spec.rb
 - spec/core_ext_spec.rb
 - spec/import_spec.rb

data/lib/terminal-table/heading.rb

@@ -1,10 +0,0 @@
-
-module Terminal
-  class Table
-    class Heading < Cell
-      def initialize width, params
-        super
-      end
-    end
-  end
-end