markita 1.0.210828 → 1.1.210831

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93274ab77ea3d606b0c0c696c73914786ee9baf0c7c880bdceec4cb1ae4cb6e
-  data.tar.gz: 7395b0d8d21fb98e929f5ca68548129fd6ccb713f8ef383504bbc59d0bd36436
+  metadata.gz: 7e32fdc718fa8203e27f73d16b930ce44389416a641274a5968797c0f3d0633c
+  data.tar.gz: 442c0aaefb4f63225dbf9ede33b1b7a253549186b78a8ed194626c60c1ee6dae
 SHA512:
-  metadata.gz: 90097792167ea98b81bad5a4682d680c323ed23c7507b355c53c05127b4f1a7177fe04f5df68522d432d4b84fa623c0e620b2f3dfdab44a72e7f07d5b6740180
-  data.tar.gz: 41d9d9716c26f65dc41f183e6d0bbf3ba93bdfe00690ce60fd2282958165ba5074cb641125d9dedfcabed4347ace94fca09c591d1d7382c0390fe5f433b5d333
+  metadata.gz: 4e242670a5d48bed91d12856dd80bcfe87dae2e3334fb61ed80719200bd6050acea75a8b70e594aea49a66f34f60740b1f1bc2759959c9ddc8dfd2bd60b808ac
+  data.tar.gz: c6f717c76229814fefa75a47d064284ffe9af7ba79f6714746b54cba75d8048275fd870f497ab79d89ca375204ac0bb8c5c3f8b0918c1b6317ac96ad5d0688f3

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 1.0.210828](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 1.1.210831](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -51,7 +51,7 @@ Types:
 * Template substitutions
 * ONLY SERVES MARKDOWN PAGES:`/**/*.md`(omit extension `.md` in the url)
 * ONLY SERVES PNG and GIF IMAGES: `/**/*.png`, and `/**/*.gif`
-* See [`lib/markita/plug`](lib/markita/plug) for examples of plugins
+* See [`lib/markita/plug`](lib/markita/plug) and [`/plug`](https://github.com/carlosjhr64/markita/tree/main/plug) for examples of plugins
 
 Optionally:
 
@@ -112,13 +112,15 @@ The above specified image will float right.
 ```
 ### One line forms
 ```txt
+Note the strict use of space!
 This will do a get method form:
 
-Google:[q](https://www.google.com/search)
+Google:[q] (https://www.google.com/search)
 
 Due to the password field, this will do a post method form:
 
-Username:[user] Password:[*pwd](/login.html)
+Username:[user] Password:[*pwd] (/login.html)
+
 ```
 ### Template substitutions
 ```txt
@@ -132,6 +134,34 @@ In the template string, uppercase keys are CGI escaped:
 The substitutions are active until the end of the block.
 If template is not provided, the line itself will be the template.
 ```
+### Escaping HTML until after markdown's conversion
+```
+
+!-- <table><tr><td> --
+
+# Left
+1. One
+2. Two
+3. Three
+
+!-- </td><td> --
+
+# Right
+* A
+* B
+* C
+
+!-- </td></tr></table> --
+
+```
+### Adding plugs
+```
+$ # Assuming ~/vimwiki
+$ mkdir ~/viwiki/plug
+$ # Then copy (or create) your plug there.
+$ # For example:
+$ GET https://raw.githubusercontent.com/carlosjhr64/markita/main/plug/todotxt.rb > ~/vimwiki/plug/todotxt.rb
+```
 ## LICENSE
 
 Copyright 2021 CarlosJHR64

data/lib/markita/base.rb

@@ -38,65 +38,28 @@ class Base < Sinatra::Base
     FOOTER
   end
 
-  def Base.pre_process(text)
+  def Base.process(text, procs=POSTPROCESS)
     val,string,_ = {},'',nil
     text.each_line do |line|
       line.chomp!
       case line
       when ''
         val.clear
-      when val[:regx]
-        # Template/Substitutions
-        line=_ if _=val[:template]
-        $~.named_captures.each do |name, value|
-          line = line.gsub("&#{name};", value)
-          line = line.gsub("&#{name.upcase};", CGI.escape(value))
-        end
-      when %r(^<!-- (.*) -->$)
-        directive = $1
+      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
-          $stderr.puts "Unrecognized directive: "+directive
-        end
-        next
-      end
-      string << line << "\n"
-    end
-    return string
-  end
-
-  def Base.post_process(text)
-    string,_ = '',nil
-    text.each_line do |line|
-      line.chomp!
-      case line
-      when %r(^(\s*)<li>\[(x| )\] (.*)</li>$)
-        # Task Lists
-        s,x,item = $1,$2,$3
-        li = (x=='x')?
-          %q{<li style="list-style-type: '&#9745; '">} :
-          %q{<li style="list-style-type: '&#9744; '">}
-        line = s+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}">\n}
+          line = directive.gsub('&lt;', '<').gsub('&gt;', '>')
         end
-        line = %Q(<form action="#{action}" method="#{method}">\n) +
-          form + %Q(  <input type="submit">\n</form>)
-      when %r(^<p><img (src="[^"]*" alt=" [^"]* ") /></p>$)
-        line = %Q(<img style="display: block; margin-left: auto; margin-right: auto;" #{$1} />)
-      when %r(^<p><img (src="[^"]*" alt=" [^"]*") />$)
-        line = %Q(<p><img style="float: left;" #{$1} />)
-      when %r(^<p><img (src="[^"]*" alt="[^"]* ") />$)
-        line = %Q(<p><img style="float: right;" #{$1} />)
+      else
+        # set line to IDontCare if IDontCare gets set
+        line=_ if procs.detect{_=_1[line, val]}
       end
       string << line << "\n"
     end
@@ -111,7 +74,7 @@ class Base < Sinatra::Base
     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.post_process markdown Base.pre_process text}
+    Base.page(key){ Base.process markdown Base.process(text, PREPROCESS)}
   end
 
   get IMAGE_PATH do |path, *_|

data/lib/markita/config.rb

@@ -14,5 +14,58 @@ module Markita
   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/plug/about.rb

@@ -19,7 +19,9 @@ class Base
         basename = File.basename(path, '.*')
         text << "* [#{basename}](#{path})\n"
       end
-      text << "\n![Favicon](/favicon.ico)\n"  if defined? Favicon
+      if defined? Favicon and Favicon::ICO
+        text << "\n![Favicon](/favicon.ico)\n"
+      end
       text
     end
   end

data/lib/markita.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 1.0.210828
+  version: 1.1.210831
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser