jekyll-spaceship 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feae82926b331a1fc32b0ed226447d3d58b6721c7187035ae3d82f297970e979
-  data.tar.gz: c34eef77784ba8087689780e75548318a91e188073995bbe0922d27abee1d0bc
+  metadata.gz: 51f0576137305906368ec086aba6c9c11d45799d10dc8a22abd5598a4026251a
+  data.tar.gz: 1a52f85350f6d2b3e128b637ec040108d993534ec554296cdd2b998e26551aec
 SHA512:
-  metadata.gz: b5e6ed122db069ffdc833eec1a360ee90257b356632ba4732a0b47a49a2ef9a41934d7e7de7eb23a03f61cf49d9347183d9d3cad88f1d9b6b79735cf100651a2
-  data.tar.gz: 8fca41fbf22600014b6c5b87f31b31b744447854effdf0099d446293e78d032bbdcc102a222c58a9fd05c7dd7f6088cea28575181e2e337488bd993c23504f93
+  metadata.gz: 1445456d3974c347367ae35c8b8b2ceec320f523931620d3ad4f19f3982ddefff2f9426f9f47318b6e548da9c0b25b0b370733a472250065579c27296785ce49
+  data.tar.gz: f78d6fd69910ea7350b77a6d0c8702214d097e8813032fb4254fa53f4521805c5f2b74c3f1ea8c763cb305b145929d6e12810653952ef57c4c32765048ccaffe

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/processors/emoji-processor.rb

@@ -37,8 +37,13 @@ module Jekyll::Spaceship
     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?
+
       # filter nodes (pre, code)
       nodes = body.css(selector)
       nodes.each do |node|

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

@@ -107,17 +107,22 @@ 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]

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/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
 
@@ -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

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.9.8"
+    VERSION = "0.9.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll