markita 4.1.230116 → 5.0.241001

data/lib/markita/markdown.rb

@@ -5,8 +5,8 @@ class Markdown
 
   def initialize(title)
     @title = title
-    @line=@html=@file=@opt=nil
-    @metadata = {}
+    @line=@html=@file=nil
+    @metadata,@attributes = {},[]
   end
 
   def start
@@ -15,31 +15,39 @@ class Markdown
   end
 
   def finish
-    if title = @metadata['Title']
-      @html << %Q(<script> document.title = "#{title}" </script>\n)
+    if (title=@metadata['Title'])
+      @html << %(<script> document.title = "#{title}" </script>\n)
     end
     @html << HTML.footer
     @line = nil
   end
 
-  def default
-    @html << @line
-    @line = @file.gets
-  end
-
   def init(fh)
-    @file,@html,@opt = Preprocess.new(fh),'',{}
+    @file,@html = Preprocess.new(fh),''
   end
 
   def parse(fh)
     init(fh)
     start
-    while @line
-      PARSERS.detect{method(_1).call} or default
-    end
+    PARSERS.detect{method(_1).call} or default while @line
     finish
   end
 
+  def default
+    # Defaults to paragraph
+    # Let html take the original @html object and set @html to ''
+    html,@html = @html,''
+    html << "<p#{@attributes.shift}>\n"
+    loop do
+      html << inline(@line)
+      break if (@line=@file.gets).nil? || PARSERS.detect{method(_1).call}
+    end
+    html << "</p>\n"
+    html << @html
+    # Give back the original object to @html
+    @html = html
+  end
+
   def markdown(string)
     parse StringIO.new string
     @html
@@ -51,44 +59,52 @@ class Markdown
   end
 
   Ux = /_([^_]+)_/
-  U  = lambda {|m| "<u>#{m[1]}</u>"}
+  U  = ->(m){"<u>#{m[1]}</u>"}
 
   Sx = /~([^~]+)~/
-  S  = lambda {|m| "<s>#{m[1]}</s>"}
+  S  = ->(m){"<s>#{m[1]}</s>"}
 
   Ix = /"([^"]+)"/
-  I  = lambda {|m| "<i>#{m[1]}</i>"}
+  I  = ->(m){"<i>#{m[1]}</i>"}
 
-  Bx = /\*([^\*]+)\*/
-  B  = lambda {|m| "<b>#{m[1]}</b>"}
+  Bx = /\*([^*]+)\*/
+  B  = ->(m){"<b>#{m[1]}</b>"}
 
   CODEx = /`([^`]+)`/
-  CODE  = lambda {|m| "<code>#{m[1].gsub('<','&lt;')}</code>"}
+  CODE  = ->(m){"<code>#{m[1].gsub('<','&lt;')}</code>"}
 
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
   def anchor(m)
     href = ((_=m[2]).match?(/^\d+$/) and @metadata[_] or _)
     text = Markdown.tag(m[1], EMOJIx, EMOJI)
-    %Q(<a href="#{href}">#{text}</a>)
+    %(<a href="#{href}">#{text}</a>)
   end
 
-  URLx = %r((https?://[\w\.\-\/\&\+\?\%]+))
-  URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
+  URLx = %r{(https?://[\w./&+?%-]+)}
+  URL  = ->(m){%(<a href="#{m[1]}">#{m[1]}</a>)}
 
   EMOJIx = /:(\w+):/
-  EMOJI  = lambda {|m| (_=EMOJIS[m[1]])? "&\#x#{_};" : m[0]}
+  EMOJI  = ->(m){(_=EMOJIS[m[1]])? "&#x#{_};" : m[0]}
 
   FOOTNOTEx = /\[\^(\d+)\](:)?/
   FOOTNOTE  = lambda do |m|
     if m[2]
-      %Q(<a id="fn:#{m[1]}" href="\#fnref:#{m[1]}">#{m[1]}:</a>)
+      %(<a id="fn:#{m[1]}" href="#fnref:#{m[1]}">#{m[1]}:</a>)
     else
-      %Q(<a id="fnref:#{m[1]}" href="\#fn:#{m[1]}"><sup>#{m[1]}</sup></a>)
+      %(<a id="fnref:#{m[1]}" href="#fn:#{m[1]}"><sup>#{m[1]}</sup></a>)
     end
   end
 
-  def Markdown.tag(entry, regx, m2string, &block)
-    if m = regx.match(entry)
+  SUPERSCRIPTx = /\\\^\(([^()]+)\)/
+  SUPERSCRIPT = ->(m){"<sup>#{m[1]}</sup>"}
+  SUBSCRIPTx = /\\\(([^()]+)\)/
+  SUBSCRIPT = ->(m){"<sub>#{m[1]}</sub>"}
+
+  ENTITYx = /\\([<>*"~`_&;:\\])/
+  ENTITY = ->(m){"&##{m[1].ord};"}
+
+  def self.tag(entry, regx, m2string, &block)
+    if (m=regx.match entry)
       string = ''
       while m
         pre_match = (block ? block.call(m.pre_match) : m.pre_match)
@@ -99,10 +115,11 @@ class Markdown
       string << (block ? block.call(post_match) : post_match)
       return string
     end
-    return (block ? block.call(entry) : entry)
+    block ? block.call(entry) : entry
   end
 
   def inline(entry)
+    entry = Markdown.tag(entry, ENTITYx, ENTITY)
     string = Markdown.tag(entry, CODEx, CODE) do |entry|
       Markdown.tag(entry, Ax, method(:anchor)) do |entry|
         Markdown.tag(entry, URLx, URL) do |entry|
@@ -112,10 +129,12 @@ class Markdown
           entry = Markdown.tag(entry, Sx, S)
           entry = Markdown.tag(entry, Ux, U)
           entry = Markdown.tag(entry, FOOTNOTEx, FOOTNOTE)
+          entry = Markdown.tag(entry, SUPERSCRIPTx, SUPERSCRIPT)
+          Markdown.tag(entry, SUBSCRIPTx, SUBSCRIPT)
         end
       end
     end
-    string.sub(/  $/,'<br>')
+    string.sub(/ ?[ \\]$/,'<br>')
   end
 
   # Empty
@@ -127,82 +146,33 @@ class Markdown
     true
   end
 
-  # Ordered list
-  ORDERED = /^( {0,3})\d+\. (\S.*)$/
-  PARSERS << :ordered
-  def ordered(md=nil)
-    md ||= ORDERED.match(@line) or return false
-    level = md[1].length
-    @html << "<ol#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    while md and level==md[1].length
-      @html << "  <li>#{inline(md[2])}</li>\n"
-      if md = (@line=@file.gets)&.match(ORDERED)
-        if level < md[1].length
-          ordered(md)
-          md = @line&.match(ORDERED)
-        end
-      end
-    end
-    @html << "</ol>\n"
-    true
-  end
-
-  # Paragraph
-  PARAGRAPHS = /^[\[\(*`'"~_]?:?\w/
-  PARSERS << :paragraphs
-  def paragraphs
-    md = PARAGRAPHS.match(@line) or return false
-    @html << "<p#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    while md
-      @html << inline(@line)
-      while (@line=@file.gets)&.start_with?('<')
-        @html << @line # Exceptional HTML injection into the paragraph
-      end
-      md = @line&.match PARAGRAPHS
-    end
-    @html << "</p>\n"
-    true
-  end
-
-  # Unordered list
-  UNORDERED = /^( {0,3})[*] (\S.*)$/
-  PARSERS << :unordered
-  def unordered(md=nil)
-    md ||= UNORDERED.match(@line) or return false
-    level = md[1].length
-    @html << "<ul#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    while md and level==md[1].length
-      @html << "  <li>#{inline(md[2])}</li>\n"
-      if md = (@line=@file.gets)&.match(UNORDERED)
-        if level < md[1].length
-          unordered(md)
-          md = @line&.match(UNORDERED)
-        end
+  # List
+  LIST = /^(?<spaces> {0,3})(?<bullet>[*]|(\d+\.)|(- \[( |x)\])) (?<text>\S.*)$/
+  PARSERS << :list
+  def list(md=nil)
+    md ||= LIST.match(@line) or return false
+    level = md[:spaces].length
+    list = md[:bullet][0]=~/\d/ ? 'ol' : 'ul'
+    @html << "<#{list}#{@attributes.shift}>\n"
+    loop do
+      style = case md[:bullet][3]
+              when ' '
+                %q( style="list-style-type: '&#9744; '")
+              when 'x'
+                %q( style="list-style-type: '&#9745; '")
+              else
+                ''
+              end
+      @html << "  <li#{style}>#{inline(md[:text])}</li>\n"
+      if (md=(@line=@file.gets)&.match LIST) && level<md[:spaces].length
+        list(md)
+        md = @line&.match(LIST)
       end
+      break unless md &&
+                   (level == md[:spaces].length) &&
+                   (list == (md[:bullet][0]=~/\d/ ? 'ol' : 'ul'))
     end
-    @html << "</ul>\n"
-    true
-  end
-
-  # Ballot box
-  BALLOTS = /^- \[(x| )\] (.*)$/
-  PARSERS << :ballots
-  def ballots
-    md = BALLOTS.match(@line) or return false
-    @html << "<ul#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    while md
-      x,t = md[1],md[2]
-      li = (x=='x')?
-        %q{<li style="list-style-type: '&#9745; '">} :
-        %q{<li style="list-style-type: '&#9744; '">}
-      @html << "  #{li}#{inline(t)}</li>\n"
-      md = (@line=@file.gets)&.match BALLOTS
-    end
-    @html << "</ul>\n"
+    @html << "</#{list}>\n"
     true
   end
 
@@ -211,8 +181,7 @@ class Markdown
   PARSERS << :definitions
   def definitions
     md = DEFINITIONS.match(@line) or return false
-    @html << "<dl#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
+    @html << "<dl#{@attributes.shift}>\n"
     while md
       case md[1]
       when /(.*): (.*)$/
@@ -230,16 +199,15 @@ class Markdown
   end
 
   # Headers
-  HEADERS = /^([#]{1,6}) (.*)$/
+  HEADERS = /^(\#{1,6}) (.*)$/
   PARSERS << :headers
   def headers
     md = HEADERS.match(@line) or return false
     i,header = md[1].length,md[2]
-    id = header.gsub(/\([^\(\)]*\)/,'').scan(/\w+/).join('+')
-    @html << %Q(<a id="#{id}">\n)
-    @html << "  <h#{i}#{@opt[:attributes]}>#{inline(header)}</h#{i}>\n"
+    id = header.gsub(/\([^()]*\)/,'').scan(/\w+/).join('+')
+    @html << %(<a id="#{id}">\n)
+    @html << "  <h#{i}#{@attributes.shift}>#{inline(header)}</h#{i}>\n"
     @html << "</a>\n"
-    @opt.delete(:attributes)
     @line = @file.gets
     true
   end
@@ -250,62 +218,40 @@ class Markdown
   def blockqs(md=nil)
     md ||= BLOCKQS.match(@line) or return false
     level = md[1].length
-    @html << "<blockquote#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    while md and level==md[1].length
+    @html << "<blockquote#{@attributes.shift}>\n"
+    while md && level==md[1].length
       @html << inline(md[2])
       @html << "\n"
-      if md = (@line=@file.gets)&.match(BLOCKQS)
-        if level < md[1].length
-          blockqs(md)
-          md = @line&.match(BLOCKQS)
-        end
-      end
+      next unless (md=(@line=@file.gets)&.match BLOCKQS) && level<md[1].length
+      blockqs(md)
+      md = @line&.match(BLOCKQS)
     end
     @html << "</blockquote>\n"
     true
   end
 
   # Code
-  CODES = /^[`~]{3}\s*(\w+)?$/
+  CODES = /^[`]{3}\s*(\w+)?$/
   PARSERS << :codes
   def codes
     md = CODES.match(@line) or return false
     lang = Rouge::Lexer.find md[1]
     klass = lang ? ' class="highlight"' : nil
-    @html << "<pre#{klass}#{@opt[:attributes]}><code>\n"
-    @opt.delete(:attributes)
+    @html << "<pre#{klass}#{@attributes.shift}><code>\n"
     code = ''
-    while @line=@file.gets and not CODES.match?(@line)
-      code << @line
-    end
+    code << @line while (@line=@file.gets) && !CODES.match?(@line)
     @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
     @html << "</code></pre>\n"
     @line = @file.gets if @line # then it's code close and thus need next @line.
     true
   end
 
-  # Script
-  SCRIPT = /^<script/
-  PARSERS << :script
-  def script
-    md = SCRIPT.match(@line) or return false
-    @html << @line
-    while @line=@file.gets
-      @html << @line
-      break if %r(^</script>).match?(@line)
-    end
-    @line = @file.gets if @line
-    true
-  end
-
   # Preform
   PREFORMS = /^ {4}(.*)$/
   PARSERS << :preforms
   def preforms
     md = PREFORMS.match(@line) or return false
-    @html << "<pre#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
+    @html << "<pre#{@attributes.shift}>\n"
     while md
       @html << md[1]
       @html << "\n"
@@ -337,8 +283,7 @@ class Markdown
       @line = @file.gets if @line&.match? HRS
     else
       # Display HR
-      @html << "<hr#{@opt[:attributes]}>\n"
-      @opt.delete(:attributes)
+      @html << "<hr#{@attributes.shift}>\n"
     end
     true
   end
@@ -348,9 +293,8 @@ class Markdown
   PARSERS << :tables
   def tables
     TABLES.match? @line or return false
-    @html << "<table#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
-    @html << '<thead><tr><th>'
+    @html << "<table#{@attributes.shift}>\n"
+    @html << "<thead#{@attributes.shift}><tr><th>"
     @html << @line[1...-1].split('|').map{inline(_1.strip)}.join('</th><th>')
     @html << "</th></tr></thead>\n"
     align = []
@@ -384,21 +328,20 @@ class Markdown
     SPLITS.match? @line or return false
     case @line.chomp
     when '|:'
-      @html << %Q(<table><tr><td#{@opt[:attributes]}>\n)
+      @html << %(<table><tr><td#{@attributes.shift}>\n)
     when '|'
-      @html << %Q(</td><td#{@opt[:attributes]}>\n)
+      @html << %(</td><td#{@attributes.shift}>\n)
     when ':|:'
-      @html << %Q(</td></tr><tr><td#{@opt[:attributes]}>\n)
+      @html << %(</td></tr><tr><td#{@attributes.shift}>\n)
     when ':|'
-      @html << %Q(</td></tr></table>\n)
+      @html << %(</td></tr></table>\n)
     end
-    @opt.delete(:attributes)
     @line = @file.gets
     true
   end
 
   # Image
-  IMAGES = /^!\[([^\[\]]+)\]\(([^\(\)]+)\)$/
+  IMAGES = /^!\[([^\[\]]+)\]\(([^()]+)\)$/
   PARSERS << :images
   def images
     md = IMAGES.match(@line) or return false
@@ -406,75 +349,24 @@ class Markdown
     style = ' '
     case alt
     when /^:.*:$/
-      style = %Q( style="display: block; margin-left: auto; margin-right: auto;" )
+      style =
+      %( style="display: block; margin-left: auto; margin-right: auto;" )
     when /:$/
-      style = %Q( style="float:left;" )
+      style = %( style="float:left;" )
     when /^:/
-      style = %Q( style="float:right;" )
+      style = %( style="float:right;" )
     end
     if /(\d+)x(\d+)/.match alt
-      style << %Q(width="#{$1}" height="#{$2}" )
+      style << %(width="#{$1}" height="#{$2}" )
     end
-    @html << %Q(<a href="#{href}">\n) if href
-    @html << %Q(<img src="#{src}"#{style}alt="#{alt.strip}"#{@opt[:attributes]}>\n)
-    @html << %Q(</a>\n) if href
-    @opt.delete(:attributes)
+    @html << %(<a href="#{href}">\n) if href
+    @html <<
+      %(<img src="#{src}"#{style}alt="#{alt.strip}"#{@attributes.shift}>\n)
+    @html << %(</a>\n) if href
     @line = @file.gets
     true
   end
 
-  # Forms
-  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
-  FIELDS = Regexp.new FIELD
-  FORMS = Regexp.new "^!( #{FIELD})+"
-  PARSERS << :forms
-  def forms
-    md = FORMS.match(@line) or return false
-    fields,nl,submit = 0,false,nil
-    action = (_=/\(([^\(\)]*)\)!?$/.match(@line))? %Q( action="#{_[1]}") : nil
-    method = @line.match?(/!$/) ? ' method="post"' : nil
-    @html << %Q(<form#{action}#{method}#{@opt[:attributes]}>\n)
-    @opt.delete(:attributes)
-    while md
-      @html << "  <br>\n" if nl
-      @line.scan(FIELDS).each do |field, pwd, name, value|
-        field &&= field[0...-1]
-        value &&= value[2...-1]
-        if field
-          type = (pwd)? 'password' : 'text'
-          if value
-            if (values = value.split('","')).length > 1
-              @html << %Q(#{field}:<select name="#{name}">\n)
-              values.each do |value|
-                fields += 1
-                @html << %Q(  <option value="#{value}">#{value}</option>\n)
-              end
-              @html << "</select>\n"
-            else
-              fields += 1
-              @html << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">\n}
-            end
-          else
-            fields += 1
-            @html << %Q{  #{field}:<input type="#{type}" name="#{name}">\n}
-          end
-        elsif name=='submit'
-          submit = value
-        else
-          @html << %Q{  <input type="hidden" name="#{name}" value="#{value}">\n}
-        end
-      end
-      md=(@line=@file.gets)&.match(FORMS) and nl=true
-    end
-    if submit or not fields==1
-      submit ||= 'Submit'
-      @html << "  <br>\n" if nl
-      @html << %Q(  <input type="submit" value="#{submit}">\n)
-    end
-    @html << %Q(</form>\n)
-    true
-  end
-
   # Embed text
   EMBED_TEXTS = /^!> (#{PAGE_KEY}\.\w+)$/
   PARSERS << :embed_texts
@@ -485,8 +377,7 @@ class Markdown
       unless extension=='html'
         lang = Rouge::Lexer.find(extension) unless extension=='txt'
         klass = lang ? ' class="highlight"' : nil
-        @html << "<pre#{klass}#{@opt[:attributes]}>"
-        @opt.delete(:attributes)
+        @html << "<pre#{klass}#{@attributes.shift}>"
         @html << '<code>' if lang
         @html << "\n"
       end
@@ -519,13 +410,89 @@ class Markdown
   end
 
   # Attributes
-  ATTRIBUTES = /^\{:( .*)\}/
+  ATTRIBUTES = /^\{:( [^\{\}]+)\}/
   PARSERS << :attributes
   def attributes
     md = ATTRIBUTES.match(@line) or return false
-    @opt[:attributes] = md[1]
+    @attributes.push md[1]
     @line = md.post_match
     true
   end
+
+  # Script
+  SCRIPT = /^<script/
+  PARSERS << :script
+  def script
+    SCRIPT.match(@line) or return false
+    @html << @line
+    while (@line=@file.gets)
+      @html << @line
+      break if %r{^</script>}.match?(@line)
+    end
+    @line = @file.gets if @line
+    true
+  end
+
+  # Html
+  HTML_MARKUP = /^ {0,3}<.*>$/
+  PARSERS << :html_markup
+  def html_markup
+    HTML_MARKUP.match(@line) or return false
+    @html << @line
+    @line = @file.gets
+    true
+  end
+
+  # Forms
+  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
+  FIELDS = Regexp.new FIELD
+  FORMS = Regexp.new "^!( #{FIELD})+"
+  PARSERS << :forms
+  def forms
+    md = FORMS.match(@line) or return false
+    fields,nl,submit = 0,false,nil
+    action = (_=/\(([^()]*)\)!?$/.match(@line))? %( action="#{_[1]}") : nil
+    method = @line.match?(/!$/) ? ' method="post"' : nil
+    @html << %(<form#{action}#{method}#{@attributes.shift}>\n)
+    while md
+      @html << "  <br>\n" if nl
+      @line.scan(FIELDS).each do |field, pwd, name, value|
+        field &&= field[0...-1]
+        value &&= value[2...-1]
+        if field
+          type = pwd ? 'password' : 'text'
+          if value
+            if (values = value.split('","')).length > 1
+              @html << %(#{field}:<select name="#{name}">\n)
+              values.each do |value|
+                fields += 1
+                @html << %(  <option value="#{value}">#{value}</option>\n)
+              end
+              @html << "</select>\n"
+            else
+              fields += 1
+              @html << %(  #{field}:<input type="#{type}" name="#{name}")
+              @html << %( value="#{value}">\n)
+            end
+          else
+            fields += 1
+            @html << %(  #{field}:<input type="#{type}" name="#{name}">\n)
+          end
+        elsif name=='submit'
+          submit = value
+        else
+          @html << %(  <input type="hidden" name="#{name}" value="#{value}">\n)
+        end
+      end
+      md=(@line=@file.gets)&.match(FORMS) and nl=true
+    end
+    if submit || fields!=1
+      submit ||= 'Submit'
+      @html << "  <br>\n" if nl
+      @html << %(  <input type="submit" value="#{submit}">\n)
+    end
+    @html << %(</form>\n)
+    true
+  end
 end
 end

data/lib/markita/plug/about.rb

@@ -15,11 +15,11 @@ class Base
       TEXT
       Base.routes['GET'].each do |route|
         path = route[0].to_s
-        next  unless %r{^/\w+\.html$}.match? path
+        next unless %r{^/\w+\.html$}.match? path
         basename = File.basename(path, '.*')
         text << "* [#{basename}](#{path})\n"
       end
-      if defined? Favicon and Favicon::ICO
+      if defined? Favicon && Favicon::ICO
         text << "\n![Favicon](/favicon.ico)\n"
       end
       text

data/lib/markita/plug/favicon.rb

@@ -1,6 +1,8 @@
 module Markita
 class Base
-  HEADER_LINKS << %Q(  <link rel="icon" type="image/x-icon" href="/favicon.ico">\n)
+  HEADER_LINKS <<
+    %(\n<link rel="icon" type="image/x-icon" href="/favicon.ico">)
+
   module Favicon
     ICO = File.read PATH['favicon.ico']
   end

data/lib/markita/plug/highlight.rb

@@ -1,10 +1,12 @@
 module Markita
 class Base
-  HEADER_LINKS << %Q(  <link rel="stylesheet" href="/highlight.css" type="text/css">\n)
+  HEADER_LINKS <<
+    %(\n<link rel="stylesheet" href="/highlight.css" type="text/css">)
+
   module Highlight
-    theme = OPTIONS&.theme || 'base16.light'
+    theme = OPTIONS.theme || 'base16.light'
     CSS = Rouge::Theme.find(theme)&.render(scope: '.highlight')
-    raise "Can't find Rouge Theme "+theme  unless CSS
+    raise "Can't find Rouge Theme "+theme unless CSS
   end
 
   get '/highlight.css' do

data/lib/markita/plug/login.rb

@@ -4,17 +4,17 @@ class Base
     ID = File.exist?(_=File.join(ROOT, '.valid-id')) ?
          File.read(_).strip :
          nil
-    IPS = (_=OPTIONS&.allowed)? _.split(',') : nil
-    if IPS and not ID
-      raise "Allowed ips without site password does not make sense."
+    IPS = (_=OPTIONS.allowed)? _.split(',') : []
+    if !IPS.empty? && !ID
+      raise 'Allowed ips without site password does not make sense.'
     end
     FORM   = File.read PATH['login_form.html']
     FAILED = File.read PATH['login_failed.html']
   end
 
   before do
-    unless Login::ID.nil? or Login::IPS&.include?(request.ip)
-      if id = params[:id]
+    unless Login::ID.nil? || Login::IPS.include?(request.ip)
+      if (id=params[:id])
         session[:id] = Digest::SHA256.hexdigest id
       end
       if session[:id] == Login::ID

data/lib/markita/plug/navigation.rb

@@ -1,3 +1,3 @@
 module Markita
-  NAVIGATION << %Q(![:Navigation](/favicon.ico /index)\n)
+  NAVIGATION << %(![:Navigation](/favicon.ico /index)\n)
 end