Refactored #number_of_columns

tj · Mar 14, 2009 · 43eff59 · 43eff59
1 parent e504f6d
commit 43eff59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/lib/terminal-table/table.rb b/lib/terminal-table/table.rb
@@ -125,11 +125,8 @@ def length_of_column n
     # Return total number of columns available.
 
     def number_of_columns
-      if rows[0]
-        rows[0].length 
-      else
-        raise Error, 'Your table needs some rows'
-      end 
+      return rows.first.length unless rows.empty?
+      raise Error, 'your table needs some rows.'
     end
 
     ##

diff --git a/lib/terminal-table/version.rb b/lib/terminal-table/version.rb
@@ -1,4 +1,6 @@
 
 module Terminal
-  VERSION = '1.0.4'
+  class Table
+    VERSION = '1.0.4'
+  end
 end
diff --git a/spec/table_spec.rb b/spec/table_spec.rb
@@ -59,6 +59,10 @@
     @table << ['a', 1]
     @table.seperator.should == '+------+-----+'
   end
+
+  it "should bitch and complain when you have no rows" do
+    lambda { @table.render }.should raise_error(Terminal::Table::Error)
+  end
 
   it "should render properly" do
     @table.headings = ['Char', 'Num']