jekyll-spaceship 0.5.3 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732fde7e5574c855d85c10741f24c63a1ba695c707772f35fe7d4fba5c4f8826
-  data.tar.gz: 72ec0732f4e9cf9ca469a71585ce54c6aca4d10b5964184277ca14d1abcc97ad
+  metadata.gz: 8df3e5c04610d7f6ae766303a8b884e1b3bd0047f72ac489275dd26d133d392a
+  data.tar.gz: '0728453eaace46c6d88aa0395f1d17ae88c17a727aa3be9b10236c222fc3d85e'
 SHA512:
-  metadata.gz: 4cfc08bf4dd2eb0ead97a61b2a6396b8ce79f2c56ac390c2a9cedbd28648d4b51193eaf36a3a005722bb0362245468c66f64b4f5d75f649b0c4bc0d640d5432b
-  data.tar.gz: 8dfcae47fdc9250c4ea68acfe13adecfd348b4e00a24855a6989a6922db959679948ac26d621820d033de2306d2cf8e2973e17eea5aa09f91f77174a7b070f65
+  metadata.gz: 1b5e65d14b80d87ebb06b9e3c5cc7c71f6d654940d58034ab314d232d5ff6614bd3b22649259d3658690b5e94b5c4e6983214a0b3e4bdd91cd03e7702901a51e
+  data.tar.gz: f7a171a023c65ceb729ade833fe7193b05000aa24483c1bd0bc6201c28df47f69d503aa2612a866aba1627fc86626f63d38b7db41b8d75a616805b14f1d71fff

data/.travis.yml

@@ -30,4 +30,5 @@ deploy:
     rvm: 2.3
     tags: true
     repo: jeffreytse/jekyll-spaceship
+  edge: true
   cleanup: false

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,12 @@ 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)
 - [Credits](#credits)
 - [Contributing](#contributing)
 - [License](#license)
@@ -128,14 +131,41 @@ Add jekyll-spaceship plugin in your site's `Gemfile`, and run `bundle install`.
 gem 'jekyll-spaceship'
 ```
 
-Add jekyll-spaceship to the `gems:` section in your site's `_config.yml`.
+Add jekyll-spaceship to the `plugins:` section in your site's `_config.yml`.
 
 ```yml
 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/)
+**💡 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
+  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
 
@@ -501,6 +531,10 @@ $ 2^{\frac{n-1}{3}} $
 $ \int\_a^b f(x)\,dx. $
 ```
 
+Code above would be parsed as:
+
+<image alt="MathJax Expression" height="180" src="https://user-images.githubusercontent.com/9413601/82814245-5a5ed180-9ec9-11ea-9d5b-fba303c627ac.png"></image>
+
 ### 3. PlantUML Usage
 
 [PlantUML](http://plantuml.sourceforge.net/) is a component that allows to quickly write:
@@ -529,6 +563,10 @@ Bob -> Alice : hello
 @enduml
 ```
 
+Code above would be parsed as:
+
+![PlantUML Diagram](https://user-images.githubusercontent.com/9413601/82813883-9180b300-9ec8-11ea-8778-f450e0056938.png)
+
 ### 4. Video Usage
 
 How often did you find yourself googling "**How to embed a video in markdown?**"
@@ -540,6 +578,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:
 
@@ -598,6 +637,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.
@@ -689,6 +743,19 @@ 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.
+
+
 ## Credits
 
 - [Jekyll](https://github.com/jekyll/jekyll) - A blog-aware static site generator in Ruby.

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"
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jekyll", ">= 3.6", "< 5.0"
   spec.add_dependency "nokogiri", "~> 1.6"
+  spec.add_dependency "gemoji", "~> 3.0"
   spec.add_dependency "rainbow", "~> 3.0"
 
   spec.add_development_dependency "bundler"

data/lib/jekyll-spaceship.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
 require 'jekyll-spaceship/cores/logger'
+require 'jekyll-spaceship/cores/config'
 require 'jekyll-spaceship/cores/manager'
 require 'jekyll-spaceship/cores/processor'
 require 'jekyll-spaceship/cores/register'
 
 module Jekyll::Spaceship
   Logger.display_info
-  Register.use 'table-processor'
-  Register.use 'mathjax-processor'
-  Register.use 'plantuml-processor'
-  Register.use 'polyfill-processor'
-  Register.use 'video-processor'
-  Register.use 'emoji-processor'
+  Config.load
 end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Jekyll::Spaceship
+  class Config
+    CONFIG_NAME = 'jekyll-spaceship'
+    DEFAULT_CONFIG = {
+      'processors' => [
+        'table-processor',
+        'mathjax-processor',
+        'plantuml-processor',
+        'polyfill-processor',
+        'video-processor',
+        'emoji-processor'
+      ]
+    }
+
+    @@store = {}
+
+    def self.deep_merge(first, second)
+      merger = proc do |_, f, s|
+        if Hash === f && Hash === s
+          f.merge(s, &merger)
+        elsif Array === f && Array === s
+          s || f
+        else
+          [:undefined, nil, :nil].include?(s) ? f : s
+        end
+      end
+      first.merge(second.to_h, &merger)
+    end
+
+    def self.store(section, default)
+      return if @@store[section].nil?
+      return @@store[section] if default.nil?
+      @@store[section] = deep_merge(@@store[section], default)
+    end
+
+    def self.load(filename = '_config.yml')
+      config = deep_merge(
+        { CONFIG_NAME => DEFAULT_CONFIG },
+        YAML.load_file(File.expand_path(filename))
+      )[CONFIG_NAME]
+      @@store = config
+      self.use_processors(config)
+    end
+
+    def self.use_processors(config)
+      config['processors'].each do |processor|
+        Register.use processor
+      end
+    end
+  end
+end

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

@@ -69,7 +69,8 @@ module Jekyll::Spaceship
     end
 
     def self.ext(page)
-      page.data['ext']
+      ext = page.path.match(/\.\S+$/)
+      ext.to_s.rstrip
     end
 
     def self.output_ext(page)
@@ -112,7 +113,7 @@ module Jekyll::Spaceship
         end
         node.replace Nokogiri::HTML.fragment content
       end
-      page.output = doc.to_html
+      page.output = Processor.escape_html doc.to_html
     end
   end
 end

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

@@ -18,6 +18,7 @@ module Jekyll::Spaceship
 
     attr_reader :page
     attr_reader :logger
+    attr_reader :config
     attr_reader :priority
     attr_reader :registers
     attr_reader :exclusions
@@ -27,11 +28,21 @@ module Jekyll::Spaceship
       self.class.name.split('::').last
     end
 
+    def filename
+      self.name
+        .gsub(/([A-Z]+)([A-Z][a-z])/,'\1-\2')
+        .gsub(/([a-z\d])([A-Z])/,'\1-\2')
+        .tr("_", "-")
+        .downcase
+    end
+
     def initialize()
       self.initialize_priority
       self.initialize_register
       self.initialize_exclusions
       @logger = Logger.new(self.name)
+      @config = Config.store(self.filename, self.class.config)
+      @handled_files = {}
     end
 
     def initialize_priority
@@ -46,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
@@ -72,6 +83,9 @@ module Jekyll::Spaceship
       @@_exclusions = types
     end
 
+    def self.config
+    end
+
     def process?
       Type.html?(output_ext) or Type.markdown?(ext)
     end
@@ -112,6 +126,9 @@ module Jekyll::Spaceship
         end
         if self.respond_to? method
           @page.output = self.send method, @page.output
+          if Type.html? output_ext
+            @page.output = self.class.escape_html(@page.output)
+          end
         end
       end
     end
@@ -127,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
 
@@ -136,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
@@ -153,10 +173,20 @@ 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
     end
+
+    def self.escape_html(content)
+      # escape link
+      content.scan(/((https?:)?\/\/\S+\?[a-zA-Z0-9%\-_=\.&;]+)/) do |result|
+        result = result[0]
+        link = result.gsub('&', '&')
+        content = content.gsub(result, link)
+      end
+      content
+    end
   end
 end

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

@@ -1,65 +1,40 @@
 # frozen_string_literal: true
 
 require 'net/http'
-require 'uri'
 require 'json'
+require 'gemoji'
 
 module Jekyll::Spaceship
   class EmojiProcessor < Processor
-    EMOJI_MARKUP_HOST = 'https://api.github.com/emojis'
-    EMOJI_MARKUP_DATA = {}
-
-    def initialize
-      super()
-      self.initialize_emoji_data
-    end
-
-    def initialize_emoji_data
-      EMOJI_MARKUP_DATA.update get_emoji_markup_data
+    def self.config
+      { 'src' => 'https://github.githubassets.com/images/icons/emoji/' }
     end
 
     def on_handle_html(content)
-      return content if EMOJI_MARKUP_DATA.size.zero?
       # handle emoji markup
-      content.scan(/:([\w+-]+):/) do |match_data|
-        emoji_markup = match_data[0]
-        emoji_image = EMOJI_MARKUP_DATA[emoji_markup]
-        next if emoji_image.nil?
+      content.scan(/:([\w\d+-]+):/) do |match|
+        emoji = Emoji.find_by_alias match[0]
+        next if emoji.nil?
         self.handled = true
 
-        # convert hex string to unicode
-        unicode = emoji_image.match(/unicode\/([\d\w]+)/)
-        if unicode[1]
-          unicode = "0x#{unicode[1]}".to_i(16)
-          alt = [unicode].pack('U*')
-        end
-        alt = emoji_markup if alt.nil?
+        # escape plus sign
+        emoji_name = emoji.name.gsub('+', '\\\+')
 
         content = content.gsub(
-          ":#{emoji_markup}:",
-          "<image class=\"emoji\" \
-            title=\"#{emoji_markup}\" \
-            alt=\"#{alt}\" \
-            src=\"#{emoji_image}\" \
-            style=\"vertical-align: middle; \
-            max-width: 1em; visibility: hidden;\" \
-            onload=\"this.style.visibility='visible'\" \
-            onerror=\"this.replaceWith(this.alt)\"> \
-          </image>"
+          /(?<!\=")\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>"
         )
       end
       content
     end
-
-    def get_emoji_markup_data
-      data = {}
-      begin
-        source = Net::HTTP.get URI(EMOJI_MARKUP_HOST)
-        data = JSON.parse(source)
-      rescue StandardError => msg
-        logger.log msg
-      end
-      data
-    end
   end
 end

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
@@ -18,13 +27,8 @@ module Jekyll::Spaceship
 
       self.handled = true
 
-      params = "config=TeX-AMS-MML_HTMLorMML"
-      src = "//cdn.mathjax.org/mathjax/latest/MathJax.js?#{params}"
-      config = "MathJax.Hub.Config({ \
-        tex2jax: { inlineMath: [['$','$'], ['\\\\(','\\\\)']] } \
-      });"
-
-      head.add_child("<script src=\"#{src}\">#{config}</script>")
+      cfg = "MathJax.Hub.Config(#{config['config'].to_json});"
+      head.add_child("<script src=\"#{config['src']}\">#{cfg}</script>")
 
       doc.to_html
     end

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

@@ -1,24 +1,36 @@
 # frozen_string_literal: true
 
+require "net/http"
 require "base64"
 
 module Jekyll::Spaceship
-  class PlantUMLProcessor < Processor
+  class PlantumlProcessor < Processor
     exclude :none
 
-    PLANT_UML_HOST = 'http://www.plantuml.com/plantuml/png/'
+    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$)/)
@@ -32,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)
@@ -46,12 +56,12 @@ module Jekyll::Spaceship
       data = self.get_plantuml_img_data(code)
 
       # return img tag
-      "<img src=\"#{data}\">"
+      "<img class=\"plantuml\" src=\"#{data}\">"
     end
 
     def get_plantuml_img_data(code)
       data = ''
-      url = "#{PLANT_UML_HOST}#{code}"
+      url = "#{config['src']}#{code}"
       begin
         data = Net::HTTP.get URI(url)
         data = Base64.encode64(data)

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,24 +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 \
-          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.5.3"
+    VERSION = "0.6.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.3
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: gemoji
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ files:
 - Rakefile
 - jekyll-spaceship.gemspec
 - lib/jekyll-spaceship.rb
+- lib/jekyll-spaceship/cores/config.rb
 - lib/jekyll-spaceship/cores/logger.rb
 - lib/jekyll-spaceship/cores/manager.rb
 - lib/jekyll-spaceship/cores/processor.rb
@@ -157,5 +172,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: []