jekyll-spaceship 0.8.0 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f4057b47af49da27acf7f6d6b26851e9094b70f4c2a939270d8fbb0c49272f
-  data.tar.gz: 64a5c8f08a467de5a67a24d89dba5785d48e2d68add11a8acb10e4199e01922c
+  metadata.gz: 5310871597e6232b96116549a1ea824054fe68572ced4bb2a14238bb3b7098fd
+  data.tar.gz: 41461f5eb94fda09064bdd21126d0b505c84232bec5a51a309b5954ffa5ba2b6
 SHA512:
-  metadata.gz: decab1852e2c7f1dc439eee47805ca18d1192657b7ebb2c707737a031734e376f971d1b5e22e3ea435308caf010ad5f90d55fa13353170822cee5c51c0496b3b
-  data.tar.gz: 9d11c7b8437a5047b52370ca49de6f84360a80dcb0021f687b0b817644095ab2086b0157a6b2587bc9041906b698005556d444d8f05719b106bc65ec9b361912
+  metadata.gz: 9a081bcfb8bcdaed430eeb456cae89172e55de4654ae81412fdf2749b8cb793f2c9cb702b829d1c80aa48db86f8bd5b445bde91cd1d07fdd57d717861e561642
+  data.tar.gz: e98d3a810ba88e430f9cddfcfafc4e6f7d5cd77b4b91ed9ad2b073b02332af915059b195fbace35f02dddc88415466405eefc11b0e4c9485633f77d5fc1b0415

data/README.md

@@ -140,7 +140,12 @@ plugins:
   - jekyll-spaceship
 ```
 
-**💡 Tip:** Note that GitHub Pages runs in `safe` mode and only allows [a set of whitelisted plugins](https://pages.github.com/versions/). To use the gem in GitHub Pages, you need to build locally or use CI (e.g. [travis](https://travis-ci.org/), [github workflow](https://help.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow)) and deploy to your `gh-pages` branch. [Click here for more information.](https://jekyllrb.com/docs/continuous-integration/github-actions/) (e.g. [https://github.com/jeffreytse/jekyll-jeffreytse-blog](https://github.com/jeffreytse/jekyll-jeffreytse-blog))
+**💡 Tip:** Note that GitHub Pages runs in `safe` mode and only allows [a set of whitelisted plugins](https://pages.github.com/versions/). To use the gem in GitHub Pages, you need to build locally or use CI (e.g. [travis](https://travis-ci.org/), [github workflow](https://help.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow)) and deploy to your `gh-pages` branch.
+
+### Additions
+
+* Here is a GitHub Action named [jekyll-deploy-action](https://github.com/jeffreytse/jekyll-deploy-action) for Jekyll site deployment conveniently. 👍
+* Here is a [Jekyll site](https://github.com/jeffreytse/jekyll-jeffreytse-blog) using Travis to build and deploy to GitHub Pages for your references.
 
 ## Configuration
 
@@ -167,7 +172,7 @@ jekyll-spaceship:
           - ['$','$']
           - ['\(','\)']
   plantuml-processor:
-    mode: default  # mode value 'pre-fetch' for fetch image at building stage
+    mode: default  # mode value 'pre-fetch' for fetching image at building stage
     css:
       class: plantuml
     syntax:
@@ -175,7 +180,7 @@ jekyll-spaceship:
       custom: ['@startuml', '@enduml']
     src: http://www.plantuml.com/plantuml/png/
   mermaid-processor:
-    mode: default  # mode value 'pre-fetch' for fetch image at building stage
+    mode: default  # mode value 'pre-fetch' for fetching image at building stage
     css:
       class: mermaid
     syntax:
@@ -221,13 +226,13 @@ This feature is contributed by [pmccloghrylaing](https://github.com/pmccloghryla
 ```markdown
 |              Stage | Direct Products | ATP Yields |
 | -----------------: | --------------: | ---------: |
