Almirah 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b91589658288fe6c451f14cbb14601ac2c4d083e28b4495aef3f1bb1edcd34
-  data.tar.gz: 3d834bb51eb285b7acac6b7c44090bab14c40d0d2e64b4743c5867b41375c0ef
+  metadata.gz: 2fa95a589e6285719010318ec666da5cf309ef511cd69cb2ffc6629464d64ae0
+  data.tar.gz: f2c8fd5747f9c5e53417744eac9caa15e2c313987d94c36b8d446434089f14fd
 SHA512:
-  metadata.gz: 48e6c007534e2af97110faa435a2596fdd772c2a0acc8cc4980432cdc7c9d99b517f13a9460a05d8d5c0a7d3564ebd53249cffcb571f3087dd9cb3317c5c4093
-  data.tar.gz: 22ec1eaef53f7cf629ebd607fc321555f759c33b18510ec0787bdea61918636a985d84d7068ce02f6a81803a6dfe17fdd7250fc7ca8cd75a2fb1f4ed47a99981
+  metadata.gz: e0071aa202dac9bd73495fb389db3008f83ff5dff9bd61d8d4f957abb935a1727362e51a3e2c6418a7a388ea28d6baef344500ec9ec46256b803982dbd5275cd
+  data.tar.gz: bcfbdf1cbca81f17d3e305723c111a38327ca16f3a8e8c28795e3135041e8a97d64e0baddd1780ae826bec85ddb0cbcf5533908506debde61d1d27e31caf02bf

data/lib/almirah/doc_fabric.rb

@@ -1,8 +1,10 @@
 require_relative 'doc_types/base_document'
 require_relative 'doc_types/specification'
 require_relative 'doc_types/protocol'
+require_relative 'doc_types/coverage'
 require_relative 'doc_parser'
 require_relative 'dom/document'
+require_relative 'doc_items/heading'
 
 class DocFabric
   @@color_index = 0
@@ -31,6 +33,24 @@ class DocFabric
     doc
   end
 
+  def self.create_coverage_matrix(specification)
+    doc = Coverage.new specification
+    Heading.reset_global_section_number
+    doc.headings << Heading.new(doc, doc.title, 0)
+    # Build dom
+    doc.dom = Document.new(doc.headings)
+    doc
+  end
+
+  def self.create_traceability_document(top_document, bottom_document)
+    doc = Traceability.new top_document, bottom_document
+    Heading.reset_global_section_number
+    doc.headings << Heading.new(doc, doc.title, 0)
+    # Build dom
+    doc.dom = Document.new(doc.headings)
+    doc
+  end
+
   def self.parse_document(doc)
 
     file = File.open(doc.path)
@@ -40,7 +60,6 @@ class DocFabric
     DocParser.parse(doc, file_lines)
 
     # Build dom
-    doc.dom = Document.new(doc.headings) if doc.is_a?(Specification)
-    
+    doc.dom = Document.new(doc.headings) if doc.is_a?(Specification) || doc.is_a?(Protocol)
   end
 end

data/lib/almirah/doc_items/controlled_paragraph.rb

@@ -1,91 +1,112 @@
-require_relative "paragraph"
+require_relative 'paragraph'
 
 class ControlledParagraph < Paragraph
+  attr_accessor :id, :up_link_ids, :down_links, :coverage_links
 
-    attr_accessor :id
-    attr_accessor :up_link_ids
-    attr_accessor :down_links
-    attr_accessor :coverage_links
+  def initialize(doc, text, id)
+    super(doc, text)
+    @parent_heading = doc.headings[-1]
+    @id = id
+    @up_link_ids = nil
+    @down_links = nil
+    @coverage_links = nil
+  end
 
