jekyll-microtypo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0733bfc59f0407baf0ee6d906665534f4f728f801cdd44066c142f04b9826401
-  data.tar.gz: 1a86bc66d21a156d8e6e14fd0cbac689a1f29365370196921cf36c7816e06b0e
+  metadata.gz: a78335b3908581612768fec1c82a5b51c91b49bef33396acc7ad0e84f76abdb0
+  data.tar.gz: 4fd09552f71508d0a33226ba8e83352a84c421b96d56e3752a17785ea9e00030
 SHA512:
-  metadata.gz: b8b08333813e62fa5a3588c4ac3c1082dc996390fe923c9e63677ac5905c0a367e41ffc7f46bf9406dfeae61f3e21c3378e576434764f4be91c19ca753a7c3c1
-  data.tar.gz: 698fc177f7a207f7314710fd01713c6854a8ca74c82587d44dc2449e3b2fe9c04c65aea00a7d01710dc4c98d00f09dd0258e1a3da49a40dd60e5234360364a5d
+  metadata.gz: ce26fd4d64015b4aebfb5df45f46951711eddaa3aa43a542c3d4db0035a7619a7528c7f4fe54cab32576e5eecfcfaa278ea832f83379a5c27b8b9ae95c75f4d0
+  data.tar.gz: 48bf3ae8c6494b944ffab3ebc627fd499fb590bbf61b549820f5e615e35bb112fb9248715e8861b03ffa5317de94ac4e97ac89075684131450d0c6fd2cc6ffbf

data/Gemfile

@@ -3,3 +3,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "rubocop"

data/lib/jekyll/microtypo.rb

@@ -1,161 +1,145 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Microtypo
-    @@settings = []
-
-    def get_settings
-      if @@settings.none?
-        @@settings = Jekyll.configuration({})['microtypo'] || {}
-      end
-      @@settings
+    QUEUE = [
+      ["<!-- nomicrotypo -->", "<!-- endnomicrotypo -->", false],
+      ["<pre", "</pre>", true],
+      ["<style", "</style>", true],
+      ["<script", "</script>", true],
+      ["<code", "</code>", true],
+    ].freeze
+    private_constant :QUEUE
+
+    def self.settings(config)
+      @settings ||= {}
+      @settings[config.hash] ||= config["microtypo"] || {}
     end
 
     # Example:
     #   {{ content | microtypo: "fr_FR" }}
-    def microtypo(input, locale = nil, settings = {})
-      if settings.none?
-        settings = get_settings
+    def microtypo(input, locale = "en_US")
+      bucket = []
+
+      recursive_parser(input, locale, bucket, QUEUE.length)
+
+      # Clean empty lines
+      bucket.join.tap do |result|
+        result.gsub!(%r!\A\s*\n$!, "")
       end
-      settings['median'] ||= false
+    end
 
-      locale ||= 'en_US'.freeze
+    private
 
-      array_response = []
+    def recursive_parser(input, locale, bucket, index)
+      input = input.to_s
+      return fix_microtypo(+input, locale, bucket) if index.zero?
 
-      # <pre></pre> management
-      # Replace \n in <pre> by <br />\n in order to keep line break visualy
-      pre_array = input.to_s.split('<pre'.freeze)
-      pre_array.each do |input_pre|
-        end_pre_array = input_pre.to_s.split('</pre>'.freeze)
-        if end_pre_array.size == 2
-          array_response.push('<pre'.freeze)
-          array_response.push(end_pre_array.first)
-          array_response.push('</pre>'.freeze)
-        end
-        input_pre = end_pre_array.last
-
-        # <!-- nomicrotypo --><!-- endnomicrotypo --> management
-        no_fix_comment_array = input_pre.to_s.split('<!-- nomicrotypo -->'.freeze)
-        no_fix_comment_array.each do |input_fix|
-          endno_fix_comment_array = input_fix.to_s.split('<!-- endnomicrotypo -->'.freeze)
-          if endno_fix_comment_array.size == 2
-            array_response.push(endno_fix_comment_array.first)
-          end
-          input_fix = endno_fix_comment_array.last
-
-          # <code></code> management
-          style_array = input_fix.to_s.split('<style'.freeze)
-          style_array.each do |input_style|
-            end_style_array = input_style.to_s.split('</style>'.freeze)
-            if end_style_array.size == 2
-              array_response.push('<style'.freeze)
-              array_response.push(end_style_array.first)
-              array_response.push('</style>'.freeze)
-            end
-            input_style = end_style_array.last
-          
-            # <code></code> management
-            code_array = input_style.to_s.split('<code'.freeze)
-            code_array.each do |input_code|
-              end_code_array = input_code.to_s.split('</code>'.freeze)
-              if end_code_array.size == 2
-                array_response.push('<code'.freeze)
-                array_response.push(end_code_array.first)
-                array_response.push('</code>'.freeze)
-              end
-              input_code = end_code_array.last
-
-              # <script></script> management
-              script_array = input_code.to_s.split('<script'.freeze)
-              script_array.each do |input|
-                end_script_array = input.to_s.split('</script>'.freeze)
-                if end_script_array.size == 2
-                  array_response.push('<script'.freeze)
-                  array_response.push(end_script_array.first)
-                  array_response.push('</script>'.freeze)
-                end
-                input = end_script_array.last
-
-                if locale == 'fr_FR'
-
-                  # Ordinals
-                  input.gsub!(/(\s)(\d)+(e|è)(r|me)?([\s.,])/, '\1\2<sup>\3\4</sup>\5'.freeze)
-
-                  # Num
-                  input.gsub!(/n°\s*(\d)/, 'n<sup>o</sup>&#8239;\1'.freeze)
-
-                  # French Guillemets
-                  input.gsub!(/(&rdquo;|”|»)<a /, '«&#8239;<a '.freeze)
-                  input.gsub!(/(&ldquo;|“|«)(?!&#8239;)(\s|&nbsp;| )*/, '«&#8239;'.freeze)
-                  input.gsub!(/(\s|&nbsp;| )*(?!&#8239;)(&rdquo;|”|»)/, '&#8239;»'.freeze)
-
-                  # Point median
-
-                  if settings['median'] == true
-                    input.gsub!(/(\p{L}+)(·\p{L}+)((·)(\p{L}+))?/, '\1<span aria-hidden="true">\2\4</span>\5'.freeze)
-                  end
-
-                  # Special punctuation
-                  input.gsub!(/(\s)+\?\!([^\w]|$)/, '&#8239;&#8264;\2'.freeze)
-                  input.gsub!(/(\s)+\!\?([^\w]|$)/, '&#8239;&#8265;\2'.freeze)
-                  input.gsub!(/(\s)+\!\!\!([^\w]|$)/, '&#8239;&#8252;\2'.freeze)
-                  input.gsub!(/(\s)+\!\!([^\w]|$)/, '&#8239;&#8252;\2'.freeze)
-
-                  # Times
-                  input.gsub!(/(\s)+(\d+)(\s)*x(\s)*(?=\d)/, '\1\2&nbsp;&times;&nbsp;\5'.freeze)
-
-                  # Non-breaking space before '%' and units (< 4 letters)…
-                  input.gsub!(/(\s)+(\d+)(\s)+([[:alpha:]]|%)/, '\1\2&nbsp;\4\5'.freeze)
-
-                  # Thin non-breaking space before ;', '!', '?'
-                  input.gsub!(/ (;|\!|\?)([^\w!]|$)/, '&#8239;\1\2'.freeze)
-
-                  # non-breaking space
-                  input.gsub!(' :'.freeze, '&nbsp;:'.freeze)
-
-                  # Currencies
-                  input.gsub!(/(\d+)\s*($|€)/, '\1&nbsp;\2'.freeze)
-
-                  # nbsp after middle dash (dialogs)
-                  input.gsub!(/(—|&mdash;)(\s)/, '\1&nbsp;'.freeze)
-
-                elsif locale == 'en_US'
-
-                  # Remove useless spaces
-                  input.gsub!(/ (:|%|;|\!|\?)([^\w!]|$)/, '\1\2'.freeze)
-
-                  # Currencies
-                  input.gsub!(/($|€)\s*(\d+)/, '\1\2'.freeze)
-
-                end
-
-                # single quotes
-                input.gsub!(/(\s)'([[:alpha:]])/, '\1‘\2'.freeze)
-                input.gsub!(/([[:alpha:]])'(\s)/, '\1’\2'.freeze)
-                input.gsub!(/(\d)''/, '\1’’'.freeze)
-                input.gsub!(/(\d)'/, '\1’'.freeze)
-
-                # Apostrophe
-                input.gsub!(/([[:alpha:]])'([[:alpha:]])/, '\1’\2'.freeze)
-
-                # Elipsis
-                input.gsub!('...', '&#8230;'.freeze)
-
-                # Special characters
-                input.gsub!(/\([c|C]\)/, '©'.freeze)
-                input.gsub!(/\([p|P]\)/, '℗'.freeze)
-                input.gsub!(/\([r|R]\)/, '®'.freeze)
-                input.gsub!(/\((tm|TM)\)/, '™'.freeze)
-                input.gsub!(/\+-/, '±'.freeze)
-
-                array_response.push input
-              end
-            end
+      index -= 1
+      head, tail, flag = QUEUE[index]
+
+      unless input.include?(head) && input.include?(tail)
+        return recursive_parser(input, locale, bucket, index)
+      end
+
+      input.split(head).each do |item|
+        item = item.to_s
+
+        if item.include?(tail)
+          end_items = item.split(tail)
+
+          if flag
+            bucket << head << end_items[0] << tail
+          else
+            bucket << end_items[0]
           end
+
+          item = end_items.last
         end
+
+        recursive_parser(item, locale, bucket, index)
       end
+    end
 
-      # Clean empty lines
-      array_response.join.gsub(/\A\s*\n$/, ''.freeze)
+    def fix_microtypo_fr(input)
+      # Ordinals
+      input.gsub!(%r!(\s)(\d)+(e|è)(r|me)?([\s.,])!, '\1\2<sup>\3\4</sup>\5')
+
+      # Num
+      input.gsub!(%r!n°\s*(\d)!, 'n<sup>o</sup>&#8239;\1')
+
+      # French Guillemets
+      input.gsub!(%r!(&rdquo;|”|»)<a !, "«&#8239;<a ")
+      input.gsub!(%r/(&ldquo;|“|«)(?!&#8239;)(\s|&nbsp;| )*/, "«&#8239;")
+      input.gsub!(%r/(\s|&nbsp;| )*(?!&#8239;)(&rdquo;|”|»)/, "&#8239;»")
+
+      settings = Microtypo.settings(@context.registers[:site].config)
+
+      # Point median
+      if settings["median"]
+        input.gsub!(%r!(\p{L}+)(·\p{L}+)((·)(\p{L}+))?!, '\1<span aria-hidden="true">\2\4</span>\5')
+      end
+
+      # Special punctuation
+      input.gsub!(%r!(\s)+\?\!([^\w]|$)!, '&#8239;&#8264;\2')
+      input.gsub!(%r!(\s)+\!\?([^\w]|$)!, '&#8239;&#8265;\2')
+      input.gsub!(%r!(\s)+\!\!\!([^\w]|$)!, '&#8239;&#8252;\2')
+      input.gsub!(%r!(\s)+\!\!([^\w]|$)!, '&#8239;&#8252;\2')
+
+      # Times
+      input.gsub!(%r!(\s)+(\d+)(\s)*x(\s)*(?=\d)!, '\1\2&nbsp;&times;&nbsp;\5')
+
+      # Non-breaking space before '%' and units (< 4 letters)
+      input.gsub!(%r!(\s)+(\d+)(\s)+([[:alpha:]]|%)!, '\1\2&nbsp;\4\5')
+
+      # Thin non-breaking space before ;', '!', '?'
+      input.gsub!(%r/ (;|\!|\?)([^\w!]|$)/, '&#8239;\1\2')
+
+      # non-breaking space
+      input.gsub!(" :", "&nbsp;:")
+
+      # Currencies
+      input.gsub!(%r!(\d+)\s*($|€)!, '\1&nbsp;\2')
+
+      # nbsp after middle dash (dialogs)
+      input.gsub!(%r!(—|&mdash;)(\s)!, '\1&nbsp;')
+    end
+
+    def fix_microtypo_us(input)
+      # Remove useless spaces
+      input.gsub!(%r/ (:|%|;|\!|\?)([^\w!]|$)/, '\1\2')
+
+      # Currencies
+      input.gsub!(%r!($|€)\s*(\d+)!, '\1\2')
+    end
+
+    def fix_microtypo(input, locale, bucket)
+      if locale == "fr_FR"
+        fix_microtypo_fr(input)
+      elsif locale == "en_US"
+        fix_microtypo_us(input)
+      end
+
+      # single quotes
+      input.gsub!(%r!(\s)'([[:alpha:]])!, '\1‘\2')
+      input.gsub!(%r!([[:alpha:]])'(\s)!, '\1’\2')
+      input.gsub!(%r!(\d)''!, '\1’’')
+      input.gsub!(%r!(\d)'!, '\1’')
+
+      # Apostrophe
+      input.gsub!(%r!([[:alpha:]])'([[:alpha:]])!, '\1’\2')
+
+      # Elipsis
+      input.gsub!("...", "&#8230;")
+
+      # Special characters
+      input.gsub!(%r!\([cC]\)!, "©")
+      input.gsub!(%r!\([pP]\)!, "℗")
+      input.gsub!(%r!\([rR]\)!, "®")
+      input.gsub!(%r!\((tm|TM)\)!, "™")
+      input.gsub!(%r!\+-!, "±")
+
+      bucket << input
     end
   end
 end

data/lib/jekyll/microtypo/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Microtypo
-    VERSION = "1.1.0".freeze
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-microtypo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Boris Schapira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -118,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin that improves microtypography