-|         Glycolysis |           2 ATP |            |
-|                 ^^ |          2 NADH |   3--5 ATP |
+|         Glycolysis |          2 ATP              ||
+| ^^                 |          2 NADH |   3--5 ATP |
 | Pyruvaye oxidation |          2 NADH |      5 ATP |
 |  Citric acid cycle |          2 ATP              ||
-|                 ^^ |          6 NADH |     15 ATP |
-|                 ^^ |          2 FADH |      3 ATP |
-|                                   30--32 ATP    |||
+| ^^                 |          6 NADH |     15 ATP |
+| ^^                 |          2 FADH |      3 ATP |
+|                               30--32 ATP        |||
 ```
 
 Code above would be parsed as:
@@ -428,7 +433,7 @@ Table cell can be set alignment separately.
 ```markdown
 | :        Fruits \|\| Food       : |||
 | :--------- | :-------- | :--------  |
-| Apple      | :  Apple :| Apple      \
+| Apple      | : Apple : | Apple      \
 | Banana     |   Banana  | Banana     \
 | Orange     |   Orange  | Orange     |
 | :   Rowspan is 4    : || How's it?  |
@@ -727,7 +732,7 @@ It's easy to write markdown inside HTML:
 
 | :        Fruits \|\| Food       : |||
 | :--------- | :-------- | :--------  |
-| Apple      | :  Apple :| Apple      \
+| Apple      | : Apple : | Apple      \
 | Banana     |   Banana  | Banana     \
 | Orange     |   Orange  | Orange     |
 | :   Rowspan is 4    : || How's it?  |
