RubyGems - markita - Versions diffs - 2.0.210906 → 3.2.210915 - Mend

markita 2.0.210906 → 3.2.210915

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml +4 -4
data/README.md +18 -2
data/bin/markita +1 -1
data/lib/markita/base.rb +1 -64
data/lib/markita/config.rb +1 -0
data/lib/markita/html.rb +25 -0
data/lib/markita/markdown.rb +272 -169
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 +4 -1
metadata +5 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4bf395f9651feb6f5a7a4ede56db6a75fa0ea50383a0bc06a0cc1c8b39d27c8
-  data.tar.gz: 5b76214448e81a4c24b01f287d3a8e11fcaead0a6c1b0e188e547d1dbb8617a0
+  metadata.gz: 2d00ccf97d0939c6b5ebd695e248046eabda96bc285b528f42ccec7e0ecddfaf
+  data.tar.gz: c3ad41a468998efd4511e72bae1cba352aca5f6ad7309f8ecb969fd3f83fe670
 SHA512:
-  metadata.gz: 23339420ce626aa7f436ca31641deed88144684df32c4b947adf109f687341a1819e48780305683ab82fbfe63bf5170abf2afd1068aeb86d88b014d370e5e18f
-  data.tar.gz: a7e8d715ff4d818f92afeec4bf64f074b10b8ac496495225ba0d1beb9e014098713c28690ea36ce46454d9a5a21e4f6780745eb34a7ae4b2f5f379f76abd80ee
+  metadata.gz: d24749f9a8550b67efe84f3ed16c42461f7a9cdfd5ab2608bc16af580af761c0761f86c4b7906feef3114f8c5f62ff67222e865cee85061799f6983ad509948b
+  data.tar.gz: 051d4e295dcff13a3b6bdf3679196741c18853cc8c9167ef6ac9a6bf20381c2fed38525e44c4def393e409d4d0bfa565e8e3a60388db4c117a3c320f976f5184

data/README.md CHANGED Viewed

@@ -1,6 +1,6 @@
 # Markita
-* [VERSION 2.0.210906](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.2.210915](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
@@ -27,6 +27,7 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 Types:
@@ -62,11 +63,23 @@ Markdown:
     ![Left Floating ](/img/image.png)
     ![ Right Floating](/img/image.png)
     Image  centered above.
-    Image to the left.
+    Image to the left with width and height set.
     Image to the right.
     And set a HR bar below.
     ---
+### Image size
+Markdown:
+    ![In alt text say 100x100](/img/image.png)
+### Image link
+Markdown:
+    ![Alt text](/img/image.png /href_to/page)
 ### Forms
 Markdown:
@@ -83,6 +96,9 @@ Markdown:
     ! Address:[address]
     ! Code:[code="1234"]
+    A selection list:
+    ! Color:[color="Red","White","Blue"]
 ### Template substitutions
 Markdown:

data/bin/markita CHANGED Viewed

@@ -13,13 +13,13 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 Types:
   DIRECTORY /^~?[\\/\\w\\.]+$/
   BIND      /^[\\w\\.]+$/
   PORT      /^\\d+$/
-  THEME     /^[\\w\\.]+$/
   IPS       /^[\\d\\.\\,]+$/
 # NOTE:
 # Assuming site is in ~/vimwiki,

data/lib/markita/base.rb CHANGED Viewed

@@ -1,33 +1,4 @@
 module Markita
-class Preprocess
-  def initialize(file)
-    @file = (file.is_a? String)? StringIO.new(file) : file
-    @regx = @template = nil
-  end
-  def gets
-    if line = @file.gets
-      case line
-      when @regx
-        line = @template if @template
-        $~.named_captures.each do |name, value|
-          line = line.gsub("&#{name.downcase};", value)
-          line = line.gsub("&#{name.upcase};", CGI.escape(value))
-        end
-      when %r(^! regx = /(.*)/$)
-        @regx = Regexp.new $1
-        line = gets
-      when %r(^! template = "(.*)"$)
-        @template = $1+"\n"
-        line = gets
-      else
-        @regx &&= (@template=nil)
-      end
-    end
-    line
-  end
-end
 class Base < Sinatra::Base
   set bind: OPTIONS&.bind || '0.0.0.0'
   set port: OPTIONS&.port || '8080'
@@ -47,44 +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
-  DEFAULT = lambda do |line, html, file, _, _|
-    html << line
-    file.gets
-  end
-  def Base.page(key, f)
-    html,opt,file,line = '',{},Preprocess.new(f),Base.header(key)
-    fct,md = nil,nil
-    while line = (fct||DEFAULT)[line, html, file, opt, md]
-      fct = nil
-      Markdown::PARSER.each{|r,f| break if md=r.match(line) and fct=f}
-    end
-    html << Base.footer
-    html
-  end
   get PAGE_KEY do |key|
     filepath = File.join ROOT, key+'.md'
     raise Sinatra::NotFound  unless File.exist? filepath
-    File.open(filepath, 'r'){|f| Base.page key, f}
+    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

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 CHANGED Viewed

@@ -1,269 +1,344 @@
 module Markita
-module Markdown
+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 {|md| "<u>#{md[1]}</u>"}
+  U  = lambda {|m| "<u>#{m[1]}</u>"}
   Sx = /~([^~]+)~/
-  S  = lambda {|md| "<s>#{md[1]}</s>"}
+  S  = lambda {|m| "<s>#{m[1]}</s>"}
   Ix = /"([^"]+)"/
