jekyll-wns 3.4.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38306cb9f707488c12823384ec74b7930cf88213f85c44dc175127e811c481fd
-  data.tar.gz: 327780f0d819168bc54b9b71869b4b18a4df0b07316403155d2ec0b445bb5015
+  metadata.gz: 39db2c4912ad62b82e3f5f8f35a2a1d8885e03ffc8a3f52ca993889e86985cbc
+  data.tar.gz: 2d7cdf9fcbf3b0c7dc99d3d264268a8b11a9d55b05219653c4b6bc92eb4acc35
 SHA512:
-  metadata.gz: 3aaba0a6bf99ac328b04d46083dcc3205feb010f60fa07eafdac95d7e2ad7d731eff4061ded3e82955f955019f59787f1e615b7b37c02d4f3914f753b225ed76
-  data.tar.gz: 2869712897b1038a276af2d06e3d19e45f0ba2e606dc5d735b4834f1abc4b321b23bd3226d7ceda4da978fd17e28dd562a005e7f82f0241ef0bd7ac4ab8423c3
+  metadata.gz: 9e3c6c0297e48963461abc3884daec9f7cbf6ce0e98ae97e157396975cda4fc93d2c8ceecfda5a0b7408ae886a4da5e2ed83ce5f6874dd2fe57d39b5daee1eba
+  data.tar.gz: c834e2ed3707525e08cb4f517aeabaf8b7102972bd6f0e4138207cc86edbaf420c38f7d61e75bf3dec30362a37fd48fde78a1d2a678a50d321c97013db7e36ab

data/.github/workflows/gem-push.yml

@@ -2,7 +2,7 @@ name: Ruby Gem
 
 on:
   push:
-    tags: "*"
+    tags: "v*"
 
 jobs:
   build:

data/Gemfile

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

data/README.md

@@ -164,3 +164,22 @@ With `abbreviations: true`:
 ```html
 … tools, e. \g., 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       = "3.4.0"
+  spec.version       = "4.1.1"
   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/lib/jekyll-wns.rb

@@ -2,10 +2,11 @@ require 'liquid'
 require 'jekyll'
 
 require_relative 'jekyll-wns/assets/abbreviations'
+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'

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

@@ -1,11 +1,16 @@
 module WNS
   module Abbreviations
-    THREE_LETTER_EXPRESSION = /([a-zA-Z])\.([a-zA-Z])\.([a-zA-Z])\.(,|) /
-    THREE_LETTER_REPLACEMENT = "\\1. \\2. \\3.\\4 "
-    TWO_LETTER_EXPRESSION = /([a-zA-Z])\.([a-zA-Z])\.(,|) /
-    TWO_LETTER_REPLACEMENT = "\\1. \\2.\\3 "
-    CLEANUP_EXPRESSION = /, ([a-zA-Z]\.&)/
-    CLEANUP_REPLACEMENT = ", \\1"
+    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 "
+
+    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"] || {}
@@ -14,9 +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::CLEANUP_EXPRESSION, Abbreviations::CLEANUP_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

@@ -0,0 +1,19 @@
+module WNS
+  module LabelUnicode
+    SYMBOLS  = [/(Ⅰ)/, /(Ⅱ)/, /(Ⅲ)/, /(Ⅳ)/, /(Ⅴ)/, /(Ⅵ)/, /(Ⅶ)/, /(Ⅷ)/, /(Ⅸ)/, /(Ⅹ)/]
+    READINGS = ['1', '2', '3',  '4', '5', '6', '7', '8', '9', '10']
+    
+    def self.enabled?(doc)
+      wns = doc.site.config["wns"] || {}
+      wns["label_unicode"] || false
+    end
+
+    def self.label_unicode!(doc)
+      if LabelUnicode::enabled?(doc)
+        for i in (0..(LabelUnicode::SYMBOLS.length()) - 1) do
+          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
+  end
+end

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

@@ -16,7 +16,9 @@ module WNS
     end
     
     def self.insert_quads_into_document!(doc)
-      doc.content = insert_quads doc.content
+      if Quads::enabled?(doc)
+        doc.content = insert_quads doc.content
+      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,14 +1,23 @@
-Jekyll::Hooks.register :documents, :pre_render do |document|
-  WNS::Abbreviations::replace_abbreviations! document
-  WNS::Quads::insert_quads_into_document! document
+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, :pre_render do |document|
-  WNS::Abbreviations::replace_abbreviations! document
-  WNS::Quads::insert_quads_into_document! document
+Jekyll::Hooks.register :pages, :post_render do |document|
+  if document.path =~ /(.md|.html)/
+    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|
+  true
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-wns
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Thai Chung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
-dependencies: []
+date: 2021-07-01 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,11 @@ 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
 - lib/jekyll-wns/assets/ruby_tag.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