terminal-table 1.4.4 → 1.4.5

data/History.rdoc

@@ -1,7 +1,8 @@
-1.4.4 / 2011-11-07
+1.4.5 / 2012-3-15
 ==================
 
-  * Add support for multi-line rows, table titles, and colors
+  * Add color support.
+  * Various bugfixes
 
 1.4.3 / 2011-10-13
 ==================

data/lib/terminal-table/cell.rb

@@ -58,7 +58,8 @@ module Terminal
       def render(line = 0)
         left = " " * @table.style.padding_left
         right = " " * @table.style.padding_right
-        "#{left}#{lines[line]}#{right}".align(alignment, width + @table.cell_padding)
+        render_width = lines[line].to_s.size - escape(lines[line]).size + width
+        "#{left}#{lines[line]}#{right}".align(alignment, render_width + @table.cell_padding)
       end
       alias :to_s :render
       
@@ -67,10 +68,7 @@ module Terminal
       # removes all ANSI escape sequences (e.g. color)
       
       def value_for_column_width_recalc
-        str = lines.sort_by { |s| s.size }.last.to_s
-        str = str.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '')
-        str = str.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '')
-        str.gsub(/[\x03|\x1a]/, '')
+        lines.map{ |s| escape(s) }.max_by{ |s| s.size }
       end
       
       ##
@@ -83,6 +81,14 @@ module Terminal
         end
         inner_width + padding
       end
+
+      ##
+      # 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]/, '').
+          gsub(/[\x03|\x1a]/, '')
+      end
     end
   end
-end
+end

data/lib/terminal-table/table.rb

@@ -11,9 +11,9 @@ module Terminal
     def initialize options = {}, &block
       @column_widths = []
       self.style = options.fetch :style, {}
-      self.title = options.fetch :title, nil
       self.headings = options.fetch :headings, []
       self.rows = options.fetch :rows, []
+      self.title = options.fetch :title, nil
       yield_or_eval(&block) if block
     end
     
@@ -108,8 +108,7 @@ module Terminal
       separator = Separator.new(self)
       buffer = [separator]
       unless @title.nil?
-        opts = {:value => @title, :alignment => :center, :colspan => number_of_columns}
-        buffer << Row.new(self, [opts])
+        buffer << Row.new(self, [title_cell_options])
         buffer << separator
       end
       unless @headings.cells.empty?
@@ -144,7 +143,7 @@ module Terminal
     
     def title=(title)
       @title = title
-      recalc_column_widths Row.new(self, [title])
+      recalc_column_widths Row.new(self, [title_cell_options])
     end
     
     ##
@@ -213,5 +212,9 @@ module Terminal
         self.instance_eval(&block)
       end
     end
+
+    def title_cell_options
+      {:value => @title, :alignment => :center, :colspan => number_of_columns}
+    end
   end
 end

data/lib/terminal-table/version.rb

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

data/spec/cell_spec.rb

@@ -29,11 +29,11 @@ describe Terminal::Table do
   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 = Cell.new :value => "barrissimo\n"+"foo".yellow, :table => Terminal::Table.new, :index => 0
+    cell.value.should == "barrissimo\n"+"foo".yellow
+    cell.lines.should == ['barrissimo','foo'.yellow]
     cell.value_for_column_width_recalc.should == 'barrissimo'
-    cell.render(1).should == " barrissimo "
+    cell.render(0).should == " barrissimo "
   end
   
   it "should allow colorized content" do

data/spec/table_spec.rb

@@ -161,15 +161,15 @@ module Terminal
       @table << ['b', 2]
       @table << ['c', 3]
       @table.render.should == <<-EOF.deindent
-        +-------+-----+
-        |    Title    |
-        +-------+-----+
-        | Char  | Num |
-        +-------+-----+
-        | a     | 1   |
-        | b     | 2   |
-        | c     | 3   |
-        +-------+-----+
+        +------+-----+
+        |   Title    |
+        +------+-----+
+        | Char | Num |
+        +------+-----+
+        | a    | 1   |
+        | b    | 2   |
+        | c    | 3   |
+        +------+-----+
       EOF
     end
 

data/terminal-table.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.4.4"
+  s.version = "1.4.5"
 
   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-11-07}
+  s.date = %q{2012-3-15}
   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/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.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/version.rb", "lib/terminal-table/row.rb", "lib/terminal-table/separator.rb", "lib/terminal-table/style.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/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", "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"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple, feature rich ascii table generation library}
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version= then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 

metadata

@@ -1,37 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: terminal-table
-version: !ruby/object:Gem::Version
-  version: 1.4.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 1.4.5
+date: 2012-03-15 00:00:00 +00:00
+summary: Simple, feature rich ascii table generation library
+require_paths: 
+- lib
+email: tj@vision-media.ca
+homepage: http://github.com/visionmedia/terminal-table
+rubyforge_project: terminal-table
+description: Simple, feature rich ascii table generation library
+autorequire: 
+default_executable: 
+bindir: bin
+has_rdoc: false
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
 platform: ruby
-authors:
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
 - TJ Holowaychuk
 - Scott J. Goldman
-autorequire: 
-bindir: bin
-cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
-dependencies: []
-description: Simple, feature rich ascii table generation library
-email: tj@vision-media.ca
-executables: []
-extensions: []
-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/row.rb
-- lib/terminal-table/separator.rb
-- lib/terminal-table/style.rb
-- tasks/docs.rake
-- tasks/gemspec.rake
-- tasks/spec.rake
-files:
+files: 
 - History.rdoc
 - Manifest
 - README.rdoc
@@ -58,34 +56,35 @@ files:
 - tasks/gemspec.rake
 - tasks/spec.rake
 - terminal-table.gemspec
-homepage: http://github.com/visionmedia/terminal-table
-licenses: []
-post_install_message: 
-rdoc_options:
+test_files: []
+
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Terminal-table
 - --main
 - README.rdoc
-require_paths:
-- lib
-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'
+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/version.rb
+- lib/terminal-table/row.rb
+- lib/terminal-table/separator.rb
+- lib/terminal-table/style.rb
+- lib/terminal-table/table_helper.rb
+- tasks/docs.rake
+- tasks/gemspec.rake
+- tasks/spec.rake
+executables: []
+
+extensions: []
+
 requirements: []
-rubyforge_project: terminal-table
-rubygems_version: 1.8.11
-signing_key: 
-specification_version: 3
-summary: Simple, feature rich ascii table generation library
-test_files: []
+
+dependencies: []
+