jekyll-spaceship 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 732fde7e5574c855d85c10741f24c63a1ba695c707772f35fe7d4fba5c4f8826
-  data.tar.gz: 72ec0732f4e9cf9ca469a71585ce54c6aca4d10b5964184277ca14d1abcc97ad
+  metadata.gz: 5675e03fa858e4cb310188943772e5a092108befff1b03d9f005d1a5d9a68916
+  data.tar.gz: 935a27cc3cd908ca00c7b6ab45a8c0a5dead24e38d7803ae8b1bc101aff85c9d
 SHA512:
-  metadata.gz: 4cfc08bf4dd2eb0ead97a61b2a6396b8ce79f2c56ac390c2a9cedbd28648d4b51193eaf36a3a005722bb0362245468c66f64b4f5d75f649b0c4bc0d640d5432b
-  data.tar.gz: 8dfcae47fdc9250c4ea68acfe13adecfd348b4e00a24855a6989a6922db959679948ac26d621820d033de2306d2cf8e2973e17eea5aa09f91f77174a7b070f65
+  metadata.gz: ce8465323d153c3d10839462cea3199f1c4a578084a507d3c14e4bf7fb0afd1d5e9945d647fe988e0f53d57bac31637a0c6787db6fe2e0ea88e97e1b1d71bed2
+  data.tar.gz: c1ae5912126110e26ca0545945ce9a5cd530fb386caba11a1135b1c991236c300326829df9895e882475dea073a95440969e7233b90388fb024966066e0bb341

data/.travis.yml

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

data/jekyll-spaceship.gemspec

@@ -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/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

@@ -112,6 +112,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
@@ -158,5 +161,15 @@ module Jekyll::Spaceship
       @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,38 @@
 # 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
-    end
+    EMOJI_MARKUP_HOST = 'https://github.githubassets.com/images/icons/emoji/'
 
     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}\" \
+          /(?<!\=")\s*:#{emoji_name}:\s*(?!"\s)/,
+          "<img class=\"emoji\" \
+            title=\":#{emoji.name}:\" \
+            alt=\":#{emoji.name}:\" \
+            raw=\"#{emoji.raw}\" \
+            src=\"#{EMOJI_MARKUP_HOST}#{emoji.image_filename}\" \
             style=\"vertical-align: middle; \
             max-width: 1em; visibility: hidden;\" \
             onload=\"this.style.visibility='visible'\" \
-            onerror=\"this.replaceWith(this.alt)\"> \
-          </image>"
+            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/plantuml-processor.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "net/http"
 require "base64"
 
 module Jekyll::Spaceship
@@ -46,7 +47,7 @@ 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/lib/jekyll-spaceship/processors/video-processor.rb

@@ -86,6 +86,7 @@ module Jekyll::Spaceship
         end
 
         html = "<iframe \
+          class=\"video\" \
           src=\"#{url}\" \
           title=\"#{title}\" \
           width=\"#{width}\" \

data/lib/jekyll-spaceship/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Spaceship
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
   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.5.4
 platform: ruby
 authors:
 - jeffreytse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-21 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