Almirah 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4e770388ae634e216ef325d7f82a5d32d44bb5405dbea4e32783e3f0d2eea91
-  data.tar.gz: 20871334c2ba2179e361abd1319634281bde45ba38032ec2fd3dabdea98f6e3a
+  metadata.gz: 877a4c7b296af5fa0418113a4287df82661d23903764f73a74b8794d2be22d9a
+  data.tar.gz: 4195b1434e0ca4c75177c4af9ea3e97ffa9a373106bda58fa11621ba273df7cf
 SHA512:
-  metadata.gz: ad3b925c13c5a6794a82eabb3cfc81894c3f5711e5250cb0cb1dbaee0e79ff56e0e571e1dbcedb969c8384b3db82a021c082017d0cba001cb4ea1a2c314d21cd
-  data.tar.gz: 38532ef2204233611d5330e5825c0ccc0234043eec49f54f81e768d2caecdbc20df78999a8dfed3b074b924fe7ae6c2bcc6d3658771863f7663ab75b8c5167d4
+  metadata.gz: 4425611cadee99f5686c79abbc853d93bbfeb0e729a97168f93842d998daf8e1a879de8e25918fcbd01bd49abe2b842cc192f24d137cd987d77816f606abed15
+  data.tar.gz: ca609c497ebde13428c516a0369f860c323f7bcaba740424d125b9a3c4bd2e1955f8f8aec665d6afd088cc44772c4edfaba5dc64f47827be631253111f82a446

data/lib/almirah/doc_fabric.rb

@@ -0,0 +1,200 @@
+#
+require_relative "doc_types/base_document"
+require_relative "doc_types/specification"
+require_relative "doc_types/protocol"
+#
+require_relative "doc_items/doc_item"
+require_relative "doc_items/heading"
+require_relative "doc_items/paragraph"
+require_relative "doc_items/blockquote"
+require_relative "doc_items/controlled_paragraph"
+require_relative "doc_items/markdown_table"
+require_relative "doc_items/controlled_table"
+require_relative "doc_items/image"
+require_relative "doc_items/markdown_list"
+
+class DocFabric
+
+    def self.create_specification(path)
+        doc = Specification.new path
+        DocFabric.parse_document doc
+        return doc
+    end
+
+    def self.create_protocol(path)
+        doc = Protocol.new path
+        DocFabric.parse_document doc
+        return doc
+    end
+
+    def self.parse_document(doc)
+
+        tempMdTable = nil
+        tempMdList = nil
+
+        file = File.open( doc.path )
+        file_lines = file.readlines     
+        file.close
+
+        file_lines.each do |s|
+            if s.lstrip != ""
+                if res = /^([#]{1,})\s(.*)/.match(s)     # Heading    
+                    
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+                    if  tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end 
+
+                    level = res[1].length
+                    value = res[2]
+                    item = Heading.new(value, level)
+                    doc.items.append(item)
+                    doc.headings.append(item)
+
+                    if level == 1 && doc.title == ""
+                        doc.title = value
+                    end   
+                        
+                elsif res = /^\[(\S*)\]\s+(.*)/.match(s)     # Controlled Paragraph
+
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+                    if tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end 
+
+                    id = res[1]
+                    text = res[2]
+
+                    #check if it contains the uplink
+                    if tmp = /(.*)\s+>\[(\S*)\]$/.match(text)           # >[SRS-001]
+
+                        text = tmp[1]
+                        up_link = tmp[2]
+                        
+                        if tmp = /^([a-zA-Z]+)[-]\d+/.match(up_link)    # SRS
+                            doc.up_link_doc_id = tmp[1].downcase
+                        end
+                    end
+
+                    item = ControlledParagraph.new( text, id )
+                    item.up_link = up_link
+
+                    doc.items.append(item)
+                    doc.dictionary[ id.to_s ] = item       #for fast search
+                    doc.controlled_items.append(item)      #for fast search
+
+                elsif res = /^[!]\[(.*)\]\((.*)\)/.match(s)     # Image
+
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+                    if tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end
+
+                    img_text = res[1]
+                    img_path = res[2]
+
+                    item = Image.new( img_text, img_path )
+
+                    doc.items.append(item)
+
+                elsif res = /^(\*\s?)+(.*)/.match(s)   #check if bullet list
+                    
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+
+                    row = res[2]
+
+                    if tempMdList
+                        tempMdList.addRow(row)
+                    else
+                        item = MarkdownList.new(row)
+                        tempMdList = item
+                    end
+
+                elsif s[0] == '|'   #check if table
+
+                    if tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end
+
+                    if res = /^[|](-{3,})[|]/.match(s) #check if it is a separator first
+
+                        if tempMdTable 
+                            #separator is found after heading - just skip it
+                        else
+                            #separator out of table scope consider it just as a regular paragraph
+                            item = Paragraph.new(s)
+                            doc.items.append(item)
+                        end
+
+                    elsif res = /^[|](.*[|])/.match(s) #check if it looks as a table
+
+                        row = res[1]
+
+                        if tempMdTable
+                            # check if it is a controlled table
+                            unless tempMdTable.addRow(row)
+                                tempMdTable = ControlledTable.new(tempMdTable, doc)
+                                tempMdTable.addRow(row)
+                            end
+                        else
+                            #start table from heading
+                            tempMdTable = MarkdownTable.new(row)
+                        end
+                    end
+
+                elsif res = /^[>](.*)/.match(s)   #check if blockquote
+
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+                    if tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end 
+
+                    item = Blockquote.new(res[1])
+                    doc.items.append(item)
+
+                else # Reqular Paragraph
+                    if tempMdTable
+                        doc.items.append tempMdTable
+                        tempMdTable = nil
+                    end
+                    if tempMdList
+                        doc.items.append tempMdList
+                        tempMdList = nil
+                    end
+
+                    item = Paragraph.new(s)
+                    doc.items.append(item)
+                end
+            end
+        end
+        # Finalize non-closed elements
+        if tempMdTable
+            doc.items.append tempMdTable
+            tempMdTable = nil
+        end
+        if tempMdList
+            doc.items.append tempMdList
+            tempMdList = nil
+        end
+    end
+end

data/lib/almirah/doc_items/blockquote.rb

@@ -11,11 +11,11 @@ class Blockquote < DocItem
     def to_html
         s = ''
         if @@htmlTableRenderInProgress
-            s += "</table>\n\r"
+            s += "</table>\n"
             @@htmlTableRenderInProgress = false
         end
 
-        s += "<div class=\"blockquote\"><p>#{@text}</div>\n\r"
+        s += "<div class=\"blockquote\"><p>#{@text}</div>\n"
         return s
     end
 end

data/lib/almirah/doc_items/controlled_paragraph.rb

@@ -5,47 +5,54 @@ class ControlledParagraph < Paragraph
     attr_accessor :id
     attr_accessor :up_link
     attr_accessor :down_links
+    attr_accessor :coverage_links
 
     def initialize(text, id)
         @text = text
         @id = id
         @up_link = nil
         @down_links = nil
+        @coverage_links = nil
     end
 
     def to_html
         s = ''
         unless @@htmlTableRenderInProgress                    
-            s += "<table class=\"controlled\">\n\r"
-            s += "\t<thead> <th>#</th> <th>Text</th> <th>UL</th> <th>DL</th> <th>COV</th> </thead>\n\r"
+            s += "<table class=\"controlled\">\n"
+            s += "\t<thead> <th>#</th> <th>Text</th> <th>UL</th> <th>DL</th> <th>COV</th> </thead>\n"
             @@htmlTableRenderInProgress = true
         end
-        s += "\t<tr>\n\r"
-        s += "\t\t<td class=\"item_id\"> <a name=\"#{@id}\"></a>#{@id} </td>\n\r"
-        s += "\t\t<td class=\"item_text\">#{@text}</td>\n\r"
+        s += "\t<tr>\n"
+        s += "\t\t<td class=\"item_id\"> <a name=\"#{@id}\"></a>#{@id} </td>\n"
+        s += "\t\t<td class=\"item_text\">#{@text}</td>\n"
 
         if @up_link
             if tmp = /^([a-zA-Z]+)[-]\d+/.match(@up_link)
                 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\" class=\"external\">#{@up_link}</a></td>\n\r"
+            s += "\t\t<td class=\"item_id\"><a href=\"./../#{up_link_doc_name}/#{up_link_doc_name}.html\" class=\"external\">#{@up_link}</a></td>\n"
         else
-            s += "\t\t<td class=\"item_id\"></td>\n\r"
+            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
-            s += "\t\t<td class=\"item_id\"><a href=\"./../#{down_link_doc_name}/#{down_link_doc_name}.html\" class=\"external\">#{@down_links.length}</a></td>\n\r"
+            s += "\t\t<td class=\"item_id\"><a href=\"./../#{down_link_doc_name}/#{down_link_doc_name}.html\" class=\"external\">#{@down_links.length}</a></td>\n"
         else
-            s += "\t\t<td class=\"item_id\"></td>\n\r"
+            s += "\t\t<td class=\"item_id\"></td>\n"
         end
 
-        #s += "\t\t<td></td>\n\r"    # UL
-        #s += "\t\t<td></td>\n\r"    # DL
-        s += "\t\t<td class=\"item_id\"></td>\n\r"    # COV
-        s += "\t</tr>\n\r"
+        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\">#{@coverage_links.length}</a></td>\n"
+        else
+            s += "\t\t<td class=\"item_id\"></td>\n"
+        end
+        s += "\t</tr>\n"
         return s
     end 
 

data/lib/almirah/doc_items/controlled_table.rb

@@ -0,0 +1,172 @@
+require_relative "controlled_table_row"
+
+
+class ControlledTableColumn
+
+    attr_accessor :text
+    
+    def initialize(text)
+        @text = text.strip
+    end
+
+    def to_html
+        "\t\t<td>#{@text}</td>\n\r"
+    end
+end
+
+
+class RegualrColumn < ControlledTableColumn
+
+end
+
+
+class TestStepNumberColumn < ControlledTableColumn
+
+    attr_accessor :step_number
+    
+    def initialize(text)
+        text = text.strip
+        @step_number = text.to_i
+        @text =  text
+    end
+
+    def to_html
+        "\t\t<td style=\"text-align: center;\">#{@text}</td>\n\r"
+    end
+end 
+
+
+class TestStepResultColumn <  ControlledTableColumn
+
+    def to_html
+        if @text.downcase == "pass"
+            "\t\t<td style=\"background-color: #cfc;\">#{@text}</td>\n\r"
+        elsif @text.downcase == "fail"
+            "\t\t<td style=\"background-color: #fcc;\">#{@text}</td>\n\r"
+        else
+            "\t\t<td>#{@text}</td>\n\r"
+        end
+    end
+end
+
+
+class TestStepReferenceColumn <  ControlledTableColumn
+
+    attr_accessor :up_link
+    attr_accessor :up_link_doc_id
+
+    def initialize(text)
+        
+        @up_link = nil
+        @up_link_doc_id = nil
+
+        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
+        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\" class=\"external\">#{@up_link}</a></td>\n\r"
+        else
+            "\t\t<td style=\"text-align: center;\"></td>\n\r"
+        end
+    end
+    
+end
+
+
+class ControlledTable < DocItem
+
+    attr_accessor :column_names
+    attr_accessor :rows
+    attr_accessor :parent_doc
+
+    def initialize(markdown_table, parent_doc)
+        @parent_doc = parent_doc
+        @column_names = markdown_table.column_names
+        # copy and re-format existing rows
+        @rows = Array.new
+
+        markdown_table.rows.each do |r|
+            @rows.append(format_columns(r))
+        end  
+    end
+
+    def addRow(row)
+
+        columns = row.split('|')
+
+        @rows.append(format_columns(columns))
+
+        return true
+    end
+
+    def format_columns(columns)
+
+        new_row = ControlledTableRow.new
+
+        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
+
+            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 
+                    if @parent_doc.up_link_doc_id == ""
+                        @parent_doc.up_link_doc_id = col.up_link_doc_id
+                    end
+                    # 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
+
+    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"
+
+        @rows.each do |row|
+            s += row.to_html
+        end
+
+        s += "</table>\n"
+
+        return s
+    end
+
+end

data/lib/almirah/doc_items/controlled_table_row.rb

@@ -0,0 +1,23 @@
+require_relative "doc_item"
+
+class ControlledTableRow < DocItem
+
+    attr_accessor :id
+    attr_accessor :up_link
+    attr_accessor :columns
+    
+    def initialize
+        @id = ""
+        @up_link = ""
+        @columns = Array.new
+    end
+
+    def to_html
+        s = ""
+        s += "\t<tr>\n"
+        @columns.each do |col|
+            s += col.to_html    # "\t\t<td>#{col}</td>\n\r"
+        end
+        s += "\t</tr>\n"
+    end
+end

data/lib/almirah/doc_items/heading.rb

@@ -3,22 +3,23 @@ require_relative "paragraph"
 class Heading < Paragraph
 
     attr_accessor :level
+    attr_accessor :anchor_id
 
     def initialize(text, level)
         @text = text
         @level = level
+        @anchor_id = self.getTextWithoutSpaces()
     end
 
     def to_html
         s = ''
         if @@htmlTableRenderInProgress
-            s += "</table>"
+            s += "</table>\n"
             @@htmlTableRenderInProgress = false
         end
-        headingLevel = level.to_s
-        itemTextNoSpaces = self.getTextWithoutSpaces
-        s += "<a name=\"#{itemTextNoSpaces}\"></a>\n\r"
-        s += "<h#{headingLevel}> #{@text} <a href=\"\##{itemTextNoSpaces}\" class=\"heading_anchor\">"
+        headingLevel = level.to_s 
+        s += "<a name=\"#{@anchor_id}\"></a>\n"
+        s += "<h#{headingLevel}> #{@text} <a href=\"\##{@anchor_id}\" class=\"heading_anchor\">"
         s += "&para;</a></h#{headingLevel}>"
         return s
     end

data/lib/almirah/doc_items/image.rb

@@ -17,7 +17,7 @@ class Image < DocItem
     def to_html
         s = ''
         if @@htmlTableRenderInProgress
-            s += "</table>\n\r"
+            s += "</table>\n"
             @@htmlTableRenderInProgress = false
         end
 

data/lib/almirah/doc_items/markdown_list.rb

@@ -16,15 +16,15 @@ class MarkdownList < DocItem
     def to_html
         s = ''
         if @@htmlTableRenderInProgress
-            s += "</table>/n/r"
+            s += "</table>\n"
             @@htmlTableRenderInProgress = false
         end
 
-        s += "<ul>\n\r"
+        s += "<ul>\n"
         @rows.each do |r|
-            s += "\t<li>#{r}</li>\n\r"
+            s += "\t<li>#{r}</li>\n"
         end
-        s += "</ul>\n\r"
+        s += "</ul>\n"
 
         return s
     end

data/lib/almirah/doc_items/markdown_table.rb

@@ -11,35 +11,46 @@ class MarkdownTable < DocItem
     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
+
         columns = row.split('|')
-        @rows.append(columns)
+        @rows.append(columns.map!{ |x| x.strip })
+        return true
     end
 
     def to_html
         s = ''
         if @@htmlTableRenderInProgress
-            s += "</table>"
+            s += "</table>\n"
             @@htmlTableRenderInProgress = false
         end
                    
-        s += "<table class=\"markdown_table\">\n\r"
+        s += "<table class=\"markdown_table\">\n"
         s += "\t<thead>" 
 
         @column_names.each do |h|
             s += " <th>#{h}</th>"
         end
 
-        s += " </thead>\n\r"
+        s += " </thead>\n"
 
         @rows.each do |row|
-            s += "\t<tr>\n\r"
+            s += "\t<tr>\n"
             row.each do |col|
-                s += "\t\t<td>#{col}</td>\n\r"
+                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
+                    s += "\t\t<td>#{col}</td>\n"
+                end
             end
-            s += "\t</tr>\n\r"
+            s += "\t</tr>\n"
         end
 
-        s += "</table>\n\r"
+        s += "</table>\n"
 
         return s
     end

data/lib/almirah/doc_types/base_document.rb

@@ -0,0 +1,18 @@
+
+class BaseDocument
+
+    attr_accessor :path
+    attr_accessor :items
+    attr_accessor :headings
+    attr_accessor :title
+    attr_accessor :id
+
+    def initialize(fele_path)
+
+        @path = fele_path
+        @items = Array.new
+        @headings = Array.new
+        @title = ""
+        @id = ""
+    end
+end

data/lib/almirah/doc_types/protocol.rb

@@ -0,0 +1,22 @@
+require_relative "base_document"
+
+class Protocol < BaseDocument
+
+    attr_accessor :up_link_doc_id
+    #attr_accessor :dictionary
+    attr_accessor :controlled_items
+
+    def initialize(fele_path)
+
+        @path = fele_path
+        @title = ""
+        @items = Array.new
+        @headings = Array.new
+        @controlled_items = Array.new
+        #@dictionary = Hash.new
+
+        @id = File.basename(fele_path, File.extname(fele_path)).downcase
+        @up_link_doc_id = ""
+    end
+
+end

data/lib/almirah/doc_types/specification.rb

@@ -0,0 +1,22 @@
+require_relative "base_document"
+
+class Specification < BaseDocument
+
+    attr_accessor :up_link_doc_id
+    attr_accessor :dictionary
+    attr_accessor :controlled_items
+
+    def initialize(fele_path)
+
+        @path = fele_path
+        @title = ""
+        @items = Array.new
+        @headings = Array.new
+        @controlled_items = Array.new
+        @dictionary = Hash.new
+
+        @id = File.basename(fele_path, File.extname(fele_path)).downcase
+        @up_link_doc_id = ""
+    end
+
+end