jekyll-spaceship 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379152712b0a1373687d9dd83d5e0ed002ba62c891d6746a5dd0968006794023
-  data.tar.gz: e98e3c2d3819d86132393a63030b1913083373f15fb9cca5ba664c465c078ea0
+  metadata.gz: 1eb92f8cf62c528dec112c2cd8a00c7721751942d635065fbfb6c73736c3df9a
+  data.tar.gz: 3c6a315b49882a071dfd0b85bf55197023156855bd618360f33e27564b77823c
 SHA512:
-  metadata.gz: 28199f722743b52508263c323c75eed9a014ec3abf567803bfbdf72aa7823fe4a28a4b8f486093e043b05e6e398f8badc988640e649c7d62eb930e9c161cab9e
-  data.tar.gz: b13bed955b451fa8c807f4cc85cb6293a89b01b199d6fcb4a195907caa649560b3cf7efe8838e44e904749386a23c32222a46ff3b154b00f183fa00e2429464b
+  metadata.gz: bb0565056cbdb3df43cab239326364e680bba9ef87068ca1e823c24cfc03a77495c8e29efb4d2df0c51b68a0c9cc95fa1a450860cc1bdeaf91ffd3d164118733
+  data.tar.gz: a033c89fbda99d63221689e07089cc3875304e74b08332bb1c91599476302ebbaa8ce91876072996811191bcaf84dc92e5f8bc5864153bdd953b588aa4e9831d

data/lib/jekyll-spaceship.rb

@@ -9,4 +9,5 @@ module Jekyll::Spaceship
   Register.use 'table-processor'
   Register.use 'mathjax-processor'
   Register.use 'plantuml-processor'
+  Register.use 'polyfill-processor'
 end

data/lib/jekyll-spaceship/cores/logger.rb

@@ -6,12 +6,12 @@ module Jekyll::Spaceship
   class Logger
     def self.display_info
       self.log "Jekyll-Spaceship #{Jekyll::Spaceship::VERSION}"
-      self.log "A Jekyll plugin to provide powerful supports."
-      self.log "https://github.com/jeffreytse/jekyll-spaceship"
+      self.log 'A Jekyll plugin to provide powerful supports.'
+      self.log 'https://github.com/jeffreytse/jekyll-spaceship'
     end
 
     def self.log(content)
-      self.output "Jekyll Spaceship", content
+      self.output 'Jekyll Spaceship', content
     end
 
     def self.output(title, content)

data/lib/jekyll-spaceship/cores/processor.rb

@@ -1,10 +1,62 @@
 # frozen_string_literal: true
 
+require 'nokogiri'
+
 module Jekyll::Spaceship
   class Processor
+    @@_hooks = {}
     @@_registers = []
+    @@_processers = []
+    @@_priority = nil
+
+    attr_accessor :priority
+    attr_accessor :page
+    attr_accessor :handled
+
+    DEFAULT_PRIORITY = 20
+
+    PRIORITY_MAP = {
+      :low    => 10,
+      :normal => 20,
+      :high   => 30,
+    }.freeze
+
+    HTML_EXTENSIONS = %w(
+      .html
+      .xhtml
+      .htm
+    ).freeze
+
+    CSS_EXTENSIONS = %w(
+      .css
+      .scss
+    ).freeze
+
+    MD_EXTENSIONS = %w(
+      .md
+      .markdown
+    ).freeze
 
     def initialize()
+      self.initialize_priority
+      self.initialize_register
+    end
+
+    def initialize_priority
+      @@_priority = DEFAULT_PRIORITY if @@_priority.nil?
+      @priority = @@_priority
+      @@_priority = nil
+
+      @@_processers.push(self)
+      @@_processers = @@_processers.sort { |a, b| b.priority <=> a.priority }
+    end
+
+    def initialize_register
+      if @@_registers.size.zero?
+        self.class.register :pages, :pre_render, :post_render
+        self.class.register :posts, :pre_render, :post_render
+      end
+
       @@_registers.each do |_register|
         container = _register.first
         events = _register.last.uniq
