jekyll-spaceship 0.9.8 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feae82926b331a1fc32b0ed226447d3d58b6721c7187035ae3d82f297970e979
-  data.tar.gz: c34eef77784ba8087689780e75548318a91e188073995bbe0922d27abee1d0bc
+  metadata.gz: a416b7cf9c8e911656cded0ab54e172ef344f3efd767647c11357c40cc95733e
+  data.tar.gz: d0b73825b4ad8ef33b5cd39f34902159aa29110d36cf4a33b0989ea4aeecb30a
 SHA512:
-  metadata.gz: b5e6ed122db069ffdc833eec1a360ee90257b356632ba4732a0b47a49a2ef9a41934d7e7de7eb23a03f61cf49d9347183d9d3cad88f1d9b6b79735cf100651a2
-  data.tar.gz: 8fca41fbf22600014b6c5b87f31b31b744447854effdf0099d446293e78d032bbdcc102a222c58a9fd05c7dd7f6088cea28575181e2e337488bd993c23504f93
+  metadata.gz: eb35ba184747e58e6a5ab3d30f3140f347ed27729050a281da36dd72990cf63a3eed0a9a8c3058b4bf14f529ebfc9c318c2c0495ccec78145d86a786343dda49
+  data.tar.gz: 8ba26f392d63e59cbc7bab80849608cc723ee05839e3f696757e0a23664b5ec491251ff39dfdd11bc530833e07028413a94b3bfa0a1ff98211c2255400b6ccd5

data/README.md

@@ -112,6 +112,7 @@ Spaceship is a minimalistic, powerful and extremely customizable [Jekyll](https:
     - [5.2 Vimeo Usage](#vimeo-usage)
     - [5.3 DailyMotion Usage](#dailymotion-usage)
     - [5.4 Spotify Usage](#spotify-usage)
+    - [5.4 Spotify Podcast Usage](#spotify-podcast-usage)
     - [5.5 SoundCloud Usage](#soundcloud-usage)
     - [5.6 General Video Usage](#general-video-usage)
     - [5.7 General Audio Usage](#general-audio-usage)
@@ -441,7 +442,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.
 
@@ -791,6 +792,15 @@ the link as below:
 
 <image width="600" src="https://user-images.githubusercontent.com/9413601/89762618-5d11b000-db23-11ea-81db-35cc3682b234.png">
 
+#### Spotify Podcast Usage
+
+```markdown
+![](https://open.spotify.com/episode/31AxcwYdjsFtStds5JVWbT)
+```
+
+<image width="600" src="https://user-images.githubusercontent.com/9413601/133599796-1d213033-8184-4059-9ec2-5415e50c94dc.png">
+
+
 #### SoundCloud Usage
 
 ```markdown

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

@@ -64,7 +64,10 @@ module Jekyll::Spaceship
     def self.load_config
       # post load site config for `group :jekyll_plugin`
       Jekyll::Hooks.register :site, :after_init do |site|
+        # load config
         self.load(site.config)
+        # dispatch site after_init event
+        Manager.dispatch(site, :site, :after_init)
       end
     end
   end

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

@@ -14,6 +14,7 @@ module Jekyll::Spaceship
         container = _register.first
         events = _register.last.uniq
         events = events.select do |event|
+          next true if event.match(/^after/)
           next true if event.match(/^post/)
           next events.index(event.to_s.gsub(/^pre/, 'post').to_sym).nil?
         end
@@ -57,23 +58,35 @@ module Jekyll::Spaceship
     end
 
     def self.dispatch(page, container, event)
+      # dispatch to each processor
       @@_processors.each do |processor|
         processor.dispatch page, container, event
+        break unless processor.next?
       end
       if event.to_s.start_with?('post') and Type.html? output_ext(page)
         self.dispatch_html_block(page)
       end
+      # update page excerpt
+      @@_processors.each do |processor|
+        next unless processor.handled
+        next unless page.is_a? Jekyll::Document
+        break page.data['excerpt'] = Jekyll::Excerpt.new(page)
+      end
+      # call on_handled
       @@_processors.each do |processor|
         processor.on_handled if processor.handled
+        break unless processor.next?
       end
     end
 
     def self.ext(page)
+      return unless page.respond_to? :path
       ext = page.path.match(/\.[^.]+$/)
       ext.to_s.rstrip
     end
 
     def self.output_ext(page)
+      return unless page.respond_to? :url_placeholders
       page.url_placeholders[:output_ext]
     end
 

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

@@ -90,6 +90,10 @@ module Jekyll::Spaceship
     def self.config
     end
 
+    def next?
+      true
+    end
+
     def process?
       Type.html?(output_ext) or Type.markdown?(ext)
     end
@@ -188,12 +192,28 @@ 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
     end
 
+    def get_exclusion(id)
+      result = nil
+      match_data = id.match /<!JEKYLL@(.+)@(.+)>/
+      unless match_data.nil?
+        id = match_data[2].to_i
+        result = {
+          :id => id,
+          :marker => match_data[0],
+          :content => @exclusion_store[id]
+        }
+      end
+      result
+    end
+
     def self.escape_html(content)
       # escape link
       content.scan(/((https?:)?\/\/\S+\?[a-zA-Z0-9%\-_=\.&;]+)/) do |result|
@@ -237,5 +257,31 @@ module Jekyll::Spaceship
         "<img class=\"#{css_class}\" src=\"#{body}\">"
       end
     end
+
+    def self.handle_bang_link(
+      content,
+      url = '(https?:)?\\/\\/.*',
+      title = '("(.*)".*){0,1}',
+      &block
+    )
+      # pre-handle reference-style links
+      regex = /(\[(.*)\]:\s*(#{url}\s*#{title}))/
+      content.scan regex do |match_data|
+        match = match_data[0]
+        ref_name = match_data[1]
+        ref_value = match_data[2]
+        content = content.gsub(match, '')
+          .gsub(/\!\[(.*)\]\s*\[#{ref_name}\]/,
+            "![\1](#{ref_value})")
+      end
+
+      # handle inline-style links
+      regex = /(\!\[(.*)\]\(.*#{url}\s*#{title}\))/
+      content.scan regex do |match_data|
+        url = match_data[2]
+        title = match_data[6]
+        block.call(url, title)
+      end
+    end
   end
 end

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

@@ -37,15 +37,31 @@ 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?
+
+      # Count for restoration
+      escaped_count = 0
+
       # filter nodes (pre, code)
-      nodes = body.css(selector)
-      nodes.each do |node|
+      body.css(selector).each do |node|
+        count = escaped_count
+
         # handle emoji markup
-        node.inner_html = node.inner_html.gsub(
-          /:([\w\d+-]+?):/, '\:\1\:'
-        )
+        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
@@ -68,8 +84,10 @@ module Jekyll::Spaceship
 
       body.inner_html = content
 
+      return doc.to_html if escaped_count.zero?
+
       # restore nodes (pre, code)
-      nodes.each do |node|
+      body.css(selector).each do |node|
         # handle emoji markup
         node.inner_html = node.inner_html.gsub(
           /\\:([\w\d+-]+?)\\:/, ':\1:'

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

@@ -45,6 +45,7 @@ module Jekyll::Spaceship
           escaped_expr = expr
             .gsub(/(?<!^)\\(?!\S$)/, '\\\\\\\\')
             .gsub(/(?<!\\)\$\$/, '\\\$\\\$')
+            .gsub(/\\\\(?=\s)/, '\\\\\\\\\\')
             .gsub(/\\ /, '\\\\\\ ')
           content = content.gsub(expr, escaped_expr)
         end
@@ -92,7 +93,7 @@ module Jekyll::Spaceship
           r&.each do |i|
             btag = Regexp.escape(i[0])
             etag = Regexp.escape(i[1])
-            patterns <<= /((?<!\\\\)#{btag}(.*?)(?<!\\\\)#{etag})/
+            patterns <<= /((?<!\\\\)#{btag}([\s\S]*?)(?<!\\\\)#{etag})/
           end
         end
       end
@@ -107,17 +108,35 @@ 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
-        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/)
+      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|
+        # filter invalid nodes
+        next if node.children.size == 0
+        invalid = false
+        node.children.each do |child|
+          unless [
+              'text', 'br', 'span',
+              'img', 'svg', 'a'
+          ].include? child.name
+            break invalid = true
           end
+        end
+        next if invalid
+
+        patterns['include'].each do |pattern|
           # check normal mathjax expression
           node.content.scan(pattern) do |result|
             expr = result[0]

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

@@ -30,6 +30,7 @@ module Jekyll::Spaceship
         handle_vimeo(element)
         handle_dailymotion(element)
         handle_spotify(element)
+        handle_spotify_podcast(element)
         handle_soundcloud(element)
       end
       doc.to_html
@@ -42,7 +43,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 +54,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 +91,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
@@ -109,6 +110,19 @@ module Jekyll::Spaceship
       })
     end
 
+    # Examples:
+    # ![spotify podcast](//open.spotify.com/episode/31AxcwYdjsFtStds5JVWbT)
+    # ![spotify podcast](//open.spotify.com/episode/44gfWHnwbmSY7Euw6Nb39k?width=400)
+    def handle_spotify_podcast(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:)?\\/\\/open\\.spotify\\.com\\/episode\\/',
+        id: '(?<=episode\\/)([a-zA-Z0-9\\_\\-]+)',
+        base_url: "https://open.spotify.com/embed/episode/",
+        height: 152
+      })
+    end
+
     # Examples:
     # ![soundcloud](//soundcloud.com/aviciiofficial/preview-avicii-vs-lenny)
     def handle_soundcloud(element)
@@ -128,7 +142,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 +172,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 +197,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 +239,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
 
@@ -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.8"
+    VERSION = "0.10.2"
   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.10.2
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll