Almirah 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28aa00ca57d213d56625d51372284eaff2668db942bb08fccd4d2c0bae10a72
-  data.tar.gz: ce278d1ab81147f9bddae86230da83575921ef26fcd849133e7d138433a6a7fd
+  metadata.gz: e9e49efacc05e9b7d14bb1aa9acd2797de76395eb7c21ae40242b6319e59a55b
+  data.tar.gz: 6cdba1580e4c9501de9c3e8cf2d1e009a127014a67d0c0fe79d142bb1d8ac662
 SHA512:
-  metadata.gz: 73fb32081f15b4314046976855e4474edf94cca23e146507210a6e232418e6b844d1d51c6bf1d7cbaad0b32a203abbc24cf38c1608e400a68485f58d7911ae2d
-  data.tar.gz: 71155f2804459d0ac0d82777f070e8628f3d1d8d3949bab4468bae35f9d04f495d78523b239a8ed5fff2df16ba98cf789c1b97017deb3b92d01a58ef81a5fe49
+  metadata.gz: 62705f4cd221a3964cb579309a09dadcda38688f1df974f026e4957dc3d2380089c690a2b95b7395ec1cdd64eeebb8fdb7ac94f869fb3e348814fba795aec1f6
+  data.tar.gz: 53aa6e81cbe3b3156107e3a71fc3c95e9bc8920dfe1615a43d0a9f2de6f0d04fe4325368b9f5563b2833b7f9dfa1a76186a4df18ec223e8a140ccabae18c6dbd

data/lib/almirah/doc_items/text_line.rb

@@ -1,139 +1,270 @@
-class TextLine
+class TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = ""
+    end
+end
 
-    @@lazy_doc_id_dict = Hash.new
+class ItalicToken < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "*"
+    end
+end
 
-    def self.add_lazy_doc_id(id)
-        doc_id = id.to_s.downcase
-        @@lazy_doc_id_dict[doc_id] = doc_id
+class BoldToken < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "**"
     end
+end
 
-    def format_string(str)
-        state = 'default'
-        prev_state = 'default'
-        result = ''
-        stack = ''
-        prev_c = ''
-        link_text = ''
-        link_url = ''
-        str.each_char do |c|
-            if c == '*'
-                if state == 'default'
-                    prev_state, state = change_state(c, state, 'first_asterisk_detected')
-
-                elsif state == 'first_asterisk_detected'
-                    prev_state, state = change_state(c, state, 'second_asterisk_detected')
-                
-                elsif state == 'second_asterisk_detected'
-                    prev_state, state = change_state(c, state, 'third_asterisk_detected')
-                
-                elsif state == 'second_asterisk_detected'
-                    prev_state, state = change_state(c, state, 'third_asterisk_detected')
-
-                elsif state == 'italic_started'
-                    prev_state, state = change_state(c, state, 'default')
-                    result += italic(stack)
-
-                elsif state == 'bold_started'
-                    prev_state, state = change_state(c, state, 'first_asterisk_after_bold_detected')
-
-                elsif state == 'first_asterisk_after_bold_detected'
-                    prev_state, state = change_state(c, state, 'default')
-                    result += bold(stack)
-
-                elsif state == 'bold_and_italic_started'
-                    prev_state, state = change_state(c, state, 'first_asterisk_after_bold_and_italic_detected')
-
-                elsif state == 'first_asterisk_after_bold_and_italic_detected'
-                    prev_state, state = change_state(c, state, 'second_asterisk_after_bold_and_italic_detected')
-
-                elsif state == 'second_asterisk_after_bold_and_italic_detected'
-                    prev_state, state = change_state(c, state, 'default')
-                    result += bold_and_italic(stack)
+class BoldAndItalicToken < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "***"
+    end
+end
 
-                else
-                end
-            elsif c == '['
-                if state == 'default'
-                    prev_state, state = change_state(c, state, 'square_bracket_left_detected')
-                else
-                end
-            elsif c == ']'
-                if state == 'square_bracket_left_detected'
-                    prev_state, state = change_state(c, state, 'default')
-                    result += '[]'
+class ParentheseLeft < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "("
+    end
+end
 
-                elsif state == 'link_text_started'
-                    prev_state, state = change_state(c, state, 'square_bracket_right_detected')
-                    link_text = stack
+class ParentheseRight < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = ")"
+    end
+end
 