-  I  = lambda {|md| "<i>#{md[1]}</i>"}
+  I  = lambda {|m| "<i>#{m[1]}</i>"}
   Bx = /\*([^\*]+)\*/
-  B  = lambda {|md| "<b>#{md[1]}</b>"}
+  B  = lambda {|m| "<b>#{m[1]}</b>"}
   CODEx = /`([^`]+)`/
-  CODE  = lambda {|md| "<code>#{md[1]}</code>"}
+  CODE  = lambda {|m| "<code>#{m[1]}</code>"}
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
-  A  = lambda {|md| %Q(<a href="#{md[2]}">#{md[1]}</a>)}
+  A  = lambda {|m| %Q(<a href="#{m[2]}">#{m[1]}</a>)}
   URLx = %r(\[(https?://[\w\.\-\/\&\+\?\%]+)\])
-  URL  = lambda {|md| %Q(<a href="#{md[1]}">#{md[1]}</a>)}
+  URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
   EMOJIx = /:(\w+):/
-  EMOJI  = lambda {|md| (_=EMOJIS[md[1]])? "&\#x#{_};" : md[0]}
+  EMOJI  = lambda {|m| (_=EMOJIS[m[1]])? "&\#x#{_};" : m[0]}
   FOOTNOTEx = /\[\^(\d+)\](:)?/
-  FOOTNOTE  = lambda do |md|
-    if md[2]
-      %Q(<a id="fn:#{md[1]}" href="\#fnref:#{md[1]}">#{md[1]}:</a>)
+  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:#{md[1]}" href="\#fn:#{md[1]}"><sup>#{md[1]}</sup></a>)
+      %Q(<a id="fnref:#{m[1]}" href="\#fn:#{m[1]}"><sup>#{m[1]}</sup></a>)
     end
   end
-  def Markdown.tag(line, regx, md2string, &block)
-    if md = regx.match(line)
-      pre_match = (block ? block.call(md.pre_match) : md.pre_match)
-      string = pre_match + md2string[md]
-      post_match = md.post_match
-      while md = regx.match(post_match)
-        pre_match = (block ? block.call(md.pre_match) : md.pre_match)
-        string << pre_match + md2string[md]
-        post_match = md.post_match
+  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(line) : line)
+    return (block ? block.call(entry) : entry)
   end
-  INLINE = lambda do |line|
-    string = Markdown.tag(line, CODEx, CODE) do |line|
-      Markdown.tag(line, Ax, A) do |line|
-        Markdown.tag(line, URLx, URL) do |line|
-          string = Markdown.tag(line, Bx, B)
-          string = Markdown.tag(string, Ix, I)
-          string = Markdown.tag(string, Sx, S)
-          string = Markdown.tag(string, Ux, U)
-          string = Markdown.tag(string, FOOTNOTEx, FOOTNOTE)
-          Markdown.tag(string, EMOJIx, EMOJI)
+  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
-  PARSER = Hash.new
   # Empty
-  PARSER[/^$/] = lambda do |_, _, file, _, _|
-    file.gets
+  EMPTY = /^$/
+  PARSERS << :empty
+  def empty
+    EMPTY.match?(@line) or return false
+    @line = @file.gets
+    true
   end
   # Ordered list
   ORDERED = /^\d+. (.*)$/
-  PARSER[ORDERED] = lambda do |line, html, file, opt, md|
-    html << "<ol#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << "  <li>#{INLINE[md[1]]}</li>\n"
+      md = (@line=@file.gets)&.match ORDERED
     end
-    html << "</ol>\n"
-    line
+    @html << "</ol>\n"
+    true
   end
   # Paragraph
   PARAGRAPHS = /^[\[`*"~_]?\w/
