terminal-table 1.4.5 → 1.5.0

data/Rakefile

@@ -1,15 +1,15 @@
-
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require './lib/terminal-table.rb'
-
-Echoe.new("terminal-table", Terminal::Table::VERSION) do |p|
-  p.author = "TJ Holowaychuk"
-  p.email = "tj@vision-media.ca"
-  p.summary = "Simple, feature rich ascii table generation library"
-  p.url = "http://github.com/visionmedia/terminal-table"
-  p.runtime_dependencies = []
-end
-
+
+require 'rubygems'
+require 'rake'
+require 'echoe'
+require './lib/terminal-table.rb'
+
+Echoe.new("terminal-table", Terminal::Table::VERSION) do |p|
+  p.author = "TJ Holowaychuk"
+  p.email = "tj@vision-media.ca"
+  p.summary = "Simple, feature rich ascii table generation library"
+  p.url = "http://github.com/visionmedia/terminal-table"
+  p.runtime_dependencies = []
+end
+
 Dir['tasks/**/*.rake'].sort.each { |lib| load lib }

data/Todo.rdoc

@@ -1,14 +1,14 @@
-
-== Major:
-
-* Nothing
-
-== Minor:
-
-* Programmatically add separator rows
-* Add multi-column sorting
-* Change; pre-create Cell and Heading objects to clean up Table a bit
-
-== Brainstorming:
-
+
+== Major:
+
+* Nothing
+
+== Minor:
+
+* Programmatically add separator rows
+* Add multi-column sorting
+* Change; pre-create Cell and Heading objects to clean up Table a bit
+
+== Brainstorming:
+
 * Nothing

data/examples/examples.rb

