markita 4.1.230116 → 4.1.230214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00a9566251da73346583e54ae03f74b7251a5d4a43ca5c5b553b0b3179fb4e2
-  data.tar.gz: 9e5e0d48d1aee16600af6033a58008c9cb24ff49cf85b12f37d47737f49194eb
+  metadata.gz: 3f0f724a5032aef309176a00528c84199b06fc0a6f9f8fa9b36b0ad81077adca
+  data.tar.gz: 371e1025357b9686e31697f563ba6534e2706df21bb2ce1e0586ea818467f387
 SHA512:
-  metadata.gz: 16b8d905d43fd810dc2f68aa0640be8be6ab7a2ebe51da42492c567cfdf01296ea5f4aeb676a36367274b1402b97428d848dea7db0c8a097e09b4afa1a4eaad9
-  data.tar.gz: ef8c0b4a38c07feada1e16b47280b4ab49e24eb3a95cdbbfdfa2578bdae11ed0618aafa426aa76a884b4e897fb7ddc5441ac060fd0b0b37f6d408fbd9b6f1c8d
+  metadata.gz: 59e8791389f0bc45488a9e80d6dc8cbd84abe8eb663550e46aff32d1ee8c32f0d0ea60e3dee4be57f589672aa4c23e7e41a305ac491141d2df955cb0aa230e88
+  data.tar.gz: 64ab90255ad7ab0ba1dcce4824bd33b5585e4ecf61333ad5bdabf75f9650eb625131fd79efb7b0968e7d99ab6c3c5eeff978e832eb7c2ce4fe95b6bb3c4202a1

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 4.1.230116](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 4.1.230214](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -351,7 +351,7 @@ $ GET https://raw.githubusercontent.com/carlosjhr64/markita/main/plug/todotxt.rb
 ```
 ## LICENSE
 
-Copyright 2023 CarlosJHR64
+Copyright (c) 2023 CarlosJHR64
 
 Permission is hereby granted, free of charge,
 to any person obtaining a copy of this software and

data/bin/markita

@@ -2,36 +2,36 @@
 require 'help_parser'
 require 'markita'
 
-OPTIONS = HelpParser[Markita::VERSION, <<HELP]
-Usage:
-  markita [:options+]
-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_login
-  --no_navigation
-  --no_plugs
-  --no_readme
-Exclusive:
-  no_login allowed
-Types:
-  DIRECTORY /^~?[\\/\\w\\.]+$/
-  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,
-# that password will restrict the site.
-# Allowed IPs bypass the need for site password
-# when the site is accessed from those locations.
+OPTIONS = HelpParser[Markita::VERSION, <<~HELP]
+  Usage:
+    markita [:options+]
+  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_login
+    --no_navigation
+    --no_plugs
+    --no_readme
+  Exclusive:
+    no_login allowed
+  Types:
+    DIRECTORY /^~?[\\/\\w\\.]+$/
+    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,
+  # that password will restrict the site.
+  # Allowed IPs bypass the need for site password
+  # when the site is accessed from those locations.
 HELP
 begin
   Markita.run!
@@ -41,8 +41,8 @@ rescue LoadError
 rescue RuntimeError
   HelpParser::REDTTY["#{$!.class}: #{$!.message}"]
   exit 65
-rescue Exception
-  $stderr.puts $!.backtrace
+rescue
+  warn $!.backtrace
   HelpParser::REDTTY["#{$!.class}: #{$!.message}"]
   exit 70
 end

data/lib/markita/base.rb

@@ -4,7 +4,7 @@ class Base < Sinatra::Base
   set port: OPTIONS&.port || '8080'
   set sessions: true
 
-  def Base.run!
+  def self.run!
     puts "#{$0}-#{VERSION}"
     super do |server|
       if ['.cert.crt', '.pkey.pem'].all?{ File.exist? File.join(ROOT, _1)}
@@ -20,13 +20,13 @@ class Base < Sinatra::Base
 
   get PAGE_KEY do |key|
     filepath = File.join ROOT, key+'.md'
-    raise Sinatra::NotFound  unless File.exist? filepath
+    raise Sinatra::NotFound unless File.exist? filepath
     Markdown.new(key).filepath filepath
   end
 
   get SEND_FILE do |path|
-    pass unless params.length==1 and
-                filepath = File.join(ROOT, path) and
+    pass unless params.length==1 &&
+                (filepath=File.join ROOT, path) &&
                 File.exist?(filepath)
     send_file filepath
   end
@@ -36,7 +36,7 @@ class Base < Sinatra::Base
     if File.exist? filepath
       Markdown.new('index').filepath filepath
     else
-      redirect '/about.html'  unless OPTIONS&.no_about
+      redirect '/about.html' unless OPTIONS&.no_about
       raise Sinatra::NotFound
     end
   end

data/lib/markita/config.rb

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

data/lib/markita/html.rb

@@ -1,6 +1,6 @@
 module Markita
 module HTML
-  def HTML.header(key)
+  def self.header(key)
     <<~HEADER
       <!DOCTYPE html>
       <html>
@@ -11,11 +11,11 @@ module HTML
     HEADER
   end
 
-  def HTML.navigation
+  def self.navigation
     NAVIGATION
   end
 
-  def HTML.footer
+  def self.footer
     <<~FOOTER
       </body>
       </html>

data/lib/markita/markdown.rb

@@ -15,8 +15,8 @@ class Markdown
   end
 
   def finish
-    if title = @metadata['Title']
-      @html << %Q(<script> document.title = "#{title}" </script>\n)
+    if (title=@metadata['Title'])
+      @html << %(<script> document.title = "#{title}" </script>\n)
     end
     @html << HTML.footer
     @line = nil
@@ -34,9 +34,7 @@ class Markdown
   def parse(fh)
     init(fh)
     start
-    while @line
-      PARSERS.detect{method(_1).call} or default
-    end
+    PARSERS.detect{method(_1).call} or default while @line
     finish
   end
 
@@ -51,44 +49,44 @@ class Markdown
   end
 
   Ux = /_([^_]+)_/
-  U  = lambda {|m| "<u>#{m[1]}</u>"}
+  U  = ->(m){"<u>#{m[1]}</u>"}
 
   Sx = /~([^~]+)~/
-  S  = lambda {|m| "<s>#{m[1]}</s>"}
+  S  = ->(m){"<s>#{m[1]}</s>"}
 
   Ix = /"([^"]+)"/
-  I  = lambda {|m| "<i>#{m[1]}</i>"}
+  I  = ->(m){"<i>#{m[1]}</i>"}
 
-  Bx = /\*([^\*]+)\*/
-  B  = lambda {|m| "<b>#{m[1]}</b>"}
+  Bx = /\*([^*]+)\*/
+  B  = ->(m){"<b>#{m[1]}</b>"}
 
   CODEx = /`([^`]+)`/
-  CODE  = lambda {|m| "<code>#{m[1].gsub('<','&lt;')}</code>"}
+  CODE  = ->(m){"<code>#{m[1].gsub('<','&lt;')}</code>"}
 
   Ax = /\[([^\[\]]+)\]\(([^()]+)\)/
   def anchor(m)
     href = ((_=m[2]).match?(/^\d+$/) and @metadata[_] or _)
     text = Markdown.tag(m[1], EMOJIx, EMOJI)
-    %Q(<a href="#{href}">#{text}</a>)
+    %(<a href="#{href}">#{text}</a>)
   end
 
-  URLx = %r((https?://[\w\.\-\/\&\+\?\%]+))
-  URL  = lambda {|m| %Q(<a href="#{m[1]}">#{m[1]}</a>)}
+  URLx = %r{(https?://[\w./&+?%-]+)}
+  URL  = ->(m){%(<a href="#{m[1]}">#{m[1]}</a>)}
 
   EMOJIx = /:(\w+):/
-  EMOJI  = lambda {|m| (_=EMOJIS[m[1]])? "&\#x#{_};" : m[0]}
+  EMOJI  = ->(m){(_=EMOJIS[m[1]])? "&#x#{_};" : m[0]}
 
   FOOTNOTEx = /\[\^(\d+)\](:)?/
   FOOTNOTE  = lambda do |m|
     if m[2]
-      %Q(<a id="fn:#{m[1]}" href="\#fnref:#{m[1]}">#{m[1]}:</a>)
+      %(<a id="fn:#{m[1]}" href="#fnref:#{m[1]}">#{m[1]}:</a>)
     else
-      %Q(<a id="fnref:#{m[1]}" href="\#fn:#{m[1]}"><sup>#{m[1]}</sup></a>)
+      %(<a id="fnref:#{m[1]}" href="#fn:#{m[1]}"><sup>#{m[1]}</sup></a>)
     end
   end
 
-  def Markdown.tag(entry, regx, m2string, &block)
-    if m = regx.match(entry)
+  def self.tag(entry, regx, m2string, &block)
+    if (m=regx.match entry)
       string = ''
       while m
         pre_match = (block ? block.call(m.pre_match) : m.pre_match)
@@ -99,7 +97,7 @@ class Markdown
       string << (block ? block.call(post_match) : post_match)
       return string
     end
-    return (block ? block.call(entry) : entry)
+    block ? block.call(entry) : entry
   end
 
   def inline(entry)
@@ -111,7 +109,7 @@ class Markdown
           entry = Markdown.tag(entry, Ix, I)
           entry = Markdown.tag(entry, Sx, S)
           entry = Markdown.tag(entry, Ux, U)
-          entry = Markdown.tag(entry, FOOTNOTEx, FOOTNOTE)
+          Markdown.tag(entry, FOOTNOTEx, FOOTNOTE)
         end
       end
     end
@@ -135,21 +133,18 @@ class Markdown
     level = md[1].length
     @html << "<ol#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md and level==md[1].length
+    while md && 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 = @line&.match(ORDERED)
-        end
-      end
+      next unless (md=(@line=@file.gets)&.match ORDERED) && level<md[1].length
+      ordered(md)
+      md = @line&.match(ORDERED)
     end
     @html << "</ol>\n"
     true
   end
 
   # Paragraph
-  PARAGRAPHS = /^[\[\(*`'"~_]?:?\w/
+  PARAGRAPHS = /^[\[(*`'"~_]?:?\w/
   PARSERS << :paragraphs
   def paragraphs
     md = PARAGRAPHS.match(@line) or return false
@@ -174,14 +169,11 @@ class Markdown
     level = md[1].length
     @html << "<ul#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md and level==md[1].length
+    while md && 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 = @line&.match(UNORDERED)
-        end
-      end
+      next unless (md=(@line=@file.gets)&.match UNORDERED) && level<md[1].length
+      unordered(md)
+      md = @line&.match(UNORDERED)
     end
     @html << "</ul>\n"
     true
@@ -196,9 +188,9 @@ class Markdown
     @opt.delete(:attributes)
     while md
       x,t = md[1],md[2]
-      li = (x=='x')?
-        %q{<li style="list-style-type: '&#9745; '">} :
-        %q{<li style="list-style-type: '&#9744; '">}
+      li = x=='x' ?
+        %q(<li style="list-style-type: '&#9745; '">) :
+        %q(<li style="list-style-type: '&#9744; '">)
       @html << "  #{li}#{inline(t)}</li>\n"
       md = (@line=@file.gets)&.match BALLOTS
     end
@@ -230,13 +222,13 @@ class Markdown
   end
 
   # Headers
-  HEADERS = /^([#]{1,6}) (.*)$/
+  HEADERS = /^(\#{1,6}) (.*)$/
   PARSERS << :headers
   def headers
     md = HEADERS.match(@line) or return false
     i,header = md[1].length,md[2]
-    id = header.gsub(/\([^\(\)]*\)/,'').scan(/\w+/).join('+')
-    @html << %Q(<a id="#{id}">\n)
+    id = header.gsub(/\([^()]*\)/,'').scan(/\w+/).join('+')
+    @html << %(<a id="#{id}">\n)
     @html << "  <h#{i}#{@opt[:attributes]}>#{inline(header)}</h#{i}>\n"
     @html << "</a>\n"
     @opt.delete(:attributes)
@@ -252,15 +244,12 @@ class Markdown
     level = md[1].length
     @html << "<blockquote#{@opt[:attributes]}>\n"
     @opt.delete(:attributes)
-    while md and level==md[1].length
+    while md && level==md[1].length
       @html << inline(md[2])
       @html << "\n"
-      if md = (@line=@file.gets)&.match(BLOCKQS)
-        if level < md[1].length
-          blockqs(md)
-          md = @line&.match(BLOCKQS)
-        end
-      end
+      next unless (md=(@line=@file.gets)&.match BLOCKQS) && level<md[1].length
+      blockqs(md)
+      md = @line&.match(BLOCKQS)
     end
     @html << "</blockquote>\n"
     true
@@ -276,9 +265,7 @@ class Markdown
     @html << "<pre#{klass}#{@opt[:attributes]}><code>\n"
     @opt.delete(:attributes)
     code = ''
-    while @line=@file.gets and not CODES.match?(@line)
-      code << @line
-    end
+    code << @line while (@line=@file.gets) && !CODES.match?(@line)
     @html << (lang ? ROUGE.format(lang.new.lex(code)) : code)
     @html << "</code></pre>\n"
     @line = @file.gets if @line # then it's code close and thus need next @line.
@@ -289,11 +276,11 @@ class Markdown
   SCRIPT = /^<script/
   PARSERS << :script
   def script
-    md = SCRIPT.match(@line) or return false
+    SCRIPT.match(@line) or return false
     @html << @line
-    while @line=@file.gets
+    while (@line=@file.gets)
       @html << @line
-      break if %r(^</script>).match?(@line)
+      break if %r{^</script>}.match?(@line)
     end
     @line = @file.gets if @line
     true
@@ -384,13 +371,13 @@ class Markdown
     SPLITS.match? @line or return false
     case @line.chomp
     when '|:'
-      @html << %Q(<table><tr><td#{@opt[:attributes]}>\n)
+      @html << %(<table><tr><td#{@opt[:attributes]}>\n)
     when '|'
-      @html << %Q(</td><td#{@opt[:attributes]}>\n)
+      @html << %(</td><td#{@opt[:attributes]}>\n)
     when ':|:'
-      @html << %Q(</td></tr><tr><td#{@opt[:attributes]}>\n)
+      @html << %(</td></tr><tr><td#{@opt[:attributes]}>\n)
     when ':|'
-      @html << %Q(</td></tr></table>\n)
+      @html << %(</td></tr></table>\n)
     end
     @opt.delete(:attributes)
     @line = @file.gets
@@ -398,7 +385,7 @@ class Markdown
   end
 
   # Image
-  IMAGES = /^!\[([^\[\]]+)\]\(([^\(\)]+)\)$/
+  IMAGES = /^!\[([^\[\]]+)\]\(([^()]+)\)$/
   PARSERS << :images
   def images
     md = IMAGES.match(@line) or return false
@@ -406,18 +393,20 @@ class Markdown
     style = ' '
     case alt
     when /^:.*:$/
-      style = %Q( style="display: block; margin-left: auto; margin-right: auto;" )
+      style =
+      %( style="display: block; margin-left: auto; margin-right: auto;" )
     when /:$/
-      style = %Q( style="float:left;" )
+      style = %( style="float:left;" )
     when /^:/
-      style = %Q( style="float:right;" )
+      style = %( style="float:right;" )
     end
     if /(\d+)x(\d+)/.match alt
-      style << %Q(width="#{$1}" height="#{$2}" )
+      style << %(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
+    @html << %(<a href="#{href}">\n) if href
+    @html <<
+      %(<img src="#{src}"#{style}alt="#{alt.strip}"#{@opt[:attributes]}>\n)
+    @html << %(</a>\n) if href
     @opt.delete(:attributes)
     @line = @file.gets
     true
@@ -431,9 +420,9 @@ class Markdown
   def forms
     md = FORMS.match(@line) or return false
     fields,nl,submit = 0,false,nil
-    action = (_=/\(([^\(\)]*)\)!?$/.match(@line))? %Q( action="#{_[1]}") : nil
+    action = (_=/\(([^()]*)\)!?$/.match(@line))? %( action="#{_[1]}") : nil
     method = @line.match?(/!$/) ? ' method="post"' : nil
-    @html << %Q(<form#{action}#{method}#{@opt[:attributes]}>\n)
+    @html << %(<form#{action}#{method}#{@opt[:attributes]}>\n)
     @opt.delete(:attributes)
     while md
       @html << "  <br>\n" if nl
@@ -441,37 +430,38 @@ class Markdown
         field &&= field[0...-1]
         value &&= value[2...-1]
         if field
-          type = (pwd)? 'password' : 'text'
+          type = pwd ? 'password' : 'text'
           if value
             if (values = value.split('","')).length > 1
-              @html << %Q(#{field}:<select name="#{name}">\n)
+              @html << %(#{field}:<select name="#{name}">\n)
               values.each do |value|
                 fields += 1
-                @html << %Q(  <option value="#{value}">#{value}</option>\n)
+                @html << %(  <option value="#{value}">#{value}</option>\n)
               end
               @html << "</select>\n"
             else
               fields += 1
-              @html << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">\n}
+              @html << %(  #{field}:<input type="#{type}" name="#{name}")
+              @html << %( value="#{value}">\n)
             end
           else
             fields += 1
-            @html << %Q{  #{field}:<input type="#{type}" name="#{name}">\n}
+            @html << %(  #{field}:<input type="#{type}" name="#{name}">\n)
           end
         elsif name=='submit'
           submit = value
         else
-          @html << %Q{  <input type="hidden" name="#{name}" value="#{value}">\n}
+          @html << %(  <input type="hidden" name="#{name}" value="#{value}">\n)
         end
       end
       md=(@line=@file.gets)&.match(FORMS) and nl=true
     end
-    if submit or not fields==1
+    if submit || fields!=1
       submit ||= 'Submit'
       @html << "  <br>\n" if nl
-      @html << %Q(  <input type="submit" value="#{submit}">\n)
+      @html << %(  <input type="submit" value="#{submit}">\n)
     end
-    @html << %Q(</form>\n)
+    @html << %(</form>\n)
     true
   end
 

data/lib/markita/plug/about.rb

@@ -15,11 +15,11 @@ class Base
       TEXT
       Base.routes['GET'].each do |route|
         path = route[0].to_s
-        next  unless %r{^/\w+\.html$}.match? path
+        next unless %r{^/\w+\.html$}.match? path
         basename = File.basename(path, '.*')
         text << "* [#{basename}](#{path})\n"
       end
-      if defined? Favicon and Favicon::ICO
+      if defined? Favicon && Favicon::ICO
         text << "\n![Favicon](/favicon.ico)\n"
       end
       text

data/lib/markita/plug/favicon.rb

@@ -1,6 +1,8 @@
 module Markita
 class Base
-  HEADER_LINKS << %Q(  <link rel="icon" type="image/x-icon" href="/favicon.ico">\n)
+  HEADER_LINKS <<
+    %(  <link rel="icon" type="image/x-icon" href="/favicon.ico">\n)
+
   module Favicon
     ICO = File.read PATH['favicon.ico']
   end

data/lib/markita/plug/highlight.rb

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

data/lib/markita/plug/login.rb

@@ -5,16 +5,16 @@ class Base
          File.read(_).strip :
          nil
     IPS = (_=OPTIONS&.allowed)? _.split(',') : nil
-    if IPS and not ID
-      raise "Allowed ips without site password does not make sense."
+    if IPS && !ID
+      raise 'Allowed ips without site password does not make sense.'
     end
     FORM   = File.read PATH['login_form.html']
     FAILED = File.read PATH['login_failed.html']
   end
 
   before do
-    unless Login::ID.nil? or Login::IPS&.include?(request.ip)
-      if id = params[:id]
+    unless Login::ID.nil? || Login::IPS&.include?(request.ip)
+      if (id=params[:id])
         session[:id] = Digest::SHA256.hexdigest id
       end
       if session[:id] == Login::ID

data/lib/markita/plug/navigation.rb

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

data/lib/markita/preprocess.rb

@@ -1,12 +1,12 @@
 module Markita
 class Preprocess
   def initialize(file)
-    @file = (file.is_a? String)? StringIO.new(file) : file
+    @file = file.is_a?(String)? StringIO.new(file) : file
     @regx = @template = nil
   end
 
   def gets
-    while line = @file.gets
+    while (line=@file.gets)
       case line
       when @regx
         line = @template if @template
@@ -15,16 +15,16 @@ class Preprocess
           line = line.gsub("&#{name.upcase};", CGI.escape(value))
         end
         return line
-      when %r(^! regx = /(.*)/$)
+      when %r{^! regx = /(.*)/$}
         @regx = Regexp.new $1
-      when %r(^! template = "(.*)"$)
+      when %r{^! template = "(.*)"$}
         @template = $1+"\n"
       else
         @regx &&= (@template=nil)
         return line
       end
     end
-    return nil
+    nil
   end
 end
 end

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '4.1.230116'
+  VERSION = '4.1.230214'
 
   def self.run!
     # Standard libraries
@@ -10,19 +10,19 @@ module Markita
     require 'sinatra/base'
     require 'thin'
     # Local
-    require_relative 'markita/config.rb'
-    require_relative 'markita/html.rb'
-    require_relative 'markita/preprocess.rb'
-    require_relative 'markita/markdown.rb'
-    require_relative 'markita/base.rb'
+    require_relative 'markita/config'
+    require_relative 'markita/html'
+    require_relative 'markita/preprocess'
+    require_relative 'markita/markdown'
+    require_relative 'markita/base'
     # 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/login.rb'      unless OPTIONS&.no_login
-    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
+    require_relative 'markita/plug/about'      unless OPTIONS&.no_about
+    require_relative 'markita/plug/favicon'    unless OPTIONS&.no_favicon
+    require_relative 'markita/plug/highlight'  unless OPTIONS&.no_highlight
+    require_relative 'markita/plug/login'      unless OPTIONS&.no_login
+    require_relative 'markita/plug/navigation' unless OPTIONS&.no_navigation
+    require_relative 'markita/plug/plugs'      unless OPTIONS&.no_plugs
+    require_relative 'markita/plug/readme'     unless OPTIONS&.no_readme
     Base.run!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 4.1.230116
+  version: 4.1.230214
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.221206
+        version: 8.2.230210
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.1.221206
+        version: 8.2.230210
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,106 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.45'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.45.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.45'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.45.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.7
 description: |
   A Sinatra Markdown server.
 
@@ -139,8 +239,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'ruby: ruby 3.2.0 (2022-12-25 revision a528908271) [aarch64-linux]'
-rubygems_version: 3.4.3
+- 'git: 2.30'
+- 'ruby: 3.2'
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: A Sinatra Markdown server.