markita 1.0.210828 → 3.0.210912

data/lib/markita/plug/about.rb

@@ -19,13 +19,15 @@ 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
 
   get '/about.html' do
-    Base.page('about') { markdown About.page}
+    Markdown.new('About').markdown About.page
   end
 end
 end

data/lib/markita/preprocess.rb

@@ -0,0 +1,30 @@
+module Markita
+class Preprocess
+  def initialize(file)
+    @file = (file.is_a? String)? StringIO.new(file) : file
+    @regx = @template = nil
+  end
+
+  def gets
+    if 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))
+        end
+      when %r(^! regx = /(.*)/$)
+        @regx = Regexp.new $1
+        line = gets
+      when %r(^! template = "(.*)"$)
+        @template = $1+"\n"
+        line = gets
+      else
+        @regx &&= (@template=nil)
+      end
+    end
+    line
+  end
+end
+end

data/lib/markita.rb

@@ -1,17 +1,19 @@
 module Markita
-  VERSION = '1.0.210828'
+  VERSION = '3.0.210912'
 
   def self.run!
     # Standard libraries
     require 'digest'
     require 'cgi'
     # Gems
+    require 'rouge'
     require 'sinatra/base'
-    require 'kramdown'
     require 'thin'
-    Tilt.register Tilt::KramdownTemplate, 'md'
     # 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'
     # Plugs
     require_relative 'markita/plug/favicon.rb'    unless OPTIONS&.no_favicon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 1.0.210828
+  version: 3.0.210912
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser
@@ -31,45 +31,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.200907
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.26'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -91,10 +91,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.1
 description: |
-  A [Sinatra](http://sinatrarb.com) Markdown server.
+  A Sinatra Markdown server.
 
-  Uses [Kramdown](https://kramdown.gettalong.org/index.html) for the Markdown to
-  HTML conversion.
+  With many extra non-standard features.
 email: carlosjhr64@gmail.com
 executables:
 - markita
@@ -103,6 +102,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/markita
+- data/emojis.tsv
 - data/favicon.ico
 - data/highlight.css
 - data/login_failed.html
@@ -111,11 +111,14 @@ files:
 - lib/markita.rb
 - lib/markita/base.rb
 - lib/markita/config.rb
+- lib/markita/html.rb
+- lib/markita/markdown.rb
 - lib/markita/plug/about.rb
 - lib/markita/plug/favicon.rb
 - lib/markita/plug/highlight.rb
 - lib/markita/plug/login.rb
 - lib/markita/plug/plugs.rb
+- lib/markita/preprocess.rb
 homepage: https://github.com/carlosjhr64/markita
 licenses:
 - MIT
@@ -138,5 +141,5 @@ requirements: []
 rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: A [Sinatra](http://sinatrarb.com) Markdown server.
+summary: A Sinatra Markdown server.
 test_files: []