terminal-table 1.4.2 → 1.4.3

data/History.rdoc

@@ -1,9 +1,13 @@
+1.4.3 / 2011-10-13
+==================
+
+  * Optimize for faster table output.
 
 1.4.2 / 2010-01-14
 ==================
 
   * Fixed some bugs with colspan
-  
+
 === 1.4.1 / 2009-12-18
 
 * Fix column alignment with separators.

data/lib/terminal-table/table.rb

@@ -13,11 +13,6 @@ module Terminal
     
     X, Y, I = '-', '|', '+'
     
-    ##
-    # Headings array.
-    
-    attr_accessor :headings
-    
     ##
     # Rows array.
     
@@ -27,11 +22,18 @@ module Terminal
     # Generates a ASCII table with the given _options_.
   
     def initialize options = {}, &block
-      @headings = options.fetch :headings, []
-      @rows = options.fetch :rows, []
+      @column_lengths = []
+      self.headings = options.fetch :headings, []
+      @rows = []
+      options.fetch(:rows, []).each { |row| add_row row }
       yield_or_eval &block if block
     end
-    
+
+    def headings= h
+      @headings = h
+      recalc_column_lengths @headings
+    end
+
     ##
     # Render the table.
   
@@ -53,7 +55,7 @@ module Terminal
     # Render headings.
 
     def render_headings
-      Y + headings.map_with_index do |heading, i|
+      Y + @headings.map_with_index do |heading, i|
         width = 0
         if heading.is_a?(Hash) and !heading[:colspan].nil?
           i.upto(i + heading[:colspan] - 1) do |col|
@@ -110,6 +112,33 @@ module Terminal
     
     def add_row row
       @rows << row
+      recalc_column_lengths row
+    end
+
+    def recalc_column_lengths row
+      if row.is_a?(Symbol) then return end
+      i = 0
+      row.each do |cell|
+        if cell.is_a?(Hash)
+          colspan = cell[:colspan] || 1
+          cell_value = cell[:value]
+        else
+          colspan = 1
+          cell_value = cell
+        end
+        colspan.downto(1) do |j|
+          cell_length = cell_value.to_s.length
+          if colspan > 1
+            spacing_length = (3 * (colspan - 1))
+            length_in_columns = (cell_length - spacing_length)
+            cell_length = (length_in_columns.to_f / colspan).ceil
+          end
+          if (@column_lengths[i] || 0) < cell_length
+            @column_lengths[i] = cell_length
+          end
+          i = i + 1
+        end
+      end
     end
     alias :<< :add_row
 
@@ -124,7 +153,7 @@ module Terminal
     # Weither or not any headings are present, since they are optional.
     
     def has_headings?
-      not headings.empty?
+      not @headings.empty?
     end
     
     ##
@@ -179,64 +208,11 @@ module Terminal
       (0...number_of_columns).map { |n| column n } 
     end
     
-    ##
-    # Return the length of the largest cell found within column _n_.
-
-    def length_of_largest_cell_in_column n
-      column_with_headings(n).map do |cell|
-        if cell.is_a? Hash
-          if cell[:colspan] && cell[:colspan] > 1
-            if (cell[:value].to_s.length <= length_of_single_columns_where_multicolumn_is(cell[:start_index],cell[:colspan]))
-              0
-            else
-              spacing_length = (3 * (cell[:colspan] - 1))
-              length_in_columns = (cell[:value].to_s.length - spacing_length)
-              (length_in_columns.to_f / cell[:colspan]).ceil
-            end
-          else
-            cell[:value].to_s.length
-          end
-        else
-          cell.to_s.length
-        end
-      end.sort.last
-    end
-
-    ##
-    # Returns the length of the largest single column cell found within column _n_.
-
-    def length_of_largest_single_column_cell_in_column n
-      column_with_headings(n).map do |cell|
-        if cell.is_a? Hash
-          if cell[:colspan] && cell[:colspan] > 1
-            0
-          else
-            cell[:value].to_s.length
-          end
-        else
-          cell.to_s.length
-        end
-      end.sort.last
-    end
-
-    ##
-    # Returns the length of the single columns starting from _n_ and going through _length_ columns.
-
-    def length_of_single_columns_where_multicolumn_is(n,length)
-      total_length = 0
-      spacing_length = (3 * (length - 1))
-      total_length = total_length + spacing_length
-      n.upto(n + length - 1) do |i|
-        total_length = total_length + length_of_largest_single_column_cell_in_column(i)
-      end
-      return total_length
-    end
-    
     ##
     # Return length of column _n_.
     
     def length_of_column n
-      length_of_largest_cell_in_column n      
+      @column_lengths[n] || 0
     end
     
     ##
@@ -261,7 +237,7 @@ module Terminal
     # Return headings combined with rows.
     
     def headings_with_rows
-      [headings] + rows
+      [@headings] + rows
     end
 
     ##
@@ -284,7 +260,7 @@ module Terminal
 
     def == other
       if other.respond_to? :headings and other.respond_to? :rows
-        headings == other.headings and rows == other.rows
+        @headings == other.headings and rows == other.rows
       end
     end
   end

data/lib/terminal-table/version.rb

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

data/terminal-table.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-01-14}
+  s.authors = ["TJ Holowaychuk", "Scott J. Goldman"]
+  s.date = %q{2011-10-13}
   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"]

metadata

@@ -1,25 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: terminal-table
-version: !ruby/object:Gem::Version 
-  version: 1.4.2
+version: !ruby/object:Gem::Version
+  version: 1.4.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - TJ Holowaychuk
+- Scott J. Goldman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-01-14 00:00:00 -08:00
-default_executable: 
+date: 2011-10-13 00:00:00.000000000Z
 dependencies: []
-
 description: Simple, feature rich ascii table generation library
 email: tj@vision-media.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - lib/terminal-table.rb
 - lib/terminal-table/cell.rb
@@ -32,7 +29,7 @@ extra_rdoc_files:
 - tasks/docs.rake
 - tasks/gemspec.rake
 - tasks/spec.rake
-files: 
+files:
 - History.rdoc
 - Manifest
 - README.rdoc
@@ -57,38 +54,34 @@ files:
 - tasks/gemspec.rake
 - tasks/spec.rake
 - terminal-table.gemspec
-has_rdoc: true
 homepage: http://github.com/visionmedia/terminal-table
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Terminal-table
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: terminal-table
-rubygems_version: 1.3.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple, feature rich ascii table generation library
 test_files: []
-