-    def initialize(doc, text, id)
-        @parent_doc = doc
-        @parent_heading = doc.headings[-1]
-        @text = text.strip
-        @id = id
-        @up_link_ids = nil
-        @down_links = nil
-        @coverage_links = nil
+  def to_html
+    s = ''
+    unless @@html_table_render_in_progress
+      s += "<table class=\"controlled\">\n"
+      s += "\t<thead> <th>#</th> <th></th> <th title=\"Up-links\">UL</th> <th title=\"Down-links\">DL</th> \
+        <th title=\"Test Coverage\">COV</th> </thead>\n"
+      @@html_table_render_in_progress = true # rubocop:disable Style/ClassVars
     end
+    f_text = format_string(@text)
+    s += "\t<tr>\n"
+    s += "\t\t<td class=\"item_id\"> \
+        <a name=\"#{@id}\" id=\"#{@id}\" href=\"##{@id}\" title=\"Paragraph ID\">#{@id}</a></td>\n"
+    s += "\t\t<td class=\"item_text\">#{f_text}</td>\n"
 
-    def to_html
-        s = ''
-        unless @@html_table_render_in_progress                    
-            s += "<table class=\"controlled\">\n"
-            s += "\t<thead> <th>#</th> <th></th> <th title=\"Up-links\">UL</th> <th title=\"Down-links\">DL</th> <th title=\"Test Coverage\">COV</th> </thead>\n"
-            @@html_table_render_in_progress = true
+    if @up_link_ids
+      if @up_link_ids.length == 1
+        if tmp = /^([a-zA-Z]+)-\d+/.match(@up_link_ids[0])
+          up_link_doc_name = tmp[1].downcase
         end
-        f_text = format_string(@text)
-        s += "\t<tr>\n"
-        s += "\t\t<td class=\"item_id\"> <a name=\"#{@id}\" id=\"#{@id}\" href=\"##{@id}\" title=\"Paragraph ID\">#{@id}</a></td>\n"
-        s += "\t\t<td class=\"item_text\">#{f_text}</td>\n"
-
-        if @up_link_ids
-            if @up_link_ids.length == 1
-                if tmp = /^([a-zA-Z]+)[-]\d+/.match(@up_link_ids[0])
-                    up_link_doc_name = tmp[1].downcase
-                end
-                s += "\t\t<td class=\"item_id\"><a href=\"./../#{up_link_doc_name}/#{up_link_doc_name}.html##{@up_link_ids[0]}\" class=\"external\" title=\"Linked to\">#{@up_link_ids[0]}</a></td>\n"
-            else
-                s += "\t\t<td class=\"item_id\">"
-                s += "<div id=\"DL_#{@id}\" style=\"display: block;\">"
-                s += "<a  href=\"#\" onclick=\"downlink_OnClick(this.parentElement); return false;\" class=\"external\" title=\"Number of up-links\">#{@up_link_ids.length}</a>"
-                s += "</div>"
-                s += "<div id=\"DLS_#{@id}\" style=\"display: none;\">"
-                @up_link_ids.each do |lnk|
-                    if tmp = /^([a-zA-Z]+)[-]\d+/.match(lnk)
-                        up_link_doc_name = tmp[1].downcase
-                    end
-                    s += "\t\t\t<a href=\"./../#{up_link_doc_name}/#{up_link_doc_name}.html##{lnk}\" class=\"external\" title=\"Linked to\">#{lnk}</a>\n<br>"
-                end
-                s += "</div>"
-                s += "</td>\n"
-            end
-        else
-            s += "\t\t<td class=\"item_id\"></td>\n"
+        s += "\t\t<td class=\"item_id\">\
+            <a href=\"./../#{up_link_doc_name}/#{up_link_doc_name}.html##{@up_link_ids[0]}\" \
+            class=\"external\" title=\"Linked to\">#{@up_link_ids[0]}</a></td>\n"
+      else
+        s += "\t\t<td class=\"item_id\">"
+        s += "<div id=\"UL_#{@id}\" style=\"display: block;\">"
+        s += "<a  href=\"#\" onclick=\"upLink_OnClick(this.parentElement); return false;\" \
+            class=\"external\" title=\"Number of up-links\">#{@up_link_ids.length}</a>"
+        s += '</div>'
+        s += "<div id=\"ULS_#{@id}\" style=\"display: none;\">"
+        @up_link_ids.each do |lnk|
+          if tmp = /^([a-zA-Z]+)-\d+/.match(lnk)
+            up_link_doc_name = tmp[1].downcase
+          end
+          s += "\t\t\t<a href=\"./../#{up_link_doc_name}/#{up_link_doc_name}.html##{lnk}\" \
+            class=\"external\" title=\"Linked to\">#{lnk}</a>\n<br>"
         end
