markita 3.4.211004 → 4.0.221124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a83f3ae0cb87314ee1ea28a3f5c39cd84813d9564e666f4ed474627988b12cf
-  data.tar.gz: c180906afdac8f5343f99cc86c28d9c6db3ae38fdb8828d65f50f338d7b15757
+  metadata.gz: b56d7c82415c4cc7c3987168c61e94dc84a346a5e524db34683529dbb7cf0e0e
+  data.tar.gz: f7473780c5c0a1d3de2cc216c2eba8ff541ee337ba0effda0612e9f45e561b2e
 SHA512:
-  metadata.gz: 98e97748ae3187b627841670a4744e55ec3a630a49839a069268ef99fdf12cecfe78589b64e7f8ab01fa2c8a4ec7f7fed07535ff5908c423190c19f807c663de
-  data.tar.gz: 0ca77e473071ef3716812dac6d727ec21229acf42ea73d367913cbfa5ec4bb32449798a3649c74c01aaa9d5640d8d30b31aaf2140f996299a6b6efab64f1694f
+  metadata.gz: 266f1406ead43f83eb681010c78f196cf843fe491123689ed5adefbcfbd1fdd104ba039595113d653b761945cbc74c9619349f08530ae3844ed5217a36c7aa03
+  data.tar.gz: 2d0c10d772d383e50b97d308ea4cc1bd5b709b1deeef06d3489ddeb17f641761903946155c6b42ca436f86a321638e0e90048094d11340884945070dc3bd3c69

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.4.211004](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 4.0.221124](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -28,9 +28,12 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
-  --no_navigation
   --no_login
+  --no_navigation
   --no_plugs
+  --no_readme
+Exclusive:
+  no_login allowed
 Types:
   DIRECTORY /^~?[\/\w\.]+$/
   BIND      /^[\w\.]+$/
@@ -60,11 +63,11 @@ Markdown:
 
 Markdown:
 
-    ![ Centered Image ](/img/image.png)
-    ![Left Floating ](/img/image.png)
-    ![ Right Floating](/img/image.png)
+    ![:Centered Image:](/img/image.png)
+    ![Left Floating:](/img/image.png)
+    ![:Right Floating](/img/image.png)
     Image  centered above.
-    Image to the left with width and height set.
+    Image to the left.
     Image to the right.
     And set a HR bar below.
     ---
@@ -88,9 +91,11 @@ Markdown:
     A get method form without submit button on single field:
     ! Google:[q] (https://www.google.com/search)
 
-    A post method form due to the password field with
-    a submit button due to multiple fields:
-    ! Username:[user] Password:[*pwd] (/login.html)
+    A post method form with a password field
+    and a submit button due to multiple fields.
+    Note the `*` in front of `pwd` marking it as a password field,
+    and the ending `!` marking the route as a post:
+    ! Username:[user] Password:[*pwd] (/login.html)!
 
     A multi-line form with default entry and hidden field:
     ! Name:[user] [status="active"] (/register.html)
@@ -177,9 +182,10 @@ Markdown:
 ### Inline links, code, bold, italic, strikes, and underline
 
 <p>
-The <b>bold</b> and <i>italics</i> <s>strikes</s> at <u>underlined</u>,
-while a <a href="#Markita">link to #Markita</a>
-sees the <code>~ code ~ "a*b*c"</code> to <a href="https://github.com">https://github.com</a>.
+The <b>bold</b> and <i>italics</i> <s>strikes</s> at <u>underlined</u>, while a
+<a href="#Markita">link to #Markita</a>
+sees the <code>~ code ~ "a*b*c"</code> to
+<a href="https://github.com">https://github.com</a>.
 </p>
 
 Markdown:
@@ -211,10 +217,9 @@ Markdown:
     * Point A
     * Point B
 
-    : Word:
-    : Definition of the word
-    : Symbol:
-    : Usage for the symbol
+    + Word: Definition of the word
+    + Symbol:
+    +   Usage for the symbol
 
 ### Block-quote
 
@@ -287,7 +292,7 @@ Markdown:
 
     There once was a man from Nantucket[^1]  
     Who kept all his cash[^2] in a bucket.  
-    But his daugter, named Nan,  
+    But his daughter, named Nan,  
     Ran away with a man  
     And as for the bucket, Natucket.[^3]
 
@@ -346,7 +351,7 @@ $ GET https://raw.githubusercontent.com/carlosjhr64/markita/main/plug/todotxt.rb
 ```
 ## LICENSE
 
-Copyright 2021 CarlosJHR64
+Copyright 2022 CarlosJHR64
 
 Permission is hereby granted, free of charge,
 to any person obtaining a copy of this software and

data/bin/markita

@@ -14,9 +14,12 @@ Options:
   --no_about
   --no_favicon
   --no_highlight
-  --no_navigation
   --no_login
+  --no_navigation
   --no_plugs
+  --no_readme
+Exclusive:
+  no_login allowed
 Types:
   DIRECTORY /^~?[\\/\\w\\.]+$/
   BIND      /^[\\w\\.]+$/

data/lib/markita/base.rb

@@ -24,12 +24,21 @@ class Base < Sinatra::Base
     Markdown.new(key).filepath filepath
   end
 
-  get IMAGE_PATH do |path, *_|
-    send_file File.join(ROOT, path)
+  get SEND_FILE do |path|
+    pass unless params.length==1 and
+                filepath = File.join(ROOT, path) and
+                File.exist?(filepath)
+    send_file filepath
   end
 
   get '/' do
-    redirect '/index'
+    filepath = File.join ROOT, 'index.md'
+    if File.exist? filepath
+      Markdown.new('index').filepath filepath
+    else
+      redirect '/about.html'  unless OPTIONS&.no_about
+      raise Sinatra::NotFound
+    end
   end
 
   not_found do

data/lib/markita/config.rb

@@ -6,7 +6,8 @@ module Markita
 
   ROOT = File.expand_path OPTIONS&.root || '~/vimwiki'
   raise "Missing site root directory: "+ROOT  unless File.directory? ROOT
-  APPDATA = File.join File.dirname(File.dirname __dir__), 'data'
+  APPDIR = File.dirname File.dirname __dir__
+  APPDATA = File.join APPDIR, 'data'
   PATH = lambda do |basename|
     [ROOT, APPDATA].map{ File.join _1, basename}.detect{ File.exist? _1}
   end
@@ -14,8 +15,8 @@ module Markita
 
   EMOJIS = Hash[*File.read(PATH['emojis.tsv']).split(/\s+/)]
 
-  PAGE_KEY   = %r{/(\w[\w\/\-]*\w)}
-  IMAGE_PATH = %r{/(\w[\w\/\-]*\w\.((png)|(gif)))}
+  PAGE_KEY  = %r{/(\w[\w\/\-]*\w)}
+  SEND_FILE = %r{/(\w[\w\/\-]*\w\.\w+)}
 
   START_TIME = Time.now
 end

data/lib/markita/markdown.rb

@@ -63,15 +63,16 @@ class Markdown
   B  = lambda {|m| "<b>#{m[1]}</b>"}
 
   CODEx = /`([^`]+)`/
-  CODE  = lambda {|m| "<code>#{m[1]}</code>"}
+  CODE  = lambda {|m| "<code>#{m[1].gsub('<','&lt;')}</code>"}
 
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
   def anchor(m)
     href = ((_=m[2]).match?(/^\d+$/) and @metadata[_] or _)
-    %Q(<a href="#{href}">#{m[1]}</a>)
+    text = Markdown.tag(m[1], EMOJIx, EMOJI)
+    %Q(<a href="#{href}">#{text}</a>)
   end
 
-  URLx = %r(\[(https?://[\w\.\-\/\&\+\?\%]+)\])
+  URLx = %r((https?://[\w\.\-\/\&\+\?\%]+))
   URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
 
   EMOJIx = /:(\w+):/
@@ -88,13 +89,12 @@ class Markdown
 
   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)
+      string = ''
+      while m
         pre_match = (block ? block.call(m.pre_match) : m.pre_match)
         string << pre_match + m2string[m]
         post_match = m.post_match
+        m = regx.match(post_match)
       end
       string << (block ? block.call(post_match) : post_match)
       return string
@@ -130,15 +130,16 @@ class Markdown
   # Ordered list
   ORDERED = /^( {0,3})\d+\. (\S.*)$/
   PARSERS << :ordered
-  def ordered(md=ORDERED.match(@line), level=0)
-    return false unless md
+  def ordered(md=nil)
+    md ||= ORDERED.match(@line) or return false
+    level = md[1].length
     @html << "<ol#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     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)
+          ordered(md)
           md = @line&.match(ORDERED)
         end
       end
@@ -148,7 +149,7 @@ class Markdown
   end
 
   # Paragraph
-  PARAGRAPHS = /^[\[\(`*"~_]?\w/
+  PARAGRAPHS = /^[\[\(*`'"~_]?:?\w/
   PARSERS << :paragraphs
   def paragraphs
     md = PARAGRAPHS.match(@line) or return false
@@ -156,7 +157,10 @@ class Markdown
     @opt.delete(:attributes)
     while md
       @html << inline(@line)
-      md = (@line=@file.gets)&.match PARAGRAPHS
+      while (@line=@file.gets)&.start_with?('<')
+        @html << @line # Exceptional HTML injection into the paragraph
+      end
+      md = @line&.match PARAGRAPHS
     end
     @html << "</p>\n"
     true
@@ -165,15 +169,16 @@ class Markdown
   # Unordered list
   UNORDERED = /^( {0,3})[*] (\S.*)$/
   PARSERS << :unordered
-  def unordered(md=UNORDERED.match(@line), level=0)
-    return false unless md
+  def unordered(md=nil)
+    md ||= UNORDERED.match(@line) or return false
+    level = md[1].length
     @html << "<ul#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     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)
+          unordered(md)
           md = @line&.match(UNORDERED)
         end
       end
@@ -202,16 +207,22 @@ class Markdown
   end
 
   # Definition list
-  DEFINITIONS = /^: (.*)$/
+  DEFINITIONS = /^[+] (.*)$/
   PARSERS << :definitions
   def definitions
     md = DEFINITIONS.match(@line) or return false
     @html << "<dl#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
     while md
-      item = md[1]
-      @html << ((item[-1]==':')? "<dt>#{inline(item[0..-2])}</dt>\n" :
-              "<dd>#{inline(item)}</dd>\n")
+      case md[1]
+      when /(.*): (.*)$/
+        @html << "<dt>#{inline $1.strip}</dt>\n"
+        @html << "<dd>#{inline $2.strip}</dd>\n"
+      when /(.*):$/
+        @html << "<dt>#{inline $1.strip}</dt>\n"
+      else
+        @html << "<dd>#{inline md[1].strip}</dd>\n"
+      end
       md = (@line=@file.gets)&.match DEFINITIONS
     end
     @html << "</dl>\n"
@@ -234,22 +245,27 @@ class Markdown
   end
 
   # Block-quote
-  BLOCKQS = /^> (.*)$/
+  BLOCKQS = /^( {0,3})> (.*)$/
   PARSERS << :blockqs
-  def blockqs
-    md = BLOCKQS.match(@line) or return false
+  def blockqs(md=nil)
+    md ||= BLOCKQS.match(@line) or return false
+    level = md[1].length
     @html << "<blockquote#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md
-      @html << inline(md[1])
+    while md and level==md[1].length
+      @html << inline(md[2])
       @html << "\n"
-      md = (@line=@file.gets)&.match BLOCKQS
+      if md = (@line=@file.gets)&.match(BLOCKQS)
+        if level < md[1].length
+          blockqs(md)
+          md = @line&.match(BLOCKQS)
+        end
+      end
     end
     @html << "</blockquote>\n"
     true
   end
 
-
   # Code
   CODES = /^[`~]{3}\s*(\w+)?$/
   PARSERS << :codes
@@ -375,11 +391,11 @@ class Markdown
     alt,src,href=md[1],*md[2].strip.split(/\s+/,2)
     style = ' '
     case alt
-    when /^ .* $/
+    when /^:.*:$/
       style = %Q( style="display: block; margin-left: auto; margin-right: auto;" )
-    when / $/
+    when /:$/
       style = %Q( style="float:left;" )
-    when /^ /
+    when /^:/
       style = %Q( style="float:right;" )
     end
     if /(\d+)x(\d+)/.match alt
@@ -400,52 +416,48 @@ class Markdown
   PARSERS << :forms
   def forms
     md = FORMS.match(@line) or return false
-    form = []
-    n,fields,submit,method = 0,0,nil,nil
-    action = (_=/\(([^\(\)]*)\)$/.match(@line))? _[1] : nil
+    fields,nl,submit = 0,false,nil
+    action = (_=/\(([^\(\)]*)\)!?$/.match(@line))? %Q( action="#{_[1]}") : nil
+    method = @line.match?(/!$/) ? ' method="post"' : nil
+    @html << %Q(<form#{action}#{method}#{@opt[:attributes]}>\n)
+    @opt.delete(:attributes)
     while md
-      n += 1
-      form << '  <br>' if n > 1
+      @html << "  <br>\n" if nl
       @line.scan(FIELDS).each do |field, pwd, name, value|
-        method ||= ' method="post"' if pwd
         field &&= field[0...-1]
         value &&= value[2...-1]
         if field
           type = (pwd)? 'password' : 'text'
           if 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>"
+              @html << %Q(#{field}:<select name="#{name}">\n)
+              values.each do |value|
+                fields += 1
+                @html << %Q(  <option value="#{value}">#{value}</option>\n)
+              end
+              @html << "</select>\n"
             else
-fields += 1
-form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
+              fields += 1
+              @html << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">\n}
             end
           else
             fields += 1
-            form << %Q{  #{field}:<input type="#{type}" name="#{name}">}
+            @html << %Q{  #{field}:<input type="#{type}" name="#{name}">\n}
           end
         elsif name=='submit'
           submit = value
         else
-          form << %Q{  <input type="hidden" name="#{name}" value="#{value}">}
+          @html << %Q{  <input type="hidden" name="#{name}" value="#{value}">\n}
         end
       end
-      md = (@line=@file.gets)&.match FORMS
+      md=(@line=@file.gets)&.match(FORMS) and nl=true
     end
     if submit or not fields==1
       submit ||= 'Submit'
-      form << '  <br>' if n > 1
-      form << %Q(  <input type="submit" value="#{submit}">)
+      @html << "  <br>\n" if nl
+      @html << %Q(  <input type="submit" value="#{submit}">\n)
     end
-    form.unshift %Q(<form action="#{action}"#{method}#{@opt[:attributes]}>)
-    form << %Q(</form>)
-    @html << form.join("\n")
-    @html << "\n"
-    @opt.delete(:attributes)
+    @html << %Q(</form>\n)
     true
   end
 
@@ -457,17 +469,17 @@ form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
     if File.exist?(filename=File.join(ROOT, md[1]))
       extension,lang = filename.split('.').last,nil
       unless extension=='html'
-        lang = Rouge::Lexer.find extension
+        lang = Rouge::Lexer.find(extension) unless extension=='txt'
         klass = lang ? ' class="highlight"' : nil
         @html << "<pre#{klass}#{@opt[:attributes]}>"
         @opt.delete(:attributes)
-        @html << '<code>' unless extension=='txt'
+        @html << '<code>' if lang
         @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 << '</code>' if lang
         @html << '</pre>'
         @html << "\n"
       end

data/lib/markita/plug/navigation.rb

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

data/lib/markita/plug/readme.rb

@@ -0,0 +1,7 @@
+module Markita
+class Base
+  get '/readme.html' do
+    Markdown.new('README').markdown File.read File.join(APPDIR,'README.md')
+  end
+end
+end

data/lib/markita/preprocess.rb

@@ -6,7 +6,7 @@ class Preprocess
   end
 
   def gets
-    if line = @file.gets
+    while line = @file.gets
       case line
       when @regx
         line = @template if @template
@@ -14,17 +14,17 @@ class Preprocess
           line = line.gsub("&#{name.downcase};", value)
           line = line.gsub("&#{name.upcase};", CGI.escape(value))
         end
+        return line
       when %r(^! regx = /(.*)/$)
         @regx = Regexp.new $1
-        line = gets
       when %r(^! template = "(.*)"$)
         @template = $1+"\n"
-        line = gets
       else
         @regx &&= (@template=nil)
+        return line
       end
     end
-    line
+    return nil
   end
 end
 end

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.4.211004'
+  VERSION = '4.0.221124'
 
   def self.run!
     # Standard libraries
@@ -16,12 +16,15 @@ module Markita
     require_relative 'markita/markdown.rb'
     require_relative 'markita/base.rb'
     # Plugs
+    require_relative 'markita/plug/about.rb'      unless OPTIONS&.no_about
     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/navigation.rb' unless OPTIONS&.no_navigation
     require_relative 'markita/plug/plugs.rb'      unless OPTIONS&.no_plugs
+    require_relative 'markita/plug/readme.rb'     unless OPTIONS&.no_readme
     Base.run!
   end
 end
+# Requires:
+#`ruby`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.4.211004
+  version: 4.0.221124
 platform: ruby
 authors:
 - CarlosJHR64
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -36,40 +36,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.26'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.26.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.26'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.26.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -118,12 +118,13 @@ files:
 - lib/markita/plug/login.rb
 - lib/markita/plug/navigation.rb
 - lib/markita/plug/plugs.rb
+- lib/markita/plug/readme.rb
 - lib/markita/preprocess.rb
 homepage: https://github.com/carlosjhr64/markita
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubygems_version: 3.2.22
-signing_key:
+requirements:
+- 'ruby: ruby 3.1.2p20 (2022-04-12 revision 4491bb740a) [aarch64-linux]'
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: A Sinatra Markdown server.
 test_files: []