jekyll-spaceship 0.8.7 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c04f1aada8ea0a1dde37b51418f843e1d163e1dd7230cf602a0f7caf5d787b19
-  data.tar.gz: 263b035717beeedaad26f42c896a2265b3be4e9bf977b2883e23d8b678f280db
+  metadata.gz: cbba69bcf95b309c36da702cce9670212f7a32985e2522f13b06fdc0058e0b60
+  data.tar.gz: 679ee30cad6abfe6c6fb271e3816bff2e16f931b94492d0e0223f4dba11263f4
 SHA512:
-  metadata.gz: 566854587a4dea0b991d755467dd402cc39a86235636c9e95c1fbd042ae6ee7bc28bd26ffd99b0d12a8e56ffcff469193bab5008d319e8408949382dec162bdb
-  data.tar.gz: c79139b158834943705be273a533beef706d028fcbff9f339f08aba027ec85a872c73a522679ab2b69d09c82f6c7bd8f8f551f33bfd369040b510b3db36859c5
+  metadata.gz: 207137e6fedec9521c2cde3a3215cf7f1ccbc81f6ce0385c385a1c48d31a1ba7d03b3c532e0cbde80ce2f8d33e79a770d299d64cc436acddfc03ed651a2e9fc4
+  data.tar.gz: 1c78e2e73e99f7c3e007e3cbcea683b1d4a4db5771737530865be9262d42adf5617e6d7b9cb9931b4947937fdc64d927bf38967121b2dc98d1107d5bec01cace

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--require spec_helper

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.7
-- 2.3
+  - 2.7
+  - 2.3
 env:
   global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-  - JEKYLL_VERSION="~> 3.8"
+    - JEKYLL_VERSION="~> 3.8"
 matrix:
   include:
   - rvm: 2.7
@@ -15,8 +15,8 @@ matrix:
   - rvm: 2.7
     env: JEKYLL_VERSION=">= 4.0.0"
 before_install:
-- gem update --system
-- gem install bundler
+  - gem update --system
+  - gem install bundler
 before_script: bundle update
 script: script/cibuild
 notifications:

data/README.md

@@ -107,11 +107,14 @@ Spaceship is a minimalistic, powerful and extremely customizable [Jekyll](https:
     - [2.2 How to use?](#22-how-to-use)
   - [3. PlantUML Usage](#3-plantuml-usage)
   - [4. Mermaid Usage](#4-mermaid-usage)
-  - [5. Video Usage](#5-video-usage)
+  - [5. Media Usage](#5-media-usage)
     - [5.1 Youtube Usage](#youtube-usage)
     - [5.2 Vimeo Usage](#vimeo-usage)
     - [5.3 DailyMotion Usage](#dailymotion-usage)
-    - [5.4 General Video Usage](#general-video-usage)
+    - [5.4 Spotify Usage](#spotify-usage)
+    - [5.5 SoundCloud Usage](#soundcloud-usage)
+    - [5.6 General Video Usage](#general-video-usage)
+    - [5.7 General Audio Usage](#general-audio-usage)
   - [6. Hybrid HTML with Markdown](#6-hybrid-html-with-markdown)
   - [7. Markdown Polyfill](#7-markdown-polyfill)
     - [7.1 Escape Ordered List](#71-escape-ordered-list)
@@ -143,7 +146,7 @@ plugins:
 
 **💡 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
+### Additions for Unlimited GitHub Pages
 
 * 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.
@@ -162,16 +165,20 @@ jekyll-spaceship:
     - plantuml-processor
     - mermaid-processor
     - polyfill-processor
-    - video-processor
+    - media-processor
     - emoji-processor
     - element-processor
   mathjax-processor:
-    src:  //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
+    src:
+      - https://polyfill.io/v3/polyfill.min.js?features=es6
+      - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
     config:
-      tex2jax:
+      tex:
         inlineMath:
           - ['$','$']
           - ['\(','\)']
+      svg:
+        fontCache: 'global'
   plantuml-processor:
     mode: default  # mode value 'pre-fetch' for fetching image at building stage
     css:
@@ -179,7 +186,7 @@ jekyll-spaceship:
     syntax:
       code: 'plantuml!'
       custom: ['@startuml', '@enduml']
-    src: http://www.plantuml.com/plantuml/png/
+    src: http://www.plantuml.com/plantuml/svg/
   mermaid-processor:
     mode: default  # mode value 'pre-fetch' for fetching image at building stage
     css:
@@ -190,14 +197,14 @@ jekyll-spaceship:
     config:
       theme: default
     src: https://mermaid.ink/svg/
-  video-processor:
+  media-processor:
     default:
-      id: 'video-{id}'
-      class: 'video'
+      id: 'media-{id}'
+      class: 'media'
       width: '100%'
       height: 350
-      border: 0
-      style: 'max-width: 600px'
+      frameborder: 0
+      style: 'max-width: 600px; outline: none;'
       allow: 'encrypted-media; picture-in-picture'
   emoji-processor:
     css:
@@ -630,7 +637,7 @@ Code above would be parsed as:
 
 ### 3. PlantUML Usage
 
-[PlantUML](http://plantuml.sourceforge.net/) is a component that allows to quickly write:
+[PlantUML](https://plantuml.com) is a component that allows to quickly write:
 
 - sequence diagram,
 - use case diagram,
@@ -701,25 +708,31 @@ Code above would be parsed as:
 
 ![Mermaid Diagram](https://user-images.githubusercontent.com/9413601/85282355-2e317300-b4be-11ea-9c30-8f9d61540d14.png)
 
-### 5. Video Usage
+### 5. Media Usage
 
-How often did you find yourself googling "**How to embed a video in markdown?**"
+How often did you find yourself googling "**How to embed a video/audio in markdown?**"
 
-While its not possible to embed a video in markdown, the best and easiest way is to extract a frame from the video. To add videos to your markdown files easier I developped this tool for you, and it will parse the video link inside the image block automatically.
+While its not possible to embed a video/audio in markdown, the best and easiest
+way is to extract a frame from the video/audio. To add videos/audios to your
+markdown files easier I developped this tool for you, and it will parse the
+video/audio link inside the image block automatically.
 
-**For now, these video links parsing are provided:**
+**For now, these media links parsing are provided:**
 
 - Youtube
 - Vimeo
 - DailyMotion
-- General Video ( mp4 | avi | webm | ogg | ogv | 3gp | flv | mov ... )
+- Spotify
+- SoundCloud
+- General Video ( mp4 | avi | ogg | ogv | webm | 3gp | flv | mov ... )
+- General Audio ( mp3 | wav | ogg | mid | midi | aac | wma ... )
 
-There are two ways to embed a video in your Jekyll blog page:
+There are two ways to embed a video/audio in your Jekyll blog page:
 
 Inline-style:
 
 ```markdown
-![]({video-link})
+![]({media-link})
 ```
 
 Reference-style:
@@ -727,10 +740,10 @@ Reference-style:
 ```markdown
 ![][{reference}]
 
-[{reference}]: {video-link}
+[{reference}]: {media-link}
 ```
 
-For configuring video attributes (e.g, width, height), just adding query string to
+For configuring media attributes (e.g, width, height), just adding query string to
 the link as below:
 
 ```markdown
@@ -763,6 +776,22 @@ the link as below:
 ![](https://dai.ly/x7tgcev?width=100%&height=400)
 ```
 
+#### Spotify Usage
+
+```markdown
+![](http://open.spotify.com/track/4Dg5moVCTqxAb7Wr8Dq2T5)
+```
+
+<image width="600" src="https://user-images.githubusercontent.com/9413601/89762618-5d11b000-db23-11ea-81db-35cc3682b234.png">
+
+#### SoundCloud Usage
+
+```markdown
+![](https://soundcloud.com/aviciiofficial/preview-avicii-vs-lenny)
+```
+
+<image width="600" src="https://user-images.githubusercontent.com/9413601/89762969-1c666680-db24-11ea-97e3-4340f7fac7ac.png">
+
 #### General Video Usage
 
 ```markdown
@@ -773,6 +802,15 @@ the link as below:
 ![](//techslides.com/demos/sample-videos/small.mp4?width=400)
 ```
 
+#### General Audio Usage
+
+```markdown
+![](//www.soundhelix.com/examples/mp3/SoundHelix-Song-1.mp3)
+
+![](//www.soundhelix.com/examples/mp3/SoundHelix-Song-1.mp3?autoplay=1&loop=1)
+```
+
+<image width="300" src="https://user-images.githubusercontent.com/9413601/89762143-68181080-db22-11ea-8467-e8b2a8a96ae5.png">
 
 ### 6. Hybrid HTML with Markdown
 
@@ -928,7 +966,7 @@ Automatically adds a `target="_blank" rel="noopener noreferrer"` attribute to al
 jekyll-spaceship:
   element-processor:
     css:
-      - a:                                     # Replce all `a` tags
+      - a:                                     # Replace all `a` tags
           props:
             class: ['(^.*$)', '\0 ext-link']   # Add `ext-link` to class by regex pattern
             target: _blank                     # Replace `target` value to `_blank`
@@ -944,9 +982,9 @@ Automatically adds `loading="lazy"` to `img` and `iframe` tags to natively load
 jekyll-spaceship:
   element-processor:
     css:
-      - a:                                     # Replce all `a` tags
+      - a:                                     # Replace all `a` tags
           props:                               #
-            loading: lazy                      # Replace `lading` value to `lazy`
+            loading: lazy                      # Replace `loading` value to `lazy`
 ```
 
 In case you want to prevent loading some images/iframes lazily, add
@@ -959,7 +997,7 @@ See the following examples to prevent lazy loading.
 jekyll-spaceship:
   element-processor:
     css:
-      - a:                                     # Replce all `a` tags
+      - a:                                     # Replace all `a` tags
           props:                               #
             loading: eager                     # Replace `loading` value to `eager`
 ```

data/jekyll-spaceship.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = Jekyll::Spaceship::VERSION
   spec.authors       = ["jeffreytse"]
   spec.email         = ["jeffreytse.mail@gmail.com"]
-  spec.summary       = "A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, mermaid, emoji, video, youtube, vimeo, dailymotion, etc."
+  spec.summary       = "A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, mermaid, emoji, video, audio, youtube, vimeo, dailymotion, spotify, soundcloud, etc."
   spec.homepage      = "https://github.com/jeffreytse/jekyll-spaceship"
   spec.license       = "MIT"
 

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

@@ -10,7 +10,7 @@ module Jekyll::Spaceship
         'plantuml-processor',
         'mermaid-processor',
         'polyfill-processor',
-        'video-processor',
+        'media-processor',
         'emoji-processor',
         'element-processor'
       ]

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

@@ -116,7 +116,7 @@ module Jekyll::Spaceship
         if self.respond_to? method
           @page.content = self.pre_exclude @page.content
           @page.content = self.send method, @page.content
-          @page.content = self.after_exclude @page.content
+          @page.content = self.post_exclude @page.content
         end
       else
         if Type.html? output_ext
@@ -151,8 +151,8 @@ module Jekyll::Spaceship
       logger.log file
     end
 
-    def pre_exclude(content)
-      @exclusion_store = []
+    def exclusion_regexs()
+      regexs = []
       @exclusions.each do |type|
         regex = nil
         if type == :code
@@ -160,9 +160,16 @@ module Jekyll::Spaceship
         elsif type == :math
           regex = /(((?<!\\)\${1,2})[^\n]*?\1)/
         elsif type == :liquid_filter
-          regex = /((?<!\\)\{\{[^\n]*?\}\})/
+          regex = /((?<!\\)((\{\{[^\n]*?\}\})|(\{%[^\n]*?%\})))/
         end
-        next if regex.nil?
+        regexs.push regex unless regex.nil?
+      end
+      regexs
+    end
+
+    def pre_exclude(content, regexs = self.exclusion_regexs())
+      @exclusion_store = []
+      regexs.each do |regex|
         content.scan(regex) do |match_data|
           match = match_data[0]
           id = @exclusion_store.size
@@ -173,7 +180,7 @@ module Jekyll::Spaceship
       content
     end
 
-    def after_exclude(content)
+    def post_exclude(content)
       while @exclusion_store.size > 0
         match = @exclusion_store.pop
         id = @exclusion_store.size
@@ -192,5 +199,38 @@ module Jekyll::Spaceship
       end
       content
     end
+
+    def self.fetch_img_data(url)
+      begin
+        res = Net::HTTP.get_response URI(url)
+        raise res.body unless res.is_a?(Net::HTTPSuccess)
+        content_type = res.header['Content-Type']
+        raise 'Unknown content type!' if content_type.nil?
+        content_body = res.body.force_encoding('UTF-8')
+        return {
+          'type' => content_type,
+          'body' => content_body
+        }
+      rescue StandardError => msg
+        logger.log msg
+      end
+    end
+
+    def self.make_img_tag(data)
+      css_class = data['class']
+      type = data['type']
+      body = data['body']
+      if type == 'url'
+        "<img class=\"#{css_class}\" src=\"#{body}\">"
+      elsif type.include?('svg')
+        body.gsub(/\<\?xml.*?\?>/, '')
+          .gsub(/<!--[^\0]*?-->/, '')
+          .sub(/<svg /, "<svg class=\"#{css_class}\" ")
+      else
+        body = Base64.encode64(body)
+        body = "data:#{type};base64, #{body}"
+        "<img class=\"#{css_class}\" src=\"#{body}\">"
+      end
+    end
   end
 end

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

@@ -6,9 +6,13 @@ module Jekyll::Spaceship
   class MathjaxProcessor < Processor
     def self.config
       {
-        'src' => '//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML',
+        'src' => [
+          'https://polyfill.io/v3/polyfill.min.js?features=es6',
+          'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js',
+        ],
         'config' => {
-          'tex2jax' => { 'inlineMath' => [['$','$'], ['\\(','\\)']] }
+          'tex' => { 'inlineMath' => [['$','$'], ['\\(','\\)']] },
+          'svg': { 'fontCache': 'global' }
         }
       }
     end
@@ -27,8 +31,15 @@ module Jekyll::Spaceship
 
       self.handled = true
 
-      cfg = "MathJax.Hub.Config(#{config['config'].to_json});"
-      head.add_child("<script src=\"#{config['src']}\">#{cfg}</script>")
+      # add mathjax config
+      cfg = config['config'].to_json
+      head.add_child("<script>MathJax=#{cfg}</script>")
+
+      # add mathjax dependencies
+      config['src'] = [config['src']] if config['src'].is_a? String
+      config['src'].each do |src|
+        head.add_child("<script src=\"#{src}\"></script>")
+      end
 
       doc.to_html
     end

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

@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+require 'uri'
+require "nokogiri"
+
+module Jekyll::Spaceship
+  class MediaProcessor < Processor
+    def self.config
+      {
+        'default' => {
+          'id' => 'media-{id}',
+          'class' => 'media',
+          'width' => '100%',
+          'height' => 350,
+          'frameborder' => 0,
+          'style' => 'max-width: 600px;outline: none',
+          'allow' => 'encrypted-media; picture-in-picture'
+        }
+      }
+    end
+
+    def on_handle_html(content)
+      # use nokogiri to parse html content
+      doc = Nokogiri::HTML(content)
+      # handle each img tag
+      doc.css('img').each do |element|
+        handle_normal_audio(element)
+        handle_normal_video(element)
+        handle_youtube(element)
+        handle_vimeo(element)
+        handle_dailymotion(element)
+        handle_spotify(element)
+        handle_soundcloud(element)
+      end
+      doc.to_html
+    end
+
+    # Examples:
+    # ![audio](//www.soundhelix.com/examples/mp3/SoundHelix-Song-1.mp3)
+    # ![audio](//www.expample.com/examples/t-rex-roar.mp3?autoplay=true&loop=true)
+    def handle_normal_audio(element)
+      handle_media(element, {
+        media_type: 'audio',
+        host: '(https?:\\/\\/)?.*\\/',
+        id: '(.+?\\.(mp3|wav|ogg|mid|midi|aac|wma))',
+      })
+    end
+
+
+    # Examples:
+    # ![video](//www.html5rocks.com/en/tutorials/video/basics/devstories.webm)
+    # ![video](//techslides.com/demos/sample-videos/small.ogv?allow=autoplay)
+    # ![video](//techslides.com/demos/sample-videos/small.mp4?width=400)
+    def handle_normal_video(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:\\/\\/)?.*\\/',
+        id: '(.+?\\.(avi|mp4|webm|ogg|ogv|flv|mkv|mov|wmv|3gp|rmvb|asf))'
+      })
+    end
+
+    # Examples:
+    # ![youtube](https://www.youtube.com/watch?v=XA2WjJbmmoM "title")
+    # ![youtube](http://www.youtube.com/embed/w-m_yZCLF5Q)
+    # ![youtube](//youtu.be/mEP3YXaSww8?height=100%&width=400)
+    def handle_youtube(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:)?\\/\\/.*youtu.*',
+        id: '(?<=\\?v\\=|embed\\/|\\.be\\/)([a-zA-Z0-9\\_\\-]+)',
+        base_url: "https://www.youtube.com/embed/"
+      })
+    end
+
+    # Examples:
+    # ![vimeo](https://vimeo.com/263856289)
+    # ![vimeo](https://vimeo.com/263856289?height=100%&width=400)
+    def handle_vimeo(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:)?\\/\\/vimeo\\.com\\/',
+        id: '([0-9]+)',
+        base_url: "https://player.vimeo.com/video/"
+      })
+    end
+
+    # Examples:
+    # ![dailymotion](https://www.dailymotion.com/video/x7tgcev)
+    # ![dailymotion](https://dai.ly/x7tgcev?height=100%&width=400)
+    def handle_dailymotion(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:)?\\/\\/.*dai.?ly.*',
+        id: '(?<=video\\/|\\/)([a-zA-Z0-9\\_\\-]+)',
+        base_url: "https://www.dailymotion.com/embed/video/"
+      })
+    end
+
+    # Examples:
+    # ![spotify](//open.spotify.com/track/4Dg5moVCTqxAb7Wr8Dq2T5)
+    # ![spotify](//open.spotify.com/track/37mEkAaqCE7FXMvnlVA8pp?width=400)
+    def handle_spotify(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        host: '(https?:)?\\/\\/open\\.spotify\\.com\\/track\\/',
+        id: '(?<=track\\/)([a-zA-Z0-9\\_\\-]+)',
+        base_url: "https://open.spotify.com/embed/track/",
+        height: 80
+      })
+    end
+
+    # Examples:
+    # ![soundcloud](//soundcloud.com/aviciiofficial/preview-avicii-vs-lenny)
+    def handle_soundcloud(element)
+      handle_media(element, {
+        media_type: 'iframe',
+        id_from: 'html',
+        host: '(https?:)?\\/\\/soundcloud\\.com\\/.+\\/[^\\?]+',
+        id: '(?<=soundcloud:\\/\\/sounds:)([0-9]+)',
+        base_url: "https://w.soundcloud.com/player/?url="\
+          "https%3A//api.soundcloud.com/tracks/",
+        height: 125,
+      })
+    end
+
+    def handle_media(element, data)
+      host = data[:host]
+      src = element.get_attribute('src')
+      title = element.get_attribute('title')
+      id = data[:id_from] === 'html' ? '()' : data[:id]
+      match_data = src.match(/#{host}#{id}\S*/)
+      return if match_data.nil?
+
+      media_type = data[:media_type]
+      base_url = data[:base_url]
+      id = data[:id_from] === 'html' \
+        ? get_id_from_html(src, data[:id]) \
+        : match_data[2]
+      qs = src.match(/(?<=\?)(\S*?)$/)
+      qs = Hash[URI.decode_www_form(qs.to_s)].reject do |k, v|
+        next true if v == id or v == ''
+      end
+
+      cfg = self.config['default'].clone
+      cfg['id'] = qs['id'] || cfg['id']
+      cfg['class'] = qs['class'] || cfg['class']
+      cfg['style'] = qs['style'] || cfg['style']
+      cfg['id'] = cfg['id'].gsub('{id}', id)
+      cfg['class'] = cfg['class'].gsub('{id}', id)
+
+      cfg['src'] = URI(base_url ? "#{base_url}#{id}" : src).tap do |v|
+        v.query = URI.encode_www_form(qs) if qs.size > 0
+      end
+
+      case media_type
+      when 'audio'
+        cfg['autoplay'] = qs['autoplay'] || data[:autoplay] || cfg['autoplay']
+        cfg['loop'] = qs['loop'] || data[:loop] || cfg['loop']
+        cfg['style'] += ';display: none;' if qs['hidden']
+        handle_audio(element, { cfg: cfg })
+      when 'iframe'
+        cfg['title'] = title
+        cfg['width'] = qs['width'] || data[:width] || cfg['width']
+        cfg['height'] = qs['height'] || data[:height] || cfg['height']
+        cfg['frameborder'] = qs['frameborder'] || cfg['frameborder']
+        cfg['allow'] ||= cfg['allow']
+        handle_iframe(element, { cfg: cfg })
+      end
+      self.handled = true
+    end
+
+    def handle_audio(element, data)
+      cfg = data[:cfg]
+      html = "<audio"\
+        " id=\"#{cfg['id']}\""\
+        " class=\"#{cfg['class']}\""\
+        " #{cfg['autoplay'] ? 'autoplay' : ''}"\
+        " #{cfg['loop'] ? 'loop' : ''}"\
+        " src=\"#{cfg['src']}\""\
+        " style=\"#{cfg['style']}\""\
+        " controls>" \
+        "<p> Your browser doesn't support HTML5 audio."\
+        " Here is a <a href=\"#{cfg['src']}\">link to download the audio</a>"\
+        "instead. </p>"\
+        "</audio>"
+      doc = Nokogiri::XML(html)
+      element.replace(doc.children.first)
+    end
+
+    def handle_iframe(element, data)
+      cfg = data[:cfg]
+      html = "<iframe"\
+        " id=\"#{cfg['id']}\""\
+        " class=\"#{cfg['class']}\""\
+        " src=\"#{cfg['src']}\""\
+        " title=\"#{cfg['title']}\""\
+        " width=\"#{cfg['width']}\""\
+        " height=\"#{cfg['height']}\""\
+        " style=\"#{cfg['style']}\""\
+        " allow=\"#{cfg['allow']}\""\
+        " frameborder=\"#{cfg['frameborder']}\""\
+        " allowfullscreen>"\
+        "</iframe>"
+      doc = Nokogiri::XML(html)
+      element.replace(doc.children.first)
+    end
+
+    def get_id_from_html(url, pattern)
+      id = ''
+      begin
+        url = 'https:' + url if url.start_with? '//'
+        res = Net::HTTP.get_response URI(url)
+        raise res.body unless res.is_a?(Net::HTTPSuccess)
+        res.body.match pattern do |match_data|
+          id = match_data[0]
+          break
+        end
+      rescue StandardError => msg
+        data = url
+        logger.log msg
+      end
+      id
+    end
+  end
+end

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

@@ -62,18 +62,20 @@ module Jekyll::Spaceship
     def handle_mermaid(code)
       # encode to UTF-8
       code = code.encode('UTF-8')
-
       url = get_url(code)
 
       # render mode
       case self.config['mode']
       when 'pre-fetch'
-        url = self.get_mermaid_img_data(url)
+        data = self.class.fetch_img_data(url)
+      end
+      if data.nil?
+        data = { 'type' => 'url', 'body' => url }
       end
 
       # return img tag
-      css_class = self.config['css']['class']
-      "<img class=\"#{css_class}\" src=\"#{url}\">"
+      data['class'] = self.config['css']['class']
+      self.class.make_img_tag(data)
     end
 
     def get_url(code)
@@ -96,21 +98,5 @@ module Jekyll::Spaceship
         raise "No supported src ! #{src}"
       end
     end
-
-    def get_mermaid_img_data(url)
-      data = ''
-      begin
-        res = Net::HTTP.get_response URI(url)
-        raise res.body unless res.is_a?(Net::HTTPSuccess)
-        data = Base64.encode64(res.body)
-        content_type = res.header['Content-Type']
-        raise 'Unknown content type!' if content_type.nil?
-        data = "data:#{content_type};base64, #{data}"
-      rescue StandardError => msg
-        data = url
-        logger.log msg
-      end
-      data
-    end
   end
 end

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

@@ -17,7 +17,7 @@ module Jekyll::Spaceship
         'css' => {
           'class' => 'plantuml'
         },
-        'src' => 'http://www.plantuml.com/plantuml/png/'
+        'src' => 'http://www.plantuml.com/plantuml/svg/'
       }
     end
 
@@ -59,18 +59,20 @@ module Jekyll::Spaceship
     def handle_plantuml(code)
       # wrap plantuml code
       code = "@startuml#{code}@enduml".encode('UTF-8')
-
-      url = get_url(code)
+      url = self.get_url(code)
 
       # render mode
       case self.config['mode']
       when 'pre-fetch'
-        url = self.get_plantuml_img_data(url)
+        data = self.class.fetch_img_data(url)
+      end
+      if data.nil?
+        data = { 'type' => 'url', 'body' => url }
       end
 
       # return img tag
-      css_class = self.config['css']['class']
-      "<img class=\"#{css_class}\" src=\"#{url}\">"
+      data['class'] = self.config['css']['class']
+      self.class.make_img_tag(data)
     end
 
     def get_url(code)
@@ -87,21 +89,5 @@ module Jekyll::Spaceship
         raise "No supported src ! #{src}"
       end
     end
-
-    def get_plantuml_img_data(url)
-      data = ''
-      begin
-        res = Net::HTTP.get_response URI(url)
-        raise res.body unless res.is_a?(Net::HTTPSuccess)
-        data = Base64.encode64(res.body)
-        content_type = res.header['Content-Type']
-        raise 'Unknown content type!' if content_type.nil?
-        data = "data:#{content_type};base64, #{data}"
-      rescue StandardError => msg
-        data = url
-        logger.log msg
-      end
-      data
-    end
   end
 end

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

@@ -305,10 +305,12 @@ module Jekyll::Spaceship
       cvter = self.converter('markdown')
       return if cvter.nil?
       content = cell.inner_html
+      content = self.pre_exclude(content, [/(\<code.*\>.*\<\/code\>)/])
         .gsub(/(?<!\\)\|/, '\\|')
         .gsub(/^\s+|\s+$/, '')
         .gsub(/&lt;/, '<')
         .gsub(/&gt;/, '>')
+      content = self.post_exclude(content)
       content = cvter.convert(content)
       content = Nokogiri::HTML.fragment(content)
       if content.children.first&.name == 'p'

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.8.7"
+    VERSION = "0.9.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.4
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -124,6 +124,7 @@ files:
 - ".codeclimate.yml"
 - ".github/FUNDING.yml"
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -140,11 +141,11 @@ files:
 - lib/jekyll-spaceship/processors/element-processor.rb
 - lib/jekyll-spaceship/processors/emoji-processor.rb
 - lib/jekyll-spaceship/processors/mathjax-processor.rb
+- lib/jekyll-spaceship/processors/media-processor.rb
 - lib/jekyll-spaceship/processors/mermaid-processor.rb
 - lib/jekyll-spaceship/processors/plantuml-processor.rb
 - lib/jekyll-spaceship/processors/polyfill-processor.rb
 - lib/jekyll-spaceship/processors/table-processor.rb
-- lib/jekyll-spaceship/processors/video-processor.rb
 - lib/jekyll-spaceship/utils/.keep
 - lib/jekyll-spaceship/version.rb
 - logos/jekyll-spaceship-logo.png
@@ -173,5 +174,6 @@ rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to provide powerful supports for table, mathjax, plantuml,
-  mermaid, emoji, video, youtube, vimeo, dailymotion, etc.
+  mermaid, emoji, video, audio, youtube, vimeo, dailymotion, spotify, soundcloud,
+  etc.
 test_files: []

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

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-
-module Jekyll::Spaceship
-  class VideoProcessor < Processor
-    def self.config
-      {
-        'default' => {
-          'id' => 'video-{id}',
-          'class' => 'video',
-          'width' => '100%',
-          'height' => 350,
-          'border' => 0,
-          'style' => 'max-width: 600px',
-          'allow' => 'encrypted-media; picture-in-picture',
-        }
-      }
-    end
-
-    def on_handle_markdown(content)
-      content = handle_normal_video(content)
-      content = handle_youtube(content)
-      content = handle_vimeo(content)
-      content = handle_dailymotion(content)
-    end
-
-    # Examples:
-    # ![video](//www.html5rocks.com/en/tutorials/video/basics/devstories.webm)
-    # ![video](//techslides.com/demos/sample-videos/small.ogv?allow=autoplay)
-    # ![video](//techslides.com/demos/sample-videos/small.mp4?width=400)
-    def handle_normal_video(content)
-      handle_video(content, {
-        host: '(https?:)?\\/\\/.*\\/',
-        id: '(.+?\\.(avi|mp4|webm|ogg|ogv|flv|mkv|mov|wmv|3gp|rmvb|asf))',
-      })
-    end
-
-    # Examples:
-    # ![youtube](https://www.youtube.com/watch?v=XA2WjJbmmoM "title")
-    # ![youtube](http://www.youtube.com/embed/w-m_yZCLF5Q)
-    # ![youtube](//youtu.be/mEP3YXaSww8?height=100%&width=400)
-    def handle_youtube(content)
-      handle_video(content, {
-        host: '(https?:)?\\/\\/.*youtu.*',
-        id: '(?<=\\?v\\=|embed\\/|\\.be\\/)([a-zA-Z0-9\\_\\-]+)',
-        iframe_url: "https://www.youtube.com/embed/"
-      })
-    end
-
-    # Examples:
-    # ![vimeo](https://vimeo.com/263856289)
-    # ![vimeo](https://vimeo.com/263856289?height=100%&width=400)
-    def handle_vimeo(content)
-      handle_video(content, {
-        host: '(https?:)?\\/\\/vimeo\\.com\\/',
-        id: '([0-9]+)',
-        iframe_url: "https://player.vimeo.com/video/"
-      })
-    end
-
-    # Examples:
-    # ![dailymotion](https://www.dailymotion.com/video/x7tgcev)
-    # ![dailymotion](https://dai.ly/x7tgcev?height=100%&width=400)
-    def handle_dailymotion(content)
-      handle_video(content, {
-        host: '(https?:)?\\/\\/.*dai.?ly.*',
-        id: '(?<=video\\/|\\/)([a-zA-Z0-9\\_\\-]+)',
-        iframe_url: "https://www.dailymotion.com/embed/video/"
-      })
-    end
-
-    def handle_video(content, data)
-      host = data[:host]
-      return content if content.sub(/#{host}/, '').nil?
-
-      iframe_url = data[:iframe_url]
-      id = data[:id]
-      url = "(#{host}#{id}\\S*)"
-      title = '("(.*)".*){0,1}'
-
-      # 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]
-        id = match_data[4]
-        title = match_data[6]
-        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
-
-        default = self.config['default']
-        css_id = qs['id'] || default['id']
-        css_class = qs['class'] || default['class']
-        width = qs['width'] || data[:width] || default['width']
-        height = qs['height'] || data[:height] || default['height']
-        frameborder = qs['frameborder'] || default['border']
-        style = qs['style'] || default['style']
-        allow = qs['allow'] || default['allow']
-
-        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
-        end
-
-        html = "<iframe"\
-          " id=\"#{css_id}\""\
-          " class=\"#{css_class}\""\
-          " src=\"#{url}\""\
-          " title=\"#{title}\""\
-          " width=\"#{width}\""\
-          " height=\"#{height}\""\
-          " style=\"#{style}\""\
-          " allow=\"#{allow}\""\
-          " frameborder=\"#{frameborder}\""\
-          " allowfullscreen>" \
-          "</iframe>"
-
-        content = content.gsub(match_data[0], html)
-        self.handled = true
-      end
-      content
-    end
-  end
-end