Almirah 0.2.2 → 0.2.3

data/lib/almirah/doc_items/markdown_table.rb

@@ -1,59 +1,63 @@
-require_relative "doc_item"
+# frozen_string_literal: true
 
-class MarkdownTable < DocItem
-
-    attr_accessor :column_names
-    attr_accessor :rows
+require_relative 'doc_item'
 
-    def initialize(heading_row)
-        @column_names = heading_row.split('|')
-        @rows = Array.new
+class MarkdownTable < DocItem
+  attr_accessor :column_names, :rows, :heading_row, :is_separator_detected
+
+  def initialize(doc, heading_row)
+    super()
+    @parent_doc = doc
+    @parent_heading = doc.headings[-1]
+    @heading_row = heading_row
+
+    res = /^[|](.*[|])/.match(heading_row)
+    @column_names = if res
+                      res[1].split('|')
+                    else
+                      ['# ERROR# ']
+                    end
+    @rows = []
+    @is_separator_detected = false
+  end
+
+  def addRow(row)
+    columns = row.split('|')
+    @rows.append(columns.map!(&:strip))
+    true
+  end
+
+  def to_html
+    s = ''
+    if @@html_table_render_in_progress
+      s += "</table>\n"
+      @@html_table_render_in_progress = false
     end
 
-    def addRow(row)
-        #check if row contains a link
-        if tmp = /(.*)\s+>\[(\S*)\]/.match(row)
-            return false # this is not a regular Markdown table.
-            # so the table type shall be changed and this row shall be passed one more time
-        end
+    s += "<table class=\"markdown_table\">\n"
+    s += "\t<thead>"
 
-        columns = row.split('|')
-        @rows.append(columns.map!{ |x| x.strip })
-        return true
+    @column_names.each do |h|
+      s += " <th>#{h}</th>"
     end
 
-    def to_html
-        s = ''
-        if @@htmlTableRenderInProgress
-            s += "</table>\n"
-            @@htmlTableRenderInProgress = false
-        end
-                   
-        s += "<table class=\"markdown_table\">\n"
-        s += "\t<thead>" 
-
-        @column_names.each do |h|
-            s += " <th>#{h}</th>"
-        end
+    s += " </thead>\n"
 
-        s += " </thead>\n"
-
-        @rows.each do |row|
-            s += "\t<tr>\n"
-            row.each do |col|
-                if col.to_i > 0 && col.to_i.to_s == col  # autoalign cells with numbers
-                    s += "\t\t<td style=\"text-align: center;\">#{col}</td>\n"
-                else
-                    f_text = format_string(col)
-                    s += "\t\t<td>#{f_text}</td>\n"
-                end
-            end
-            s += "\t</tr>\n"
+    @rows.each do |row|
+      s += "\t<tr>\n"
+      row.each do |col|
+        if col.to_i.positive? && col.to_i.to_s == col  # autoalign cells with numbers
+          s += "\t\t<td style=\"text-align: center;\">#{col}</td>\n"
+        else
+          f_text = format_string(col)
+          s += "\t\t<td>#{f_text}</td>\n"
         end
-
-        s += "</table>\n"
-
-        return s
+      end
+      s += "\t</tr>\n"
     end
 
-end
+    s += "</table>\n"
+
+    s
+  end
+end

data/lib/almirah/doc_items/paragraph.rb

@@ -4,7 +4,9 @@ class Paragraph < DocItem
 
     attr_accessor :text
 
-    def initialize(text)
+    def initialize(doc, text)
+        @parent_doc = doc
+        @parent_heading = doc.headings[-1]
         @text = text
     end
 
@@ -14,9 +16,9 @@ class Paragraph < DocItem
 
     def to_html
         s = ''
-        if @@htmlTableRenderInProgress
+        if @@html_table_render_in_progress
             s += "</table>"
-            @@htmlTableRenderInProgress = false
+            @@html_table_render_in_progress = false
         end
 
         s += "<p>" + format_string(@text)