jekyll-spaceship 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 917f5191110c86af367498a90d9ad362185254fdfc30f54eeb48705159b72db7
-  data.tar.gz: 23e627f48d83363b2b473d2c080c98d327ddc51d982290209e218ff755a8920e
+  metadata.gz: 0e78e90266b5520e8f2779dea8af5f83b3bb4107d5666eac6dae98d2f754c88e
+  data.tar.gz: 2a485a89f512d3c1da45b52ba679f76575de7c91be34d687f2104984f286fb5f
 SHA512:
-  metadata.gz: daf20ba10a46e6f8538a02b84153bb19f3371e4ea58b689f4c520a04eb7041e76f172ac5886fca2e8a6e9140515fc7afdb30afec97bdda38d99ed43df6ecb3e7
-  data.tar.gz: '089e665d0359d9c0bfe0e37c1e91dfb63c6bc1dacc2c7f928e617c9d3cd1d8af959005a9cc70fca63f05a3ab5c662a24ac2ebaed113073483bc71676146bb12f'
+  metadata.gz: 6268083908d3ec0ff4420b13efd4b35acde48329d2339d7e793f29f0c2a8311f5d7aef36ec5fa95a5e2d94fe3cc04db8fb540f00a0e10f26335dcedb8da236de
+  data.tar.gz: 0b5d5950a8a446429cf4a00c3ebba32cde6068f4d3856e00f2868933cfa8031ef3af0b1bee0c5d40e28ea1abd19530a87b3addfd184a543ad27a3684ee10cb01

data/.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: jeffreytse # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: jeffreytse
 open_collective: # Replace with a single Open Collective username
 ko_fi: jeffreytse

data/README.md

@@ -441,7 +441,7 @@ Code above would be parsed as:
 #### Cell Alignment
 
 Markdown table syntax use colons ":" for forcing column alignment.  
-Therefore, here we also use it for foring cell alignment.
+Therefore, here we also use it for forcing cell alignment.
 
 Table cell can be set alignment separately.
 

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