@@ -1,80 +1,83 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require 'terminal-table/import'
-
-puts
-puts table(['a', 'b'], [1, 2], [3, 4])
-
-puts
-t = table ['a', 'b']
-t.style = {:padding_left => 2, :width => 80}
-t << [1, 2]
-t << [3, 4]
-t << :separator
-t << [4, 6]
-puts t
-
-puts
-user_table = table do |v|
-  v.title = "Contact Information"
-  v.headings = 'First Name', 'Last Name', 'Email'
-  v << %w( TJ Holowaychuk tj@vision-media.ca )
-  v << %w( Bob Someone bob@vision-media.ca )
-  v << %w( Joe Whatever bob@vision-media.ca )
-end
-puts user_table
-
-puts
-user_table = table do |v|
-  v.style.width = 80
-  v.headings = 'First Name', 'Last Name', 'Email'
-  v << %w( TJ Holowaychuk tj@vision-media.ca )
-  v << %w( Bob Someone bob@vision-media.ca )
-  v << %w( Joe Whatever bob@vision-media.ca )
-end
-puts user_table
-
-puts
-user_table = table do
-  self.headings = 'First Name', 'Last Name', 'Email'
-  add_row ['TJ',  'Holowaychuk', 'tj@vision-media.ca']
-  add_row ['Bob', 'Someone',     'bob@vision-media.ca']
-  add_row ['Joe', 'Whatever',    'joe@vision-media.ca']
-  add_separator
-  add_row ['Total', { :value => '3', :colspan => 2, :alignment => :right }]
-  align_column 1, :center
-end
-puts user_table
-
-puts
-user_table = table do
-  self.headings = ['First Name', 'Last Name', {:value => 'Phones', :colspan => 2, :alignment => :center}]
-  add_row ['Bob', 'Someone',     '123', '456']
-  add_row :separator
-  add_row ['TJ',  'Holowaychuk', {:value => "No phones\navaiable", :colspan => 2, :alignment => :center}]
-  add_row :separator
-  add_row ['Joe', 'Whatever',    '4324', '343242']
-end
-puts user_table
-
-rows = []
-rows << ['Lines',      100]
-rows << ['Comments',   20]
-rows << ['Ruby',       70]
-rows << ['JavaScript', 30]
-puts table([nil, 'Lines'], *rows)
-
-rows = []
-rows << ['Lines',      100]
-rows << ['Comments',   20]
-rows << ['Ruby',       70]
-rows << ['JavaScript', 30]
-puts table(nil, *rows)
-
-rows = []
-rows << ['Lines',      100]
-rows << ['Comments',   20]
-rows << ['Ruby',       70]
-rows << ['JavaScript', 30]
-table = table([{ :value => 'Stats', :colspan => 2, :alignment => :center }], *rows)
-table.align_column 1, :right
-puts table
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'terminal-table/import'
+
+puts
+puts table(['a', 'b'], [1, 2], [3, 4])
+
+puts
+puts table(['name', 'content'], ['ftp.example.com', '1.1.1.1'], ['www.example.com', '|lalalala|lalala|'])
+
+puts
+t = table ['a', 'b']
+t.style = {:padding_left => 2, :width => 80}
+t << [1, 2]
+t << [3, 4]
+t << :separator
+t << [4, 6]
+puts t
+
+puts
+user_table = table do |v|
+  v.title = "Contact Information"
+  v.headings = 'First Name', 'Last Name', 'Email'
+  v << %w( TJ Holowaychuk tj@vision-media.ca )
+  v << %w( Bob Someone bob@vision-media.ca )
+  v << %w( Joe Whatever bob@vision-media.ca )
+end
+puts user_table
+
+puts
+user_table = table do |v|
+  v.style.width = 80
+  v.headings = 'First Name', 'Last Name', 'Email'
+  v << %w( TJ Holowaychuk tj@vision-media.ca )
+  v << %w( Bob Someone bob@vision-media.ca )
+  v << %w( Joe Whatever bob@vision-media.ca )
+end
+puts user_table
+
+puts
+user_table = table do
+  self.headings = 'First Name', 'Last Name', 'Email'
+  add_row ['TJ',  'Holowaychuk', 'tj@vision-media.ca']
+  add_row ['Bob', 'Someone',     'bob@vision-media.ca']
+  add_row ['Joe', 'Whatever',    'joe@vision-media.ca']
+  add_separator
+  add_row ['Total', { :value => '3', :colspan => 2, :alignment => :right }]
+  align_column 1, :center
+end
+puts user_table
+
+puts
+user_table = table do
+  self.headings = ['First Name', 'Last Name', {:value => 'Phones', :colspan => 2, :alignment => :center}]
+  add_row ['Bob', 'Someone',     '123', '456']
+  add_row :separator
+  add_row ['TJ',  'Holowaychuk', {:value => "No phones\navaiable", :colspan => 2, :alignment => :center}]
+  add_row :separator
+  add_row ['Joe', 'Whatever',    '4324', '343242']
+end
+puts user_table
+
+rows = []
+rows << ['Lines',      100]
+rows << ['Comments',   20]
+rows << ['Ruby',       70]
+rows << ['JavaScript', 30]
+puts table([nil, 'Lines'], *rows)
+
+rows = []
+rows << ['Lines',      100]
+rows << ['Comments',   20]
+rows << ['Ruby',       70]
+rows << ['JavaScript', 30]
+puts table(nil, *rows)
+
+rows = []
+rows << ['Lines',      100]
+rows << ['Comments',   20]
+rows << ['Ruby',       70]
+rows << ['JavaScript', 30]
+table = table([{ :value => 'Stats', :colspan => 2, :alignment => :center }], *rows)
+table.align_column 1, :right
+puts table

data/lib/terminal-table.rb

@@ -22,6 +22,6 @@
 #++
 
 $:.unshift File.dirname(__FILE__)
-%w(version core_ext table cell row separator style table_helper).each do |file|
+%w(version table cell row separator style table_helper).each do |file|
   require "terminal-table/#{file}"
-end
+end

data/lib/terminal-table/cell.rb

@@ -2,12 +2,6 @@
 module Terminal
   class Table
     class Cell
-      
-      ##
-      # Cell width.
-      
-      attr_reader :width
-      
       ##
       # Cell value.
       
@@ -36,7 +30,7 @@ module Terminal
       end
       
       def alignment
-        @alignment || :left
+        @alignment || @table.style.alignment || :left
       end
       
       def alignment=(val)
@@ -48,6 +42,10 @@ module Terminal
         end
       end
       
+      def align(val, position, length)
+        positions = { :left => :ljust, :right => :rjust, :center => :center }
+        val.public_send(positions[position], length)
+      end
       def lines
         @value.to_s.split(/\n/)
       end
@@ -59,7 +57,7 @@ module Terminal
         left = " " * @table.style.padding_left
         right = " " * @table.style.padding_right
         render_width = lines[line].to_s.size - escape(lines[line]).size + width
-        "#{left}#{lines[line]}#{right}".align(alignment, render_width + @table.cell_padding)
+        align("#{left}#{lines[line]}#{right}", alignment, render_width + @table.cell_padding)
       end
       alias :to_s :render
       
@@ -87,7 +85,7 @@ module Terminal
       def escape(line)
         line.to_s.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').
           gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').
-          gsub(/[\x03|\x1a]/, '')
+          gsub(/(\x03|\x1a)/, '')
       end
     end
   end

data/lib/terminal-table/import.rb

@@ -1,4 +1,4 @@
-
-require 'terminal-table'
-
-include Terminal::Table::TableHelper
+
+require 'terminal-table'
+
+include Terminal::Table::TableHelper

data/lib/terminal-table/table.rb

@@ -96,9 +96,13 @@ module Terminal
     ##
     # Set the headings
     
-    def headings= array
-      @headings = Row.new(self, array)
-      recalc_column_widths @headings
+    def headings= arrays
+      arrays = [arrays] unless arrays.first.is_a?(Array)
+      @headings = arrays.map do |array|
+        row = Row.new(self, array)
+        recalc_column_widths row
+        row
+      end
     end
 
     ##
@@ -111,9 +115,11 @@ module Terminal
         buffer << Row.new(self, [title_cell_options])
         buffer << separator
       end
-      unless @headings.cells.empty?
-        buffer << @headings
-        buffer << separator
+      @headings.each do |row|
+        unless row.cells.empty?
+          buffer << row
+          buffer << separator
+        end
       end
       buffer += @rows
       buffer << separator
@@ -166,7 +172,7 @@ module Terminal
       return [] if style.width.nil?
       spacing = style.width - columns_width
       if spacing < 0
-        raise "Table width exceeds wanted width of #{wanted} characters."
+        raise "Table width exceeds wanted width of #{style.width} characters."
       else
         per_col = spacing / number_of_columns
         arr = (1...number_of_columns).to_a.map { |i| per_col }
@@ -201,7 +207,7 @@ module Terminal
     # Return headings combined with rows.
     
     def headings_with_rows
-      [@headings] + rows
+      @headings + rows
     end
     
     def yield_or_eval &block

data/lib/terminal-table/table_helper.rb

@@ -1,9 +1,9 @@
-module Terminal
-  class Table
-    module TableHelper
-      def table headings = [], *rows, &block
-        Terminal::Table.new :headings => headings.to_a, :rows => rows, &block
-      end
-    end
-  end
-end
+module Terminal
+  class Table
+    module TableHelper
+      def table headings = [], *rows, &block
+        Terminal::Table.new :headings => headings.to_a, :rows => rows, &block
+      end
+    end
+  end
+end

data/lib/terminal-table/version.rb

@@ -1,6 +1,6 @@
 
 module Terminal
   class Table
-    VERSION = '1.4.5'
+    VERSION = '1.5.0'
   end
 end

data/spec/cell_spec.rb

@@ -3,11 +3,11 @@ require 'term/ansicolor'
 
 class String; include Term::ANSIColor; end
 
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe Terminal::Table do
   Cell = Terminal::Table::Cell
-  
+
   it "should default alignment to the left" do
     cell = Cell.new :value => 'foo', :table => Terminal::Table.new, :index => 0
     cell.value.should == 'foo'
@@ -19,7 +19,7 @@ describe Terminal::Table do
     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
@@ -27,7 +27,7 @@ describe Terminal::Table do
     @cell.alignment = :center
     lambda { @cell.alignment = "foo" }.should raise_error
   end
-  
+
   it "should allow multiline content" do
     cell = Cell.new :value => "barrissimo\n"+"foo".yellow, :table => Terminal::Table.new, :index => 0
     cell.value.should == "barrissimo\n"+"foo".yellow
@@ -35,14 +35,14 @@ describe Terminal::Table do
     cell.value_for_column_width_recalc.should == 'barrissimo'
     cell.render(0).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
@@ -51,4 +51,10 @@ describe Terminal::Table do
     cell.render.should == " foo   "
   end
 
+  it "should not ignore pipe characters" do
+    cell = Cell.new :value => "f|o|o", :table => Terminal::Table.new, :index => 0
+    cell.value.should == "f|o|o"
+    cell.value_for_column_width_recalc.should == 'f|o|o'
+    cell.render.should == " f|o|o "
+  end
 end

data/spec/import_spec.rb

@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require "terminal-table/import"
 
 describe Object do

data/spec/spec_helper.rb

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