markita 3.0.210907 → 3.3.210918

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8176e09462f3a78f7e10600cef156aff9d32ed892c97366d242bf299e87adf5e
-  data.tar.gz: '0864ffe280f23e7d15b196aef1226a14f7b3443c0ebf4a142667187550665ab9'
+  metadata.gz: 00f2378d6afe1f1ed2251e78d0e413305cc3a2616da3dfeccfe3446faac0712c
+  data.tar.gz: 8d099fe74a6bd50829c1a09f9bbc492893113c868dc4731cd41bd4380d19cbe5
 SHA512:
-  metadata.gz: 16135591f2eb1d7446be0337c0ba7b51624834f169f219c1a0a534d88f263dec04da18e8b8e05f5c4d4998b8d9a96aaf437e53d1d0858b36aab19948f10985bc
-  data.tar.gz: ecfc73bc0f9e13e216a1b5e9682bbfdc93a9aada53b3aaa49e19c529324b37a9afeb06761349a2ce4dda10c1bfeb4852d4bc705ff137f488451117afb3eb2612
+  metadata.gz: 0d13c5e56db469e15a3d5b11048cb1f70b3ffae0f02dec77b02edef36b47d8393218f66755fa5619c2755861e163b1c4d3d05edba9f55f06d44f1c61366ee239
+  data.tar.gz: 958c7442e49d7efd39bc9c99d843c788c0f5e1e29ca87e5965816f04fff8a61494ccc1acaa2b855e9ce543edc6b9a4b1e505043159d494a8f9820bd0d4461b02

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.0.210907](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.3.210918](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -23,18 +23,20 @@ Options:
   --root=DIRECTORY 	 ~/vimwiki
   --bind=BIND      	 0.0.0.0
   --port=PORT      	 8080
+  --theme=THEME    	 base16.light
   --allowed=IPS
   --no_about
   --no_favicon
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 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,
@@ -62,11 +64,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 +97,9 @@ Markdown:
     ! Address:[address]
     ! Code:[code="1234"]
 
+    A selection list:
+    ! Color:[color="Red","White","Blue"]
+
 ### Template substitutions
 
 Markdown:
@@ -284,12 +301,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,18 +9,20 @@ 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
   --no_highlight
+  --no_navigation
   --no_login
   --no_plugs
 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/config.rb

@@ -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

@@ -11,6 +11,10 @@ module HTML
     HEADER
   end
 
+  def HTML.navigation
+    NAVIGATION
+  end
+
   def HTML.footer
     <<~FOOTER
       </body>

data/lib/markita/markdown.rb

@@ -9,11 +9,13 @@ class Markdown
   end
 
   def start
-    @line,@html,@opt = HTML.header(@title),'',{}
+    @html << HTML.header(@title)
+    @line = HTML.navigation
   end
 
   def finish
     @html << HTML.footer
+    @line = nil
   end
 
   def default
@@ -21,8 +23,12 @@ class Markdown
     @line = @file.gets
   end
 
+  def init(fh)
+    @file,@html,@opt = Preprocess.new(fh),'',{}
+  end
+
   def parse(fh)
-    @file = Preprocess.new(fh)
+    init(fh)
     start
     while @line
       PARSERS.detect{method(_1).call} or default
@@ -93,12 +99,12 @@ class Markdown
     string = Markdown.tag(entry, CODEx, CODE) do |entry|
       Markdown.tag(entry, Ax, A) do |entry|
         Markdown.tag(entry, URLx, URL) do |entry|
-          string = Markdown.tag(entry, 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)
+          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
@@ -115,15 +121,20 @@ 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
@@ -145,15 +156,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
@@ -332,7 +348,7 @@ class Markdown
   PARSERS << :images
   def images
     md = IMAGES.match(@line) or return false
-    alt,src=md[1],md[2]
+    alt,src,href=md[1],*md[2].strip.split(/\s+/,2)
     style = ' '
     case alt
     when /^ .* $/
@@ -342,14 +358,21 @@ class Markdown
     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+(="[^"]*")?\])+/
+  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
+  FIELDS = Regexp.new FIELD
+  FORMS = Regexp.new "^!( #{FIELD})+"
   PARSERS << :forms
   def forms
     md = FORMS.match(@line) or return false
@@ -359,16 +382,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'

data/lib/markita/plug/favicon.rb

@@ -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

@@ -1,8 +1,10 @@
 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']
+    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/plug/navigation.rb

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

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.0.210907'
+  VERSION = '3.3.210918'
 
   def self.run!
     # Standard libraries
@@ -18,6 +18,7 @@ module Markita
     # 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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.0.210907
+  version: 3.3.210918
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-18 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
@@ -117,6 +116,7 @@ files:
 - 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

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;
-}