+        s += '</div>'
+        s += "</td>\n"
+      end
+    else
+      s += "\t\t<td class=\"item_id\"></td>\n"
+    end
 
-        if @down_links
-            if tmp = /^([a-zA-Z]+)[-]\d+/.match(@down_links[0].id)    # guessing that all the links refer to one document
-                down_link_doc_name = tmp[1].downcase
-            end
-            if @down_links.length == 1
-                s += "\t\t<td class=\"item_id\"><a href=\"./../#{down_link_doc_name}/#{down_link_doc_name}.html##{@down_links[0].id}\" class=\"external\" title=\"Referenced in\">#{@down_links[0].id}</a></td>\n"
-            else
-                s += "\t\t<td class=\"item_id\">"
-                s += "<div id=\"DL_#{@id}\" style=\"display: block;\">"
-                s += "<a  href=\"#\" onclick=\"downlink_OnClick(this.parentElement); return false;\" class=\"external\" title=\"Number of references\">#{@down_links.length}</a>"
-                s += "</div>"
-                s += "<div id=\"DLS_#{@id}\" style=\"display: none;\">"
-                @down_links.each do |lnk|
-                    s += "\t\t\t<a href=\"./../#{lnk.parent_doc.id}/#{lnk.parent_doc.id}.html##{lnk.id}\" class=\"external\" title=\"Referenced in\">#{lnk.id}</a>\n<br>"
-                end
-                s += "</div>"
-                s += "</td>\n"
-            end
-        else
-            s += "\t\t<td class=\"item_id\"></td>\n"
+    if @down_links
+      if tmp = /^([a-zA-Z]+)-\d+/.match(@down_links[0].id) # guessing that all the links refer to one document
+        down_link_doc_name = tmp[1].downcase
+      end
+      if @down_links.length == 1
+        s += "\t\t<td class=\"item_id\">\
+            <a href=\"./../#{down_link_doc_name}/#{down_link_doc_name}.html##{@down_links[0].id}\" \
+            class=\"external\" title=\"Referenced in\">#{@down_links[0].id}</a></td>\n"
+      else
+        s += "\t\t<td class=\"item_id\">"
+        s += "<div id=\"DL_#{@id}\" style=\"display: block;\">"
+        s += "<a  href=\"#\" onclick=\"downlink_OnClick(this.parentElement); return false;\" \
+            class=\"external\" title=\"Number of references\">#{@down_links.length}</a>"
+        s += '</div>'
+        s += "<div id=\"DLS_#{@id}\" style=\"display: none;\">"
+        @down_links.each do |lnk|
+          s += "\t\t\t<a href=\"./../#{lnk.parent_doc.id}/#{lnk.parent_doc.id}.html##{lnk.id}\" \
+            class=\"external\" title=\"Referenced in\">#{lnk.id}</a>\n<br>"
         end
+        s += '</div>'
+        s += "</td>\n"
+      end
+    else
+      s += "\t\t<td class=\"item_id\"></td>\n"
+    end
 
-        if @coverage_links
-            if tmp = /^(.+)[.]\d+/.match(@coverage_links[0].id)    # guessing that all the links refer to one document
-                cov_link_doc_name = tmp[1].downcase
-            end
-            s += "\t\t<td class=\"item_id\"><a href=\"./../../tests/protocols/#{cov_link_doc_name}/#{cov_link_doc_name}.html\" class=\"external\" title=\"Number of verification steps\">#{@coverage_links.length}</a></td>\n"
-        else
-            s += "\t\t<td class=\"item_id\"></td>\n"
+    if @coverage_links
+      if tmp = /^(.+)[.]\d+/.match(@coverage_links[0].id)    # guessing that all the links refer to one document
+        cov_link_doc_name = tmp[1].downcase
+      end
+      if @coverage_links.length == 1
+        s += "\t\t<td class=\"item_id\">\
+            <a href=\"./../../tests/protocols/#{cov_link_doc_name}/#{cov_link_doc_name}.html\" \
+            class=\"external\" title=\"Number of verification steps\">#{@coverage_links[0].id}</a></td>\n"
+      else
+        s += "\t\t<td class=\"item_id\">"
+        s += "<div id=\"COV_#{@id}\" style=\"display: block;\">"
+        s += "<a  href=\"#\" onclick=\"coverageLink_OnClick(this.parentElement); return false;\" \
+            class=\"external\" title=\"Number of verification steps\">#{@coverage_links.length}</a>"
+        s += '</div>'
+        s += "<div id=\"COVS_#{@id}\" style=\"display: none;\">"
+        @coverage_links.each do |lnk|
+          s += "\t\t\t<a href=\"./../../tests/protocols/#{lnk.parent_doc.id}/#{lnk.parent_doc.id}.html##{lnk.id}\" \
+            class=\"external\" title=\"Covered in\">#{lnk.id}</a>\n<br>"
         end
-        s += "\t</tr>\n"
-        return s
-    end 
-
-end
+        s += '</div>'
+        s += "</td>\n"
+      end
+    else
+      s += "\t\t<td class=\"item_id\"></td>\n"
+    end
+    s += "\t</tr>\n"
+    s
+  end
+end

data/lib/almirah/doc_items/controlled_table.rb

@@ -1,181 +1,224 @@
-require_relative "controlled_table_row"
-require_relative "text_line"
+require_relative 'controlled_table_row'
+require_relative 'text_line'
 
-class ControlledTableColumn < TextLine
+class ControlledTableColumn < TextLine # rubocop:disable Style/Documentation
+  attr_accessor :text
 
-    attr_accessor :text
-    
-    def initialize(text)
-        @text = text.strip
-    end
+  def initialize(text) # rubocop:disable Lint/MissingSuper
+    @text = text.strip
+  end
 
-    def to_html
-        f_text = format_string(@text)
-        "\t\t<td>#{f_text}</td>\n\r"
-    end
+  def to_html
+    f_text = format_string(@text)
+    "\t\t<td>#{f_text}</td>\n\r"
+  end
 end
 
-
 class RegualrColumn < ControlledTableColumn
-
 end
 
+class TestStepNumberColumn < ControlledTableColumn # rubocop:disable Style/Documentation
+  attr_accessor :step_number, :row_id
 
-class TestStepNumberColumn < ControlledTableColumn
+  def initialize(text)
+    super
+    @step_number = text.to_i
+    @row_id = ''
+  end
 
-    attr_accessor :step_number
-    attr_accessor :row_id
-    
-    def initialize(text)
-        text = text.strip
-        @step_number = text.to_i
-        @text =  text
-        @row_id = ""
-    end
+  def to_html
+    "\t\t<td style=\"text-align: center;\"><a name=\"#{@row_id}\" id=\"#{@row_id}\" \
+        href=\"##{@row_id}\">#{@text}</a></td>\n\r"
+  end
+end
 
-    def to_html
-        "\t\t<td style=\"text-align: center;\"><a name=\"#{@row_id}\" id=\"#{@row_id}\" href=\"##{@row_id}\">#{@text}</a></td>\n\r"
+class TestStepResultColumn < ControlledTableColumn # rubocop:disable Style/Documentation
+  def to_html
+    f_text = format_string(@text)
+    case @text.downcase
+    when 'pass'
+      "\t\t<td style=\"background-color: #cfc;\">#{f_text}</td>\n\r"
+    when 'fail'
+      "\t\t<td style=\"background-color: #fcc;\">#{f_text}</td>\n\r"
+    else
+      "\t\t<td>#{f_text}</td>\n\r"
     end
-end 
-
-
-class TestStepResultColumn <  ControlledTableColumn
+  end
+end
 
-    def to_html
-        f_text = format_string(@text)
-        if @text.downcase == "pass"
-            "\t\t<td style=\"background-color: #cfc;\">#{f_text}</td>\n\r"
-        elsif @text.downcase == "fail"
-            "\t\t<td style=\"background-color: #fcc;\">#{f_text}</td>\n\r"
-        else
-            "\t\t<td>#{f_text}</td>\n\r"
-        end
+class TestStepReferenceColumn < ControlledTableColumn # rubocop:disable Style/Documentation
+  attr_accessor :up_link_ids, :up_link_doc_ids, :parent_row
+
+  def initialize(parent_row, text)
+    super(text)
+    @up_link_ids = nil
+    @up_link_doc_ids = {}
+    @parent_row = parent_row
+
+    up_links = nil
+
+    # check if it contains the uplink (one or many)
+    first_pos = text.length # for trailing commas
+    tmp = text.scan(/(>\[(?>[^\[\]]|\g<0>)*\])/) # >[SRS-001], >[SYS-002]
+    unless tmp.empty?
+      up_links = []
+      tmp.each do |ul|
+        lnk = ul[0]
+        # do not add links for the self document
+        doc_id = /([a-zA-Z]+)-\d+/.match(lnk) # SRS
+        up_links << lnk.upcase if doc_id # (doc_id) and (doc_id[1].downcase != doc.id.downcase)
+        # try to find the real end of text
+        pos = text.index(lnk)
+        first_pos = pos if pos < first_pos
+        # remove uplink from text
+        text = text.split(lnk, 1).join('')
+      end
+      # remove trailing commas and spaces
+      if text.length > first_pos
+        first_pos -= 1
+        text = text[0..first_pos].strip
+      end
     end
-end
 
+    if up_links # rubocop:disable Style/GuardClause
+      up_links.uniq! # remove duplicates
+      # doc.items_with_uplinks_number += 1 # for statistics
+      up_links.each do |ul|
+        next unless tmp = />\[(\S*)\]$/.match(ul) # >[SRS-001]
 
-class TestStepReferenceColumn <  ControlledTableColumn
+        up_link_id = tmp[1]
 
-    attr_accessor :up_link
-    attr_accessor :up_link_doc_id
+        @up_link_ids ||= []
 
-    def initialize(text)
-        
-        @up_link = nil
-        @up_link_doc_id = nil
+        @up_link_ids.append(up_link_id)
 
-        if tmp = />\[(\S*)\]/.match(text)   # >[SRS-001]
-            @up_link = tmp[1]
-            if tmp = /^([a-zA-Z]+)[-]\d+/.match(@up_link)   # SRS
-                @up_link_doc_id = tmp[1].downcase 
-            end
+        if tmp = /^([a-zA-Z]+)-\d+/.match(up_link_id) # SRS
+          @up_link_doc_ids[tmp[1].downcase.to_s] = tmp[1].downcase # multiple documents could be up-linked
         end
+      end
     end
-
-    def to_html
-        if @up_link
-            "\t\t<td class=\"item_id\"><a href=\"./../../../specifications/#{@up_link_doc_id}/#{@up_link_doc_id}.html##{@up_link}\" class=\"external\">#{@up_link}</a></td>\n\r"
-        else
-            "\t\t<td style=\"text-align: center;\"></td>\n\r"
+  end
+
+  def to_html # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    s = ''
+    if @up_link_ids
+      if @up_link_ids.length == 1
+        if tmp = /^([a-zA-Z]+)-\d+/.match(@up_link_ids[0])
+          up_link_doc_name = tmp[1].downcase
+        end
+        s += "\t\t<td class=\"item_id\" style=\"text-align: center;\">\
+                    <a href=\"./../../../specifications/#{up_link_doc_name}/#{up_link_doc_name}.html##{@up_link_ids[0]}\" \
+                    class=\"external\" title=\"Linked to\">#{@up_link_ids[0]}</a></td>\n"
+      else
+        s += "\t\t<td class=\"item_id\" style=\"text-align: center;\">"
+        s += "<div id=\"COV_#{@parent_row.id}\" style=\"display: block;\">"
+        s += "<a  href=\"#\" onclick=\"coverageLink_OnClick(this.parentElement); return false;\" \
+                    class=\"external\" title=\"Number of verified items\">#{@up_link_ids.length}</a>"
+        s += '</div>'
+        s += "<div id=\"COVS_#{@parent_row.id}\" style=\"display: none;\">"
+        @up_link_ids.each do |lnk|
+          if tmp = /^([a-zA-Z]+)-\d+/.match(lnk)
+            up_link_doc_name = tmp[1].downcase
+          end
+          s += "\t\t\t<a href=\"./../../../specifications/#{up_link_doc_name}/#{up_link_doc_name}.html##{lnk}\" \
+                    class=\"external\" title=\"Verifies\">#{lnk}</a>\n<br>"
         end
+        s += '</div>'
+        s += "</td>\n"
+      end
+    else
+      "\t\t<td style=\"text-align: center;\"></td>\n\r"
     end
-    
+  end
 end
 
+class ControlledTable < DocItem # rubocop:disable Style/Documentation
+  attr_accessor :column_names, :rows, :is_separator_detected
+
+  def initialize(doc, markdown_table) # rubocop:disable Lint/MissingSuper
+    @parent_doc = doc
+    @parent_heading = doc.headings[-1]
 
-class ControlledTable < DocItem
+    @column_names = markdown_table.column_names
+    @is_separator_detected = markdown_table.is_separator_detected
+    # copy and re-format existing rows
+    @rows = []
 
-    attr_accessor :column_names
-    attr_accessor :rows
-    attr_accessor :is_separator_detected
+    markdown_table.rows.each do |r|
+      @rows.append(format_columns(r))
+    end
+  end
 
-    def initialize(doc, markdown_table)
-        @parent_doc = doc
-        @parent_heading = doc.headings[-1]
+  def add_row(row)
+    columns = row.split('|')
 
-        @column_names = markdown_table.column_names
-        @is_separator_detected = markdown_table.is_separator_detected
-        # copy and re-format existing rows
-        @rows = Array.new
+    @rows.append(format_columns(columns))
 
-        markdown_table.rows.each do |r|
-            @rows.append(format_columns(r))
-        end  
-    end
+    true
+  end
 
-    def addRow(row)
+  def format_columns(columns) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    new_row = ControlledTableRow.new
+    new_row.parent_doc = @parent_doc
 
-        columns = row.split('|')
+    columns.each_with_index do |element, index|
+      if index.zero? # it is expected that test step id is placed in the first columl
 
-        @rows.append(format_columns(columns))
+        col = TestStepNumberColumn.new element
+        new_row.columns.append col
+        new_row.id = "#{@parent_doc.id}.#{col.text}"
+        col.row_id = new_row.id
 
-        return true
-    end
+      elsif index + 1 == columns.length # it is expected that a link is placed to the last column only
 
