RubyGems - markita - Versions diffs - 1.1.210831 → 3.1.210913 - Mend

markita 1.1.210831 → 3.1.210913

Files changed (15) hide show

checksums.yaml +4 -4
data/README.md +252 -84
data/bin/markita +1 -0
data/data/emojis.tsv +1874 -0
data/lib/markita/base.rb +1 -54
data/lib/markita/config.rb +3 -53
data/lib/markita/html.rb +25 -0
data/lib/markita/markdown.rb +446 -0
data/lib/markita/plug/about.rb +1 -1
data/lib/markita/plug/favicon.rb +1 -1
data/lib/markita/plug/highlight.rb +1 -1
data/lib/markita/plug/navigation.rb +3 -0
data/lib/markita/preprocess.rb +30 -0
data/lib/markita.rb +6 -3
metadata +20 -16

data/lib/markita/base.rb CHANGED Viewed

@@ -18,63 +18,10 @@ class Base < Sinatra::Base
     end
   end
-  def Base.header(key)
-    <<-HEADER
-<!DOCTYPE html>
-<html>
-<head>
-  <title>#{key}</title>
-#{HEADER_LINKS}</head>
-<body>
-    HEADER
-  end
-  def Base.footer
-    <<-FOOTER
-</body>
-</html>
-    FOOTER
-  end
-  def Base.process(text, procs=POSTPROCESS)
-    val,string,_ = {},'',nil
-    text.each_line do |line|
-      line.chomp!
-      case line
-      when ''
-        val.clear
-      when %r(^<(p>)?!\p{Pd}+ (.*) \p{Pd}+(</p)?>$)
-        directive = $2
-        case directive
-        when %r(^(\w+): "(.*)"$)
-          val[$1.to_sym] = $2
-          next
-        when %r(^(\w+): /(.*)/)
-          val[$1.to_sym] = Regexp.new $2
-          next
-        else
-          line = directive.gsub('&lt;', '<').gsub('&gt;', '>')
-        end
-      else
-        # set line to IDontCare if IDontCare gets set
-        line=_ if procs.detect{_=_1[line, val]}
-      end
-      string << line << "\n"
-    end
-    return string
-  end
-  def Base.page(key)
-    Base.header(key) + yield + Base.footer
-  end
   get PAGE_KEY do |key|
     filepath = File.join ROOT, key+'.md'
     raise Sinatra::NotFound  unless File.exist? filepath
-    text = File.read(filepath).force_encoding('utf-8')
-    Base.page(key){ Base.process markdown Base.process(text, PREPROCESS)}
+    Markdown.new(key).filepath filepath
   end
   get IMAGE_PATH do |path, *_|

data/lib/markita/config.rb CHANGED Viewed

@@ -2,6 +2,7 @@ module Markita
   OPTIONS ||= nil
   HEADER_LINKS = ''
+  NAVIGATION = ''
   ROOT = File.expand_path OPTIONS&.root || '~/vimwiki'
   raise "Missing site root directory: "+ROOT  unless File.directory? ROOT
@@ -11,61 +12,10 @@ module Markita
   end
   NOT_FOUND = File.read PATH['not_found.html']
+  EMOJIS = Hash[*File.read(PATH['emojis.tsv']).split(/\s+/)]
   PAGE_KEY   = %r{/(\w[\w\/\-]*\w)}
   IMAGE_PATH = %r{/(\w[\w\/\-]*\w\.((png)|(gif)))}
-  PREPROCESS = [
-    lambda do |line, val|
-      case line
-      when val[:regx]
-        # Template/Substitutions
-        template = val[:template] || line
-        $~.named_captures.each do |name, value|
-          template = template.gsub("&#{name};", value)
-          template = template.gsub("&#{name.upcase};", CGI.escape(value))
-        end
-        template
-      when /^```\s*(\w+)?$/
-        $1 ? "~~~ #{$1}" : '~~~'
-      else
-        nil
-      end
-    end
-  ]
-  POSTPROCESS = [
-    lambda do |line,_|
-      case line
-      when %r(^(\s*)<li>\[(x| )\] (.*)</li>$)
-        # Task Lists
-        spaces,x,item = $1,$2,$3
-        li = (x=='x')?
-          %q{<li style="list-style-type: '&#9745; '">} :
-          %q{<li style="list-style-type: '&#9744; '">}
-        spaces+li+item+"</li>"
-      when %r(^<p>(\w+:\[\*?\w+\] )+\((\S+)\)</p>$)
-        # One Line Forms
-        action,method,form = $2,'get',[]
-        line.scan(/(\w+):\[(\*)?(\w+)\] /).each do |field, pwd, name|
-          type = (pwd)? 'password' : 'text'
-          method = 'post' if pwd
-          form << %Q{  #{field}:<input type="#{type}" name="#{name}">}
-        end
-        form.unshift %Q(<form action="#{action}" method="#{method}">)
-        form.push %Q(  <input type="submit">) if form.length==1
-        form.push %Q(</form>)
-        form.join("\n")
-      when %r(^<p><img (src="[^"]*" alt=" [^"]* ") /></p>$)
-        %Q(<img style="display: block; margin-left: auto; margin-right: auto;" #{$1} />)
-      when %r(^<p><img (src="[^"]*" alt=" [^"]*") />$)
-        %Q(<p><img style="float: left;" #{$1} />)
-      when %r(^<p><img (src="[^"]*" alt="[^"]* ") />$)
-        %Q(<p><img style="float: right;" #{$1} />)
-      else
-        nil
-      end
-    end
-  ]
   START_TIME = Time.now
 end

data/lib/markita/html.rb ADDED Viewed

@@ -0,0 +1,25 @@
+module Markita
+module HTML
+  def HTML.header(key)
+    <<~HEADER
+      <!DOCTYPE html>
+      <html>
+      <head>
+        <title>#{key}</title>
+      #{HEADER_LINKS}</head>
+      <body>
+    HEADER
+  end
+  def HTML.navigation
+    NAVIGATION
+  end
+  def HTML.footer
+    <<~FOOTER
+      </body>
+      </html>
+    FOOTER
+  end
+end
+end

data/lib/markita/markdown.rb ADDED Viewed

@@ -0,0 +1,446 @@
+module Markita
+class Markdown
+  ROUGE = Rouge::Formatters::HTML.new
+  PARSERS = []
+  def initialize(title)
+    @title = title
+    @line=@html=@file=@opt=nil
+  end
+  def start
+    @html << HTML.header(@title)
+    @line = HTML.navigation
+  end
+  def finish
+    @html << HTML.footer
+    @line = nil
+  end
+  def default
+    @html << @line
+    @line = @file.gets
+  end
+  def init(fh)
+    @file,@html,@opt = Preprocess.new(fh),'',{}
+  end
+  def parse(fh)
+    init(fh)
+    start
+    while @line
+      PARSERS.detect{method(_1).call} or default
+    end
+    finish
+  end
+  def markdown(string)
+    parse StringIO.new string
+    @html
+  end
+  def filepath(filepath)
+    File.open(filepath, 'r'){|fh| parse fh}
+    @html
+  end
+  Ux = /_([^_]+)_/
+  U  = lambda {|m| "<u>#{m[1]}</u>"}
+  Sx = /~([^~]+)~/
+  S  = lambda {|m| "<s>#{m[1]}</s>"}
+  Ix = /"([^"]+)"/
+  I  = lambda {|m| "<i>#{m[1]}</i>"}
+  Bx = /\*([^\*]+)\*/
+  B  = lambda {|m| "<b>#{m[1]}</b>"}
+  CODEx = /`([^`]+)`/
+  CODE  = lambda {|m| "<code>#{m[1]}</code>"}
+  Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
+  A  = lambda {|m| %Q(<a href="#{m[2]}">#{m[1]}</a>)}
+  URLx = %r(\[(https?://[\w\.\-\/\&\+\?\%]+)\])
+  URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
+  EMOJIx = /:(\w+):/
+  EMOJI  = lambda {|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>)
+    else
+      %Q(<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)
+      pre_match = (block ? block.call(m.pre_match) : m.pre_match)
+      string = pre_match + m2string[m]
+      post_match = m.post_match
+      while m = regx.match(post_match)
+        pre_match = (block ? block.call(m.pre_match) : m.pre_match)
+        string << pre_match + m2string[m]
+        post_match = m.post_match
+      end
+      string << (block ? block.call(post_match) : post_match)
+      return string
+    end
+    return (block ? block.call(entry) : entry)
+  end
+  INLINE = lambda do |entry|
+    string = Markdown.tag(entry, CODEx, CODE) do |entry|
+      Markdown.tag(entry, Ax, A) do |entry|
+        Markdown.tag(entry, URLx, URL) do |entry|
+          entry = Markdown.tag(entry, EMOJIx, EMOJI)
+          entry = Markdown.tag(entry, Bx, B)
+          entry = Markdown.tag(entry, Ix, I)
+          entry = Markdown.tag(entry, Sx, S)
+          entry = Markdown.tag(entry, Ux, U)
+          entry = Markdown.tag(entry, FOOTNOTEx, FOOTNOTE)
+        end
+      end
+    end
+    string.sub(/  $/,'<br>')
+  end
+  # Empty
+  EMPTY = /^$/
+  PARSERS << :empty
+  def empty
+    EMPTY.match?(@line) or return false
+    @line = @file.gets
+    true
+  end
+  # Ordered list
+  ORDERED = /^\d+. (.*)$/
+  PARSERS << :ordered
+  def ordered
+    md = ORDERED.match(@line) or return false
+    @html << "<ol#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    while md
+      @html << "  <li>#{INLINE[md[1]]}</li>\n"
+      md = (@line=@file.gets)&.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]
+      md = (@line=@file.gets)&.match PARAGRAPHS
+    end
+    @html << "</p>\n"
+    true
+  end
+  # Unordered list
+  UNORDERED = /^[*] (.*)$/
+  PARSERS << :unordered
+  def unordered
+    md = UNORDERED.match(@line) or return false
+    @html << "<ul#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    while md
+      @html << "  <li>#{INLINE[md[1]]}</li>\n"
+      md = (@line=@file.gets)&.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"
+    true
+  end
+  # Definition list
+  DEFINITIONS = /^: (.*)$/
+  PARSERS << :definitions
+  def definitions
+    md = DEFINITIONS.match(@line) or return false
+    @html << "<dl#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    while md
+      item = md[1]
+      @html << ((item[-1]==':')? "<dt>#{INLINE[item[0..-2]]}</dt>\n" :
+              "<dd>#{INLINE[item]}</dd>\n")
+      md = (@line=@file.gets)&.match DEFINITIONS
+    end
+    @html << "</dl>\n"
+    true
+  end
+  # Headers
+  HEADERS = /^([#]{1,6}) (.*)$/
+  PARSERS << :headers
+  def headers
+    md = HEADERS.match(@line) or return false
+    i,header = md[1].length,md[2]
+    id = header.strip.gsub(/\s+/,'+')
+    @html << %Q(<a id="#{id}">\n)
+    @html << "  <h#{i}#{@opt[:attributes]}>#{INLINE[header]}</h#{i}>\n"
+    @html << "</a>\n"
+    @opt.delete(:attributes)
+    @line = @file.gets
+    true
+  end
+  # Block-quote
+  BLOCKQS = /^> (.*)$/
+  PARSERS << :blockqs
+  def blockqs
+    md = BLOCKQS.match(@line) or return false
+    @html << "<blockquote#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    while md
+      @html << INLINE[md[1]]
+      @html << "\n"
+      md = (@line=@file.gets)&.match BLOCKQS
+    end
+    @html << "</blockquote>\n"
+    true
+  end
+  # Code
+  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)
+    code = ''
+    while @line=@file.gets and not CODES.match(@line)
+      code << @line
+    end
+    @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
+  # Preform
+  PREFORMS = /^ {4}(.*)$/
+  PARSERS << :preforms
+  def preforms
+    md = PREFORMS.match(@line) or return false
+    @html << "<pre#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    while md
+      @html << md[1]
+      @html << "\n"
+      md = (@line=@file.gets)&.match PREFORMS
+    end
+    @html << "</pre>\n"
+    true
+  end
+  # Horizontal rule
+  HRS = /^---+$/
+  PARSERS << :hrs
+  def hrs
+    HRS.match? @line or return false
+    @html << "<hr#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    @line = @file.gets
+    true
+  end
+  # Table
+  TABLES = /^\|.+\|$/
+  PARSERS << :tables
+  def tables
+    TABLES.match? @line or return false
+    @html << "<table#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
+    @html << '<thead><tr><th>'
+    @html << @line[1...-1].split('|').map{INLINE[_1.strip]}.join('</th><th>')
+    @html << "</th></tr></thead>\n"
+    align = []
+    while (@line=@file.gets)&.match TABLES
+      @html << '<tr>'
+      @line[1...-1].split('|').each_with_index do |cell, i|
+        case cell
+        when /^\s*:-+:\s*$/
+          align[i] = ' align="center"'
+          @html << '<td><hr></td>'
+        when /^\s*-+:\s*$/
+          align[i] = ' align="right"'
+          @html << '<td><hr></td>'
+        when /^\s*:-+\s*$/
+          align[i] = ' align="left"'
+          @html << '<td><hr></td>'
+        else
+          @html << "<td#{align[i]}>#{INLINE[cell.strip]}</td>"
+        end
+      end
+      @html << "</tr>\n"
+    end
+    @html << "</table>\n"
+    true
+  end
+  # Splits
+  SPLITS = /^:?\|:?$/
+  PARSERS << :splits
+  def splits
+    SPLITS.match? @line or return false
+    case @line.chomp
+    when '|:'
+      @html << %Q(<table><tr><td#{@opt[:attributes]}>\n)
+    when '|'
+      @html << %Q(</td><td#{@opt[:attributes]}>\n)
+    when ':|:'
+      @html << %Q(</td></tr><tr><td#{@opt[:attributes]}>\n)
+    when ':|'
+      @html << %Q(</td></tr></table>\n)
+    end
+    @opt.delete(:attributes)
+    @line = @file.gets
+    true
+  end
+  # Image
+  IMAGES = /^!\[([^\[\]]+)\]\(([^\(\)]+)\)$/
+  PARSERS << :images
+  def images
+    md = IMAGES.match(@line) or return false
+    alt,src,href=md[1],*md[2].strip.split(/\s+/,2)
+    style = ' '
+    case alt
+    when /^ .* $/
+      style = %Q( style="display: block; margin-left: auto; margin-right: auto;" )
+    when / $/
+      style = %Q( style="float:left;" )
+    when /^ /
+      style = %Q( style="float:right;" )
+    end
+    if /(\d+)x(\d+)/.match alt
+      style << %Q(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)
+    @line = @file.gets
+    true
+  end
+  # Forms
+  FORMS = /^!( (\w+:)?\[\*?\w+(="[^"]*")?\])+/
+  PARSERS << :forms
+  def forms
+    md = FORMS.match(@line) or return false
+    form = []
+    n,fields,submit,method = 0,0,nil,nil
+    action = (_=/\(([^\(\)]*)\)$/.match(@line))? _[1] : nil
+    while md
+      n += 1
+      form << '  <br>' if n > 1
+      @line.scan(/(\w+:)?\[(\*)?(\w+)(="[^"]*")?\]/).each do |field, pwd, name, value|
+        method ||= ' method="post"' if pwd
+        field &&= field[0...-1]
+        value &&= value[2...-1]
+        if field
+          fields += 1
+          type = (pwd)? 'password' : 'text'
+          if value
+            form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
+          else
+            form << %Q{  #{field}:<input type="#{type}" name="#{name}">}
+          end
+        elsif name=='submit'
+          submit = value
+        else
+          form << %Q{  <input type="hidden" name="#{name}" value="#{value}">}
+        end
+      end
+      md = (@line=@file.gets)&.match FORMS
+    end
+    if submit or not fields==1
+      submit ||= 'Submit'
+      form << '  <br>' if n > 1
+      form << %Q(  <input type="submit" value="#{submit}">)
+    end
+    form.unshift %Q(<form action="#{action}"#{method}#{@opt[:attributes]}>)
+    form << %Q(</form>)
+    @html << form.join("\n")
+    @html << "\n"
+    @opt.delete(:attributes)
+    true
+  end
+  # Embed text
+  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.txt)$/
+  PARSERS << :embed_texts
+  def embed_texts
+    md = EMBED_TEXTS.match(@line) or return false
+    if File.exist?(filename=File.join(ROOT, md[1]))
+      @html << "<pre>\n"
+      @html << File.read(filename)
+      @html << "</pre>\n"
+    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