@@ -5,7 +5,6 @@ module Jekyll::Spaceship
     CONFIG_NAME = 'jekyll-spaceship'
     DEFAULT_CONFIG = {
       'processors' => [
-        'cache-processor',
         'table-processor',
         'mathjax-processor',
         'plantuml-processor',

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

@@ -192,7 +192,9 @@ module Jekyll::Spaceship
       while @exclusion_store.size > 0
         match = @exclusion_store.pop
         id = @exclusion_store.size
-        content = content.sub("<!JEKYLL@#{object_id}@#{id}>", match)
+        content = content.sub(
+          "<!JEKYLL@#{object_id}@#{id}>"
+        ) { match }
       end
       @exclusion_store = []
       content

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

@@ -16,31 +16,85 @@ module Jekyll::Spaceship
     end
 
     def on_handle_html(content)
-      # handle emoji markup
-      content.scan(/:([\w\d+-]+):/) do |match|
+      emoji_filter(content, 'pre code') do |emoji|
+        # mark current file has been handled
+        self.handled = true
+
+        # here is the replacement content
+        "<img class=\"#{config['css']['class']}\""\
+          " title=\":#{emoji.name}:\""\
+          " alt=\":#{emoji.name}:\""\
+          " raw=\"#{emoji.raw}\""\
+          " src=\"#{config['src']}#{emoji.image_filename}\""\
+          " style=\"vertical-align: middle; display: inline;"\
+          " max-width: 1em; visibility: hidden;\""\
+          " onload=\"this.style.visibility='visible'\""\
+          " onerror=\"this.replaceWith(this.getAttribute('raw'))\">"\
+          "</img>"
+      end
+    end
+
+    def emoji_filter(content, selector)
+      # use nokogiri to parse html
+      doc = Nokogiri::HTML(content)
+
+      body = doc.at('body')
+
+      # in case of a page has no the body node, especially when your
+      # page's layout field of front matter is nil or unavailable
+      return content if body.nil?
+
+      # Count for restoration
+      escaped_count = 0
+
+      # filter nodes (pre, code)
+      body.css(selector).each do |node|
+        count = escaped_count
+
+        # handle emoji markup
+        inner_html = node.inner_html.gsub(
+          /(?<!\\):([\w\d+-]+?)(?<!\\):/
+        ) do |match|
+          escaped_count += 1
+          "\\:#{match[1..-2]}\\:"
+        end
+
+        if escaped_count > count
+          node.inner_html = inner_html
+        end
+      end
+
+      # parse the emoji
+      content = body.inner_html
+      content.scan(/(?<!\\):([\w\d+-]+?)(?<!\\):/) do |match|
+        # Skip invalid emoji name
         emoji = Emoji.find_by_alias match[0]
         next if emoji.nil?
-        self.handled = true
 
         # escape plus sign
         emoji_name = emoji.name.gsub('+', '\\\+')
-        css_class = self.config['css']['class']
+
+        result = yield emoji
+        next if result.nil?
 
         content = content.gsub(
           /(?<!\=")\s*:#{emoji_name}:\s*(?!"\s)/,
-          "<img class=\"#{css_class}\""\
-            " title=\":#{emoji.name}:\""\
-            " alt=\":#{emoji.name}:\""\
-            " raw=\"#{emoji.raw}\""\
-            " src=\"#{config['src']}#{emoji.image_filename}\""\
-            " style=\"vertical-align: middle; display: inline;"\
-            " max-width: 1em; visibility: hidden;\""\
-            " onload=\"this.style.visibility='visible'\""\
-            " onerror=\"this.replaceWith(this.getAttribute('raw'))\">"\
-          "</img>"
+          result)
+      end
+
+      body.inner_html = content
+
+      return doc.to_html if escaped_count.zero?
+
+      # restore nodes (pre, code)
+      body.css(selector).each do |node|
+        # handle emoji markup
+        node.inner_html = node.inner_html.gsub(
+          /\\:([\w\d+-]+?)\\:/, ':\1:'
         )
       end
-      content
+
+      doc.to_html
     end
   end
 end

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

@@ -35,6 +35,8 @@ module Jekyll::Spaceship
       patterns['include'].each do |pattern|
         content.scan(pattern) do |result|
           expr = result[0]
+          body = result[1]
+          next if body.size.zero?
           is_excluded = false
           patterns['exclude'].each do |pe|
             break is_excluded = true if expr.match(/#{pe}/)
@@ -42,6 +44,7 @@ module Jekyll::Spaceship
           next if is_excluded
           escaped_expr = expr
             .gsub(/(?<!^)\\(?!\S$)/, '\\\\\\\\')
+            .gsub(/(?<!\\)\$\$/, '\\\$\\\$')
             .gsub(/\\ /, '\\\\\\ ')
           content = content.gsub(expr, escaped_expr)
         end
@@ -89,7 +92,7 @@ module Jekyll::Spaceship
           r&.each do |i|
             btag = Regexp.escape(i[0])
             etag = Regexp.escape(i[1])
-            patterns <<= /((?<!\\\\)#{btag}.+?(?<!\\\\)#{etag})/
+            patterns <<= /((?<!\\\\)#{btag}(.*?)(?<!\\\\)#{etag})/
           end
         end
       end
@@ -104,20 +107,27 @@ module Jekyll::Spaceship
 
     def scan_mathjax_expression(doc, &block)
       patterns = get_math_patterns()
-      doc.css('*').each do |node|
-        next if ['code', 'pre', 'figure'].include? node.name
-        next if node.ancestors('code, pre, figure').size > 0
-        next if node.children.size > 1
+      doc = doc.clone
+
+      # remove code, pre, figure nodes
+      doc.css('body code, body pre, body figure').each do |node|
+        node.remove
+      end
+
+      # remove scripting mathjax expression
+      doc.css('body script').each do |node|
+        next if node['type']&.match(/math\/tex/)
+        node.remove
+      end
+
+      # scan mathjax expressions
+      doc.css('body *').each do |node|
         patterns['include'].each do |pattern|
-          # check scripting mathjax expression
-          if node.name == 'script'
-            type = node['type']
-            next unless type
-            next unless type.match(/math\/tex/)
-          end
           # check normal mathjax expression
           node.content.scan(pattern) do |result|
             expr = result[0]
+            body = result[1]
+            next if body.size.zero?
             is_excluded = false
             patterns['exclude'].each do |pe|
               break is_excluded = true if expr.match(/#{pe}/)

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

@@ -42,7 +42,7 @@ module Jekyll::Spaceship
       handle_media(element, {
         media_type: 'audio',
         host: '(https?:\\/\\/)?.*\\/',
-        id: '(.+?\\.(mp3|wav|ogg|mid|midi|aac|wma))',
+        id: '(.+?\\.(mp3|wav|ogg|mid|midi|aac|wma))'
       })
     end
 
@@ -53,7 +53,7 @@ module Jekyll::Spaceship
     # ![video](//techslides.com/demos/sample-videos/small.mp4?width=400)
     def handle_normal_video(element)
       handle_media(element, {
-        media_type: 'iframe',
+        media_type: 'video',
         host: '(https?:\\/\\/)?.*\\/',
         id: '(.+?\\.(avi|mp4|webm|ogg|ogv|flv|mkv|mov|wmv|3gp|rmvb|asf))'
       })
@@ -90,8 +90,8 @@ module Jekyll::Spaceship
     def handle_dailymotion(element)
       handle_media(element, {
         media_type: 'iframe',
-        host: '(https?:)?\\/\\/.*dai.?ly.*',
-        id: '(?<=video\\/|\\/)([a-zA-Z0-9\\_\\-]+)',
+        host: '(https?:)?\\/\\/(?>www\\.)?dai\\.?ly(?>motion\\.com\\/video)?\\/',
+        id: '([a-zA-Z0-9\\_\\-]+)',
         base_url: "https://www.dailymotion.com/embed/video/"
       })
     end
@@ -128,7 +128,7 @@ module Jekyll::Spaceship
       src = element.get_attribute('src')
       title = element.get_attribute('title')
       id = data[:id_from] === 'html' ? '()' : data[:id]
-      match_data = src.match(/#{host}#{id}\S*/)
+      match_data = src&.match(/#{host}#{id}\S*/)
       return if match_data.nil?
 
       media_type = data[:media_type]
@@ -158,6 +158,10 @@ module Jekyll::Spaceship
         cfg['loop'] = qs['loop'] || data[:loop] || cfg['loop']
         cfg['style'] += ';display: none;' if qs['hidden']
         handle_audio(element, { cfg: cfg })
+      when 'video'
+        cfg['autoplay'] = qs['autoplay'] || data[:autoplay] || cfg['autoplay']
+        cfg['loop'] = qs['loop'] || data[:loop] || cfg['loop']
+        handle_video(element, { cfg: cfg })
       when 'iframe'
         cfg['title'] = title
         cfg['width'] = qs['width'] || data[:width] || cfg['width']
@@ -179,12 +183,32 @@ module Jekyll::Spaceship
         " src=\"#{cfg['src']}\""\
         " style=\"#{cfg['style']}\""\
         " controls>" \
-        "<p> Your browser doesn't support HTML5 audio."\
+        " Your browser doesn't support HTML5 audio."\
         " Here is a <a href=\"#{cfg['src']}\">link to download the audio</a>"\
-        "instead. </p>"\
+        " instead."\
         "</audio>"
-      doc = Nokogiri::XML(html)
-      element.replace(doc.children.first)
+      doc = Nokogiri::HTML(html)
+      return if element.parent.nil?
+      element.replace(doc.at('body').children.first)
+    end
+
+    def handle_video(element, data)
+      cfg = data[:cfg]
+      html = "<video"\
+        " id=\"#{cfg['id']}\""\
+        " class=\"#{cfg['class']}\""\
+        " style=\"#{cfg['style']}\""\
+        " #{cfg['autoplay'] ? 'autoplay' : ''}"\
+        " #{cfg['loop'] ? 'loop' : ''}"\
+        " controls>" \
+        " <source src=\"#{cfg['src']}\">" \
+        " Your browser doesn't support HTML5 video."\
+        " Here is a <a href=\"#{cfg['src']}\">link to download the video</a>"\
+        " instead."\
+        "</video>"
+      doc = Nokogiri::HTML(html)
+      return if element.parent.nil?
+      element.replace(doc.at('body').children.first)
     end
 
     def handle_iframe(element, data)
@@ -201,8 +225,9 @@ module Jekyll::Spaceship
         " frameborder=\"#{cfg['frameborder']}\""\
         " allowfullscreen>"\
         "</iframe>"
-      doc = Nokogiri::XML(html)
-      element.replace(doc.children.first)
+      doc = Nokogiri::HTML(html)
+      return if element.parent.nil?
+      element.replace(doc.at('body').children.first)
     end
 
     def get_id_from_html(url, pattern)

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

@@ -60,6 +60,9 @@ module Jekyll::Spaceship
     end
 
     def handle_mermaid(code)
+      # Handle extra empty lines, otherwise it would cause error
+      code = code.gsub(/\n\s*\n/, "\n%%-\n")
+
       # encode to UTF-8
       code = code.encode('UTF-8')
       url = get_url(code)

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

@@ -18,13 +18,21 @@ module Jekyll::Spaceship
       end
       if references.size > 0
         content.scan(/[^\n]*(?<!\\)\|[^\n]*/) do |result|
+          replace = result
           references.each do |key, val|
-            replace = result.gsub(
-              /\[([^\n\]]*?)\]\s*\[#{key}\]/,
-              "[\1](#{val})")
-            next if result == replace
-            content = content.gsub(result, replace)
+            replace = replace.gsub(
+                /\[([^\n\]]*?)\]\s*\[#{Regexp.escape(key)}\]/,
+                "[\\1](#{val})"
+            )
           end
+          references.each do |key, val|
+            replace = replace.gsub(
+              /\[#{Regexp.escape(key)}\](?!\s*\(.*?\))/,
+              "[#{key}](#{val})"
+            )
+          end
+          next if result == replace
+          content = content.gsub(result, replace)
         end
       end
 
@@ -87,7 +95,6 @@ module Jekyll::Spaceship
             handle_multi_rows(data)
             handle_text_align(data)
             handle_rowspan(data)
-            handle_attr_list(data)
           end
         end
         rows.each do |row|
@@ -95,6 +102,7 @@ module Jekyll::Spaceship
           cells.each do |cell|
             data.cell = cell
             handle_format(data)
+            handle_attr_list(data)
           end
         end
         self.handled = true
@@ -143,10 +151,10 @@ module Jekyll::Spaceship
         end
       end
 
-      result = cell.content.match(/(\|)+$/)
+      result = cell.inner_html.match(/(\|)+$/)
       return if result.nil?
 
-      cell.content = cell.content.gsub(/(\|)+$/, '')
+      cell.inner_html = cell.inner_html.gsub(/(\|)+$/, '')
       result = result[0]
       colspan = result.scan(/\|/).count
       scope.row.colspan += colspan
@@ -203,8 +211,8 @@ module Jekyll::Spaceship
 
       # handle rowspan
       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}/, '')
+      if span_cell and cell.inner_html.match(/^\s*\^{2}/)
+        cell.inner_html = cell.inner_html.gsub(/^\s*\^{2}/, '')
         span_cell.inner_html += "\n<br>\n#{cell.inner_html}"
         rowspan = span_cell.get_attribute('rowspan') || 1
         rowspan = rowspan.to_i + 1
@@ -264,7 +272,7 @@ module Jekyll::Spaceship
       content = cell.inner_html
       # inline attribute list(IAL) handler
       ial_handler = ->(list) do
-        list.scan(/(\S+)=("|')(.*?)\2|(\S+)/) do |attr|
+        list.scan(/(\S+)=(”|"|')(.*?)\2|(\S+)/) do |attr|
           key = attr[0]
           val = attr[2]
           single = attr[3]

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.9.6"
+    VERSION = "0.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - jeffreytse
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -114,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
+description: 
 email:
 - jeffreytse.mail@gmail.com
 executables: []
@@ -155,7 +155,7 @@ homepage: https://github.com/jeffreytse/jekyll-spaceship
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to provide powerful supports for table, mathjax, plantuml,
   mermaid, emoji, video, audio, youtube, vimeo, dailymotion, spotify, soundcloud,