markita 4.1.230214 → 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
@@ -22,13 +22,8 @@ class Markdown
     @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)
@@ -38,6 +33,21 @@ class Markdown
     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
@@ -85,6 +95,14 @@ class Markdown
     end
   end
 
+  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 = ''
@@ -101,6 +119,7 @@ class Markdown
   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|
@@ -109,11 +128,13 @@ class Markdown
           entry = Markdown.tag(entry, Ix, I)
           entry = Markdown.tag(entry, Sx, S)
           entry = Markdown.tag(entry, Ux, U)
-          Markdown.tag(entry, FOOTNOTEx, FOOTNOTE)
+          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
@@ -125,76 +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 && level==md[1].length
-      @html << "  <li>#{inline(md[2])}</li>\n"
-      next unless (md=(@line=@file.gets)&.match ORDERED) && level<md[1].length
-      ordered(md)
-      md = @line&.match(ORDERED)
-    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
+  # 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
-      md = @line&.match PARAGRAPHS
+      break unless md &&
+                   (level == md[:spaces].length) &&
+                   (list == (md[:bullet][0]=~/\d/ ? 'ol' : 'ul'))
     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 && level==md[1].length
-      @html << "  <li>#{inline(md[2])}</li>\n"
-      next unless (md=(@line=@file.gets)&.match UNORDERED) && level<md[1].length
-      unordered(md)
-      md = @line&.match(UNORDERED)
-    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
 
@@ -203,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 /(.*): (.*)$/
@@ -229,9 +206,8 @@ class Markdown
     i,header = md[1].length,md[2]
     id = header.gsub(/\([^()]*\)/,'').scan(/\w+/).join('+')
     @html << %(<a id="#{id}">\n)
-    @html << "  <h#{i}#{@opt[:attributes]}>#{inline(header)}</h#{i}>\n"
+    @html << "  <h#{i}#{@attributes.shift}>#{inline(header)}</h#{i}>\n"
     @html << "</a>\n"
-    @opt.delete(:attributes)
     @line = @file.gets
     true
   end
@@ -242,8 +218,7 @@ 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)
+    @html << "<blockquote#{@attributes.shift}>\n"
     while md && level==md[1].length
       @html << inline(md[2])
       @html << "\n"
@@ -256,14 +231,13 @@ class Markdown
   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 = ''
     code << @line while (@line=@file.gets) && !CODES.match?(@line)
     @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
@@ -272,27 +246,12 @@ class Markdown
     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
-
   # 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"
@@ -324,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
@@ -335,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 = []
@@ -371,15 +328,14 @@ class Markdown
     SPLITS.match? @line or return false
     case @line.chomp
     when '|:'