-  PARSER[PARAGRAPHS] = lambda do |line, html, file, opt, md|
-    html << "<p#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << INLINE[@line]
+      md = (@line=@file.gets)&.match PARAGRAPHS
     end
-    html << "</p>\n"
-    line
+    @html << "</p>\n"
+    true
   end
   # Unordered list
   UNORDERED = /^[*] (.*)$/
-  PARSER[UNORDERED] = lambda do |line, html, file, opt, md|
-    html << "<ul#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << "  <li>#{INLINE[md[1]]}</li>\n"
+      md = (@line=@file.gets)&.match UNORDERED
     end
-    html << "</ul>\n"
-    line
+    @html << "</ul>\n"
+    true
   end
   # Ballot box
   BALLOTS = /^- \[(x| )\] (.*)$/
-  PARSER[BALLOTS] = lambda do |line, html, file, opt, md|
-    html << "<ul#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << "  #{li}#{INLINE[t]}</li>\n"
+      md = (@line=@file.gets)&.match BALLOTS
     end
-    html << "</ul>\n"
-    line
+    @html << "</ul>\n"
+    true
   end
   # Definition list
   DEFINITIONS = /^: (.*)$/
-  PARSER[DEFINITIONS] = lambda do |line, html, file, opt, md|
-    html << "<dl#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  PARSERS << :definitions
+  def definitions
+    md = DEFINITIONS.match(@line) or return false
+    @html << "<dl#{@opt[:attributes]}>\n"
+    @opt.delete(:attributes)
     while md
       item = md[1]
