Almirah 0.2.2 → 0.2.4

data/lib/almirah/doc_items/text_line.rb

@@ -1,313 +1,296 @@
 class TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = ""
-    end
+  attr_accessor :value
+
+  def initialize
+    @value = ''
+  end
 end
 
 class ItalicToken < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "*"
-    end
+  def initialize # rubocop:disable Lint/MissingSuper
+    @value = '*'
+  end
 end
 
 class BoldToken < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "**"
-    end
+  def initialize # rubocop:disable Lint/MissingSuper
+    @value = '**'
+  end
 end
 
 class BoldAndItalicToken < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "***"
-    end
+  def initialize # rubocop:disable Lint/MissingSuper
+    @value = '***'
+  end
 end
 
 class ParentheseLeft < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "("
-    end
+  def initialize # rubocop:disable Lint/MissingSuper
+    @value = '('
+  end
 end
 
 class ParentheseRight < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = ")"
-    end
+  def initialize
+    @value = ')'
+  end
 end
 
 class SquareBracketLeft < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "["
-    end
+  def initialize # rubocop:disable Lint/MissingSuper
+    @value = '['
+  end
 end
 
 class SquareBracketRight < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "]"
-    end
+  def initialize
+    @value = ']'
+  end
 end
 
 class SquareBracketRightAndParentheseLeft < TextLineToken
-    attr_accessor :value
-    def initialize()
-        @value = "]("
-    end
+  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
-                    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
-            end
+  attr_accessor :supported_tokens
+
+  def initialize # rubocop:disable Metrics/AbcSize
+    @supported_tokens = []
+    @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 = []
+    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
+          next if projected_end_position > sl
+
+          buf = str[si..projected_end_position]
+          if buf == t.value
+            result.append(t)
+            si = projected_end_position + 1
+            break
+          end
+        else
+          if result.length.positive? && (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
-        return result
+      end
     end
+    result
+  end
 end
 
 class TextLineBuilderContext
+  def italic(str)
+    str
+  end
 
-    def italic(str)
-        return str
-    end
-
-    def bold(str)
-        return str
-    end
+  def bold(str)
+    str
+  end
 
-    def bold_and_italic(str)
-        return str
-    end
+  def bold_and_italic(str)
+    str
+  end
 
-    def link(link_text, link_url)
-        return link_url
-    end
+  def link(_link_text, link_url)
+    link_url
+  end
 end
 
 class TextLineBuilder
-    attr_accessor :builder_context
-
-    def initialize(builder_context)
-        @builder_context = builder_context
-    end
-
-    def restore(token_list)
-        result = ""
-        if token_list == nil
-            return ""
+  attr_accessor :builder_context
+
+  def initialize(builder_context)
+    @builder_context = builder_context
+  end
+
+  def restore(token_list)
+    result = ''
+    return '' if token_list.nil?
+
+    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
-        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             
+        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
-        return result
+
+      when 'TextLineToken', 'ParentheseLeft', 'ParentheseRight', 'SquareBracketRight'
+        result += token_list[ti].value
+        ti += 1
+      else
+        ti += 1
+      end
     end
+    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}"
-        return cur_state, new_state
-    end
-
-    def italic(str)
-        "<i>#{str}</i>"
-    end
-
-    def bold(str)
-        "<b>#{str}</b>"
-    end
-
-    def bold_and_italic(str)
-        "<b><i>#{str}</i></b>"
+  @@lazy_doc_id_dict = {}
+
+  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 italic(str)
+    "<i>#{str}</i>"
+  end
+
+  def bold(str)
+    "<b>#{str}</b>"
+  end
+
+  def bold_and_italic(str)
+    "<b><i>#{str}</i></b>"
+  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>"
+
+    lazy_doc_id = nil
+    anchor = nil
+
+    if res = /(\w+)[.]md$/.match(link_url)          # link
+      lazy_doc_id = res[1].to_s.downcase
+
+    elsif res = /(\w*)[.]md(#.*)$/.match(link_url)  # link with anchor
+      if res && res.length > 2
+        lazy_doc_id = res[1]
+        anchor = res[2]
+      end
     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>"
-
-        lazy_doc_id, anchor = nil, nil
-
-        if res = /(\w+)[.]md$/.match(link_url)          #link
-            lazy_doc_id = res[1].to_s.downcase
-
-        elsif res = /(\w*)[.]md(#.*)$/.match(link_url)  # link with anchor
-            if res && res.length > 2
-                lazy_doc_id = res[1]
-                anchor = res[2]
-            end
-        end
-
-        if lazy_doc_id
-            if @@lazy_doc_id_dict.has_key?(lazy_doc_id)
-                if anchor
-                    result = "<a href=\".\\..\\#{lazy_doc_id}\\#{lazy_doc_id}.html#{anchor}\" class=\"external\">#{link_text}</a>"
-                else
-                    result = "<a href=\".\\..\\#{lazy_doc_id}\\#{lazy_doc_id}.html\" class=\"external\">#{link_text}</a>"
-                end
-            end
-        end
-        return result
+    if lazy_doc_id && @@lazy_doc_id_dict.key?(lazy_doc_id)
+      result = if anchor
+                 "<a href=\".\\..\\#{lazy_doc_id}\\#{lazy_doc_id}.html#{anchor}\" class=\"external\">#{link_text}</a>"
+               else
+                 "<a href=\".\\..\\#{lazy_doc_id}\\#{lazy_doc_id}.html\" class=\"external\">#{link_text}</a>"
+               end
     end
-end
+    result
+  end
+end

data/lib/almirah/doc_items/todo_block.rb

@@ -11,9 +11,9 @@ class TodoBlock < DocItem
     def to_html
         s = ''
         f_text = format_string(@text)
-        if @@htmlTableRenderInProgress
+        if @@html_table_render_in_progress
             s += "</table>\n"
-            @@htmlTableRenderInProgress = false
+            @@html_table_render_in_progress = false
         end
 
         s += "<div class=\"todoblock\"><p>#{f_text}</div>\n"