-      @html << %(<table><tr><td#{@opt[:attributes]}>\n)
+      @html << %(<table><tr><td#{@attributes.shift}>\n)
     when '|'
-      @html << %(</td><td#{@opt[:attributes]}>\n)
+      @html << %(</td><td#{@attributes.shift}>\n)
     when ':|:'
-      @html << %(</td></tr><tr><td#{@opt[:attributes]}>\n)
+      @html << %(</td></tr><tr><td#{@attributes.shift}>\n)
     when ':|'
       @html << %(</td></tr></table>\n)
     end
-    @opt.delete(:attributes)
     @line = @file.gets
     true
   end
@@ -405,9 +361,84 @@ class Markdown
     end
     @html << %(<a href="#{href}">\n) if href
     @html <<
-      %(<img src="#{src}"#{style}alt="#{alt.strip}"#{@opt[:attributes]}>\n)
+      %(<img src="#{src}"#{style}alt="#{alt.strip}"#{@attributes.shift}>\n)
     @html << %(</a>\n) if href
-    @opt.delete(:attributes)
+    @line = @file.gets
+    true
+  end
+
+  # Embed text
+  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.\w+)$/
+  PARSERS << :embed_texts
+  def embed_texts
+    md = EMBED_TEXTS.match(@line) or return false
+    if File.exist?(filename=File.join(ROOT, md[1]))
+      extension,lang = filename.split('.').last,nil
+      unless extension=='html'
+        lang = Rouge::Lexer.find(extension) unless extension=='txt'
+        klass = lang ? ' class="highlight"' : nil
+        @html << "<pre#{klass}#{@attributes.shift}>"
+        @html << '<code>' if lang
+        @html << "\n"
+      end
+      code = File.read(filename)
+      @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
+      unless extension=='html'
+        @html << '</code>' if lang
+        @html << '</pre>'
+        @html << "\n"
+      end
+    else
+      @html << @line
+    end
+    @line = @file.gets
+    true
+  end
+
+  # Footnotes
+  FOOTNOTES = /^\[\^\d+\]:/
+  PARSERS << :footnotes
+  def footnotes
+    md = FOOTNOTES.match(@line) or return false
+    @html << "<small>\n"
+    while md
+      @html << inline(@line.chomp)+"<br>\n"
+      md = (@line=@file.gets)&.match FOOTNOTES
+    end
+    @html << "</small>\n"
+    true
+  end
+
+  # Attributes
+  ATTRIBUTES = /^\{:( [^\{\}]+)\}/
+  PARSERS << :attributes
+  def attributes
+    md = ATTRIBUTES.match(@line) or return false
+    @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
@@ -422,8 +453,7 @@ class Markdown
     fields,nl,submit = 0,false,nil
     action = (_=/\(([^()]*)\)!?$/.match(@line))? %( action="#{_[1]}") : nil
     method = @line.match?(/!$/) ? ' method="post"' : nil
-    @html << %(<form#{action}#{method}#{@opt[:attributes]}>\n)
-    @opt.delete(:attributes)
+    @html << %(<form#{action}#{method}#{@attributes.shift}>\n)
     while md
       @html << "  <br>\n" if nl
       @line.scan(FIELDS).each do |field, pwd, name, value|
@@ -464,58 +494,5 @@ class Markdown
     @html << %(</form>\n)
     true
   end
-
-  # Embed text
-  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.\w+)$/
-  PARSERS << :embed_texts
-  def embed_texts
-    md = EMBED_TEXTS.match(@line) or return false
-    if File.exist?(filename=File.join(ROOT, md[1]))
-      extension,lang = filename.split('.').last,nil
-      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 << '<code>' if lang
-        @html << "\n"
-      end
-      code = File.read(filename)
-      @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
-      unless extension=='html'
-        @html << '</code>' if lang
-        @html << '</pre>'
-        @html << "\n"
-      end
-    else
-      @html << @line
-    end
-    @line = @file.gets
-    true
-  end
-
-  # Footnotes
-  FOOTNOTES = /^\[\^\d+\]:/
-  PARSERS << :footnotes
-  def footnotes
-    md = FOOTNOTES.match(@line) or return false
-    @html << "<small>\n"
-    while md
-      @html << inline(@line.chomp)+"<br>\n"
-      md = (@line=@file.gets)&.match FOOTNOTES
-    end
-    @html << "</small>\n"
-    true
-  end
-
-  # Attributes
-  ATTRIBUTES = /^\{:( .*)\}/
-  PARSERS << :attributes
-  def attributes
-    md = ATTRIBUTES.match(@line) or return false
-    @opt[:attributes] = md[1]
-    @line = md.post_match
-    true
-  end
 end
 end

data/lib/markita/plug/favicon.rb

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

data/lib/markita/plug/highlight.rb

@@ -1,9 +1,10 @@
 module Markita
 class Base
   HEADER_LINKS <<
-    %(  <link rel="stylesheet" href="/highlight.css" type="text/css">\n)
+    %(\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
   end

data/lib/markita/plug/login.rb

@@ -4,8 +4,8 @@ class Base
     ID = File.exist?(_=File.join(ROOT, '.valid-id')) ?
          File.read(_).strip :
          nil
-    IPS = (_=OPTIONS&.allowed)? _.split(',') : nil
-    if IPS && !ID
+    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']
@@ -13,7 +13,7 @@ class Base
   end
 
   before do
-    unless Login::ID.nil? || Login::IPS&.include?(request.ip)
+    unless Login::ID.nil? || Login::IPS.include?(request.ip)
       if (id=params[:id])
         session[:id] = Digest::SHA256.hexdigest id
       end

data/lib/markita.rb

@@ -1,14 +1,15 @@
 module Markita
-  VERSION = '4.1.230214'
+  VERSION = '5.0.241001'
 
   def self.run!
     # Standard libraries
     require 'digest'
     require 'cgi'
+    require 'openssl'
     # Gems
     require 'rouge'
+    require 'webrick/https'
     require 'sinatra/base'
-    require 'thin'
     # Local
     require_relative 'markita/config'
     require_relative 'markita/html'
@@ -16,13 +17,13 @@ module Markita
     require_relative 'markita/markdown'
     require_relative 'markita/base'
     # Plugs
-    require_relative 'markita/plug/about'      unless OPTIONS&.no_about
-    require_relative 'markita/plug/favicon'    unless OPTIONS&.no_favicon
-    require_relative 'markita/plug/highlight'  unless OPTIONS&.no_highlight
-    require_relative 'markita/plug/login'      unless OPTIONS&.no_login
-    require_relative 'markita/plug/navigation' unless OPTIONS&.no_navigation
-    require_relative 'markita/plug/plugs'      unless OPTIONS&.no_plugs
-    require_relative 'markita/plug/readme'     unless OPTIONS&.no_readme
+    require_relative 'markita/plug/about'      unless OPTIONS.no_about
+    require_relative 'markita/plug/favicon'    unless OPTIONS.no_favicon
+    require_relative 'markita/plug/highlight'  unless OPTIONS.no_highlight
+    require_relative 'markita/plug/login'      unless OPTIONS.no_login
+    require_relative 'markita/plug/navigation' unless OPTIONS.no_navigation
+    require_relative 'markita/plug/plugs'      unless OPTIONS.no_plugs
+    require_relative 'markita/plug/readme'     unless OPTIONS.no_readme
     Base.run!
   end
 end