-    def format_columns(columns)
-
-        new_row = ControlledTableRow.new
-        new_row.parent_doc = @parent_doc
-
-        columns.each_with_index do | element, index |
-
-            if index == 0 # it is expected that test step id is placed in the first columl
-                
-                col = TestStepNumberColumn.new element
-                new_row.columns.append col
-                new_row.id = @parent_doc.id + '.' + col.text
-                col.row_id = new_row.id
-
-            elsif index + 1 == columns.length # it is expected that a link is placed to the last column only
-                
-                col = TestStepReferenceColumn.new element
-                new_row.columns.append col
-                # save uplink key but do not rewrite
-                if col.up_link_doc_id != nil 
-                    
-                    @parent_doc.up_link_docs[ col.up_link_doc_id.to_s ] = col.up_link_doc_id
-
-                    # save reference to the test step
-                    new_row.up_link = col.up_link
-                    @parent_doc.controlled_items.append new_row
-                end               
-
-            elsif index + 2 == columns.length # it is expected that test step result is placed to the pre-last column only
-                
-                col = TestStepResultColumn.new element
-                new_row.columns.append col
-
-            else
-                col = RegualrColumn.new element
-                new_row.columns.append col
-            end             
-        end
-        return new_row
-    end
+        col = TestStepReferenceColumn.new(new_row, element)
+        new_row.columns << col
+        # save uplink key but do not rewrite
+        unless col.up_link_doc_ids.empty?
+          col.up_link_doc_ids.each do |key, value|
+            @parent_doc.up_link_docs[key] = value
 
-    def to_html
-        s = ''
-        if @@html_table_render_in_progress
-            s += "</table>\n"
-            @@html_table_render_in_progress = false
+            # save reference to the test step
+            new_row.up_link_ids = col.up_link_ids
+            @parent_doc.controlled_items.append new_row
+          end
         end
-                   
-        s += "<table class=\"markdown_table\">\n"
-        s += "\t<thead>" 
 
-        @column_names.each do |h|
-            s += " <th>#{h}</th>"
-        end
+      elsif index + 2 == columns.length # it is expected that test step result is placed to the pre-last column only
 
-        s += " </thead>\n"
+        col = TestStepResultColumn.new element
+        new_row.columns.append col
 
-        @rows.each do |row|
-            s += row.to_html
-        end
+      else
+        col = RegualrColumn.new element
+        new_row.columns.append col
+      end
+    end
+    new_row
+  end
+
+  def to_html # rubocop:disable Metrics/MethodLength
+    s = ''
+    if @@html_table_render_in_progress
+      s += "</table>\n"
+      @@html_table_render_in_progress = false # rubocop:disable Style/ClassVars
+    end
 
-        s += "</table>\n"
+    s += "<table class=\"markdown_table\">\n"
+    s += "\t<thead>"
 
-        return s
+    @column_names.each do |h|
+      s += " <th>#{h}</th>"
     end
 
-end
+    s += " </thead>\n"
+
+    @rows.each do |row|
+      s += row.to_html
+    end
+
+    s += "</table>\n"
+
+    s
+  end
+end

data/lib/almirah/doc_items/controlled_table_row.rb

@@ -3,13 +3,13 @@ require_relative "doc_item"
 class ControlledTableRow < DocItem
 
     attr_accessor :id
-    attr_accessor :up_link
+    attr_accessor :up_link_ids
     attr_accessor :columns
     
     def initialize
         @id = ""
-        @up_link = ""
-        @columns = Array.new
+        @up_link_ids = nil
+        @columns = []
     end
 
     def to_html

data/lib/almirah/doc_items/markdown_list.rb

@@ -21,7 +21,7 @@ class MarkdownList < DocItem
     @@lists_stack.push(self)
   end
 
-  def addRow(raw_text)
+  def add_row(raw_text)
     pos = calculate_text_position(raw_text)
     row = raw_text[pos..-1]
 
@@ -44,7 +44,7 @@ class MarkdownList < DocItem
         prev_lists_stack_item.rows[-1] = nested_list
       end
 
-      nested_list.addRow(raw_text)
+      nested_list.add_row(raw_text)
 
     elsif pos < @@lists_stack[-1].indent_position
 

data/lib/almirah/doc_items/markdown_table.rb

@@ -21,7 +21,7 @@ class MarkdownTable < DocItem
     @is_separator_detected = false
   end
 
-  def addRow(row)
+  def add_row(row)
     columns = row.split('|')
     @rows.append(columns.map!(&:strip))
     true