jekyll-wns 4.0.0 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15e91d37d865ed42046e37f966254d7677a1c4cbb6f1bc0aed66563db24957ca
-  data.tar.gz: e3c28d73df0d986bc40664ad0cf4108bcc4c0cff2e1aa26daa33eda68890282e
+  metadata.gz: f642384eee2481fe29a4e457158baef1269233ad002977eb901905a6de935bb6
+  data.tar.gz: 768b7e9e1d03418e8ce29db6170ddff5d87d20908716a535a171a7790751a0ea
 SHA512:
-  metadata.gz: 139ff2525f0a3b3895a9ef82a7671cfe7978a960f791b107718e3726827c1556bd8f39179c7815ecf4e0df4f09aa5add4a40fc39c2cc96c5295cabbac0f35f06
-  data.tar.gz: '0197f8cf54e680d458544df89abc4272b3b85db50bbbc2a8ba9889b9e61e76b46587a8fa805d81f39548df9c0471ea556dd065eed385e5c6fc137b6328faa1fb'
+  metadata.gz: 250d2367ac3714527f597eab8b3e6e85580276d437d501dbdfc8a43e28a604c590a28d31075d8315379fec41bae72b5a549ce811998765a0d97d2d429e54edcf
+  data.tar.gz: a71808669a1e27218dc52f354120a93477c0ba0b4215a04d975ecf8b67196ccd7182c82514703cae1d8d2b2b3d1fa8f3b3bdee1b8edf58492bcbb6aab703338d

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "ruby-mp3info", "~> 0.8.10"

data/README.md

