jekyll-spaceship 0.4.0 → 0.5.0

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

@@ -5,7 +5,7 @@ require "nokogiri"
 module Jekyll::Spaceship
   class MathjaxProcessor < Processor
     def process?
-      return true if html?(output_ext)
+      return true if Type.html?(output_ext)
     end
 
     def on_handle_html(content)
@@ -20,7 +20,10 @@ module Jekyll::Spaceship
 
       params = "config=TeX-AMS-MML_HTMLorMML"
       src = "//cdn.mathjax.org/mathjax/latest/MathJax.js?#{params}"
-      config = "MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});"
+      config = "MathJax.Hub.Config({ \
+        tex2jax: { inlineMath: [['$','$'], ['\\\\(','\\\\)']] } \
+      });"
+
       head.add_child("<script src=\"#{src}\">#{config}</script>")
 
       doc.to_html
@@ -28,7 +31,10 @@ module Jekyll::Spaceship
 
     def has_mathjax_expression?(doc)
       doc.css('*').each do |node|
-        if node.content.match(/\$.+\$/)
+        if node.content.match(/(?<!\\)\$.+(?<!\\)\$/)
+          return true
+        end
+        if node.content.match(/(?<!\\)\\\(.+(?<!\\)\\\)/)
           return true
         end
       end

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

@@ -2,6 +2,8 @@
 
 module Jekyll::Spaceship
   class PlantUMLProcessor < Processor
+    exclude :none
+
     def on_handle_markdown(content)
       # match default plantuml block and code block
       pattern = Regexp.union(

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

@@ -7,7 +7,7 @@ module Jekyll::Spaceship
     def on_handle_markdown(content)
       # escape ordered list.
       rexp = /(\s*)(?<!\\)\\(?=\d+\.)/
-      self.handled = true if content.match?(rexp)
+      self.handled = true if content.match(rexp)
       content.gsub(rexp, '\1&#8291;')
     end
   end

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

@@ -46,23 +46,7 @@ module Jekyll::Spaceship
       # use nokogiri to parse html content
       doc = Nokogiri::HTML(content)
 
-      data = OpenStruct.new(_: OpenStruct.new)
-      data.reset = ->(scope, namespace = nil) {
-        data._.marshal_dump.each do |key, val|
-          if namespace == key or namespace.nil?
-            data._[key][scope] = OpenStruct.new
-          end
-        end
-      }
-      data.scope = ->(namespace) {
-        if not data._[namespace]
-          data._[namespace] = OpenStruct.new(
-            table: OpenStruct.new,
-            row: OpenStruct.new
-          )
-        end
-        data._[namespace]
-      }
+      data = self.table_scope_data
 
       # handle each table
       doc.css('table').each do |table|
@@ -96,45 +80,65 @@ module Jekyll::Spaceship
       doc.to_html
     end
 
+    def table_scope_data
+      data = OpenStruct.new(_: OpenStruct.new)
+      data.reset = ->(scope, namespace = nil) {
+        data._.marshal_dump.each do |key, val|
+          if namespace == key or namespace.nil?
+            data._[key][scope] = OpenStruct.new
+          end
+        end
+      }
+      data.scope = ->(namespace) {
+        if not data._[namespace]
+          data._[namespace] = OpenStruct.new(
+            table: OpenStruct.new,
+            row: OpenStruct.new
+          )
+        end
+        data._[namespace]
+      }
+      data
+    end
+
     def handle_colspan(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
-      scope_row = scope.row
       cells = data.cells
       cell = data.cell
 
-      if scope_table.row != data.row
-        scope_table.row = data.row
-        scope_row.colspan = 0
+      if scope.table.row != data.row
+        scope.table.row = data.row
+        scope.row.colspan = 0
       end
 
       # handle colspan
-      result = cell.content.match(/(\s*\|)+$/)
-      if cell == cells.last and scope_row.colspan > 0
-        range = (cells.count - scope_row.colspan)...cells.count
+      if cell == cells.last and scope.row.colspan > 0
+        range = (cells.count - scope.row.colspan)...cells.count
         for i in range do
           cells[i].remove
         end
       end
-      if result
-        result = result[0]
-        scope_row.colspan += result.scan(/\|/).count
-        cell.content = cell.content.gsub(/(\s*\|)+$/, '')
-        cell.set_attribute('colspan', scope_row.colspan + 1)
-      end
+
+      result = cell.content.match(/(\s*\|)+$/)
+      return if result.nil?
+
+      cell.content = cell.content.gsub(/(\s*\|)+$/, '')
+      result = result[0]
+      colspan = result.scan(/\|/).count
+      scope.row.colspan += colspan
+      cell.set_attribute('colspan', colspan + 1)
     end
 
     def handle_multi_rows(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
       cells = data.cells
       row = data.row
       cell = data.cell
 
-      if scope_table.table != data.table
-        scope_table.table = data.table
-        scope_table.multi_row_cells = nil
-        scope_table.multi_row_start = false
+      if scope.table.table != data.table
+        scope.table.table = data.table
+        scope.table.multi_row_cells = nil
+        scope.table.multi_row_start = false
       end
 
       # handle multi-rows
@@ -143,41 +147,38 @@ module Jekyll::Spaceship
       match = cell.content.match(/(?<!\\)\\\s*$/)
       if match
         cell.content = cell.content.gsub(/(?<!\\)\\\s*$/, '')
-        if not scope_table.multi_row_start
-          scope_table.multi_row_cells = cells
-          scope_table.multi_row_start = true
+        if not scope.table.multi_row_start
+          scope.table.multi_row_cells = cells
+          scope.table.multi_row_start = true
         end
       end
 
-      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]
+      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}"
         end
         row.remove
       end
-      scope_table.multi_row_start = false if not match
+      scope.table.multi_row_start = false if not match
     end
 
     def handle_rowspan(data)
       scope = data.scope.call __method__
-      scope_table = scope.table
-      scope_row = scope.row
       cell = data.cell
       cells = data.cells
 
-      if scope_table.table != data.table
-        scope_table.table = data.table
-        scope_table.span_row_cells = []
+      if scope.table.table != data.table
+        scope.table.table = data.table
+        scope.table.span_row_cells = []
       end
-
-      if scope_row.row != data.row
-        scope_row.row = data.row
-        scope_row.col_index = 0
+      if scope.row.row != data.row
+        scope.row.row = data.row
+        scope.row.col_index = 0
       end
 
       # handle rowspan
-      span_cell = scope_table.span_row_cells[scope_row.col_index]
+      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}"
@@ -186,10 +187,9 @@ module Jekyll::Spaceship
         span_cell.set_attribute('rowspan', "#{rowspan}")
         cell.remove
       else
-        scope_table.span_row_cells[scope_row.col_index] = cell
+        scope.table.span_row_cells[scope.row.col_index] = cell
       end
-
-      scope_row.col_index += 1
+      scope.row.col_index += [cell.get_attribute('colspan').to_i, 1].max
     end
 
     def handle_text_align(data)
@@ -211,7 +211,6 @@ module Jekyll::Spaceship
 
       # handle text align
       return if align == 0
-
       style = cell.get_attribute('style')
       if align == 1
         align = 'text-align: left'

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'uri'
+
 module Jekyll::Spaceship
   class VideoProcessor < Processor
     def on_handle_markdown(content)
@@ -70,20 +72,26 @@ module Jekyll::Spaceship
         url = match_data[2]
         id = match_data[4]
         title = match_data[6]
-        width = url.match(/(?<=width=)(\S*?)(?=&|$)/)
-        height = url.match(/(?<=height=)(\S*?)(?=&|$)/)
+        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
+
+        width = qs['width'] || data[:width] || 600
+        height = qs['height'] || data[:height] || 400
+        style = "max-width: 100%" if width.nil?
 
-        data[:width] = 600 if data[:width].nil?
-        data[:height] = 400 if data[:height].nil?
-        width = data[:width] if width.nil?
-        height = data[:height] if height.nil?
+        url = URI("#{iframe_url}#{id}").tap do |v|
+          v.query = URI.encode_www_form(qs) if qs.size > 0
+        end
 
-        url = "#{iframe_url}#{id}"
         html = "<iframe \
           src=\"#{url}\" \
           title=\"#{title}\" \
           width=\"#{width}\" \
           height=\"#{height}\" \
+          style=\"#{style}\" \
+          allow=\"autoplay; encrypted-media\" \
           frameborder=\"0\" \
           allowfullscreen=\"\">\
           </iframe>"

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/script/cibuild

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+set -e
+
+script/test
+bundle exec rake build

data/script/test

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -ex
+
+bundle exec rspec "$@"

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-spaceship
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,15 +93,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".github/FUNDING.yml"
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
 - jekyll-spaceship.gemspec
 - lib/jekyll-spaceship.rb
 - lib/jekyll-spaceship/cores/logger.rb
+- lib/jekyll-spaceship/cores/manager.rb
 - lib/jekyll-spaceship/cores/processor.rb
 - lib/jekyll-spaceship/cores/register.rb
+- lib/jekyll-spaceship/cores/type.rb
+- lib/jekyll-spaceship/processors/emoji-processor.rb
 - lib/jekyll-spaceship/processors/mathjax-processor.rb
 - lib/jekyll-spaceship/processors/plantuml-processor.rb
 - lib/jekyll-spaceship/processors/polyfill-processor.rb
@@ -103,6 +116,9 @@ files:
 - lib/jekyll-spaceship/processors/video-processor.rb
 - lib/jekyll-spaceship/utils/plantuml/plantuml.jar
 - lib/jekyll-spaceship/version.rb
+- logos/jekyll-spaceship-logo.png
+- script/cibuild
+- script/test
 homepage: https://github.com/jeffreytse/jekyll-spaceship
 licenses:
 - MIT
@@ -122,9 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to provide powerful supports for table, mathjax, plantuml,
-  youtube, etc.
+  emoji, youtube, vimeo, dailymotion, etc.
 test_files: []