-                else
-                end
-            elsif c == '('
-                if state == 'square_bracket_right_detected'
-                    prev_state, state = change_state(c, state, 'brace_left_detected')
-                else
-                    result += c
-                end
-            elsif c == ')'
-                if state == 'brace_left_detected'
-                    prev_state, state = change_state(c, state, 'default')
-                    result += '()'
+class SquareBracketLeft < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "["
+    end
+end
+
+class SquareBracketRight < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "]"
+    end
+end
 
-                elsif state == 'link_url_started'
-                    prev_state, state = change_state(c, state, 'default')
-                    link_url = stack
-                    result += link(link_text, link_url)
+class SquareBracketRightAndParentheseLeft < TextLineToken
+    attr_accessor :value
+    def initialize()
+        @value = "]("
+    end
+end
+
+class TextLineParser
+    attr_accessor :supported_tokens
+
+    def initialize()
+        @supported_tokens = Array.new
+        @supported_tokens.append(BoldAndItalicToken.new)
+        @supported_tokens.append(BoldToken.new)
+        @supported_tokens.append(ItalicToken.new)
+        @supported_tokens.append(SquareBracketRightAndParentheseLeft.new)
+        @supported_tokens.append(ParentheseLeft.new)
+        @supported_tokens.append(ParentheseRight.new)
+        @supported_tokens.append(SquareBracketLeft.new)
+        @supported_tokens.append(SquareBracketRight.new)
+        @supported_tokens.append(TextLineToken.new)
+    end
 
+    def tokenize(str)
+        result = Array.new
+        sl = str.length
+        si = 0
+        while si < sl
+            @supported_tokens.each do |t|
+                tl = t.value.length
+                if tl != 0  # literal is the last supported token in the list
+                    projected_end_position = si+tl-1
+                    if projected_end_position > sl
+                        next
+                    end
+                    buf = str[si..projected_end_position]
+                    if buf == t.value
+                        result.append(t)
+                        si = projected_end_position +1
+                        break
+                    end
                 else
-                    result += c
+                    if (result.length > 0) and (result[-1].instance_of? TextLineToken)
+                        literal = result[-1]
+                        literal.value += str[si]
+                    else
+                        literal = TextLineToken.new
+                        literal.value = str[si]
+                        result.append(literal)
+                    end
+                    si += 1
                 end
-            else
-                if state == 'default'
-                    result += c
-                else
-                    if state == 'first_asterisk_detected'
-                        prev_state, state = change_state(c, state, 'italic_started')
-                        stack = ''
+            end
+        end
+        return result
+    end
+end
 
-                    elsif state == 'second_asterisk_detected'
-                        prev_state, state = change_state(c, state, 'bold_started')
-                        stack = ''
+class TextLineBuilderContext
 
-                    elsif state == 'third_asterisk_detected'
-                        prev_state, state = change_state(c, state, 'bold_and_italic_started')
-                        stack = ''
-                    
-                    elsif state == 'first_asterisk_after_bold_detected'
-                        prev_state, state = change_state(c, state, 'bold_started')
+    def italic(str)
+        return str
+    end
 
-                    elsif state == 'first_asterisk_after_bold_and_italic_detected'
-                        prev_state, state = change_state(c, state, 'bold_and_italic_started')
+    def bold(str)
+        return str
+    end
 
-                    elsif state == 'second_asterisk_after_bold_and_italic_detected'
-                        prev_state, state = change_state(c, state, 'bold_and_italic_started')
+    def bold_and_italic(str)
+        return str
+    end
 
-                    elsif state == 'square_bracket_left_detected'
-                        prev_state, state = change_state(c, state, 'link_text_started')
-                        stack = ''
+    def link(link_text, link_url)
+        return link_url
+    end
+end
 
-                    elsif state == 'square_bracket_right_detected'
-                        prev_state, state = change_state(c, state, 'default')
-                        result += stack + c
-                        c = ''
+class TextLineBuilder
+    attr_accessor :builder_context
 
-                    elsif state == 'brace_left_detected'
-                        prev_state, state = change_state(c, state, 'link_url_started')
-                        stack = ''
+    def initialize(builder_context)
+        @builder_context = builder_context
+    end
 
-                    else
-                    end
-                    stack += c
+    def restore(token_list)
+        result = ""
+        if token_list == nil
+            return ""
+        end
+        sub_list_url_text = nil
+        sub_list_url_address = nil
+        tl = token_list.length
+        ti = 0
+        while ti < tl
+            case token_list[ti].class.name
+            when "ItalicToken"
+                is_found = false
+                ti_starting_position = ti
+                # try to find closing part
+                tii = ti + 1
+                while tii < tl
+                    if token_list[tii].instance_of? ItalicToken
+                        sub_list = token_list[(ti+1)..(tii-1)]
+                        result += @builder_context.italic(restore(sub_list))
+                        ti = tii +1
+                        is_found = true
+                        break
+                    end 
+                    tii += 1 
+                end
+                unless is_found
+                    result += "*"
+                    ti = ti_starting_position + 1
+                end
+            when "BoldToken"
+                is_found = false
+                ti_starting_position = ti
+                # try to find closing part
+                tii = ti + 1
+                while tii < tl
+                    if token_list[tii].instance_of? BoldToken
+                        sub_list = token_list[(ti+1)..(tii-1)]
+                        result += @builder_context.bold(restore(sub_list))
+                        ti = tii +1
+                        is_found = true
+                        break
+                    end 
+                    tii += 1 
+                end
+                unless is_found
+                    result += "**"
+                    ti = ti_starting_position + 1
+                end
+            when "BoldAndItalicToken"
+                is_found = false
+                ti_starting_position = ti
+                # try to find closing part
+                tii = ti + 1
+                while tii < tl
+                    if token_list[tii].instance_of? BoldAndItalicToken
+                        sub_list = token_list[(ti+1)..(tii-1)]
+                        result += @builder_context.bold_and_italic(restore(sub_list))
+                        ti = tii +1
+                        is_found = true
+                        break
+                    end 
+                    tii += 1 
+                end
+                unless is_found
+                    result += "***"
+                    ti = ti_starting_position + 1
                 end
+            when "SquareBracketLeft"
+                # try to find closing part
+                is_found = false
+                tii = ti + 1
+                ti_starting_position = ti
+                while tii < tl
+                    case token_list[tii].class.name 
+                    when "SquareBracketRightAndParentheseLeft" 
+                        sub_list_url_text = token_list[(ti+1)..(tii-1)]
+                        ti = tii +1
+                        tiii = ti
+                        while tiii < tl
+                            case token_list[tiii].class.name
+                            when "ParentheseRight"
+                                sub_list_url_address = token_list[(tii+1)..(tiii-1)]
+                                ti = tiii +1
+                                is_found = true
+                                break
+                            end
+                            tiii += 1
+                        end
+                        break
+                    when "SquareBracketRight"
+                        break
+                    end 
+                    tii += 1
+                end
+                if is_found
+                    result += @builder_context.link(restore(sub_list_url_text), restore(sub_list_url_address))
+                else
+                    result += "["
+                    ti = ti_starting_position + 1
+                end
+           
+            when "TextLineToken", "ParentheseLeft", "ParentheseRight", "SquareBracketLeft", "SquareBracketRight"
+                result += token_list[ti].value
+                ti += 1 
+            else
+                ti += 1             
             end
-            prev_c = c
         end
         return result
     end
+end
+
+class TextLine < TextLineBuilderContext
+
+    @@lazy_doc_id_dict = Hash.new
+
+    def self.add_lazy_doc_id(id)
+        doc_id = id.to_s.downcase
+        @@lazy_doc_id_dict[doc_id] = doc_id
+    end
+
+    def format_string(str)
+        tlp = TextLineParser.new
+        tlb = TextLineBuilder.new(self)
+        tlb.restore(tlp.tokenize(str))
+    end
 
     def change_state(c, cur_state, new_state)
         # puts "[#{c}] Transition: #{cur_state} --> #{new_state}"
@@ -153,7 +284,6 @@ class TextLine
     end
 
     def link(link_text, link_url)
-
         # define default result first
         result = "<a target=\"_blank\" rel=\"noopener\" href=\"#{link_url}\" class=\"external\">#{link_text}</a>"
 

data/lib/almirah/dom/doc_section.rb

@@ -12,7 +12,7 @@ class DocSection
 
     def to_html
         s = ''
-        s += "\t<li><span class=\"fa-li\"><i class=\"fa fa-plus-square-o\"> </i></span>"
+        s += "\t<li><span class=\"fa-li\"><i class=\"fa fa-sticky-note-o\"> </i></span>"
         s += "<a href=\"\#" + @heading.anchor_id.to_s + "\">" + @heading.get_section_info + "</a>\n"
         if @sections.length >0
             s += "\t\t<ul class=\"fa-ul\">\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Almirah
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Oleksandr Ivanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies: []
 description: The software part of the Almirah framework
 email: oleksandr.ivanov.development@gmail.com