@@ -13,57 +65,215 @@ module Jekyll::Spaceship
           next !events.any?(event.to_s.gsub(/^pre/, 'post').to_sym)
         end
         events.each do |event|
-          register container, event
+          self.class.hook container, event
         end
       end
       @@_registers.clear
     end
 
-    def content_tag(post)
-      # pre-handle content
-      content_tag = "<content_tag id=\"#{post.url}\" />"
+    def self.priority(value)
+      value = value.to_sym
+      if PRIORITY_MAP.has_key? value
+        @@_priority = PRIORITY_MAP[value]
+      elsif value.nil?
+        @@_priority = DEFAULT_PRIORITY
+      else
+        @@_priority = value
+      end
     end
 
     def self.register(container, *events)
       @@_registers << [container, events]
     end
 
-    def register(container, event, &block)
-      # define handle proc
-      handle = ->(post) {
-        method = "on_#{container}_#{event}"
-        self.send method, post if self.respond_to? method
-        block.call(post) if block
+    def self.hook_register(container, event)
+      hook_name = "#{container}_#{event}".to_sym
+      return false if @@_hooks.has_key? hook_name
+      @@_hooks[hook_name] = true
+    end
+
+    def self.hook(container, event, &block)
+      return if not hook_register container, event
+
+      # define dispatch proc
+      dispatch = ->(instance) {
+        @@_processers.each do |processor|
+          processor.page = instance
+          processor.handled = false
+          next if not processor.process?
+          processor.dispatch container, event
+        end
+        if event.to_s.start_with?('post') and self.html? output_ext(instance)
+          self.handle_html_block(instance)
+        end
+        @@_processers.each do |processor|
+          processor.page = instance
+          if processor.handled
+            processor.on_handled
+          end
+        end
+        block.call if block
       }
 
-      if event.to_s.start_with?("after")
-        Jekyll::Hooks.register container, event do |post|
-          handle.call post
+      if event.to_s.start_with?('after')
+        Jekyll::Hooks.register container, event do |instance|
+          dispatch.call instance
+        end
+      elsif event.to_s.start_with?('post')
+        Jekyll::Hooks.register container, event do |instance|
+          dispatch.call instance
+        end
+
+        # auto add pre-event
+        register container, event.to_s.sub('post', 'pre').to_sym
+      elsif event.to_s.start_with?('pre')
+        Jekyll::Hooks.register container, event do |instance|
+          dispatch.call instance
         end
-      elsif event.to_s.start_with?("post")
-        Jekyll::Hooks.register container, event do |post|
-          # remove content tags
-          tag = self.content_tag(post)
-          post.content = post.content.gsub(tag, "")
+      end
+    end
 
-          handle.call post
+    def dispatch(container, event)
+      method = "on_#{container}_#{event}"
+      self.send method, @page if self.respond_to? method
 
-          # replace output content
-          post.output = post.output.gsub(/#{tag}.*#{tag}/m, post.content)
+      if event.to_s.start_with?('pre')
+        if markdown? ext
+          method = 'on_handle_markdown'
+        else
+          method = ''
         end
 
-        # auto add pre-event
-        register container, event.to_s.sub("post", "pre").to_sym
-      elsif event.to_s.start_with?("pre")
-        Jekyll::Hooks.register container, event do |post|
-          # wrap post content with tags
-          tag = self.content_tag(post)
+        if self.respond_to? method
+          @page.content = self.send method, @page.content
+        end
+      else
+        if html? output_ext
+          method = 'on_handle_html'
+        elsif css? output_ext
+          method = 'on_handle_css'
+        else
+          method = ''
+        end
+
+        if self.respond_to? method
+          @page.output = self.send method, @page.output
+        end
+      end
+    end
+
+    def html?(_ext)
+      self.class.html? _ext
+    end
+
+    def css?(_ext)
+      self.class.css? _ext
+    end
 
-          handle.call post
+    def markdown?(_ext)
+      self.class.markdown? _ext
+    end
+
+    def self.html?(_ext)
+      HTML_EXTENSIONS.include?(_ext)
+    end
+
+    def self.css?(_ext)
+      CSS_EXTENSIONS.include?(_ext)
+    end
+
+    def self.markdown?(_ext)
+      MD_EXTENSIONS.include?(_ext)
+    end
+
+    def converter(name)
+      self.class.converter(@page, name)
+    end
+
+    def self.converter(instance, name)
+      instance.site.converters.each do |converter|
+        class_name = converter.class.to_s.downcase
+        return converter if class_name.end_with?(name.downcase)
+      end
+    end
+
+    def ext
+      self.class.ext @page
+    end
+
+    def output_ext
+      self.class.output_ext @page
+    end
+
+    def self.ext(instance)
+      instance.data['ext']
+    end
+
+    def self.output_ext(instance)
+      instance.url_placeholders[:output_ext]
+    end
+
+    def process?
+      html?(output_ext) or markdown?(ext)
+    end
+
+    def on_handled
+      processor = self.class.name.split('::').last
+      file = page.path.gsub(/.*_posts\//, '')
+      Logger.log "[#{processor}] #{file}"
+    end
 
-          post.content = "#{tag}\n#{post.content}\n#{tag}"
+    def self.handle_html_block(instance)
+      doc = Nokogiri::HTML(instance.output)
+
+      doc.css('script').each do |node|
+        blk_type = node['type']
+        blk_content = node.content
+
+        cvter = nil
+        method = ''
+        block_method = 'on_handle_html_block'
+
+        case blk_type
+        when 'text/markdown'
+          method = 'on_handle_markdown'
+          cvter = self.converter(instance, 'markdown')
         end
+
+        @@_processers.each do |processor|
+          processor.page = instance
+          next if not processor.process?
+
+          # dispatch to on_handle_html_block
+          if processor.respond_to? block_method
+            blk_content = processor.send block_method blk_content, blk_type
+          end
+
+          # dispatch to other handlers
+          if processor.respond_to? method
+            blk_content = processor.send method, blk_content
+          end
+        end
+
+        if not cvter.nil?
+          blk_content = cvter.convert blk_content
+        end
+
+        next if method == ''
+
+        method = 'on_handle_html'
+        @@_processers.each do |processor|
+          processor.page = instance
+          next if not processor.process?
+          if processor.respond_to? method
+            blk_content = processor.send method, blk_content
+          end
+        end
+
+        node.replace Nokogiri::HTML.fragment(blk_content)
       end
+
+      instance.output = doc.to_html
     end
   end
 end

data/lib/jekyll-spaceship/cores/register.rb

@@ -5,10 +5,10 @@ module Jekyll::Spaceship
     def self.walk(start, &block)
       Dir.foreach start do |x|
         path = File.join(start, x)
-        if x == "." or x == ".."
+        if x == '.' or x == '..'
           next
         elsif File.directory?(path)
-          block.call(path + "/")
+          block.call(path + '/')
           walk path
         else
           block.call(path)

data/lib/jekyll-spaceship/processors/mathjax-processor.rb

@@ -1,20 +1,45 @@
 # frozen_string_literal: true
 
-require 'nokogiri'
+require "nokogiri"
 
 module Jekyll::Spaceship
   class MathjaxProcessor < Processor
-    register :posts, :post_render
+    def process?
+      return true if html?(output_ext)
+    end
 
-    def on_posts_post_render(post)
+    def on_handle_html(content)
       # use nokogiri to parse html
-      doc = Nokogiri::HTML(post.output)
+      doc = Nokogiri::HTML(content)
+
+      head = doc.at('head')
+      return content if head.nil?
+      return content if not self.has_mathjax_expression? doc
+
+      self.handled = true
 
       params = "config=TeX-AMS-MML_HTMLorMML"
       src = "//cdn.mathjax.org/mathjax/latest/MathJax.js?#{params}"
-      doc.at('head').add_child("<script src=\"#{src}\"></script>")
+      config = "MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});"
+      head.add_child("<script src=\"#{src}\">#{config}</script>")
+
+      doc.to_html
+    end
+
+    def has_mathjax_expression?(doc)
+      doc.css('p').each do |node|
+        if node.content.match(/\$.+\$/)
+          return true
+        end
+      end
 
-      post.output = doc.to_s
+      doc.css('script').each do |node|
+        type = node['type']
+        if type and type.match(/math\/tex/)
+          return true
+        end
+      end
+      false
     end
   end
 end

data/lib/jekyll-spaceship/processors/plantuml-processor.rb

@@ -2,16 +2,14 @@
 
 module Jekyll::Spaceship
   class PlantUMLProcessor < Processor
-    register :posts, :pre_render
-
-    def on_posts_pre_render(post)
+    def on_handle_markdown(content)
       # match default plantuml block and code block
       pattern = Regexp.union(
         /(\\?@startuml((?:.|\n)*?)@enduml)/,
         /(`{3}\s*plantuml((?:.|\n)*?)`{3})/
       )
 
-      post.content.scan pattern do |match|
+      content.scan pattern do |match|
         match = match.select { |m| not m.nil? }
         block = match[0]
         code = match[1]
@@ -21,16 +19,16 @@ module Jekyll::Spaceship
           next
         end
 
-        Logger.log "handle plantuml block - #{post.path.gsub(/.*_posts\//, '')}"
+        self.handled = true
 
-        post.content = post.content.gsub(
+        content = content.gsub(
           block,
           handle_plantuml(code)
         )
       end
 
       # handle escape default plantuml block
-      post.content = post.content.gsub(/\\(@startuml|@enduml)/, '\1')
+      content.gsub(/\\(@startuml|@enduml)/, '\1')
     end
 
     def handle_plantuml(code)

data/lib/jekyll-spaceship/processors/polyfill-processor.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jekyll::Spaceship
+  class PolyfillProcessor < Processor
+    priority :high
+
+    def on_handle_markdown(content)
+      # escape ordered list.
+      rexp = /(\s*)(?<!\\)\\(?=\d+\.)/
+      self.handled = true if content.match?(rexp)
+      content.gsub(rexp, '\1&#8291;')
+    end
+  end
+end

data/lib/jekyll-spaceship/processors/table-processor.rb

@@ -1,23 +1,33 @@
 # frozen_string_literal: true
 
 require "ostruct"
-require 'nokogiri'
+require "nokogiri"
 
 module Jekyll::Spaceship
   class TableProcessor < Processor
-    register :posts, :pre_render, :post_render
-
-    def on_posts_pre_render(post)
-      # pre-handle table in markdown
-      post.content = post.content
-        .gsub(/\|(?=\|)/, '\\|')
+    def on_handle_markdown(content)
+      # escape | and :
+      content = content.gsub(/\|(?=\|)/, '\\|')
         .gsub(/\\:(?=.*?(?<!\\)\|)/, '\\\\\\\\:')
         .gsub(/((?<!\\)\|.*?)(\\:)/, '\1\\\\\\\\:')
+
+      # escape * and _ and $ etc.
+      content.scan(/.*(?<!\\)\|.*/) do |result|
+        replace = result.gsub(
+          /(?<!(?<!\\)\\)(\*|\$|\[|\(|\"|_)/,
+          '\\\\\\\\\1'
+        )
+        if result != replace
+          content = content.gsub(result, replace)
+        end
+      end
+
+      content
     end
 
-    def on_posts_post_render(post)
+    def on_handle_html(content)
       # use nokogiri to parse html content
-      doc = Nokogiri::HTML(post.content)
+      doc = Nokogiri::HTML(content)
 
       data = OpenStruct.new(_: OpenStruct.new)
       data.reset = ->(scope, namespace = nil) {
@@ -40,7 +50,7 @@ module Jekyll::Spaceship
       # handle each table
       doc.css('table').each do |table|
         rows = table.css('tr')
-        data.table= table
+        data.table = table
         data.rows = rows
         data.reset.call :table
         rows.each do |row|
@@ -56,9 +66,17 @@ module Jekyll::Spaceship
             handle_rowspan(data)
           end
         end
+        rows.each do |row|
+          cells = row.css('th, td')
+          cells.each do |cell|
+            data.cell = cell
+            handle_format(data)
+          end
+        end
+        self.handled = true
       end
 
-      post.content = doc.at('body').inner_html
+      doc.to_html
     end
 
     def handle_colspan(data)
@@ -84,8 +102,8 @@ module Jekyll::Spaceship
       if result
         result = result[0]
         scope_row.colspan += result.scan(/\|/).count
-        cell.content = cell.content.gsub(/(\s*\|)+$/, "")
-        cell.set_attribute("colspan", scope_row.colspan + 1)
+        cell.content = cell.content.gsub(/(\s*\|)+$/, '')
+        cell.set_attribute('colspan', scope_row.colspan + 1)
       end
     end
 
@@ -116,7 +134,8 @@ module Jekyll::Spaceship
 
       if scope_table.multi_row_cells != cells and scope_table.multi_row_start
         for i in 0...scope_table.multi_row_cells.count do
-          scope_table.multi_row_cells[i].inner_html += "<br>#{cells[i].content}"
+          multi_row_cell = scope_table.multi_row_cells[i]
+          multi_row_cell.content += "  \n#{cells[i].content}"
         end
         row.remove
       end
@@ -143,11 +162,11 @@ module Jekyll::Spaceship
       # handle rowspan
       span_cell = scope_table.span_row_cells[scope_row.col_index]
       if span_cell and cell.content.match(/^\^{2}/)
-        cell.content = cell.content.gsub(/^\^{2}/, "")
-        span_cell.inner_html += "<br>#{cell.content}"
-        rowspan = span_cell.get_attribute("rowspan") || 1
+        cell.content = cell.content.gsub(/^\^{2}/, '')
+        span_cell.content += "  \n#{cell.content}"
+        rowspan = span_cell.get_attribute('rowspan') || 1
         rowspan = rowspan.to_i + 1
-        span_cell.set_attribute("rowspan", "#{rowspan}")
+        span_cell.set_attribute('rowspan', "#{rowspan}")
         cell.remove
       else
         scope_table.span_row_cells[scope_row.col_index] = cell
@@ -162,27 +181,27 @@ module Jekyll::Spaceship
       # pre-handle text align
       align = 0
       if cell.content.match(/^:(?!:)/)
-        cell.content = cell.content.gsub(/^:/, "")
+        cell.content = cell.content.gsub(/^:/, '')
         align += 1
       end
       if cell.content.match(/(?<!\\):$/)
-        cell.content = cell.content.gsub(/:$/, "")
+        cell.content = cell.content.gsub(/:$/, '')
         align += 2
       end
 
       # handle escape colon
-      cell.content = cell.content.gsub(/\\:/, ":")
+      cell.content = cell.content.gsub(/\\:/, ':')
 
       # handle text align
       return if align == 0
 
-      style = cell.get_attribute("style")
+      style = cell.get_attribute('style')
       if align == 1
-        align = "text-align: left"
+        align = 'text-align: left'
       elsif align == 2
-        align = "text-align: right"
+        align = 'text-align: right'
       elsif align == 3
-        align = "text-align: center"
+        align = 'text-align: center'
       end
 
       # handle existed inline-style
@@ -191,7 +210,16 @@ module Jekyll::Spaceship
       else
         style = align
       end
-      cell.set_attribute("style", style)
+      cell.set_attribute('style', style)
+    end
+
+    def handle_format(data)
+      cell = data.cell
+      cvter = self.converter('markdown')
+      return if cvter.nil?
+      content = cell.content.gsub(/(?<!\\)\|/, '\\|')
+      content = cvter.convert(content.strip)
+      cell.inner_html = Nokogiri::HTML.fragment(content)
     end
   end
 end

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -98,6 +98,7 @@ files:
 - lib/jekyll-spaceship/cores/register.rb
 - lib/jekyll-spaceship/processors/mathjax-processor.rb
 - lib/jekyll-spaceship/processors/plantuml-processor.rb
+- lib/jekyll-spaceship/processors/polyfill-processor.rb
 - lib/jekyll-spaceship/processors/table-processor.rb
 - lib/jekyll-spaceship/utils/plantuml/plantuml.jar
 - lib/jekyll-spaceship/version.rb