-      line = ((item[-1]==':')? "<dt>#{INLINE[item[0..-2]]}</dt>\n" :
+      @html << ((item[-1]==':')? "<dt>#{INLINE[item[0..-2]]}</dt>\n" :
               "<dd>#{INLINE[item]}</dd>\n")
-      html << line
-      md = (line=file.gets)&.match DEFINITIONS
+      md = (@line=@file.gets)&.match DEFINITIONS
     end
-    html << "</dl>\n"
-    line
+    @html << "</dl>\n"
+    true
   end
   # Headers
   HEADERS = /^([#]{1,6}) (.*)$/
-  PARSER[HEADERS] = lambda do |line, html, file, opt, md|
+  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)
-    file.gets
+    @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 = /^> (.*)$/
-  PARSER[BLOCKQS] = lambda do |line, html, file, opt, md|
-    html << "<blockquote#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << INLINE[md[1]]
+      @html << "\n"
+      md = (@line=@file.gets)&.match BLOCKQS
     end
-    html << "</blockquote>\n"
-    line
+    @html << "</blockquote>\n"
+    true
   end
-  HTML = Rouge::Formatters::HTML.new
   # Code
   CODES = /^[`~]{3}\s*(\w+)?$/
-  PARSER[CODES] = lambda do |line, html, file, opt, md|
+  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}#{@opt[:attributes]}><code>\n"
+    @opt.delete(:attributes)
     code = ''
-    while line=file.gets and not CODES.match(line)
-      code << line
+    while @line=@file.gets and not CODES.match(@line)
+      code << @line
     end
-    html << (lang ? HTML.format(lang.new.lex(code)) : code)
-    html << "</code></pre>\n"
-    # line is either nil or the code close
-    line and file.gets
+    @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}(.*)$/
-  PARSER[PREFORMS] = lambda do |line, html, file, opt, md|
-    html << "<pre#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
+  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
+      @html << md[1]
+      @html << "\n"
+      md = (@line=@file.gets)&.match PREFORMS
     end
-    html << "</pre>\n"
-    line
+    @html << "</pre>\n"
+    true
   end
   # Horizontal rule
   HRS = /^---+$/
-  PARSER[HRS] = lambda do |_, html, file, opt, _|
-    html << "<hr#{opt[:attributes]}>\n"
-    opt.delete(:attributes)
-    file.gets
+  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 = /^\|.+\|$/
-  PARSER[TABLES] = lambda do |line, html, file, opt, _|
-    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"
+  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|
+    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>'
+          @html << '<td><hr></td>'
         when /^\s*-+:\s*$/
           align[i] = ' align="right"'
-          html << '<td><hr></td>'
+          @html << '<td><hr></td>'
         when /^\s*:-+\s*$/
           align[i] = ' align="left"'
-          html << '<td><hr></td>'
+          @html << '<td><hr></td>'
         else
-          html << "<td#{align[i]}>#{INLINE[cell.strip]}</td>"
+          @html << "<td#{align[i]}>#{INLINE[cell.strip]}</td>"
         end
       end
-      html << "</tr>\n"
+      @html << "</tr>\n"
     end
-    html << "</table>\n"
-    line
+    @html << "</table>\n"
+    true
   end
   # Splits
   SPLITS = /^:?\|:?$/
-  PARSER[SPLITS] = lambda do |line, html, file, opt, _|
-    case line.chomp
+  PARSERS << :splits
+  def splits
+    SPLITS.match? @line or return false
+    case @line.chomp
     when '|:'
-      html << %Q(<table><tr><td#{opt[:attributes]}>\n)
+      @html << %Q(<table><tr><td#{@opt[:attributes]}>\n)
     when '|'
-      html << %Q(</td><td#{opt[:attributes]}>\n)
+      @html << %Q(</td><td#{@opt[:attributes]}>\n)
     when ':|:'
-      html << %Q(</td></tr><tr><td#{opt[:attributes]}>\n)
+      @html << %Q(</td></tr><tr><td#{@opt[:attributes]}>\n)
     when ':|'
-      html << %Q(</td></tr></table>\n)
+      @html << %Q(</td></tr></table>\n)
     end
-    opt.delete(:attributes)
-    file.gets
+    @opt.delete(:attributes)
+    @line = @file.gets
+    true
   end
   # Image
   IMAGES = /^!\[([^\[\]]+)\]\(([^\(\)]+)\)$/
-  PARSER[IMAGES] = lambda do |line, html, file, opt, md|
-    alt,src=md[1],md[2]
+  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 /^ .* $/
@@ -273,30 +348,50 @@ module Markdown
     when /^ /
       style = %Q( style="float:right;" )
     end
-    html << %Q(<img src="#{src}"#{style}alt="#{alt.strip}"#{opt[:attributes]}>\n)
-    opt.delete(:attributes)
-    file.gets
+    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+(="[^"]*")?\])+/
-  PARSER[FORMS] = lambda do |line, html, file, opt, md|
+  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
+  FIELDS = Regexp.new FIELD
+  FORMS = Regexp.new "^!( #{FIELD})+"
+  PARSERS << :forms
+  def forms
+    md = FORMS.match(@line) or return false
     form = []
-    lines,fields,submit,method = 0,0,nil,nil
-    action = (_=/\(([^\(\)]*)\)$/.match(line))? _[1] : nil
+    n,fields,submit,method = 0,0,nil,nil
+    action = (_=/\(([^\(\)]*)\)$/.match(@line))? _[1] : nil
     while md
-      lines += 1
-      form << '  <br>' if lines > 1
-      line.scan(/(\w+:)?\[(\*)?(\w+)(="[^"]*")?\]/).each do |field, pwd, name, value|
+      n += 1
+      form << '  <br>' if n > 1
+      @line.scan(FIELDS).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}">}
+            if (values = value.split('","')).length > 1
+form << %Q(#{field}:<select name="#{name}">)
+values.each do |value|
+  fields += 1
+  form << %Q(  <option value="#{value}">#{value}</option>)
+end
+form << "</select>"
+            else
+fields += 1
+form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
+            end
           else
+            fields += 1
             form << %Q{  #{field}:<input type="#{type}" name="#{name}">}
           end
         elsif name=='submit'
@@ -305,51 +400,59 @@ module Markdown
           form << %Q{  <input type="hidden" name="#{name}" value="#{value}">}
         end
       end
-      md = (line=file.gets)&.match FORMS
+      md = (@line=@file.gets)&.match FORMS
     end
     if submit or not fields==1
       submit ||= 'Submit'
-      form << '  <br>' if lines > 1
+      form << '  <br>' if n > 1
       form << %Q(  <input type="submit" value="#{submit}">)
     end
-    form.unshift %Q(<form action="#{action}"#{method}#{opt[:attributes]}>)
+    form.unshift %Q(<form action="#{action}"#{method}#{@opt[:attributes]}>)
     form << %Q(</form>)
-    html << form.join("\n")
-    html << "\n"
-    opt.delete(:attributes)
-    line
+    @html << form.join("\n")
+    @html << "\n"
+    @opt.delete(:attributes)
+    true
   end
   # Embed text
   EMBED_TEXTS = /^!> (#{PAGE_KEY}\.txt)$/
-  PARSER[EMBED_TEXTS] = lambda do |line, html, file, opt, md|
+  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"
+      @html << "<pre>\n"
+      @html << File.read(filename)
+      @html << "</pre>\n"
     else
-      html << line
+      @html << @line
     end
-    file.gets
+    @line = @file.gets
+    true
   end
   # Footnotes
   FOOTNOTES = /^\[\^\d+\]:/
-  PARSER[FOOTNOTES] = lambda do |line, html, file, opt, md|
-    html << "<small>\n"
+  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
+      @html << INLINE[@line.chomp]+"<br>\n"
+      md = (@line=@file.gets)&.match FOOTNOTES
     end
-    html << "</small>\n"
-    line
+    @html << "</small>\n"
+    true
   end
   # Attributes
   ATTRIBUTES = /^\{:( .*)\}/
-  PARSER[ATTRIBUTES] = lambda do |line, html, file, opt, md|
-    opt[:attributes] = md[1]
-    md.post_match
+  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/about.rb CHANGED Viewed

@@ -27,7 +27,7 @@ class Base
   end
   get '/about.html' do
-    Base.page 'about', About.page
+    Markdown.new('About').markdown About.page
   end
 end
 end

data/lib/markita/plug/favicon.rb CHANGED Viewed

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

data/lib/markita/plug/highlight.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Markita
-class Base < Sinatra::Base
+class Base
   HEADER_LINKS << %Q(  <link rel="stylesheet" href="/highlight.css" type="text/css">\n)
   module Highlight
     CSS = File.read PATH['highlight.css']

data/lib/markita/plug/navigation.rb ADDED Viewed

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

data/lib/markita/preprocess.rb ADDED Viewed

@@ -0,0 +1,30 @@
+module Markita
+class Preprocess
+  def initialize(file)
+    @file = (file.is_a? String)? StringIO.new(file) : file
+    @regx = @template = nil
+  end
+  def gets
+    if line = @file.gets
+      case line
+      when @regx
+        line = @template if @template
+        $~.named_captures.each do |name, value|
+          line = line.gsub("&#{name.downcase};", value)
+          line = line.gsub("&#{name.upcase};", CGI.escape(value))
+        end
+      when %r(^! regx = /(.*)/$)
+        @regx = Regexp.new $1
+        line = gets
+      when %r(^! template = "(.*)"$)
+        @template = $1+"\n"
+        line = gets
+      else
+        @regx &&= (@template=nil)
+      end
+    end
+    line
+  end
+end
+end

data/lib/markita.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '2.0.210906'
+  VERSION = '3.2.210915'
   def self.run!
     # Standard libraries
@@ -11,11 +11,14 @@ module Markita
     require 'thin'
     # Local
     require_relative 'markita/config.rb'
+    require_relative 'markita/html.rb'
+    require_relative 'markita/preprocess.rb'
     require_relative 'markita/markdown.rb'
     require_relative 'markita/base.rb'
     # Plugs
     require_relative 'markita/plug/favicon.rb'    unless OPTIONS&.no_favicon
     require_relative 'markita/plug/highlight.rb'  unless OPTIONS&.no_highlight
+    require_relative 'markita/plug/navigation.rb' unless OPTIONS&.no_navigation
     require_relative 'markita/plug/login.rb'      unless OPTIONS&.no_login
     require_relative 'markita/plug/about.rb'      unless OPTIONS&.no_about
     require_relative 'markita/plug/plugs.rb'      unless OPTIONS&.no_plugs

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 2.0.210906
+  version: 3.2.210915
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -111,12 +111,15 @@ files:
 - lib/markita.rb
 - lib/markita/base.rb
 - lib/markita/config.rb
+- lib/markita/html.rb
 - lib/markita/markdown.rb
 - lib/markita/plug/about.rb
 - lib/markita/plug/favicon.rb
 - lib/markita/plug/highlight.rb
 - lib/markita/plug/login.rb
+- lib/markita/plug/navigation.rb
 - lib/markita/plug/plugs.rb
+- lib/markita/preprocess.rb
 homepage: https://github.com/carlosjhr64/markita
 licenses:
 - MIT