table_parser 0.5.7 → 0.6.0

data/lib/table_parser/parser.rb

@@ -42,44 +42,54 @@ module TableParser
       headers
     end
     
-    def self.extract_nodes(rows, headers, dup_rows, dup_cols)
-      data = rows.collect do |row|
+    def self.extract_nodes(input_rows, headers, dup_rows, dup_cols)
+      data = input_rows.collect do |row|
         row.collect do |ele|
           node = TableNode.new(ele)
         end
       end
-              
-      # handle rowspan
-      data.each_index do |row_index|
-        row = data[row_index]
-        row.each_index do |col_index|
-          col = row[col_index]
-          if headers[col_index]
-            headers[col_index].children << col if col.class != EmptyTableNode
+      
+      columns = []
+      curr_x = 0
+      curr_y = 0
+      data.each do |row|
+        columns[curr_y] = [] unless columns[curr_y]
 
-            if col.colspan > 1 
-              if dup_cols
-                row.insert(col_index, TableNode.new(col.element, col.rowspan, col.colspan - 1))
-              else
-                row.insert(col_index, EmptyTableNode.new(col.rowspan, col.colspan - 1))
-              end
-            end
-            
-            if col.rowspan > 1
-              unless data[row_index+1]
-                data.insert(row_index, [])
-              end
+        curr_y = 0
+        row.each do |node|
+          rowspan = node.rowspan - 1
+          colspan = node.colspan - 1
 
-              if dup_rows
-                data[row_index+1].insert(col_index, TableNode.new(col.element, col.rowspan - 1))
+          (0..rowspan).each do |x|
+            (0..colspan).each do |y|
+              columns[curr_y+y] = [] unless columns[curr_y+y]
+              if (x == 0 || dup_rows) && (y == 0 || dup_cols)
+                while columns[curr_y+y][curr_x+x]
+                  curr_y += 1
+                end
+                columns[curr_y+y][curr_x+x] = node
               else
-                data[row_index+1].insert(col_index, EmptyTableNode.new(col.rowspan - 1))
+                while columns[curr_y+y][curr_x+x]
+                  curr_y += 1
+                end
+                columns[curr_y+y][curr_x+x] = EmptyTableNode.new(node.element)
               end
             end
           end
+          curr_y += 1
         end
-      end      
-      data
+        curr_x += 1
+      end
+            
+      columns.each_index do |col_index|
+        columns[col_index].each do |node|
+          if headers[col_index]
+            headers[col_index].children << node unless node.class == EmptyTableNode
+          end
+        end
+      end
+         
+      columns
     end
     
   end

data/lib/table_parser/table_node.rb

@@ -3,9 +3,19 @@ module TableParser
     attr_reader :element, :text, :rowspan, :colspan
     def initialize(element, rowspan=nil, colspan=nil)
       @element = element
-      @text = element.text.strip rescue ""     
-      @colspan = colspan || element["colspan"].to_i rescue 1
-      @rowspan = rowspan || element["rowspan"].to_i rescue 1
+      @text = element.text.strip rescue ""
+      
+      if element.nil?
+        @colspan = colspan || 1
+        @rowspan = rowspan || 1
+      else
+        @colspan = colspan || element["colspan"].nil? ? 1 : element["colspan"].to_i
+        @rowspan = rowspan || element["rowspan"].nil? ? 1 : element["rowspan"].to_i
+      end
+    end
+    
+    def span(row, col)
+      TableNode.new(element, rowspan-row, colspan-col)
     end
 
     def to_s
@@ -17,8 +27,8 @@ module TableParser
     def initialize(rowspan=nil, colspan=nil)
       @element = nil
       @text = ""
-      @colspan = colspan || element["colspan"].to_i rescue 1
-      @rowspan = rowspan || element["rowspan"].to_i rescue 1
+      @colspan = colspan || 1
+      @rowspan = rowspan || 1
     end
   end
 end

data/lib/table_parser.rb

@@ -4,5 +4,5 @@ require 'table_parser/table'
 require 'table_parser/parser'
 
 module TableParser
-  VERSION = '0.5.7'
+  VERSION = '0.6.0'
 end

data/test/test_table_parser.rb

@@ -5,15 +5,28 @@ require 'open-uri'
 
 class TestTableParser < Test::Unit::TestCase
   def test_parse_rowspan
-    html = "<html><body><table><tr><td>A</td><td>B</td></tr>\
-      <tr><td rowspan=\"2\">1</td><td>2</td></tr> \
-      <tr><td>3</td></tr></table></body></html>"
+    html = open("rowspan.html").read
     doc = Nokogiri::HTML(html)
-    table = TableParser::Table.new doc, "/html/body/table"
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => false, :dup_cols => false}
+    assert_equal(2, table.columns.size, 'header_count should = 2 ')
+    assert_equal(2, table[0].size)
+    assert_equal(2, table[1].size)
 
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => true, :dup_cols => false}
+    assert_equal(2, table.columns.size, 'header_count should = 2 ')
+    assert_equal(3, table[0].size)
+    assert_equal(3, table[1].size)
+    
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => false, :dup_cols => true}
     assert_equal(2, table.columns.size, 'header_count should = 2 ')
     assert_equal(2, table[0].size)
     assert_equal(2, table[1].size)
+
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => true, :dup_cols => true}
+    assert_equal(2, table.columns.size, 'header_count should = 2 ')
+    assert_equal(3, table[0].size)
+    assert_equal(3, table[1].size)
+
   end
   
   def test_parse_rowspan_disable_dup
@@ -29,27 +42,27 @@ class TestTableParser < Test::Unit::TestCase
   end
   
   def test_parse_colspan
-    html = "<html><body><table>\
-      <tr><td>A</td><td colspan=\"2\">B</td></tr>\
-      <tr><td rowspan=\"2\">A1</td><td>B1</td><td>C1</td></tr> \
-      <tr><td>B2</td><td>C2</td></tr>\
-      <tr><td>A3</td><td>B3</td><td>C3</td></tr>\
-      <tr><td>A4</td><td colspan=\"2\" rowspan=\"2\">B4</td></tr>\
-      <tr><td>A5</td></tr>\
-      <tr><td rowspan=\"2\">A1</td><td>B1</td><td>C1</td></tr> \
-      <tr><td>B2</td><td>C2</td></tr>\
-      <tr><td>A3</td><td>B3</td><td>C3</td></tr>\
-      <tr><td>A4</td><td colspan=\"2\" rowspan=\"2\">B4</td></tr>\
-      <tr><td>A5</td></tr>\
-      </table></body></html>"
+    html = open("colspan.html").read
     doc = Nokogiri::HTML(html)
     table = TableParser::Table.new doc, "/html/body/table"
-    puts table
-
     assert_equal(3, table.columns.size, 'header_count should = 3 ')
     assert_equal(10, table[0].size)
     assert_equal(10, table[1].size)
     assert_equal(10, table[2].size)
+
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => false}
+    puts table.to_s
+    assert_equal(3, table.columns.size, 'header_count should = 3 ')
+    assert_equal(8, table[0].size)
+    assert_equal(8, table[1].size)
+    assert_equal(8, table[2].size)
+
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => false, :dup_cols => false}
+    puts table.to_s
+    assert_equal(3, table.columns.size, 'header_count should = 3 ')
+    assert_equal(8, table[0].size)
+    assert_equal(8, table[1].size)
+    assert_equal(6, table[2].size)
   end
   
   def test_parse_complex
@@ -68,17 +81,7 @@ class TestTableParser < Test::Unit::TestCase
   end
 
   def test_parse_complex2
-    html = "<html><body><table><tr><td>Header1</td><td>Header2</td><td>Header3</td><td>Header4</td></tr>\
-      <tr><td rowspan=\"3\">A1</td><td>A2</td><td rowspan=\"2\">A3</td><td>A4</td></tr>\
-      <tr><td>B2</td><td>B4</td></tr>\
-      <tr><td>C2</td><td rowspan=\"2\">C3</td><td>C4</td></tr>\
-      <tr><td rowspan=\"3\">D1</td><td>D2</td><td>D4</td></tr>\
-      <tr><td>E2</td><td rowspan=\"2\">E3</td><td>E4</td></tr>\
-      <tr><td>F2</td><td>F4</td></tr>\
-      <tr><td rowspan=\"3\">G1</td><td>G2</td><td rowspan=\"2\">G3</td><td>G4</td></tr>\
-      <tr><td>H2</td><td>H4</td></tr>\
-      <tr><td>I2</td><td>I3</td><td>I4</td></tr>\
-      </table></body></html>"
+    html = open("complex2.html").read
     doc = Nokogiri::HTML(html)
     table = TableParser::Table.new doc, "/html/body/table"
 
@@ -87,6 +90,15 @@ class TestTableParser < Test::Unit::TestCase
     assert_equal 9, table[1].size
     assert_equal 9, table[2].size
     assert_equal 9, table[3].size
+    
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_rows => false}
+    puts "table=" + table.to_s
+    assert_equal 4, table.columns.size
+    assert_equal 3, table[0].size
+    assert_equal 9, table[1].size
+    assert_equal 5, table[2].size
+    assert_equal 9, table[3].size
+
   end
 
   def test_parse_noheader
@@ -101,6 +113,37 @@ class TestTableParser < Test::Unit::TestCase
     assert_equal(3, table[1].size)
   end
   
+  def test_parse_complex_colrowspan
+    html = open("table_rowcol.html").read
+
+    doc = Nokogiri::HTML(html)
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_cols => false, :dup_rows => false}
+    puts table
+    assert_equal(5, table.columns.size, 'header_count should = 5 ')
+    assert_equal(1, table[0].size)
+    assert_equal(3, table[1].size)
+    assert_equal(3, table[2].size)
+    assert_equal(4, table[3].size)
+    assert_equal(5, table[4].size)
+    
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_cols => false, :dup_rows => true}
+    puts table
+    assert_equal(5, table.columns.size, 'header_count should = 5 ')
+    assert_equal(5, table[0].size)
+    assert_equal(5, table[1].size)
+    assert_equal(3, table[2].size)
+    assert_equal(5, table[3].size)
+    assert_equal(5, table[4].size)
+    
+    table = TableParser::Table.new doc, "/html/body/table", {:dup_cols => true, :dup_rows => true}
+    puts table
+    assert_equal(5, table.columns.size, 'header_count should = 5 ')
+    assert_equal(5, table[0].size)
+    assert_equal(5, table[1].size)
+    assert_equal(5, table[2].size)
+    assert_equal(5, table[3].size)
+    assert_equal(5, table[4].size)
+  end
   
   def test_web
     html = open("test4.html").read
@@ -108,4 +151,5 @@ class TestTableParser < Test::Unit::TestCase
     table = TableParser::Table.new doc, "/html/body/div/div[3]/div/div[2]/table", {:header => false, :dup_rows => false}
     puts table.columns[0].size
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: table_parser
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors: 
 - Francis Chong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +08:00
+date: 2010-01-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency