markita 4.1.230214 → 6.0.250327

data/lib/markita/plug/highlight.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
+
+# Markita namespace
 module Markita
-class Base
-  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
-  end
+  Html.header_links <<
+    %(<link rel="stylesheet" href="/highlight.css" type="text/css">\n)
 
-  get '/highlight.css' do
-    headers 'Content-Type' => 'text/css'
-    Highlight::CSS
+  # Base class of the Sinatra Markita application
+  class Base
+    # Highlight namespace to support the /highlight.css route
+    module Highlight
+      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
+      headers 'Content-Type' => 'text/css'
+      Highlight::CSS
+    end
   end
 end
-end

data/lib/markita/plug/login.rb

@@ -1,37 +1,44 @@
+# frozen_string_literal: true
+
+# Markita namespace
 module Markita
-class Base
-  module Login
-    ID = File.exist?(_=File.join(ROOT, '.valid-id')) ?
-         File.read(_).strip :
-         nil
-    IPS = (_=OPTIONS&.allowed)? _.split(',') : nil
-    if IPS && !ID
-      raise 'Allowed ips without site password does not make sense.'
+  # Base class of the Sinatra Markita application
+  class Base
+    # Login namespace to support the /login.html route
+    module Login
+      ID = if File.exist?(filename = File.join(ROOT, '.valid-id'))
+             File.read(filename).strip
+           end
+      IPS = (ips = OPTIONS.allowed) ? ips.split(',') : []
+      if !IPS.empty? && !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
-    FORM   = File.read PATH['login_form.html']
-    FAILED = File.read PATH['login_failed.html']
-  end
 
-  before do
-    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
-        redirect '/' if request.path_info == '/login.html'
-      else
-        redirect '/login.html' unless request.path_info == '/login.html'
+    before do
+      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
+          redirect '/' if request.path_info == '/login.html'
+        else
+          # Report this unauthorized access attempt
+          puts "#{request.ip} #{request.path_info}".magenta
+          redirect '/login.html' unless request.path_info == '/login.html'
+        end
       end
     end
-    puts "#{request.ip} #{request.path_info}"
-  end
 
-  get '/login.html' do
-    Login::FORM
-  end
+    get '/login.html' do
+      Login::FORM
+    end
 
-  post '/login.html' do
-    Login::FAILED
+    post '/login.html' do
+      Login::FAILED
+    end
   end
 end
-end

data/lib/markita/plug/navigation.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Markita namespace
 module Markita
-  NAVIGATION << %(![:Navigation](/favicon.ico /index)\n)
+  Html.navigation << %(![:Navigation](/favicon.ico /index)\n)
 end

data/lib/markita/plug/plugs.rb

@@ -1 +1,7 @@
-Dir.glob(File.join Markita::ROOT, 'plug', '*.rb').each{ require _1}
+# frozen_string_literal: true
+
+Dir.glob(File.join(Markita::ROOT, 'plug', '*.rb')).each do |path|
+  next if Markita.no.include? File.basename(path, '.rb').to_sym
+
+  require path
+end

data/lib/markita/plug/readme.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
+# Markita namespace
 module Markita
-class Base
-  get '/readme.html' do
-    Markdown.new('README').markdown File.read File.join(APPDIR,'README.md')
+  # Base class of the Sinatra Markita application
+  class Base
+    get '/readme.html' do
+      Markdown.new('README').markdown File.read File.join(APPDIR, 'README.md')
+    end
   end
 end
-end

data/lib/markita/preprocess.rb

@@ -1,30 +1,59 @@
+# frozen_string_literal: true
+
+# Markita namespace
 module Markita
-class Preprocess
-  def initialize(file)
-    @file = file.is_a?(String)? StringIO.new(file) : file
-    @regx = @template = nil
-  end
+  # Preprocess template lines
+  class Preprocess
+    using Refinement
+    # State variables that change as lines are read
+    IterationVariables = Struct.new(:line, :rgx, :template, :captures) do
+      def line2rgx
+        if (mdt = %r{^! regx = /(.*)/$}.match(line))
+          self.rgx = Regexp.new(mdt[1])
+        end
+      end
+
+      def line2template
+        if (mdt = /^! template = "(.*)"$/.match(line))
+          self.template = "#{mdt[1]}\n"
+        end
+      end
 
-  def gets
-    while (line=@file.gets)
-      case line
-      when @regx
-        line = @template if @template
-        $~.named_captures.each do |name, value|
-          line = line.gsub("&#{name.downcase};", value)
-          line = line.gsub("&#{name.upcase};", CGI.escape(value))
+      def line2captures
+        if (mdt = rgx.match(line))
+          self.captures = mdt.named_captures
+        else
+          self.rgx = self.template = nil
         end
-        return line
-      when %r{^! regx = /(.*)/$}
-        @regx = Regexp.new $1
-      when %r{^! template = "(.*)"$}
-        @template = $1+"\n"
-      else
-        @regx &&= (@template=nil)
-        return line
       end
+
+      def next?(line)
+        self.line = line
+        return true if line2rgx || line2template
+
+        line2captures if rgx
+        false
+      end
+
+      def to_s
+        return (template || line).template(captures) if captures
+
+        line
+      end
+    end
+
+    def gets
+      while (line = @line_getter.gets)
+        next if @iv.next?(line)
+
+        return @iv.to_s
+      end
+      nil
+    end
+
+    def initialize(line_getter)
+      @line_getter = line_getter
+      @iv = IterationVariables.new
     end
-    nil
   end
 end
-end

data/lib/markita/refinement.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Markita top level namespace
+module Markita
+  # Utility methods as refinements
+  module Refinement
+    # category: string
+    refine String do
+      def template(named_captures)
+        template = dup
+        named_captures.each { |key, value| template.template!(key, value) }
+        template
+      end
+
+      def template!(key, value)
+        gsub!("&#{key.downcase};", value)
+        gsub!("&#{key.upcase};", CGI.escape(value))
+      end
+    end
+  end
+end

data/lib/markita/requires.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Standard libraries
+require 'English'
+require 'digest'
+require 'cgi'
+require 'openssl'
+# Gems
+require 'colorize'
+require 'rouge'
+require 'webrick/https'
+require 'sinatra/base'
+# Local
+require_relative 'refinement'
+require_relative 'config'
+require_relative 'html'
+require_relative 'preprocess'
+require_relative 'markdown'
+require_relative 'base'
+# Plugs
+require_relative 'plug/about'      unless Markita.no.include? :about
+require_relative 'plug/favicon'    unless Markita.no.include? :favicon
+require_relative 'plug/highlight'  unless Markita.no.include? :highlight
+require_relative 'plug/login'      unless Markita.no.include? :login
+require_relative 'plug/navigation' unless Markita.no.include? :navigation
+require_relative 'plug/plugs'      unless Markita.no.include? :plugs
+require_relative 'plug/readme'     unless Markita.no.include? :readme
+# Requires:
+# `ruby`

data/lib/markita.rb

@@ -1,30 +1,21 @@
+# frozen_string_literal: true
+
+# Markita top level namespace
+# :reek:ClassVariable
+# rubocop:disable Style/ClassVars
 module Markita
-  VERSION = '4.1.230214'
+  VERSION = '6.0.250327'
+
+  @@no = []
+  def self.no = @@no
 
   def self.run!
-    # Standard libraries
-    require 'digest'
-    require 'cgi'
-    # Gems
-    require 'rouge'
-    require 'sinatra/base'
-    require 'thin'
-    # Local
-    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'      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
+    require_relative 'markita/requires'
+    # Requiring the markdown elements:
+    Dir.glob("#{__dir__}/markita/markdown/*.rb")
+       .map { File.basename(it, '.rb') }
+       .each { require_relative "markita/markdown/#{it}" }
     Base.run!
   end
 end
-# Requires:
-#`ruby`
+# rubocop:enable Style/ClassVars

metadata

@@ -1,195 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 4.1.230214
+  version: 6.0.250327
 platform: ruby
 authors:
 - CarlosJHR64
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: help_parser
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.230210
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.2.230210
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rouge
+  name: help_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 9.0.240926
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 9.0.240926
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !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'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.45.1
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.7
-  type: :development
+        version: 1.9.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: 1.9.1
 description: |
   A Sinatra Markdown server.
 
@@ -212,6 +131,25 @@ files:
 - lib/markita/config.rb
 - lib/markita/html.rb
 - lib/markita/markdown.rb
+- lib/markita/markdown/attributes.rb
+- lib/markita/markdown/blockquote.rb
+- lib/markita/markdown/code.rb
+- lib/markita/markdown/code_block.rb
+- lib/markita/markdown/definitions.rb
+- lib/markita/markdown/embed.rb
+- lib/markita/markdown/empty.rb
+- lib/markita/markdown/fold.rb
+- lib/markita/markdown/footnotes.rb
+- lib/markita/markdown/form.rb
+- lib/markita/markdown/heading.rb
+- lib/markita/markdown/horizontal_rule.rb
+- lib/markita/markdown/image.rb
+- lib/markita/markdown/inline.rb
+- lib/markita/markdown/list.rb
+- lib/markita/markdown/markup.rb
+- lib/markita/markdown/script.rb
+- lib/markita/markdown/split.rb
+- lib/markita/markdown/table.rb
 - lib/markita/plug/about.rb
 - lib/markita/plug/favicon.rb
 - lib/markita/plug/highlight.rb
@@ -220,11 +158,12 @@ files:
 - lib/markita/plug/plugs.rb
 - lib/markita/plug/readme.rb
 - lib/markita/preprocess.rb
+- lib/markita/refinement.rb
+- lib/markita/requires.rb
 homepage: https://github.com/carlosjhr64/markita
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -232,17 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- 'git: 2.30'
-- 'ruby: 3.2'
-rubygems_version: 3.4.6
-signing_key: 
+requirements: []
+rubygems_version: 3.6.6
 specification_version: 4
 summary: A Sinatra Markdown server.
 test_files: []