markita 3.2.210915 → 3.3.210918

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d00ccf97d0939c6b5ebd695e248046eabda96bc285b528f42ccec7e0ecddfaf
-  data.tar.gz: c3ad41a468998efd4511e72bae1cba352aca5f6ad7309f8ecb969fd3f83fe670
+  metadata.gz: 00f2378d6afe1f1ed2251e78d0e413305cc3a2616da3dfeccfe3446faac0712c
+  data.tar.gz: 8d099fe74a6bd50829c1a09f9bbc492893113c868dc4731cd41bd4380d19cbe5
 SHA512:
-  metadata.gz: d24749f9a8550b67efe84f3ed16c42461f7a9cdfd5ab2608bc16af580af761c0761f86c4b7906feef3114f8c5f62ff67222e865cee85061799f6983ad509948b
-  data.tar.gz: 051d4e295dcff13a3b6bdf3679196741c18853cc8c9167ef6ac9a6bf20381c2fed38525e44c4def393e409d4d0bfa565e8e3a60388db4c117a3c320f976f5184
+  metadata.gz: 0d13c5e56db469e15a3d5b11048cb1f70b3ffae0f02dec77b02edef36b47d8393218f66755fa5619c2755861e163b1c4d3d05edba9f55f06d44f1c61366ee239
+  data.tar.gz: 958c7442e49d7efd39bc9c99d843c788c0f5e1e29ca87e5965816f04fff8a61494ccc1acaa2b855e9ce543edc6b9a4b1e505043159d494a8f9820bd0d4461b02

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.2.210915](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,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,
@@ -300,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,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
@@ -21,6 +22,7 @@ Types:
   BIND      /^[\\w\\.]+$/
   PORT      /^\\d+$/
   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

@@ -121,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
@@ -151,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

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.2.210915'
+  VERSION = '3.3.210918'
 
   def self.run!
     # Standard libraries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.2.210915
+  version: 3.3.210918
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 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

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