jekyll-spaceship 0.4.2 → 0.5.2

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

@@ -24,21 +24,17 @@ module Jekyll::Spaceship
         filename = File.basename(path, '.rb')
         next if filename.gsub(/-/, '').downcase != name
 
-        Logger.log "use #{filename}"
-
+        Logger.log "🗂  use #{filename}"
         require path
-
         constants = Jekyll::Spaceship.constants.select do |c|
           c.downcase.to_s == name
         end
 
         next if constants.first.nil?
-
         _class = Jekyll::Spaceship.const_get(constants.first)
-
         next unless _class.is_a? Class
 
-        _class.new
+        Manager.add _class.new
       end
     end
   end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Jekyll::Spaceship
+  class Type
+    HTML_EXTENSIONS = %w(
+      .html
+      .xhtml
+      .htm
+    ).freeze
+
+    CSS_EXTENSIONS = %w(
+      .css
+      .scss
+    ).freeze
+
+    MD_EXTENSIONS = %w(
+      .md
+      .markdown
+    ).freeze
+
+    HTML_BLOCK_TYPE_MAP = {
+      'text/markdown'  => 'markdown',
+    }.freeze
+
+    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 self.html_block_type(type)
+      HTML_BLOCK_TYPE_MAP[type]
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'uri'
+require 'json'
+
+module Jekyll::Spaceship
+  class EmojiProcessor < Processor
+    EMOJI_MARKUP_HOST = 'https://api.github.com/emojis'
+    EMOJI_MARKUP_DATA = {}
+
+    def initialize
+      super()
+      self.initialize_emoji_data
+    end
+
+    def initialize_emoji_data
+      EMOJI_MARKUP_DATA.update get_emoji_markup_data
+    end
+
+    def on_handle_html(content)
+      return content if EMOJI_MARKUP_DATA.size.zero?
+      # handle emoji markup
+      content.scan(/:([\w+-]+):/) do |match_data|
+        emoji_markup = match_data[0]
+        emoji_image = EMOJI_MARKUP_DATA[emoji_markup]
+        next if emoji_image.nil?
+        self.handled = true
+
+        # convert hex string to unicode
+        unicode = emoji_image.match(/unicode\/([\d\w]+)/)
+        if unicode[1]
+          unicode = "0x#{unicode[1]}".to_i(16)
+          alt = [unicode].pack('U*')
+        end
+        alt = emoji_markup if alt.nil?
+
+        content = content.gsub(
+          ":#{emoji_markup}:",
+          "<image class=\"emoji\" \
+            title=\"#{emoji_markup}\" \
+            alt=\"#{alt}\" \
+            src=\"#{emoji_image}\" \
+            style=\"vertical-align: middle; \
+            max-width: 1em; visibility: hidden;\" \
+            onload=\"this.style.visibility='visible'\" \
+            onerror=\"this.replaceWith(this.alt)\"> \
+          </image>"
+        )
+      end
+      content
+    end
+
+    def get_emoji_markup_data
+      data = {}
+      begin
+        source = Net::HTTP.get URI(EMOJI_MARKUP_HOST)
+        data = JSON.parse(source)
+      rescue StandardError => msg
+        logger.log msg
+      end
+      data
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ require "nokogiri"
 module Jekyll::Spaceship
   class MathjaxProcessor < Processor
     def process?
-      return true if html?(output_ext)
+      return true if Type.html?(output_ext)
     end
 
     def on_handle_html(content)
@@ -20,7 +20,10 @@ module Jekyll::Spaceship
 
       params = "config=TeX-AMS-MML_HTMLorMML"
       src = "//cdn.mathjax.org/mathjax/latest/MathJax.js?#{params}"
-      config = "MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});"
+      config = "MathJax.Hub.Config({ \
+        tex2jax: { inlineMath: [['$','$'], ['\\\\(','\\\\)']] } \
+      });"
+
       head.add_child("<script src=\"#{src}\">#{config}</script>")
 
       doc.to_html
@@ -28,7 +31,10 @@ module Jekyll::Spaceship
 
     def has_mathjax_expression?(doc)
       doc.css('*').each do |node|
-        if node.content.match(/\$.+\$/)
+        if node.content.match(/(?<!\\)\$.+(?<!\\)\$/)
+          return true
+        end
+        if node.content.match(/(?<!\\)\\\(.+(?<!\\)\\\)/)
           return true
         end
       end

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

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require "base64"
+
 module Jekyll::Spaceship
   class PlantUMLProcessor < Processor
     exclude :none
 
+    PLANT_UML_HOST = 'http://www.plantuml.com/plantuml/png/'
+
     def on_handle_markdown(content)
       # match default plantuml block and code block
       pattern = Regexp.union(
@@ -35,18 +39,28 @@ module Jekyll::Spaceship
 
     def handle_plantuml(code)
       # wrap plantuml code
-      uml = "@startuml#{code}@enduml"
-
-      dir = File.dirname(__FILE__)
-      jar = dir + "/../utils/plantuml/plantuml.jar"
-      echo = "echo -e \"#{uml.gsub('"', '\"')}\""
-      plantuml = "java -jar \"#{jar}\" -pipe 2>/dev/null"
+      code = "@startuml#{code}@enduml".encode('UTF-8')
 
-      # exec plantuml.jar and output base64 data
-      base64 = `#{echo} | #{plantuml} | base64`
+      # encode to hex string
+      code = '~h' + code.unpack("H*").first
+      data = self.get_plantuml_img_data(code)
 
       # return img tag
-      "<img src=\"data:image/png;base64, #{base64}\">"
+      "<img src=\"#{data}\">"
+    end
+
+    def get_plantuml_img_data(code)
+      data = ''
+      url = "#{PLANT_UML_HOST}#{code}"
+      begin
+        data = Net::HTTP.get URI(url)
+        data = Base64.encode64(data)
+        data = "data:image/png;base64, #{data}"
+      rescue StandardError => msg
+        data = url
+        logger.log msg
+      end
+      data
     end
   end
 end

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

@@ -46,23 +46,7 @@ module Jekyll::Spaceship
       # use nokogiri to parse html content
       doc = Nokogiri::HTML(content)
 
-      data = OpenStruct.new(_: OpenStruct.new)
-      data.reset = ->(scope, namespace = nil) {
-        data._.marshal_dump.each do |key, val|
-          if namespace == key or namespace.nil?
-            data._[key][scope] = OpenStruct.new
-          end
-        end
-      }
-      data.scope = ->(namespace) {
-        if not data._[namespace]
-          data._[namespace] = OpenStruct.new(
-            table: OpenStruct.new,
-            row: OpenStruct.new
-          )
-        end
-        data._[namespace]
-      }
+      data = self.table_scope_data
 
       # handle each table
       doc.css('table').each do |table|
@@ -96,45 +80,66 @@ module Jekyll::Spaceship
       doc.to_html
     end
 
+    def table_scope_data
+      data = OpenStruct.new(_: OpenStruct.new)
+      data.reset = ->(scope, namespace = nil) {
+        data._.marshal_dump.each do |key, val|
+          if namespace == key or namespace.nil?
+            data._[key][scope] = OpenStruct.new
+          end
+        end
+      }
+      data.scope = ->(namespace) {
+        if not data._[namespace]
+          data._[namespace] = OpenStruct.new(
+            table: OpenStruct.new,
+            row: OpenStruct.new
+          )
+        end
+        data._[namespace]
+      }
+      data
+    end
+
     def handle_colspan(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
-      scope_row = scope.row
       cells = data.cells
       cell = data.cell
 
-      if scope_table.row != data.row
-        scope_table.row = data.row
-        scope_row.colspan = 0
+      if scope.table.row != data.row
+        scope.table.row = data.row
+        scope.row.colspan = 0
       end
 
       # handle colspan
-      result = cell.content.match(/(\s*\|)+$/)
-      if cell == cells.last and scope_row.colspan > 0
-        range = (cells.count - scope_row.colspan)...cells.count
-        for i in range do
-          cells[i].remove
+      if cell == cells.last and scope.row.colspan > 0
+        cells.count.downto(cells.count - scope.row.colspan + 1) do |i|
+          c = cells[i - 1]
+          return unless c.get_attribute('colspan').nil?
+          c.remove
         end
       end
-      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)
-      end
+
+      result = cell.content.match(/(\|)+$/)
+      return if result.nil?
+
+      cell.content = cell.content.gsub(/(\|)+$/, '')
+      result = result[0]
+      colspan = result.scan(/\|/).count
+      scope.row.colspan += colspan
+      cell.set_attribute('colspan', colspan + 1)
     end
 
     def handle_multi_rows(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
       cells = data.cells
       row = data.row
       cell = data.cell
 
-      if scope_table.table != data.table
-        scope_table.table = data.table
-        scope_table.multi_row_cells = nil
-        scope_table.multi_row_start = false
+      if scope.table.table != data.table
+        scope.table.table = data.table
+        scope.table.multi_row_cells = nil
+        scope.table.multi_row_start = false
       end
 
       # handle multi-rows
@@ -143,41 +148,38 @@ module Jekyll::Spaceship
       match = cell.content.match(/(?<!\\)\\\s*$/)
       if match
         cell.content = cell.content.gsub(/(?<!\\)\\\s*$/, '')
-        if not scope_table.multi_row_start
-          scope_table.multi_row_cells = cells
-          scope_table.multi_row_start = true
+        if not scope.table.multi_row_start
+          scope.table.multi_row_cells = cells
+          scope.table.multi_row_start = true
         end
       end
 
-      if scope_table.multi_row_cells != cells and scope_table.multi_row_start
-        for i in 0...scope_table.multi_row_cells.count do
-          multi_row_cell = scope_table.multi_row_cells[i]
+      if scope.table.multi_row_cells != cells and scope.table.multi_row_start
+        for i in 0...scope.table.multi_row_cells.count do
+          multi_row_cell = scope.table.multi_row_cells[i]
           multi_row_cell.content += "  \n#{cells[i].content}"
         end
         row.remove
       end
-      scope_table.multi_row_start = false if not match
+      scope.table.multi_row_start = false if not match
     end
 
     def handle_rowspan(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
-      scope_row = scope.row
       cell = data.cell
       cells = data.cells
 
-      if scope_table.table != data.table
-        scope_table.table = data.table
-        scope_table.span_row_cells = []
+      if scope.table.table != data.table
+        scope.table.table = data.table
+        scope.table.span_row_cells = []
       end
-
-      if scope_row.row != data.row
-        scope_row.row = data.row
-        scope_row.col_index = 0
+      if scope.row.row != data.row
+        scope.row.row = data.row
+        scope.row.col_index = 0
       end
 
       # handle rowspan
-      span_cell = scope_table.span_row_cells[scope_row.col_index]
+      span_cell = scope.table.span_row_cells[scope.row.col_index]
       if span_cell and cell.content.match(/^\s*\^{2}/)
         cell.content = cell.content.gsub(/^\s*\^{2}/, '')
         span_cell.content += "  \n#{cell.content}"
@@ -186,10 +188,9 @@ module Jekyll::Spaceship
         span_cell.set_attribute('rowspan', "#{rowspan}")
         cell.remove
       else
-        scope_table.span_row_cells[scope_row.col_index] = cell
+        scope.table.span_row_cells[scope.row.col_index] = cell
       end
-
-      scope_row.col_index += 1
+      scope.row.col_index += [cell.get_attribute('colspan').to_i, 1].max
     end
 
     def handle_text_align(data)
@@ -211,7 +212,6 @@ module Jekyll::Spaceship
 
       # handle text align
       return if align == 0
-
       style = cell.get_attribute('style')
       if align == 1
         align = 'text-align: left'

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module Jekyll::Spaceship
   class VideoProcessor < Processor
     def on_handle_markdown(content)
@@ -70,22 +72,26 @@ module Jekyll::Spaceship
         url = match_data[2]
         id = match_data[4]
         title = match_data[6]
-        width = url.match(/(?<=width=)(\S*?)(?=&|$)/)
-        height = url.match(/(?<=height=)(\S*?)(?=&|$)/)
+        qs = url.match(/(?<=\?)(\S*?)$/)
+        qs = Hash[URI.decode_www_form(qs.to_s)].reject do |k, v|
+          next true if v == id or v == ''
+        end
 
-        data[:width] = 600 if data[:width].nil?
-        data[:height] = 400 if data[:height].nil?
+        width = qs['width'] || data[:width] || 600
+        height = qs['height'] || data[:height] || 400
         style = "max-width: 100%" if width.nil?
-        width = data[:width] if width.nil?
-        height = data[:height] if height.nil?
 
-        url = "#{iframe_url}#{id}"
+        url = URI("#{iframe_url}#{id}").tap do |v|
+          v.query = URI.encode_www_form(qs) if qs.size > 0
+        end
+
         html = "<iframe \
           src=\"#{url}\" \
           title=\"#{title}\" \
           width=\"#{width}\" \
           height=\"#{height}\" \
           style=\"#{style}\" \
+          allow=\"autoplay; encrypted-media\" \
           frameborder=\"0\" \
           allowfullscreen=\"\">\
           </iframe>"