@@ -903,6 +908,12 @@ jekyll-spaceship:
             loading: eager                     # Replace `loading` value to `eager`
 ```
 
+There are three options when using this method to lazy load images. Here are the supported values for the loading attribute:
+
+- auto: Default lazy-loading behavior of the browser, which is the same as not including the attribute.
+- lazy: Defer loading of the resource until it reaches a calculated distance from the viewport.
+- eager: Load the resource immediately, regardless of where it’s located on the page.
+
 
 ## Credits
 

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

@@ -65,7 +65,7 @@ module Jekyll::Spaceship
 
     def initialize_exclusions
       if @@_exclusions.size.zero?
-        self.class.exclude :code, :block_quotes
+        self.class.exclude :code, :math, :liquid_filter
       end
       @exclusions = @@_exclusions.uniq
       @@_exclusions.clear
@@ -121,7 +121,7 @@ module Jekyll::Spaceship
       else
         if Type.html? output_ext
           method = 'on_handle_html'
-        elsif css? output_ext
+        elsif Type.css? output_ext
           method = 'on_handle_css'
         end
         if self.respond_to? method
@@ -156,13 +156,17 @@ module Jekyll::Spaceship
       @exclusions.each do |type|
         regex = nil
         if type == :code
-          regex = /((`+)\s*(\w*)((?:.|\n)*?)\2)/
+          regex = /(((?<!\\)`+)\s*(\w*)((?:.|\n)*?)\2)/
+        elsif type == :math
+          regex = /(((?<!\\)\${1,2})[^\n]*?\1)/
+        elsif type == :liquid_filter
+          regex = /((?<!\\)\{\{[^\n]*?\}\})/
         end
         next if regex.nil?
         content.scan(regex) do |match_data|
           match = match_data[0]
           id = @exclusion_store.size
-          content = content.sub(match, "[JEKYLL@#{object_id}@#{id}]")
+          content = content.sub(match, "<!JEKYLL@#{object_id}@#{id}>")
           @exclusion_store.push match
         end
       end
@@ -173,7 +177,7 @@ 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/element-processor.rb

@@ -45,61 +45,11 @@ module Jekyll::Spaceship
       if data.kind_of? String
         element.replace Nokogiri::HTML.fragment(data)
       elsif data.kind_of? Hash
-        # set name
-        element.name = data['name'] unless data['name'].nil?
-
-        # set props
-        data['props']&.each do |prop, val|
-          next element.remove_attribute if val.nil?
-          if val.kind_of? Array
-            next if val.size != 2
-            v = element[prop]
-            v = '' if v.nil?
-            val = v.sub(/#{val[0]}/, val[1])
-          elsif val.kind_of? Hash
-            result = []
-            val.each { |k, v| result.push "#{k}: #{v}" }
-            val = result.join(";")
-          end
-          element.set_attribute(prop, val)
-        end
-
-        # processing children
-        return unless data.has_key?('children')
-        return element.inner_html = "" if data['children'].nil?
-        children = self.create_children({
+        handle_hash_element({
           :doc => doc,
-          :data => data['children']
+          :element => element,
+          :data => data,
         })
-
-        # replace whole inner html
-        unless data['children'].kind_of? Array
-          return element.inner_html = children
-        end
-
-        if element.children.size.zero?
-          return element.inner_html = children
-        end
-
-        index = data['children'].index(nil)
-        if index.nil?
-          return element.inner_html = children
-        end
-
-        # insert to the end of children
-        if index == 0
-          return element.children.last.after(children)
-        end
-
-        # insert to the begin of children
-        rindex = data['children'].rindex { |item| !item.nil? }
-        if index == rindex + 1
-          return element.children.first.before children
-        end
-
-        # wrap the children
-        element.children.first.before children[0..index]
-        element.children.last.after children[index..children.size]
       end
     end
 
@@ -126,6 +76,45 @@ module Jekyll::Spaceship
       root.children
     end
 
+    def handle_hash_element(data)
+      doc = data[:doc]
+      element = data[:element]
+      data = data[:data]
+
+      # set name
+      element.name = data['name'] unless data['name'].nil?
+
+      # set props
+      data['props']&.each do |prop, val|
+        next element.remove_attribute if val.nil?
+        if val.kind_of? Array
+          next if val.size != 2
+          v = element[prop]
+          v = '' if v.nil?
+          val = v.sub(/#{val[0]}/, val[1])
+        elsif val.kind_of? Hash
+          result = []
+          val.each { |k, v| result.push "#{k}: #{v}" }
+          val = result.join(";")
+        end
+        element.set_attribute(prop, val)
+      end
+
+      # processing children
+      return unless data.has_key?('children')
+      return element.inner_html = "" if data['children'].nil?
+      children = self.create_children({
+        :doc => doc,
+        :data => data['children']
+      })
+
+      handle_element_placement({
+        :data => data,
+        :element => element,
+        :children => children,
+      })
+    end
+
     def create_element(data)
       doc = data[:doc]
       data = data[:data]
@@ -148,5 +137,34 @@ module Jekyll::Spaceship
       end
       node
     end
+
+    def handle_element_placement(data)
+      element = data[:element]
+      children = data[:children]
+      data = data[:data]
+
+      # replace whole inner html
+      unless data['children'].kind_of? Array
+        return element.inner_html = children
+      end
+
+      if element.children.size.zero?
+        return element.inner_html = children
+      end
+
+      index = data['children'].index(nil)
+      rindex = data['children'].rindex { |item| !item.nil? }
+
+      if index.nil?
+        element.inner_html = children
+      elsif index == 0 # insert to the end of children
+        element.children.last.after(children)
+      elsif index == rindex + 1 # insert to the begin of children
+          element.children.first.before children
+      else # wrap the children
+        element.children.first.before children[0..index]
+        element.children.last.after children[index..children.size]
+      end
+    end
   end
 end

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

@@ -24,15 +24,16 @@ module Jekyll::Spaceship
 
         # escape plus sign
         emoji_name = emoji.name.gsub('+', '\\\+')
+        css_class = self.config['css']['class']
 
         content = content.gsub(
           /(?<!\=")\s*:#{emoji_name}:\s*(?!"\s)/,
-          "<img class=\"\""\
+          "<img class=\"#{css_class}\""\
             " title=\":#{emoji.name}:\""\
             " alt=\":#{emoji.name}:\""\
             " raw=\"#{emoji.raw}\""\
             " src=\"#{config['src']}#{emoji.image_filename}\""\
-            " style=\"vertical-align: middle;"\
+            " style=\"vertical-align: middle; display: inline;"\
             " max-width: 1em; visibility: hidden;\""\
             " onload=\"this.style.visibility='visible'\""\
             " onerror=\"this.replaceWith(this.getAttribute('raw'))\">"\

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

@@ -8,15 +8,15 @@ module Jekyll::Spaceship
     def on_handle_markdown(content)
       # pre-handle reference-style links
       references = {}
-      content.scan(/(\[(.*)\]:\s*(.*))/) do |match_data|
+      content.scan(/\n\s*(\[(.*)\]:\s*(\S+(\s+".*?")?))/) do |match_data|
         ref_name = match_data[1]
         ref_value = match_data[2]
         references[ref_name] = ref_value
       end
       if references.size > 0
-        content.scan(/.*(?<!\\)\|.*/) do |result|
+        content.scan(/[^\n]*(?<!\\)\|[^\n]*/) do |result|
           references.each do |key, val|
-            replace = result.gsub(/\[(.*)\]\s*\[#{key}\]/, "[\1](#{val})")
+            replace = result.gsub(/\[([^\n]*)\]\s*\[#{key}\]/, "[\1](#{val})")
             next if result == replace
             content = content.gsub(result, replace)
           end
@@ -24,18 +24,21 @@ module Jekyll::Spaceship
       end
 
       # pre-handle row-span
-      content = content.gsub(/(?<!\\)(\|.*\\\s*)\|\s*\n/, "\\1\n")
+      content = content.gsub(/(?<!\\)(\|[^\n]*\\\s*)\|\s*\n/, "\\1\n")
 
       # escape | and :
       content = content.gsub(/\|(?=\|)/, '\\|')
-        .gsub(/\\:(?=.*?(?<!\\)\|)/, '\\\\\\\\:')
-        .gsub(/((?<!\\)\|.*?)(\\:)/, '\1\\\\\\\\:')
+        .gsub(/\\:(?=[^\n]*?(?<!\\)\|)/, '\\\\\\\\:')
+        .gsub(/((?<!\\)\|[^\n]*?)(\\:)/, '\1\\\\\\\\:')
 
       # escape * and _ and $ etc.
-      content.scan(/.*(?<!\\)\|.*/) do |result|
+      content.scan(/[^\n]*(?<!\\)\|[^\n]*/) do |result|
+        # skip for math expression within pipeline
+        next unless result
+          .gsub(/((?<!\\)\${1,2})[^\n]*?\1/, '')
+          .match(/(?<!\\)\|/)
         replace = result.gsub(
-          /(?<!(?<!\\)\\)(\*|\$|\[|\(|\"|_)/,
-          '\\\\\\\\\1')
+          /(?<!(?<!\\)\\)(\*|\$|\[|\(|\"|_)/, '\\\\\\\\\1')
         next if result == replace
         content = content.gsub(result, replace)
       end
@@ -50,6 +53,7 @@ module Jekyll::Spaceship
 
       # handle each table
       doc.css('table').each do |table|
+        next if table.ancestors('code, pre').size > 0
         rows = table.css('tr')
         data.table = table
         data.rows = rows
@@ -239,7 +243,11 @@ module Jekyll::Spaceship
         .gsub(/(?<!\\)\|/, '\\|')
         .gsub(/^\s+|\s+$/, '')
       content = cvter.convert(content)
-      cell.inner_html = Nokogiri::HTML.fragment(content)
+      content = Nokogiri::HTML.fragment(content)
+      if content.children.first&.name == 'p'
+        content = content.children
+      end
+      cell.inner_html = content.inner_html
     end
   end
 end

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

@@ -110,8 +110,8 @@ module Jekyll::Spaceship
         style = qs['style'] || default['style']
         allow = qs['allow'] || default['allow']
 
-        css_id.gsub('{id}', id)
-        css_class.gsub('{id}', id)
+        css_id = css_id.gsub('{id}', id)
+        css_class = css_class.gsub('{id}', id)
 
         url = URI(iframe_url ? "#{iframe_url}#{id}" : url).tap do |v|
           v.query = URI.encode_www_form(qs) if qs.size > 0

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.8.0"
+    VERSION = "0.8.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll