jekyll-spaceship 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abfd1cf82bdc535d470ecc9e5397dca1e1e82456897fdf7ee2035bb62ae19f4
-  data.tar.gz: bab5a4df56d4ac49a1f9b2838b9a05d1ef5e720e9a0cb7838cc9db23a0a211a0
+  metadata.gz: 38acd43c5d713728eb8beefc21a41ccff0404503138429c5fc695d5a92b0fbb5
+  data.tar.gz: aa0e6b588b3f778ef332ec83604ba26a3d238de34bfb458a7f85d1c3b006c0f5
 SHA512:
-  metadata.gz: ddb2c1c75889ada85e605ee06db3f67aa11392c2774d8db3115ced6fafecd4dcdb3d60bef85677502f511926cfaf358227bfe12aad10d622a0726e7e9d3802a2
-  data.tar.gz: 00c0d8b4656c3c14db2a78742033cb7cb9d0b41d86bce8a45b7f332175ce1ec24a55aa32c3bf811d506b4ba07a354ae391ac46f06f71d2e5a790f0025648eae1
+  metadata.gz: 53ad3ff1458d8b5a1cde457ec7fa34672680f334fddb1613ebec356a461f0c7217faea14e361f0e022b3dceb7789d0ff7fa5d069d95c190343008d9485630f76
+  data.tar.gz: 97606894a42e2fa2fc34e66fb9b3cbb6013587696ed70bf8153a9b5bd2cf81f6444ee9337d13d672f3c3afe3c504039fd754b51deee9324c3df6287bee7c6b53

data/README.md

@@ -64,8 +64,8 @@
 
 <div align="center">
   <h4>
-    <a href="#requirements">Requirements</a> |
     <a href="#installation">Install</a> |
+    <a href="#configuration">Config</a> |
     <a href="#usage">Usage</a> |
     <a href="#credits">Credits</a> |
     <a href="#license">License</a>
@@ -80,10 +80,10 @@
 <br>
 
 
-A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, emoji, youtube, vimeo, dailymotion, etc.
+Spaceship is a minimalistic, powerful and extremely customizable [Jekyll](https://jekyllrb.com/) plugin. It combines everything you may need for convenient work, without unnecessary complications, like a real spaceship.
 
 <p align="center">
-    <img alt="Jekyll Spaceship Demo" src="https://user-images.githubusercontent.com/9413601/82250463-15451780-997e-11ea-8809-f411586d9508.gif" alt="Donate (Ko-fi)" />
+    <img alt="Jekyll Spaceship Demo" src="https://user-images.githubusercontent.com/9413601/82250463-15451780-997e-11ea-8809-f411586d9508.gif" />
 </p>
 
 **💡 Tip:** I hope you enjoy using this plugin. If you like this project, **a little star** for it is your way make a clear statement: **My work is valued**. I would appreciate your support! _Thank you!_
@@ -93,6 +93,7 @@ A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, emoji
 
 - [Requirements](#requirements)
 - [Installation](#installation)
+- [Configuration](#configuration)
 - [Usage](#usage)
   - [1. Table Usage](#1-table-usage)
     - [1.1 Rowspan and Colspan](#rowspan-and-colspan)
@@ -108,10 +109,13 @@ A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, emoji
     - [4.1 Youtube Usage](#youtube-usage)
     - [4.2 Vimeo Usage](#vimeo-usage)
     - [4.3 DailyMotion Usage](#dailymotion-usage)
+    - [4.4 General Video Usage](#general-video-usage)
   - [5. Hybrid HTML with Markdown](#5-hybrid-html-with-markdown)
   - [6. Markdown Polyfill](#6-markdown-polyfill)
     - [6.1 Escape Ordered List](#escape-ordered-list)
   - [7. Emoji Usage](#7-emoji-usage)
+    - [7.1 Emoji Customizing](#71-emoji-customizing)
+  - [8. Modifying Element Usage](#8-modifying-element-usage)
 - [Credits](#credits)
 - [Contributing](#contributing)
 - [License](#license)
@@ -137,6 +141,34 @@ 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. [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))
 
+## Configuration
+
+This plugin runs with the following configuration options by default. Alternative settings for these options can be explicitly specified in the configuration file `_config.yml`.
+
+```yml
+# Where things are
+jekyll-spaceship:
+  processors:
+    - table-processor
+    - mathjax-processor
+    - plantuml-processor
+    - polyfill-processor
+    - video-processor
+    - emoji-processor
+    - element-processor
+  mathjax-processor:
+    src:  //cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
+    config:
+      tex2jax:
+        inlineMath:
+          - ['$','$']
+          - ['\(','\)']
+  plantuml-processor:
+    src: http://www.plantuml.com/plantuml/png/
+  emoji-processor:
+    src: https://github.githubassets.com/images/icons/emoji/
+```
+
 ## Usage
 
 ### 1. Table Usage
@@ -548,6 +580,7 @@ While its not possible to embed a video in markdown, the best and easiest way is
 - Youtube
 - Vimeo
 - DailyMotion
+- General Video ( mp4 | avi | webm | ogg | ogv | 3gp | flv | mov ... )
 
 There are two ways to embed a video in your Jekyll blog page:
 
@@ -606,6 +639,21 @@ the link as below:
 ![](https://dai.ly/x7tgcev?width=100%&height=400)
 ```
 
+#### General Video Usage
+
+```markdown
+![](//www.html5rocks.com/en/tutorials/video/basics/devstories.webm)
+```
+
+```markdown
+![](//techslides.com/demos/sample-videos/small.ogv?allow=autoplay)
+```
+
+```markdown
+![](//techslides.com/demos/sample-videos/small.mp4?width=400)
+```
+
+
 ### 5. Hybrid HTML with Markdown
 
 As markdown is not only a lightweight markup language with plain-text-formatting syntax, but also an easy-to-read and easy-to-write plain text format, so writing a hybrid HTML with markdown is an awesome choice.
@@ -697,12 +745,114 @@ I give this plugin two :+1:!
 
 I give this plugin two :+1:!
 
+#### 7.1 Emoji Customizing
+
+If you'd like to serve emoji images locally, or use a custom emoji source, you can specify so in your `_config.yml` file:
+
+```yml
+jekyll-spaceship:
+  emoji-processor:
+    src: "/assets/images/emoji"
+```
+
+See the [Gemoji](https://github.com/github/gemoji) documentation for generating image files.
+
+### 8. Modifying Element Usage
+
+It allows us to modify elements via `CSS3 selectors`. Through it you can easily
+modify the attributes of an element tag, replace the children nodes and so on, 
+it's very flexible, but here is example usage for modifying a document:
+
+```yml
+# Here is a comprehensive example
+jekyll-spaceship:
+  element-processor:
+    css:
+      - a: '<h1>Test</h1>'                     # Replace all `a` tags (String Style)
+      - ['a.link1', 'a.link2']:                # Replace all `a.link1`, `a.link2` tags (Hash Style)
+          name: img                            # Replace element tag name
+          props:                               # Replace element properties
+            title: Good image                  # Add a title attribute
+            src: ['(^.*$)', '\0?a=123']        # Add query string to src attribute by regex pattern
+            style:                             # Add style attribute (Hash Style)
+              color: red
+              font-size: '1.2em'
+          children:                            # Add children to the element
+            -                                  # First empty for adding after the last child node
+            - "<span>Google</span>"            # First child node (String Style)
+            -                                  # Middle empty for wrapping the children nodes
+            - name: span                       # Second child node (Hash Style)
+              props:
+                prop1: "1"                     # Custom property1
+                prop2: "2"                     # Custom property2
+                prop3: "3"                     # Custom property3
+              children:                        # Add nested chidren nodes
+                - "<span>Jekyll</span>"        # First child node (String Style)
+                - name: span                   # Second child node (Hash Style)
+                  props:                       # Add attributes to child node (Hash Style)
+                    prop1: "a"
+                    prop2: "b"
+                    prop3: "c"
+                  children: "<b>Yap!</b>"      # Add children nodes (String Style)
+            -                                  # Last empty for adding before the first child node
+      - a.link: '<a href="//t.com">Link</a>'   # Replace all `a.link` tags (String Style)
+      - 'h1#title':                            # Replace `h1#title` tags (Hash Style)
+          children: I'm a title!               # Replace inner html to new text
+```
+
+#### Example 1
+
+Automatically adds a `target="_blank" rel="noopener noreferrer"` attribute to all external links in Jekyll's content.
+
+```yml
+jekyll-spaceship:
+  element-processor:
+    css:
+      - a:                                     # Replce all `a` tags
+          props:
+            class: ['(^.*$)', '\0 ext-link']   # Add `ext-link` to class by regex pattern
+            target: _blank                     # Replace `target` value to `_blank`
+            rel: noopener noreferrer           # Replace `rel` value to `noopener noreferrer`
+```
+
+#### Example 2
+
+Automatically adds `loading="lazy"` to `img` and `iframe` tags to natively load lazily.
+[Browser support](https://caniuse.com/#feat=loading-lazy-attr) is growing. If a browser does not support the `loading` attribute, it will load the resource just like it would normally.
+
+```yml
+jekyll-spaceship:
+  element-processor:
+    css:
+      - a:                                     # Replce all `a` tags
+          props:                               #
+            loading: lazy                      # Replace `lading` value to `lazy`
+```
+
+In case you want to prevent loading some images/iframes lazily, add
+`loading="eager"` to their tags. This might be useful to prevent flickering of
+images during navigation (e.g. the site's logo).
+
+See the following examples to prevent lazy loading.
+
+```yml
+jekyll-spaceship:
+  element-processor:
+    css:
+      - a:                                     # Replce all `a` tags
+          props:                               #
+            loading: eager                     # Replace `loading` value to `eager`
+```
+
+
 ## Credits
 
 - [Jekyll](https://github.com/jekyll/jekyll) - A blog-aware static site generator in Ruby.
 - [MultiMarkdown](https://fletcher.github.io/MultiMarkdown-6) - Lightweight markup processor to produce HTML, LaTeX, and more.
 - [markdown-it-multimd-table](https://github.com/RedBug312/markdown-it-multimd-table) - Multimarkdown table syntax plugin for markdown-it markdown parser.
 - [jmoji](https://github.com/jekyll/jemoji) - GitHub-flavored emoji plugin for Jekyll.
+- [jekyll-target-blank](https://github.com/keithmifsud/jekyll-target-blank) - Automatically opens external links in a new browser for Jekyll Pages, Posts and Docs.
+- [jekyll-loading-lazy](https://github.com/gildesmarais/jekyll-loading-lazy) - Automatically adds loading="lazy" to img and iframe tags to natively load lazily.
 
 ## Contributing
 

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, emoji, youtube, vimeo, dailymotion, etc."
+  spec.summary       = "A Jekyll plugin to provide powerful supports for table, mathjax, plantuml, emoji, video, youtube, vimeo, dailymotion, etc."
   spec.homepage      = "https://github.com/jeffreytse/jekyll-spaceship"
   spec.license       = "MIT"
 

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

@@ -12,20 +12,9 @@ module Jekyll::Spaceship
         'plantuml-processor',
         'polyfill-processor',
         'video-processor',
-        'emoji-processor'
-      ],
-      'mathjax-processor' => {
-        'src' => '//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML',
-        'config' => {
-          'tex2jax' => { 'inlineMath' => [['$','$'], ['\\(','\\)']] }
-        }
-      },
-      'plantuml-processor' => {
-        'src' => 'http://www.plantuml.com/plantuml/png/'
-      },
-      'emoji-processor' => {
-        'src' => 'https://github.githubassets.com/images/icons/emoji/'
-      }
+        'emoji-processor',
+        'element-processor'
+      ]
     }
 
     @@store = {}
@@ -43,14 +32,16 @@ module Jekyll::Spaceship
       first.merge(second.to_h, &merger)
     end
 
-    def self.store(section)
-      @@store[section]
+    def self.store(section, default)
+      return if @@store[section].nil?
+      return @@store[section] if default.nil?
+      @@store[section] = deep_merge(default, @@store[section])
     end
 
-    def self.load(filename = '_config.yml')
+    def self.load(config = self.site_config)
       config = deep_merge(
         { CONFIG_NAME => DEFAULT_CONFIG },
-        YAML.load_file(File.expand_path(filename))
+        config
       )[CONFIG_NAME]
       @@store = config
       self.use_processors(config)
@@ -61,5 +52,9 @@ module Jekyll::Spaceship
         Register.use processor
       end
     end
+
+    def self.site_config
+      Jekyll.sites.first.config
+    end
   end
 end

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

@@ -41,7 +41,8 @@ module Jekyll::Spaceship
       self.initialize_register
       self.initialize_exclusions
       @logger = Logger.new(self.name)
-      @config = Config.store(self.filename)
+      @config = Config.store(self.filename, self.class.config)
+      @handled_files = {}
     end
 
     def initialize_priority
@@ -56,7 +57,7 @@ module Jekyll::Spaceship
     def initialize_register
       if @@_registers.size.zero?
         self.class.register :pages, :pre_render, :post_render
-        self.class.register :posts, :pre_render, :post_render
+        self.class.register :documents, :pre_render, :post_render
       end
       @registers = Array.new @@_registers
       @@_registers.clear
@@ -82,6 +83,9 @@ module Jekyll::Spaceship
       @@_exclusions = types
     end
 
+    def self.config
+    end
+
     def process?
       Type.html?(output_ext) or Type.markdown?(ext)
     end
@@ -140,7 +144,10 @@ module Jekyll::Spaceship
     end
 
     def on_handled
-      file = page.path.gsub(/.*_posts\//, '')
+      source = page.site.source
+      file = page.path.sub(/^#{source}\//, '')
+      return if @handled_files.has_key? file
+      @handled_files[file] = true
       logger.log file
     end
 
@@ -149,13 +156,13 @@ module Jekyll::Spaceship
       @exclusions.each do |type|
         regex = nil
         if type == :code
-          regex = /(`{3}\s*(\w*)((?:.|\n)*?)`{3})/
+          regex = /((`+)\s*(\w*)((?:.|\n)*?)\2)/
         end
         next if regex.nil?
         content.scan(regex) do |match_data|
           match = match_data[0]
           id = @exclusion_store.size
-          content = content.gsub(match, "[//]: JEKYLL_EXCLUDE_##{id}")
+          content = content.sub(match, "[JEKYLL@#{object_id}@#{id}]")
           @exclusion_store.push match
         end
       end
@@ -166,7 +173,7 @@ module Jekyll::Spaceship
       while @exclusion_store.size > 0
         match = @exclusion_store.pop
         id = @exclusion_store.size
-        content = content.gsub("[//]: JEKYLL_EXCLUDE_##{id}", match)
+        content = content.sub("[JEKYLL@#{object_id}@#{id}]", match)
       end
       @exclusion_store = []
       content

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

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require 'nokogiri'
+
+module Jekyll::Spaceship
+  class ElementProcessor < Processor
+    priority :lowest
+
+    def self.config
+      { 'css' => [] }
+    end
+
+    def on_handle_html(content)
+      return content if config['css'].size.zero?
+
+      # use nokogiri to parse html content
+      doc = Nokogiri::HTML(content)
+
+      # handle each css pattern
+      config['css'].each do |data|
+        data.each do |key, val|
+          key = [key] if key.kind_of? String
+          key.each do |pattern|
+            nodes = doc.css(pattern)
+            nodes.each do |element|
+              handle_css_pattern({
+                :doc => doc,
+                :element => element,
+                :data => val
+              })
+            end
+            self.handled = true
+          end
+        end
+      end
+
+      doc.to_html
+    end
+
+    def handle_css_pattern(data)
+      doc = data[:doc]
+      element = data[:element]
+      data = data[:data]
+
+      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({
+          :doc => doc,
+          :data => data['children']
+        })
+
+        # 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
+
+    def create_children(data)
+      doc = data[:doc]
+      data = data[:data]
+      root = Nokogiri::HTML.fragment("")
+
+      data = [data] unless data.kind_of? Array
+      data.each do |child_data|
+        node = self.create_element({
+          :doc => doc,
+          :data => child_data
+        })
+        next if node.nil?
+        unless child_data['children'].nil?
+          node.children = self.create_children({
+            :doc => doc,
+            :data => child_data['children']
+          })
+        end
+        root.add_child node
+      end
+      root.children
+    end
+
+    def create_element(data)
+      doc = data[:doc]
+      data = data[:data]
+
+      return if data.nil?
+      return Nokogiri::HTML.fragment(data) if data.kind_of? String
+      return if data['name'].nil?
+
+      # create node
+      node = doc.create_element(data['name'])
+
+      # set props
+      data['props']&.each do |prop, val|
+        if val.kind_of? Hash
+          result = []
+          val.each { |k, v| result.push "#{k}: #{v}" }
+          val = result.join(";")
+        end
+        node.set_attribute(prop, val)
+      end
+      node
+    end
+  end
+end

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

@@ -6,6 +6,10 @@ require 'gemoji'
 
 module Jekyll::Spaceship
   class EmojiProcessor < Processor
+    def self.config
+      { 'src' => 'https://github.githubassets.com/images/icons/emoji/' }
+    end
+
     def on_handle_html(content)
       # handle emoji markup
       content.scan(/:([\w\d+-]+):/) do |match|
@@ -18,16 +22,16 @@ module Jekyll::Spaceship
 
         content = content.gsub(
           /(?<!\=")\s*:#{emoji_name}:\s*(?!"\s)/,
-          "<img class=\"emoji\" \
-            title=\":#{emoji.name}:\" \
-            alt=\":#{emoji.name}:\" \
-            raw=\"#{emoji.raw}\" \
-            src=\"#{config['src']}#{emoji.image_filename}\" \
-            style=\"vertical-align: middle; \
-            max-width: 1em; visibility: hidden;\" \
-            onload=\"this.style.visibility='visible'\" \
-            onerror=\"this.replaceWith(this.getAttribute('raw'))\"> \
-          </img>"
+          "<img class=\"emoji\""\
+            " title=\":#{emoji.name}:\""\
+            " alt=\":#{emoji.name}:\""\
+            " raw=\"#{emoji.raw}\""\
+            " src=\"#{config['src']}#{emoji.image_filename}\""\
+            " style=\"vertical-align: middle;"\
+            " max-width: 1em; visibility: hidden;\""\
+            " onload=\"this.style.visibility='visible'\""\
+            " onerror=\"this.replaceWith(this.getAttribute('raw'))\">"\
+          "</img>"
         )
       end
       content

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

@@ -4,6 +4,15 @@ require "nokogiri"
 
 module Jekyll::Spaceship
   class MathjaxProcessor < Processor
+    def self.config
+      {
+        'src' => '//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML',
+        'config' => {
+          'tex2jax' => { 'inlineMath' => [['$','$'], ['\\(','\\)']] }
+        }
+      }
+    end
+
     def process?
       return true if Type.html?(output_ext)
     end

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

@@ -7,17 +7,30 @@ module Jekyll::Spaceship
   class PlantumlProcessor < Processor
     exclude :none
 
+    PLANTUML_PATTERNS = [
+      /(\\?(@startuml)((?:.|\n)*?)@enduml)/,
+      /((`{3,})\s*plantuml((?:.|\n)*?)\2)/
+    ]
+
+    def self.config
+      { 'src' => 'http://www.plantuml.com/plantuml/png/' }
+    end
+
     def on_handle_markdown(content)
       # match default plantuml block and code block
-      pattern = Regexp.union(
-        /(\\?@startuml((?:.|\n)*?)@enduml)/,
-        /(`{3}\s*plantuml((?:.|\n)*?)`{3})/
-      )
+      PLANTUML_PATTERNS.each do |pattern|
+        content = handle_plantuml_block(pattern, content)
+      end
 
+      # handle escape default plantuml block
+      content.gsub(/\\(@startuml|@enduml)/, '\1')
+    end
+
+    def handle_plantuml_block(pattern, content)
       content.scan pattern do |match|
         match = match.select { |m| not m.nil? }
         block = match[0]
-        code = match[1]
+        code = match[2]
 
         # skip escape default plantuml block
         if block.match(/(^\\@startuml|\\@enduml$)/)
@@ -31,9 +44,7 @@ module Jekyll::Spaceship
           handle_plantuml(code)
         )
       end
-
-      # handle escape default plantuml block
-      content.gsub(/\\(@startuml|@enduml)/, '\1')
+      content
     end
 
     def handle_plantuml(code)

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

@@ -157,7 +157,7 @@ module Jekyll::Spaceship
       if scope.table.multi_row_cells != cells and scope.table.multi_row_start
         for i in 0...scope.table.multi_row_cells.count do
           multi_row_cell = scope.table.multi_row_cells[i]
-          multi_row_cell.content += "  \n#{cells[i].content}"
+          multi_row_cell.inner_html += "<br>#{cells[i].inner_html}"
         end
         row.remove
       end
@@ -182,7 +182,7 @@ module Jekyll::Spaceship
       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}/, '')
-        span_cell.content += "  \n#{cell.content}"
+        span_cell.inner_html += "<br>#{cell.inner_html}"
         rowspan = span_cell.get_attribute('rowspan') || 1
         rowspan = rowspan.to_i + 1
         span_cell.set_attribute('rowspan', "#{rowspan}")
@@ -207,11 +207,12 @@ module Jekyll::Spaceship
         align += 2
       end
 
+      # handle text align
+      return if align == 0
+
       # handle escape colon
       cell.content = cell.content.gsub(/\\:/, ':')
 
-      # handle text align
-      return if align == 0
       style = cell.get_attribute('style')
       if align == 1
         align = 'text-align: left'
@@ -234,8 +235,10 @@ module Jekyll::Spaceship
       cell = data.cell
       cvter = self.converter('markdown')
       return if cvter.nil?
-      content = cell.content.gsub(/(?<!\\)\|/, '\\|')
-      content = cvter.convert(content.strip)
+      content = cell.inner_html
+        .gsub(/(?<!\\)\|/, '\\|')
+        .gsub(/^\s+|\s+$/, '')
+      content = cvter.convert(content)
       cell.inner_html = Nokogiri::HTML.fragment(content)
     end
   end

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

@@ -5,11 +5,23 @@ require 'uri'
 module Jekyll::Spaceship
   class VideoProcessor < Processor
     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)
@@ -29,9 +41,7 @@ module Jekyll::Spaceship
       handle_video(content, {
         host: '(https?:)?\\/\\/vimeo\\.com\\/',
         id: '([0-9]+)',
-        iframe_url: "https://player.vimeo.com/video/",
-        width: 600,
-        height: 350
+        iframe_url: "https://player.vimeo.com/video/"
       })
     end
 
@@ -77,25 +87,30 @@ module Jekyll::Spaceship
           next true if v == id or v == ''
         end
 
-        width = qs['width'] || data[:width] || 600
-        height = qs['height'] || data[:height] || 400
-        style = "max-width: 100%" if width.nil?
+        css_id = qs['id'] || "video-#{id}"
+        css_class = qs['class'] || 'video'
+        width = qs['width'] || data[:width] || "100%"
+        height = qs['height'] || data[:height] || 350
+        frameborder = qs['frameborder'] || 0
+        style = qs['style'] || 'max-width: 600px'
+        allow = qs['allow'] || "encrypted-media; picture-in-picture"
 
-        url = URI("#{iframe_url}#{id}").tap do |v|
+        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 \
-          class=\"video\" \
-          src=\"#{url}\" \
-          title=\"#{title}\" \
-          width=\"#{width}\" \
-          height=\"#{height}\" \
-          style=\"#{style}\" \
-          allow=\"autoplay; encrypted-media\" \
-          frameborder=\"0\" \
-          allowfullscreen=\"\">\
-          </iframe>"
+        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

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.6.0"
+    VERSION = "0.7.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -137,6 +137,7 @@ files:
 - lib/jekyll-spaceship/cores/processor.rb
 - lib/jekyll-spaceship/cores/register.rb
 - lib/jekyll-spaceship/cores/type.rb
+- 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/plantuml-processor.rb
@@ -172,5 +173,5 @@ rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to provide powerful supports for table, mathjax, plantuml,
-  emoji, youtube, vimeo, dailymotion, etc.
+  emoji, video, youtube, vimeo, dailymotion, etc.
 test_files: []