visionmedia-terminal-table 1.0.1 → 1.0.4

data/History.rdoc

@@ -1,4 +1,8 @@
 
+=== 1.0.3 / 2009-01-15
+
+* Moved yield or eval to Terminal::Table initialize where it belongs
+
 === 1.0.0 / 2009-01-13
 
 * Initial release

data/README.rdoc

@@ -31,13 +31,13 @@ Simple, feature rich ASCII table generator.
    end
    puts user_table
    
-	 user_table = table do
-	   self.headings = 'First Name', 'Last Name', 'Email'
-	   add_row ['TJ',  'Holowaychuk', { :value => 'tj@vision-media.ca', :align => :right }]
-	   add_row ['Bob', 'Someone',     'bob@vision-media.ca']
-	   add_row ['Joe', 'Whatever',    'joe@vision-media.ca']
-	   align_column 1, :center
-	 end
+   user_table = table do
+     self.headings = 'First Name', 'Last Name', 'Email'
+     add_row ['TJ',  'Holowaychuk', { :value => 'tj@vision-media.ca', :align => :right }]
+     add_row ['Bob', 'Someone',     'bob@vision-media.ca']
+     add_row ['Joe', 'Whatever',    'joe@vision-media.ca']
+     align_column 1, :center
+   end
    puts user_table
    
    rows = []
@@ -78,13 +78,13 @@ Simple, feature rich ASCII table generator.
    | Joe        | Whatever    | joe@vision-media.ca |
    +------------+-------------+---------------------+
    
-	 +------------+-----------------------------+---------------------+
-	 | First Name | Last Name                   | Email               |
-	 +------------+-----------------------------+---------------------+
-	 | TJ         |         Holowaychuk         |  tj@vision-media.ca |
-	 | Bob        |           Someone           | bob@vision-media.ca |
-	 | Joe        |          Whatever           | joe@vision-media.ca |
-	 +------------+-----------------------------+---------------------+
+   +------------+-----------------------------+---------------------+
+   | First Name | Last Name                   | Email               |
+   +------------+-----------------------------+---------------------+
+   | TJ         |         Holowaychuk         |  tj@vision-media.ca |
+   | Bob        |           Someone           | bob@vision-media.ca |
+   | Joe        |          Whatever           | joe@vision-media.ca |
+   +------------+-----------------------------+---------------------+
 
    +------------+-------+
    |            | Lines |

data/lib/terminal-table/import.rb

@@ -48,8 +48,6 @@ module Kernel
   #
   
   def table headings = [], rows = [], &block
-    table = Terminal::Table.new :headings => headings, :rows => rows
-    table.yield_or_eval &block
-    table
+    table = Terminal::Table.new :headings => headings, :rows => rows, &block
   end
 end

data/lib/terminal-table/table.rb

@@ -29,6 +29,12 @@ module Terminal
   
   class Table
     
+    #--
+    # Exceptions
+    #++
+    
+    class Error < StandardError; end
+    
     ##
     # Table characters, x axis, y axis, and intersection.
     
@@ -39,9 +45,10 @@ module Terminal
     ##
     # Generates a ASCII table.
   
-    def initialize options = {}
+    def initialize options = {}, &block
       @headings = options.delete(:headings) || []
-      @rows = options.delete(:rows) || []
+      @rows = options.delete(:rows) || [] 
+      yield_or_eval &block if block_given?
     end
     
     ##
@@ -118,8 +125,12 @@ module Terminal
     ##
     # Return total number of columns available.
      
-    def number_of_columns 
-      rows[0].length
+    def number_of_columns
+      if rows[0]
+        rows[0].length 
+      else
+        raise Error, 'Your table needs some rows'
+      end 
     end
     
     ##

data/lib/terminal-table/version.rb

@@ -2,7 +2,7 @@
 module Terminal
   class Table
     module VERSION #:nodoc:
-      MAJOR, MINOR, TINY = [1, 0, 1]
+      MAJOR, MINOR, TINY = [1, 0, 4]
       STRING = [MAJOR, MINOR, TINY].join '.'
     end
   end

data/spec/table_spec.rb

@@ -89,6 +89,36 @@ describe Terminal::Table do
     EOF
   end
   
+  it "should render properly using block syntax" do
+    table = Terminal::Table.new do |t|
+      t << ['a', 1]
+      t << ['b', 2]
+      t << ['c', 3]
+    end
+    table.render.should == <<-EOF.deindent
+      +---+---+
+      | a | 1 |
+      | b | 2 |
+      | c | 3 |
+      +---+---+
+    EOF
+  end
+  
+  it "should render properly using instance_eval block syntax" do
+    table = Terminal::Table.new do
+      add_row ['a', 1]
+      add_row ['b', 2]
+      add_row ['c', 3]
+    end
+    table.render.should == <<-EOF.deindent
+      +---+---+
+      | 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]]

data/terminal-table.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{terminal-table}
-  s.version = "1.0.1"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-terminal-table
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors: 
 - TJ Holowaychuk