markita 3.1.210913 → 3.4.211004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48cd0cacac70dc9974733968e16d5958676172aae7ac7138995855ef82839b7
-  data.tar.gz: 1355e68fa3255f16331a4afc36f2d47ecfbd1583fbf2f16a9742c53e50390414
+  metadata.gz: 2a83f3ae0cb87314ee1ea28a3f5c39cd84813d9564e666f4ed474627988b12cf
+  data.tar.gz: c180906afdac8f5343f99cc86c28d9c6db3ae38fdb8828d65f50f338d7b15757
 SHA512:
-  metadata.gz: 54630f6cef7d9632699c16b8e9e447799c85806adc75202cc774272066de82927260ba5fbb4da5f974860dc48d5a26ef9e96d463c4825676a801207c28f850bd
-  data.tar.gz: 34a7e703827b69fb3e0c4e406d477c3ab35d605fc9f1d87c9cae1a2724b8e01099de74b7c6b1ee5f6c220f35bc277e717637925464dfab5938303fcfb37f601b
+  metadata.gz: 98e97748ae3187b627841670a4744e55ec3a630a49839a069268ef99fdf12cecfe78589b64e7f8ab01fa2c8a4ec7f7fed07535ff5908c423190c19f807c663de
+  data.tar.gz: 0ca77e473071ef3716812dac6d727ec21229acf42ea73d367913cbfa5ec4bb32449798a3649c74c01aaa9d5640d8d30b31aaf2140f996299a6b6efab64f1694f

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.1.210913](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.4.211004](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -23,6 +23,7 @@ Options:
   --root=DIRECTORY 	 ~/vimwiki
   --bind=BIND      	 0.0.0.0
   --port=PORT      	 8080
+  --theme=THEME    	 base16.light
   --allowed=IPS
   --no_about
   --no_favicon
@@ -34,8 +35,8 @@ Types:
   DIRECTORY /^~?[\/\w\.]+$/
   BIND      /^[\w\.]+$/
   PORT      /^\d+$/
-  THEME     /^[\w\.]+$/
   IPS       /^[\d\.\,]+$/
+  THEME     /^[\w\.]+$/
 # NOTE:
 # Assuming site is in ~/vimwiki,
 # when ~/vimwiki/.valid-id is set with a sha256sum of a password,
@@ -96,6 +97,9 @@ Markdown:
     ! Address:[address]
     ! Code:[code="1234"]
 
+    A selection list:
+    ! Color:[color="Red","White","Blue"]
+
 ### Template substitutions
 
 Markdown:
@@ -265,8 +269,9 @@ Markdown:
 
     !> /path-to/ascii_art.txt
 
-Must be a `*.txt` file.
 Useful for ASCII art.
+Unless an `*.html` file, the text is embedded in `pre` tags.
+Further more unless a `*.txt` file, the text is embedded in `code` tags.
 
 ### Emojis
 
@@ -290,6 +295,16 @@ Markdown:
     [^2]: Cash is money in currency.
     [^3]: Read as "Nan took it."
 
+### Meta-data
+
+Markdown:
+
+    ---
+    Title: The Title You Want For Your Page
+    1: https://way.to/create/ref/links
+    ---
+    You can now [link](1) with a reference number.
+
 ## HOW-TOs
 
 ### Set site password:
@@ -297,12 +312,11 @@ Markdown:
 $ # Assuming ~/vimwiki is your site's root...
 $ echo -n '<SitePasswordHere>' | sha256sum | grep -o '^\w*' > ~/vimwiki/.valid-id
 ```
-### Set site custom favicon, css, not found page, and login form and fail page:
+### Set site custom favicon, not found page, and login form and fail page:
 ```console
 $ # Assuming ~/vimwiki is your site's root...
 $ # Note that you'll have to restart the server on any change to these:
 $ cp /path-to/custom/favicon.ico ~/vimwiki/favicon.ico
-$ cp /path-to/custom/highlight.css ~/vimwiki/highlight.css
 $ cp /path-to/custom/not_found.html ~/vimwiki/not_found.html
 $ cp /path-to/custom/login_form.html ~/vimwiki/login_form.html
 $ cp /path-to/custom/login_fail.html ~/vimwiki/login_fail.html

data/bin/markita

@@ -9,6 +9,7 @@ Options:
   --root=DIRECTORY \t ~/vimwiki
   --bind=BIND      \t 0.0.0.0
   --port=PORT      \t 8080
+  --theme=THEME    \t base16.light
   --allowed=IPS
   --no_about
   --no_favicon
@@ -20,8 +21,8 @@ Types:
   DIRECTORY /^~?[\\/\\w\\.]+$/
   BIND      /^[\\w\\.]+$/
   PORT      /^\\d+$/
-  THEME     /^[\\w\\.]+$/
   IPS       /^[\\d\\.\\,]+$/
+  THEME     /^[\\w\\.]+$/
 # NOTE:
 # Assuming site is in ~/vimwiki,
 # when ~/vimwiki/.valid-id is set with a sha256sum of a password,

data/lib/markita/markdown.rb

@@ -6,6 +6,7 @@ class Markdown
   def initialize(title)
     @title = title
     @line=@html=@file=@opt=nil
+    @metadata = {}
   end
 
   def start
@@ -14,6 +15,9 @@ class Markdown
   end
 
   def finish
+    if title = @metadata['Title']
+      @html << %Q(<script> document.title = "#{title}" </script>\n)
+    end
     @html << HTML.footer
     @line = nil
   end
@@ -62,7 +66,10 @@ class Markdown
   CODE  = lambda {|m| "<code>#{m[1]}</code>"}
 
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
-  A  = lambda {|m| %Q(<a href="#{m[2]}">#{m[1]}</a>)}
+  def anchor(m)
+    href = ((_=m[2]).match?(/^\d+$/) and @metadata[_] or _)
+    %Q(<a href="#{href}">#{m[1]}</a>)
+  end
 
   URLx = %r(\[(https?://[\w\.\-\/\&\+\?\%]+)\])
   URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
@@ -95,9 +102,9 @@ class Markdown
     return (block ? block.call(entry) : entry)
   end
 
-  INLINE = lambda do |entry|
+  def inline(entry)
     string = Markdown.tag(entry, CODEx, CODE) do |entry|
-      Markdown.tag(entry, Ax, A) do |entry|
+      Markdown.tag(entry, Ax, method(:anchor)) do |entry|
         Markdown.tag(entry, URLx, URL) do |entry|
           entry = Markdown.tag(entry, EMOJIx, EMOJI)
           entry = Markdown.tag(entry, Bx, B)
@@ -121,29 +128,34 @@ class Markdown
   end
 
   # Ordered list
-  ORDERED = /^\d+. (.*)$/
+  ORDERED = /^( {0,3})\d+\. (\S.*)$/
   PARSERS << :ordered
-  def ordered
-    md = ORDERED.match(@line) or return false
+  def ordered(md=ORDERED.match(@line), level=0)
+    return false unless md
     @html << "<ol#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md
-      @html << "  <li>#{INLINE[md[1]]}</li>\n"
-      md = (@line=@file.gets)&.match ORDERED
+    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[1].length)
+          md = @line&.match(ORDERED)
+        end
+      end
     end
     @html << "</ol>\n"
     true
   end
 
   # Paragraph
-  PARAGRAPHS = /^[\[`*"~_]?\w/
+  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]
+      @html << inline(@line)
       md = (@line=@file.gets)&.match PARAGRAPHS
     end
     @html << "</p>\n"
@@ -151,15 +163,20 @@ class Markdown
   end
 
   # Unordered list
-  UNORDERED = /^[*] (.*)$/
+  UNORDERED = /^( {0,3})[*] (\S.*)$/
   PARSERS << :unordered
-  def unordered
-    md = UNORDERED.match(@line) or return false
+  def unordered(md=UNORDERED.match(@line), level=0)
+    return false unless md
     @html << "<ul#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md
-      @html << "  <li>#{INLINE[md[1]]}</li>\n"
-      md = (@line=@file.gets)&.match UNORDERED
+    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[1].length)
+          md = @line&.match(UNORDERED)
+        end
+      end
     end
     @html << "</ul>\n"
     true
@@ -177,7 +194,7 @@ class Markdown
       li = (x=='x')?
         %q{<li style="list-style-type: '&#9745; '">} :
         %q{<li style="list-style-type: '&#9744; '">}
-      @html << "  #{li}#{INLINE[t]}</li>\n"
+      @html << "  #{li}#{inline(t)}</li>\n"
       md = (@line=@file.gets)&.match BALLOTS
     end
     @html << "</ul>\n"
@@ -193,8 +210,8 @@ class Markdown
     @opt.delete(:attributes)
     while md
       item = md[1]
-      @html << ((item[-1]==':')? "<dt>#{INLINE[item[0..-2]]}</dt>\n" :
-              "<dd>#{INLINE[item]}</dd>\n")
+      @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"
@@ -207,9 +224,9 @@ class Markdown
   def headers
     md = HEADERS.match(@line) or return false
     i,header = md[1].length,md[2]
-    id = header.strip.gsub(/\s+/,'+')
+    id = header.gsub(/\([^\(\)]*\)/,'').scan(/\w+/).join('+')
     @html << %Q(<a id="#{id}">\n)
-    @html << "  <h#{i}#{@opt[:attributes]}>#{INLINE[header]}</h#{i}>\n"
+    @html << "  <h#{i}#{@opt[:attributes]}>#{inline(header)}</h#{i}>\n"
     @html << "</a>\n"
     @opt.delete(:attributes)
     @line = @file.gets
@@ -224,7 +241,7 @@ class Markdown
     @html << "<blockquote#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md
-      @html << INLINE[md[1]]
+      @html << inline(md[1])
       @html << "\n"
       md = (@line=@file.gets)&.match BLOCKQS
     end
@@ -268,14 +285,31 @@ class Markdown
     true
   end
 
-  # Horizontal rule
+  # Meta-data
+  METADATAS = /^(\w+): (.*)$/
+  def metadata
+    md = METADATAS.match(@line) or return false
+    while md
+      @metadata[md[1]] = md[2]
+      md = (@line=@file.gets)&.match METADATAS
+    end
+    true
+  end
+
+  # Horizontal rule or Meta-data
   HRS = /^---+$/
   PARSERS << :hrs
   def hrs
     HRS.match? @line or return false
-    @html << "<hr#{@opt[:attributes]}>\n"
-    @opt.delete(:attributes)
     @line = @file.gets
+    if metadata
+      # Optional closing HRS
+      @line = @file.gets if @line&.match? HRS
+    else
+      # Display HR
+      @html << "<hr#{@opt[:attributes]}>\n"
+      @opt.delete(:attributes)
+    end
     true
   end
 
@@ -287,7 +321,7 @@ class Markdown
     @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 << @line[1...-1].split('|').map{inline(_1.strip)}.join('</th><th>')
     @html << "</th></tr></thead>\n"
     align = []
     while (@line=@file.gets)&.match TABLES
@@ -304,7 +338,7 @@ class Markdown
           align[i] = ' align="left"'
           @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"
@@ -360,7 +394,9 @@ class Markdown
   end
 
   # Forms
-  FORMS = /^!( (\w+:)?\[\*?\w+(="[^"]*")?\])+/
+  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
+  FIELDS = Regexp.new FIELD
+  FORMS = Regexp.new "^!( #{FIELD})+"
   PARSERS << :forms
   def forms
     md = FORMS.match(@line) or return false
@@ -370,16 +406,26 @@ class Markdown
     while md
       n += 1
       form << '  <br>' if n > 1
-      @line.scan(/(\w+:)?\[(\*)?(\w+)(="[^"]*")?\]/).each do |field, pwd, name, value|
+      @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'
@@ -404,14 +450,27 @@ class Markdown
   end
 
   # Embed text
-  EMBED_TEXTS = /^!> (#{PAGE_KEY}\.txt)$/
+  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]))
-      @html << "<pre>\n"
-      @html << File.read(filename)
-      @html << "</pre>\n"
+      extension,lang = filename.split('.').last,nil
+      unless extension=='html'
+        lang = Rouge::Lexer.find extension
+        klass = lang ? ' class="highlight"' : nil
+        @html << "<pre#{klass}#{@opt[:attributes]}>"
+        @opt.delete(:attributes)
+        @html << '<code>' unless extension=='txt'
+        @html << "\n"
+      end
+      code = File.read(filename)
+      @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
+      unless extension=='html'
+        @html << '</code>' unless extension=='txt'
+        @html << '</pre>'
+        @html << "\n"
+      end
     else
       @html << @line
     end
@@ -426,7 +485,7 @@ class Markdown
     md = FOOTNOTES.match(@line) or return false
     @html << "<small>\n"
     while md
-      @html << INLINE[@line.chomp]+"<br>\n"
+      @html << inline(@line.chomp)+"<br>\n"
       md = (@line=@file.gets)&.match FOOTNOTES
     end
     @html << "</small>\n"

data/lib/markita/plug/highlight.rb

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

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.1.210913'
+  VERSION = '3.4.211004'
 
   def self.run!
     # Standard libraries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.1.210913
+  version: 3.4.211004
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.200907
+        version: 8.0.210917
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.200907
+        version: 8.0.210917
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.26.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,6 @@ files:
 - bin/markita
 - data/emojis.tsv
 - data/favicon.ico
-- data/highlight.css
 - data/login_failed.html
 - data/login_form.html
 - data/not_found.html

data/data/highlight.css

@@ -1,81 +0,0 @@
-/* Ruby Gem Rouge's base16.light  */
-.highlight table td { padding: 5px; }
-.highlight table pre { margin: 0; }
-.highlight, .highlight .w {
-  color: #303030;
-}
-.highlight .err {
-  color: #151515;
-  background-color: #ac4142;
-}
-.highlight .c, .highlight .ch, .highlight .cd, .highlight .cm, .highlight .cpf, .highlight .c1, .highlight .cs {
-  color: #505050;
-}
-.highlight .cp {
-  color: #f4bf75;
-}
-.highlight .nt {
-  color: #f4bf75;
-}
-.highlight .o, .highlight .ow {
-  color: #d0d0d0;
-}
-.highlight .p, .highlight .pi {
-  color: #d0d0d0;
-}
-.highlight .gi {
-  color: #90a959;
-}
-.highlight .gd {
-  color: #ac4142;
-}
-.highlight .gh {
-  color: #6a9fb5;
-  background-color: #151515;
-  font-weight: bold;
-}
-.highlight .k, .highlight .kn, .highlight .kp, .highlight .kr, .highlight .kv {
-  color: #aa759f;
-}
-.highlight .kc {
-  color: #d28445;
-}
-.highlight .kt {
-  color: #d28445;
-}
-.highlight .kd {
-  color: #d28445;
-}
-.highlight .s, .highlight .sb, .highlight .sc, .highlight .dl, .highlight .sd, .highlight .s2, .highlight .sh, .highlight .sx, .highlight .s1 {
-  color: #90a959;
-}
-.highlight .sa {
-  color: #aa759f;
-}
-.highlight .sr {
-  color: #75b5aa;
-}
-.highlight .si {
-  color: #8f5536;
-}
-.highlight .se {
-  color: #8f5536;
-}
-.highlight .nn {
-  color: #f4bf75;
-}
-.highlight .nc {
-  color: #f4bf75;
-}
-.highlight .no {
-  color: #f4bf75;
-}
-.highlight .na {
-  color: #6a9fb5;
-}
-.highlight .m, .highlight .mb, .highlight .mf, .highlight .mh, .highlight .mi, .highlight .il, .highlight .mo, .highlight .mx {
-  color: #90a959;
-}
-.highlight .ss {
-  color: #90a959;
-}