terminal-table 1.4.5 → 1.5.0

data/spec/table_spec.rb

@@ -1,12 +1,12 @@
 
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 module Terminal
   describe Table do
     before :each do
       @table = Table.new
     end
-    
+
     it "should select columns" do
       @table << ['foo', 'bar']
       @table << ['big foo', 'big foo bar']
@@ -137,6 +137,25 @@ module Terminal
       EOF
     end
 
+
+    it "should render default alignment properly" do
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.style.width = 21
+      @table.style.alignment = :right
+      @table.render.should == <<-EOF.deindent
+        +---------+---------+
+        |    Char |     Num |
+        +---------+---------+
+        |       a |       1 |
+        |       b |       2 |
+        |       c |       3 |
+        +---------+---------+
+      EOF
+    end
+
     it "should render width properly" do
       @table.headings = ['Char', 'Num']
       @table << ['a', 1]
@@ -154,6 +173,16 @@ module Terminal
       EOF
     end
 
+    it "should raise an error if the table width exceeds style width" do
+      @table.headings = ['Char', 'Num']
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table << ['d', 'x' * 22]
+      @table.style.width = 21
+      expect { @table.render }.to raise_error "Table width exceeds wanted width of 21 characters."
+    end
+
     it "should render title properly" do
       @table.title = "Title"
       @table.headings = ['Char', 'Num']
@@ -254,6 +283,24 @@ module Terminal
       EOF
     end
 
+    it "should render multi-row headings properly" do
+      @table.headings = [['Char', 'Num'], [{ :value => "2nd heading", :colspan => 2 }]]
+      @table << ['a', 1]
+      @table << ['b', 2]
+      @table << ['c', 3]
+      @table.render.should == <<-EOF.deindent
+        +------+------+
+        | Char | Num  |
+        +------+------+
+        | 2nd heading |
+        +------+------+
+        | a    | 1    |
+        | b    | 2    |
+        | c    | 3    |
+        +------+------+
+      EOF
+    end
+
     it "should allows a hash of options for creation" do
       headings = ['Char', 'Num']
       rows = [['a', 1], ['b', 2], ['c', 3]]
@@ -324,7 +371,7 @@ module Terminal
      # 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
@@ -448,7 +495,7 @@ module Terminal
       @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.deindent
         +------+---+---+---+
         | name | values    |
@@ -459,7 +506,7 @@ module Terminal
         +------+---+---+---+
       EOF
     end
-    
+
     it "should handle multiple colspan" do
       @table.headings = [
         'name',
@@ -486,7 +533,7 @@ module Terminal
         +--------+----+----+-------+-------+-----+-----+
       EOF
     end
-    
+
     it "should render a table with only X cell borders" do
       @table.style = {:border_x => "-", :border_y => "", :border_i => ""}
 
@@ -504,7 +551,7 @@ module Terminal
 ---------------
       EOF
     end
-    
+
     it "should render a table without cell borders" do
       @table.style = {:border_x => "", :border_y => "", :border_i => ""}
 

data/tasks/docs.rake

@@ -1,13 +1,13 @@
-
-namespace :docs do
-  
-  desc 'Remove rdoc products'
-  task :remove => [:clobber_docs]
-  
-  desc 'Build docs, and open in browser for viewing (specify BROWSER)'
-  task :open => [:docs] do
-    browser = ENV["BROWSER"] || "safari"
-    sh "open -a #{browser} doc/index.html"
-  end
-  
+
+namespace :docs do
+  
+  desc 'Remove rdoc products'
+  task :remove => [:clobber_docs]
+  
+  desc 'Build docs, and open in browser for viewing (specify BROWSER)'
+  task :open => [:docs] do
+    browser = ENV["BROWSER"] || "safari"
+    sh "open -a #{browser} doc/index.html"
+  end
+  
 end

data/tasks/gemspec.rake

@@ -1,3 +1,3 @@
-
-desc 'Build gemspec file'
+
+desc 'Build gemspec file'
 task :gemspec => [:build_gemspec]

data/tasks/spec.rake

@@ -1,25 +1,25 @@
-
-require 'spec/rake/spectask'
-  
-desc "Run all specifications"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << "lib"
-  t.spec_opts = ["--color", "--require", "spec/spec_helper.rb"]
-end
-  
-namespace :spec do
-
-  desc "Run all specifications verbosely"
-  Spec::Rake::SpecTask.new(:verbose) do |t|
-    t.libs << "lib"
-    t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
-  end
-  
-  desc "Run specific specification verbosely (specify SPEC)"
-  Spec::Rake::SpecTask.new(:select) do |t|
-    t.libs << "lib"
-    t.spec_files = [ENV["SPEC"]]
-    t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
-  end
-  
+
+require 'spec/rake/spectask'
+  
+desc "Run all specifications"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.libs << "lib"
+  t.spec_opts = ["--color", "--require", "spec/spec_helper.rb"]
+end
+  
+namespace :spec do
+
+  desc "Run all specifications verbosely"
+  Spec::Rake::SpecTask.new(:verbose) do |t|
+    t.libs << "lib"
+    t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
+  end
+  
+  desc "Run specific specification verbosely (specify SPEC)"
+  Spec::Rake::SpecTask.new(:select) do |t|
+    t.libs << "lib"
+    t.spec_files = [ENV["SPEC"]]
+    t.spec_opts = ["--color", "--format", "specdoc", "--require", "spec/spec_helper.rb"]
+  end
+  
 end

data/terminal-table.gemspec

@@ -2,23 +2,24 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.4.5"
+  s.version = "1.5.0"
 
   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{2012-3-15}
+  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/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.extra_rdoc_files = ["README.rdoc", "lib/terminal-table.rb", "lib/terminal-table/cell.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/import.rb", "lib/terminal-table/table.rb", "lib/terminal-table/table_helper.rb", "lib/terminal-table/version.rb", "spec/cell_spec.rb", "spec/import_spec.rb", "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.license = %q{MIT}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Terminal-table", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{terminal-table}
   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,35 +1,32 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
+--- !ruby/object:Gem::Specification
 name: terminal-table
-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: 
+version: !ruby/object:Gem::Version
+  version: 1.5.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
-authors: 
+authors:
 - TJ Holowaychuk
 - Scott J. Goldman
-files: 
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-10-13 00:00:00.000000000 Z
+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/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
+files:
 - History.rdoc
 - Manifest
 - README.rdoc
@@ -38,53 +35,46 @@ files:
 - 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
-test_files: []
-
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
+homepage: http://github.com/visionmedia/terminal-table
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Terminal-table
-- --main
+- "--main"
 - README.rdoc
-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: []
-
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
-dependencies: []
-
+rubyforge_project: terminal-table
+rubygems_version: 2.4.8
+signing_key: 
+specification_version: 3
+summary: Simple, feature rich ascii table generation library
+test_files: []

data/lib/terminal-table/core_ext.rb

@@ -1,8 +0,0 @@
-
-class String
-  def align position, length
-    self.__send__ position, length
-  end
-  alias_method :left, :ljust
-  alias_method :right, :rjust
-end

data/lib/terminal-table/row.rb

@@ -1,48 +0,0 @@
-module Terminal
-  class Table
-    class Row
-      
-      ##
-      # Row cells
-      
-      attr_reader :cells
-      
-      attr_reader :table
-      
-      ##
-      # Initialize with _width_ and _options_.
-      
-      def initialize table, array = []
-        @cell_index = 0
-        @table = table
-        @cells = []
-        array.each { |item| self << item }
-      end
-      
-      def add_cell item
-        options = item.is_a?(Hash) ? item : {:value => item}
-        cell = Cell.new(options.merge(:index => @cell_index, :table => @table))
-        @cell_index += cell.colspan
-        @cells << cell
-      end
-      alias << add_cell
-      
-      def [] index
-        cells[index]
-      end
-      
-      def height
-        cells.map { |c| c.lines.count }.max
-      end
-      
-      def render
-        y = @table.style.border_y
-        (0...height).to_a.map do |line|
-          y + cells.map do |cell|
-            cell.render(line)
-          end.join(y) + y
-        end.join("\n")
-      end
-    end
-  end
-end

data/lib/terminal-table/separator.rb

@@ -1,14 +0,0 @@
-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