table_parser 0.2.0 → 0.3.0

data/Manifest.txt

@@ -6,6 +6,6 @@ Rakefile
 lib/table_parser.rb
 lib/table_parser/parser.rb
 lib/table_parser/table.rb
-lib/table_parser/table_header.rb
+lib/table_parser/table_column.rb
 lib/table_parser/table_node.rb
 test/test_table_parser.rb

data/lib/table_parser.rb

@@ -1,8 +1,8 @@
 require 'table_parser/table_node'
-require 'table_parser/table_header'
+require 'table_parser/table_column'
 require 'table_parser/table'
 require 'table_parser/parser'
 
 module TableParser
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/table_parser/parser.rb

@@ -18,14 +18,14 @@ module TableParser
       rows
     end
 
-    def self.extract_headers(rows)
+    def self.extract_column_headers(rows)
       headers = []
       rows.first.collect do |col|
-        header = TableHeader.new(col)
+        header = TableColumn.new(col)
         headers << header
 
         (header.colspan-1).times do
-          headers << TableHeader.new(col)
+          headers << TableColumn.new(col)
         end
       end
       rows.delete_at(0)

data/lib/table_parser/table.rb

@@ -1,23 +1,19 @@
 module TableParser
   class Table
-    attr_reader :nodes, :headers
+    attr_reader :nodes, :columns
     def initialize(input, xpath_to_table="//table[0]")
       table = Parser.extract_table(input, xpath_to_table)
-      @headers = Parser.extract_headers(table)
-      @nodes = Parser.extract_nodes(table, @headers)
+      @columns = Parser.extract_column_headers(table)
+      @nodes = Parser.extract_nodes(table, @columns)
     end
   
     def to_s
       "Table<#{@headers.collect{|h| h.to_s }.join("\n")}>"
     end
-    
-    def header_count
-      @headers.size
-    end
-    
+
     # get column by index
     def [](index)
-      @headers[index]
+      @columns[index]
     end
   end
 end

data/lib/table_parser/{table_header.rb → table_column.rb}

@@ -1,5 +1,5 @@
 module TableParser
-  class TableHeader < TableNode
+  class TableColumn < TableNode
     attr_reader :children
     def initialize(element, rowspan=nil, colspan=nil)
       super(element, rowspan, colspan)

data/test/test_table_parser.rb

@@ -8,7 +8,7 @@ class TestTableParser < Test::Unit::TestCase
       <tr><td>3</td></tr></table></body></html>", 
       "/html/body/table"
 
-    assert_equal(2, table.header_count, 'header_count should = 2 ')
+    assert_equal(2, table.columns.size, 'header_count should = 2 ')
     assert_equal(2, table[0].size)
     assert_equal(2, table[1].size)
   end
@@ -20,7 +20,7 @@ class TestTableParser < Test::Unit::TestCase
       <tr><td>A3</td><td>B3</td><td>C3</td></tr><tr><td>A4</td><td>B4</td><td>C4</td></tr></table></body></html>", 
       "/html/body/table"
 
-    assert_equal(3, table.header_count, 'header_count should = 3 ')
+    assert_equal(3, table.columns.size, 'header_count should = 3 ')
     assert_equal(4, table[0].size)
     assert_equal(4, table[1].size)
     assert_equal(4, table[2].size)
@@ -35,7 +35,7 @@ class TestTableParser < Test::Unit::TestCase
     </table></body></html>", 
       "/html/body/table"
       
-    assert_equal 4, table.header_count
+    assert_equal 4, table.columns.size
     assert_equal 3, table[0].size
     assert_equal 3, table[1].size
     assert_equal 3, table[2].size
@@ -55,7 +55,7 @@ class TestTableParser < Test::Unit::TestCase
     </table></body></html>", 
       "/html/body/table"
 
-    assert_equal 4, table.header_count
+    assert_equal 4, table.columns.size
     assert_equal 9, table[0].size
     assert_equal 9, table[1].size
     assert_equal 9, table[2].size
@@ -66,7 +66,7 @@ class TestTableParser < Test::Unit::TestCase
     table = TableParser::Table.new open("test.html").read, 
       "/html/body/table"
 
-    assert_equal 11, table.header_count
+    assert_equal 11, table.columns.size
     assert_equal 9, table[0].size
     assert_equal 9, table[1].size
     assert_equal 9, table[2].size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: table_parser
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Francis Chong
@@ -42,7 +42,7 @@ files:
 - lib/table_parser.rb
 - lib/table_parser/parser.rb
 - lib/table_parser/table.rb
-- lib/table_parser/table_header.rb
+- lib/table_parser/table_column.rb
 - lib/table_parser/table_node.rb
 - test/test_table_parser.rb
 has_rdoc: true