@@ -99,12 +99,13 @@ plugins:
 The following snippet should be integrated into your site for the tag to properly work:
 
 ```javascript
-function loadYouTube() {
-  var videos = d.getElementsByClassName('youtube');
-  for (var i = 0; i < videos.length; i++) {
-    videos[i].innerHTML = d.getElementById(videos[i].getAttribute('data-videoid')).innerHTML;
-  }
+function loadYouTube(e = null) {
+  if (e == null) return;
+  var i = e.target.getAttribute('data-videoid');
+  d.getElementById(i).innerHTML = d.getElementById('yt-' + i).innerHTML
 }
+
+$('.youtube a:last-child').on('click', loadYouTube);
 ```
 
 ```liquid
@@ -164,3 +165,22 @@ With `abbreviations: true`:
 ```html
 … tools,&nbsp;e.&#8239;\g.,&nbsp;hammer,…
 ```
+
+### Automatic labelling of Unicode Characters
+
+Some assistive technologies don't play nice with Unicode character, this should improve thing by adding aria-labels spans to wherever necessary.
+
+To enable this, add this to your `_config.yml`:
+
+```yml
+wns:
+  label_unicode: true
+```
+
+```markdown
+Hyda-Ⅳ
+```
+
+```html
+Hyda-<span aria-label="4">Ⅳ</span>
+```

data/jekyll-wns.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-wns"
-  spec.version       = "4.0.0"
+  spec.version       = "4.1.3"
   spec.authors       = ["Thai Chung"]
   spec.email         = ["mail@0xReki.de"]
   spec.summary       = "Collection of Filters, Tags and Hooks I use."
@@ -10,4 +10,6 @@ Gem::Specification.new do |spec|
   spec.licenses      = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
+
+  spec.add_dependency("ruby-mp3info", "~> 0.8.10")
 end

data/js/youtube.js

@@ -1,6 +1,7 @@
-function loadYouTube() {
-  var videos = d.getElementsByClassName('youtube');
-  for (var i = 0; i < videos.length; i++) {
-    videos[i].innerHTML = d.getElementById(videos[i].getAttribute('data-videoid')).innerHTML;
-  }
+function loadYouTube(e = null) {
+  if (e == null) return;
+  var i = e.target.getAttribute('data-videoid');
+  d.getElementById(i).innerHTML = d.getElementById('yt-' + i).innerHTML
 }
+
+$('.youtube a:last-child').on('click', loadYouTube);

data/lib/jekyll-wns/assets/abbreviations.rb

@@ -1,17 +1,17 @@
 module WNS
   module Abbreviations
-    THREE_LETTER_EXPRESSION = /([a-zA-Z]\.)([a-zA-Z]\.)([a-zA-Z]\.)(,|) /
-    THREE_LETTER_REPLACEMENT = "\\1 \\2 \\3\\4 "
+    INNER_DOTS_EXPRESSION = /([a-zA-Z]\.)([a-zA-Z]\.)([a-zA-Z]\.|)([a-zA-Z]\.|)([a-zA-Z]\.|)(,|) /
+    INNER_DOTS_REPLACEMENT = "\\1 \\2 \\3 \\4 \\5 \\6 "
 
-    TWO_LETTER_EXPRESSION = /([a-zA-Z]\.)([a-zA-Z]\.)(,|) /
-    TWO_LETTER_REPLACEMENT = "\\1 \\2\\3 "
-
-    TITLE_EXPRESSION = /(Mr|Ms|Mrs|Messrs|Mmes|Msgr|Prof|Rev|Dr|Sr|St|[A-Z][a-z]|[A-Z][a-z][a-z])(\.|)(,|) /
-    TITLE_REPLACEMENT = "\\1\\2\\3 "
+    TITLE_EXPRESSION = /(Mr|Ms|Mrs|Messrs|Mmes|Msgr|Prof|Rev|Dr|Sr|St|[A-Z][a-z]|[A-Z][a-z][a-z])(\.|\.,|,) /
+    TITLE_REPLACEMENT = "\\1\\2 "
     
     PREFIX_EXPRESSION = /, ([a-zA-Z]\.&)/
     PREFIX_REPLACEMENT = ", \\1"
 
+    COLLAPSE_SPACES_EXPRESSION = /( )*( |,)/
+    COLLAPSE_SPACES_REPLACEMENT = "\\2"
+
     def self.enabled?(doc)
       wns = doc.site.config["wns"] || {}
       wns["abbreviations"] || false
@@ -19,10 +19,10 @@ module WNS
 
     def self.replace_abbreviations!(doc)
       if Abbreviations::enabled?(doc)
-        doc.content = doc.content.gsub(Abbreviations::THREE_LETTER_EXPRESSION, Abbreviations::THREE_LETTER_REPLACEMENT)
-        doc.content = doc.content.gsub(Abbreviations::TWO_LETTER_EXPRESSION, Abbreviations::TWO_LETTER_REPLACEMENT)
+        doc.content = doc.content.gsub(Abbreviations::INNER_DOTS_EXPRESSION, Abbreviations::INNER_DOTS_REPLACEMENT)
         doc.content = doc.content.gsub(Abbreviations::TITLE_EXPRESSION, Abbreviations::TITLE_REPLACEMENT)
         doc.content = doc.content.gsub(Abbreviations::PREFIX_EXPRESSION, Abbreviations::PREFIX_REPLACEMENT)
+        doc.content = doc.content.gsub(Abbreviations::COLLAPSE_SPACES_EXPRESSION, Abbreviations::COLLAPSE_SPACES_REPLACEMENT)
       end
     end
   end

data/lib/jekyll-wns/assets/file_property_filters.rb

@@ -0,0 +1,39 @@
+require 'mp3info'
+
+module WNS
+  module FilePropertyFilters
+    def file_size(path)
+      source = Jekyll.configuration({})['source']
+      
+      unless source.empty?
+        source += '/'
+      else 
+        source = ''
+      end 
+      full_path = source + path
+
+      unless path.nil?
+        File.size full_path
+      else
+        0
+      end
+    end
+    
+    def mp3_duration(path)
+      source = Jekyll.configuration({})['source'] || ''
+      
+      unless source.empty?
+        source += '/'
+      else 
+        source = ''
+      end 
+      full_path = source + path
+
+      unless path.nil?
+        Mp3Info.open(full_path).length.to_i
+      else
+        0
+      end
+    end
+  end
+end

data/lib/jekyll-wns/assets/label_unicode.rb

@@ -11,7 +11,7 @@ module WNS
     def self.label_unicode!(doc)
       if LabelUnicode::enabled?(doc)
         for i in (0..(LabelUnicode::SYMBOLS.length()) - 1) do
-          doc.content = doc.content.gsub(LabelUnicode::SYMBOLS[i], "<span aria-label='#{LabelUnicode::READINGS[i]}'>\\1</span>")
+          doc.content = doc.content.gsub(Regexp.new("([\\-A-Za-z0-9]*|)#{LabelUnicode::SYMBOLS[i].source}([\\-A-Za-z0-9]*|)"), "<span aria-label='\\1#{LabelUnicode::READINGS[i]}\\3'>\\1\\2\\3</span>")
         end
       end
     end

data/lib/jekyll-wns/assets/scene_break_tag.rb

@@ -9,16 +9,14 @@ module WNS
     def render(context)
       case @text
       when "leaves"
-        '<p style="text-align:center" data-mce-style="text-align:center">🙐 🙑 🙓 🙒 🙐 🙑 🙓 🙒 🙐 🙑 🙓 🙒</p>'
+        '<p style="text-align:center" data-mce-style="text-align:center" aria-hidden="true">🙐 🙑 🙓 🙒 🙐 🙑 🙓 🙒 🙐 🙑 🙓 🙒</p>'
       when "wave"
-        '<p style="text-align:center;letter-spacing:-.13em" data-mce-style="text-align:center;letter-spacing:-.13em">◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠‏</p>'
+        '<p style="text-align:center;letter-spacing:-.13em" data-mce-style="text-align:center;letter-spacing:-.13em" aria-hidden="true">◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠◡◠</p>'
       when "wall"
-        '<p style="text-align:center;letter-spacing:-.2em" data-mce-style="text-align:center;letter-spacing:-.2em">⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍</p>'
+        '<p style="text-align:center;letter-spacing:-.2em" data-mce-style="text-align:center;letter-spacing:-.2em" aria-hidden="true">⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍⚎⚍</p>'
       else
-        '<p style="text-align:center" data-mce-style="text-align:center">🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿</p>'
+        '<p style="text-align:center" data-mce-style="text-align:center" aria-hidden="true">🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿🙾🙿</p>'
       end
     end 
   end
 end
-
-

data/lib/jekyll-wns/assets/youtube_tag.rb

@@ -6,16 +6,15 @@ module WNS
     end
 
     def render(context)
-      "<div class='youtube' data-videoid='youtube-" + @text[0] + "'>
+      "<div class='youtube' id='" + @text[0] + "'>
   <a class='btn btn-lg btn-block btn-primary' href='https://youtu.be/" + @text[0] + "' target='_blank' rel='noopener'>
     Watch “" + @text[1] + "” on YouTube
   </a>
-  <a class='btn btn-lg btn-block btn-primary' 
-      href='javascript:loadYouTube();'>
+  <a class='btn btn-lg btn-block btn-primary youtube-load-btn' data-videoid='" + @text[0] + "'>
     Load YouTube Video (3rd party script)
   </a>
 </div>
-<script id='youtube-" + @text[0] + "' type='text/html'>
+<script id='yt-" + @text[0] + "' type='text/html'>
   <div style='position: relative; padding-bottom: 56.25%; padding-top: 30px; height: 0; overflow: hidden;'>
     <iframe
       style='position: absolute; top: 0; left: 0; width: 100%; height: 100%;'

data/lib/jekyll-wns/register_filters.rb

@@ -1,3 +1,3 @@
 Liquid::Template.register_filter(WNS::QuadsFilter)
 Liquid::Template.register_filter(WNS::DigestFilters)
-Liquid::Template.register_filter(WNS::FilePropertiesFilter)
+Liquid::Template.register_filter(WNS::FilePropertyFilters)

data/lib/jekyll-wns/register_hooks.rb

@@ -1,21 +1,23 @@
 Jekyll::Hooks.register :pages, :pre_render do |document|
   if document.path =~ /(.md|.html)/
+    WNS::Abbreviations::replace_abbreviations! document
+    WNS::LabelUnicode::label_unicode! document
     WNS::Quads::insert_quads_into_document! document
   end
 end
 
 Jekyll::Hooks.register :pages, :post_render do |document|
   if document.path =~ /(.md|.html)/
-    WNS::Abbreviations::replace_abbreviations! document
-    WNS::LabelUnicode::label_unicode! document
+    true
   end
 end
 
 Jekyll::Hooks.register :posts, :pre_render do |document|
+  WNS::Abbreviations::replace_abbreviations! document
+  WNS::LabelUnicode::label_unicode! document
   WNS::Quads::insert_quads_into_document! document
 end
 
 Jekyll::Hooks.register :posts, :post_render do |document|
-  WNS::Abbreviations::replace_abbreviations! document
-  WNS::LabelUnicode::label_unicode! document
+  true
 end

data/lib/jekyll-wns.rb

@@ -6,7 +6,7 @@ require_relative 'jekyll-wns/assets/label_unicode'
 require_relative 'jekyll-wns/assets/quads'
 
 require_relative 'jekyll-wns/assets/digest_filters'
-require_relative 'jekyll-wns/assets/file_properties_filter'
+require_relative 'jekyll-wns/assets/file_property_filters'
 require_relative 'jekyll-wns/assets/quads_filter'
 
 require_relative 'jekyll-wns/assets/ruby_tag'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-wns
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.3
 platform: ruby
 authors:
 - Thai Chung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
-dependencies: []
+date: 2021-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-mp3info
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.10
 description: 
 email:
 - mail@0xReki.de
@@ -24,11 +38,10 @@ files:
 - README.md
 - jekyll-wns.gemspec
 - js/youtube.js
-- lib/.ruby-version
 - lib/jekyll-wns.rb
 - lib/jekyll-wns/assets/abbreviations.rb
 - lib/jekyll-wns/assets/digest_filters.rb
-- lib/jekyll-wns/assets/file_properties_filter.rb
+- lib/jekyll-wns/assets/file_property_filters.rb
 - lib/jekyll-wns/assets/label_unicode.rb
 - lib/jekyll-wns/assets/quads.rb
 - lib/jekyll-wns/assets/quads_filter.rb

data/lib/.ruby-version

@@ -1 +0,0 @@
-3.0.1

data/lib/jekyll-wns/assets/file_properties_filter.rb

@@ -1,7 +0,0 @@
-module WNS
-  module FilePropertiesFilter
-    def file_size(path)
-      File.size path
-    end
-  end
-end