Merge pull request #180 from ruby-docx/fix-160-table-cell-hyperlinks

Pass document_properties to table cell paragraphs so to_html works with hyperlinks (#160)

Author: satoryu

lib/docx/containers/table.rb

@@ -13,14 +13,16 @@ def self.tag
           'tbl'
         end
 
-        def initialize(node)
+        def initialize(node, document_properties = {}, doc = nil)
           @node = node
           @properties_tag = 'tblGrid'
+          @document_properties = document_properties
+          @document = doc
         end
 
         # Array of row
         def rows
-          @node.xpath('w:tr').map {|r_node| Containers::TableRow.new(r_node) }
+          @node.xpath('w:tr').map {|r_node| Containers::TableRow.new(r_node, @document_properties, @document) }
         end
 
         def row_count
@@ -31,7 +33,7 @@ def row_count
         def columns
           columns_containers = []
           (0..(column_count-1)).each do |i|
-            columns_containers[i] = Containers::TableColumn.new @node.xpath("w:tr//w:tc[#{i+1}]")
+            columns_containers[i] = Containers::TableColumn.new(@node.xpath("w:tr//w:tc[#{i+1}]"), @document_properties, @document)
           end
           columns_containers
         end

lib/docx/containers/table_cell.rb

@@ -12,9 +12,11 @@ def self.tag
           'tc'
         end
 
-        def initialize(node)
+        def initialize(node, document_properties = {}, doc = nil)
           @node = node
           @properties_tag = 'tcPr'
+          @document_properties = document_properties
+          @document = doc
         end
 
         # Return text of paragraph's cell
@@ -24,7 +26,7 @@ def to_s
 
         # Array of paragraphs contained within cell
         def paragraphs
-          @node.xpath('w:p').map {|p_node| Containers::Paragraph.new(p_node) }
+          @node.xpath('w:p').map {|p_node| Containers::Paragraph.new(p_node, @document_properties, @document) }
         end
 
         # Iterate over each text run within a paragraph's cell

lib/docx/containers/table_column.rb

@@ -12,10 +12,12 @@ def self.tag
           'w:gridCol'
         end
 
-        def initialize(cell_nodes)
+        def initialize(cell_nodes, document_properties = {}, doc = nil)
           @node = ''
           @properties_tag = ''
-          @cells = cell_nodes.map { |c_node| Containers::TableCell.new(c_node) }
+          @document_properties = document_properties
+          @document = doc
+          @cells = cell_nodes.map { |c_node| Containers::TableCell.new(c_node, @document_properties, @document) }
         end
 
         # Array of cells contained within row

lib/docx/containers/table_row.rb

@@ -12,14 +12,16 @@ def self.tag
           'tr'
         end
 
-        def initialize(node)
+        def initialize(node, document_properties = {}, doc = nil)
           @node = node
           @properties_tag = ''
+          @document_properties = document_properties
+          @document = doc
         end
 
         # Array of cells contained within row
         def cells
-          @node.xpath('w:tc').map {|c_node| Containers::TableCell.new(c_node) }
+          @node.xpath('w:tc').map {|c_node| Containers::TableCell.new(c_node, @document_properties, @document) }
         end
 
       end

lib/docx/document.rb

@@ -275,7 +275,7 @@ def parse_bookmark_from(b_node)
     end
 
     def parse_table_from(t_node)
-      Elements::Containers::Table.new(t_node)
+      Elements::Containers::Table.new(t_node, document_properties, self)
     end
   end
 end

spec/docx/document_spec.rb

@@ -202,6 +202,15 @@
       expect(@doc.tables[0].columns[1].cells[1].text).to match(/^Directive/)
     end
 
+    # Regression test for #160: rendering html for a cell that contains a
+    # hyperlink must not raise (the cell's paragraphs need document_properties).
+    it 'renders html for cells containing hyperlinks' do
+      cell = @doc.tables[0].rows[1].cells[1]
+      html = nil
+      expect { html = cell.paragraphs.map(&:to_html).join }.to_not raise_error
+      expect(html).to include('<a href="http://google.com/"')
+    end
+
     describe '#paragraphs' do
       it 'should not grabs paragraphs in the tables' do
         expect(@doc.paragraphs.map(&:text)).to_not include("Second table")