terminal-table 1.5.2 → 1.6.0

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,83 +1,83 @@
-$:.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
+$:.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/cell.rb

@@ -1,20 +1,19 @@
-
 module Terminal
   class Table
     class Cell
       ##
       # Cell value.
-      
+
       attr_reader :value
-      
+
       ##
       # Column span.
-      
+
       attr_reader :colspan
-      
+
       ##
       # Initialize with _options_.
-      
+
       def initialize options = nil
         @value, options = options, {} unless Hash === options
         @value = options.fetch :value, value
@@ -24,15 +23,15 @@ module Terminal
         @index = options.fetch :index
         @table = options.fetch :table
       end
-      
+
       def alignment?
         !@alignment.nil?
       end
-      
+
       def alignment
         @alignment || @table.style.alignment || :left
       end
-      
+
       def alignment=(val)
         supported = %w(left center right)
         if supported.include?(val.to_s)
@@ -41,7 +40,7 @@ module Terminal
           raise "Aligment must be one of: #{supported.join(' ')}"
         end
       end
-      
+
       def align(val, position, length)
         positions = { :left => :ljust, :right => :rjust, :center => :center }
         val.public_send(positions[position], length)
@@ -49,10 +48,10 @@ module Terminal
       def lines
         @value.to_s.split(/\n/)
       end
-      
+
       ##
       # Render the cell.
-      
+
       def render(line = 0)
         left = " " * @table.style.padding_left
         right = " " * @table.style.padding_right
@@ -60,18 +59,18 @@ module Terminal
         align("#{left}#{lines[line]}#{right}", alignment, render_width + @table.cell_padding)
       end
       alias :to_s :render
-      
+
       ##
       # Returns the longest line in the cell and
       # removes all ANSI escape sequences (e.g. color)
-      
+
       def value_for_column_width_recalc
         lines.map{ |s| escape(s) }.max_by{ |s| s.size }
       end
-      
+
       ##
       # Returns the width of this cell
-      
+
       def width
         padding = (colspan - 1) * @table.cell_spacing
         inner_width = (1..@colspan).to_a.inject(0) do |w, counter|
@@ -81,7 +80,7 @@ module Terminal
       end
 
       ##
-      # removes all ANSI escape sequences (e.g. color)      
+      # removes all ANSI escape sequences (e.g. color)
       def escape(line)
         line.to_s.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').
           gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '').

data/lib/terminal-table/separator.rb

@@ -1,14 +1,14 @@
-module Terminal
-  class Table
-    class Separator < Row
-      
-      def render
-        arr_x = (0...@table.number_of_columns).to_a.map do |i|
-          @table.style.border_x * (@table.column_width(i) + @table.cell_padding) 
-        end
-        border_i = @table.style.border_i
-        border_i + arr_x.join(border_i) + border_i
-      end
-    end
-  end
-end
+module Terminal
+  class Table
+    class Separator < Row
+
+      def render
+        arr_x = (0...@table.number_of_columns).to_a.map do |i|
+          @table.style.border_x * (@table.column_width(i) + @table.cell_padding)
+        end
+        border_i = @table.style.border_i
+        border_i + arr_x.join(border_i) + border_i
+      end
+    end
+  end
+end

data/lib/terminal-table/style.rb

@@ -1,62 +1,67 @@
-
-module Terminal
-  class Table
-    # A Style object holds all the formatting information for a Table object
-    # 
-    # To create a table with a certain style, use either the constructor 
-    # option <tt>:style</tt>, the Table#style object or the Table#style= method
-    #
-    # All these examples have the same effect:
-    # 
-    #     # by constructor
-    #     @table = Table.new(:style => {:padding_left => 2, :width => 40})
-    #
-    #     # by object
-    #     @table.style.padding_left = 2
-    #     @table.style.width = 40
-    #
-    #     # by method
-    #     @table.style = {:padding_left => 2, :width => 40}
-    # 
-    # To set a default style for all tables created afterwards use Style.defaults=
-    # 
-    #     Terminal::Table::Style.defaults = {:width => 80}
-    #
-    class Style
-      @@defaults = {
-        :border_x => "-", :border_y => "|", :border_i => "+",
-        :padding_left => 1, :padding_right => 1,
-        :width => nil, :alignment => nil
-      }
-      
-      attr_accessor :border_x
-      attr_accessor :border_y
-      attr_accessor :border_i
-      
-      attr_accessor :padding_left
-      attr_accessor :padding_right
-      
-      attr_accessor :width
-      attr_accessor :alignment
-      
-      
-      def initialize options = {}
-        apply self.class.defaults.merge(options)
-      end
-      
-      def apply options
-        options.each { |m, v| __send__ "#{m}=", v }
-      end
-      
-      class << self
-        def defaults
-          @@defaults
-        end
-        
-        def defaults= options
-          @@defaults = defaults.merge(options)
-        end
-      end
-    end
-  end
-end
+module Terminal
+  class Table
+    # A Style object holds all the formatting information for a Table object
+    #
+    # To create a table with a certain style, use either the constructor
+    # option <tt>:style</tt>, the Table#style object or the Table#style= method
+    #
+    # All these examples have the same effect:
+    #
+    #     # by constructor
+    #     @table = Table.new(:style => {:padding_left => 2, :width => 40})
+    #
+    #     # by object
+    #     @table.style.padding_left = 2
+    #     @table.style.width = 40
+    #
+    #     # by method
+    #     @table.style = {:padding_left => 2, :width => 40}
+    #
+    # To set a default style for all tables created afterwards use Style.defaults=
+    #
+    #     Terminal::Table::Style.defaults = {:width => 80}
+    #
+    class Style
+      @@defaults = {
+        :border_x => "-", :border_y => "|", :border_i => "+",
+        :padding_left => 1, :padding_right => 1,
+        :margin_left => '',
+        :width => nil, :alignment => nil,
+        :all_separators => false
+      }
+
+      attr_accessor :border_x
+      attr_accessor :border_y
+      attr_accessor :border_i
+
+      attr_accessor :padding_left
+      attr_accessor :padding_right
+
+      attr_accessor :margin_left
+
+      attr_accessor :width
+      attr_accessor :alignment
+
+      attr_accessor :all_separators
+
+
+      def initialize options = {}
+        apply self.class.defaults.merge(options)
+      end
+
+      def apply options
+        options.each { |m, v| __send__ "#{m}=", v }
+      end
+
+      class << self
+        def defaults
+          @@defaults
+        end
+
+        def defaults= options
+          @@defaults = defaults.merge(options)
+        end
+      end
+    end
+  end
+end