jekyll-spaceship 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3414a157fe1966031e109e08be4805790638d24fa4f7197bf74fc231b69778
-  data.tar.gz: 95b7d289cd489e28c09902ff5b7f6e35229847cab376df5be9bbab3434f4e41f
+  metadata.gz: df761631c9d2636245947978d30acc90b604f9ebd7dbfb047350cff020f80709
+  data.tar.gz: 6eb135842d1d1e2f6eb87817a8bbdf7d2c1126a3c0e935e6275ee8ef5dd36a26
 SHA512:
-  metadata.gz: 27e7c3291a2994b03b8670a920ff8cb9d8727a1986debc19d1cf1a92989fc651790353cf29811d2cead664bf999fb0cb77ebb676b5af5773192b8d934e3ce90d
-  data.tar.gz: fde58815d50920a1c1c9b4c6694b0600e7a02102bd2d86edad24db469487942e9fdad477a70c567afbcd8e527275bc093328b7b0e75627ed0c194247155361d4
+  metadata.gz: 9675c39c1174d6420d08081d52a802865ef0a3773df936ad01cc29323a7d4287af07176328237de283a087154d86e8a3e92cd19e67a4b9ac1dae38e418a21c47
+  data.tar.gz: b3c0d6b610fed90ca7017b25f5e08c880188f5ea9c68f7645e1027f9e8a8fb32b80b0dbc97e446d00a24346f86fbbeb394fea925a2d018af6d68c9e71368f570

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

@@ -13,19 +13,7 @@ module Jekyll::Spaceship
         '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/'
-      }
+      ]
     }
 
     @@store = {}
@@ -43,8 +31,10 @@ 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(@@store[section], default)
     end
 
     def self.load(filename = '_config.yml')

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
 

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,6 +7,10 @@ module Jekyll::Spaceship
   class PlantumlProcessor < Processor
     exclude :none
 
+    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(

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'] || ''
+        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.1"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -172,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: []