jekyll-antex 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1cc97e98e01d13964af2cbe1a631ea2be276310
-  data.tar.gz: 5e35ad685f11471225ec8d312c35ee5b90a511d7
+  metadata.gz: 433dcdd8d21dc9ecf05abd9356a52105aefe7646
+  data.tar.gz: 1f233c071d6ed01728d12971c049bc35cce18e43
 SHA512:
-  metadata.gz: 78342e277b2b021777af53d0ed3ed6cf82f4ab3ec3ba956a7693d8a69f1b5f51a5640e1563812ec8ceb2a75a6f51e5a53c6b89014d6074c835ce904d0bda6732
-  data.tar.gz: 763468d9eb428a6294a0fef1a73b43eb1ae913604e7215cfc51283e1f6052d5b94559bd20b95a13c572957799affffe1412fbf4c4a78f2602cc59935df27503c
+  metadata.gz: 96479fe656d0ba72cfa2cd8984c1ca9e0653bce6cbabc99ed891a3aa3bd410becd335fef505c165b68720e49c7266129293855708af560305f9cdf7ef9123c8b
+  data.tar.gz: 992dea3ca86bac0da9f0b67213884dfa9ee789b82dd4c5be37392fa878477644a57819b6c8009eda9d6de6500e43f767c26b6e96aae370175de5ab85a224adf8

data/lib/jekyll/antex/alias.rb

@@ -1,33 +1,27 @@
 # frozen_string_literal: true
 
 require 'jekyll/antex/error'
+require 'jekyll/antex/utils'
 
 module Jekyll
   module Antex
     class Alias
       class InvalidRegexp < Error; end
 
-      attr_reader :priority, :regexp, :multiline, :options
+      attr_reader :priority, :regexp, :options
 
-      def initialize(priority:, options: {},
-                     regexp:, multiline: false, extended: true)
+      def initialize(priority:, regexp:, options: {},
+                     multiline: false, extended: true)
         @priority = priority.to_i
-        @regexp = build_regexp source: regexp,
-                               extended: extended,
-                               multiline: multiline
+        @regexp = Utils.build_regexp source: regexp,
+                                     extended: extended,
+                                     multiline: multiline
         validate_regexp!
         @options = options.to_h
       end
 
       private
 
-      def build_regexp(source:, extended:, multiline:)
-        options = 0
-        options |= Regexp::EXTENDED if extended
-        options |= Regexp::MULTILINE if multiline
-        Regexp.new source, options
-      end
-
       def validate_regexp!
         return if @regexp.names.include? 'code'
         raise InvalidRegexp, <<~MESSAGE

data/lib/jekyll/antex/defaults.yml

@@ -73,6 +73,21 @@ commands:
       - "{{ file.fit }}"
     targets:
       - "{{ file.svg }}"
+guards:
+  comment:
+    priority: 1000
+    multiline: true
+    regexp: >
+      <!---
+      .*?
+      --->
+  verbatim:
+    priority: 100
+    multiline: true
+    regexp: >
+      ```
+      .*?
+      ```
 aliases:
   # 'internal' must have the highest priority;
   # it is the liquid tag all other aliases are rendered to.

data/lib/jekyll/antex/generator.rb

@@ -6,6 +6,9 @@ require 'jekyll/utils'
 require 'jekyll/antex/alias'
 require 'jekyll/antex/dealiaser'
 
+require 'jekyll/antex/guard'
+require 'jekyll/antex/guardian'
+
 module Jekyll
   module Antex
     class Generator < Jekyll::Generator
@@ -23,15 +26,12 @@ module Jekyll
       private
 
       def dealias_resource_content!(site:, resource:)
-        dealiaser = build_dealiaser site: site, resource: resource
+        options = build_options site: site, resource: resource
+        guardian = build_guardian options['guards']
+        dealiaser = build_dealiaser options['aliases']
+        resource.content = guardian.apply resource.content
         resource.content = dealiaser.parse resource.content
-      end
-
-      def build_dealiaser(site:, resource:)
-        options = build_options(site: site, resource: resource)
-        dealiaser = Jekyll::Antex::Dealiaser.new
-        dealiaser.add_aliases build_aliases(options['aliases'])
-        dealiaser
+        resource.content = guardian.remove resource.content
       end
 
       def build_options(site:, resource:)
@@ -40,6 +40,24 @@ module Jekyll
                                      resource.data['antex'] || {}
       end
 
+      def build_guardian(guards_options_hash)
+        guardian = Jekyll::Antex::Guardian.new
+        guardian.add_guards build_guards(guards_options_hash)
+        guardian
+      end
+
+      def build_dealiaser(aliases_options_hash)
+        dealiaser = Jekyll::Antex::Dealiaser.new
+        dealiaser.add_aliases build_aliases(aliases_options_hash)
+        dealiaser
+      end
+
+      def build_guards(options_hash)
+        options_hash.values.map do |args|
+          Guard.new Jekyll::Utils.symbolize_hash_keys(args)
+        end
+      end
+
       def build_aliases(options_hash)
         options_hash.values.map do |args|
           Alias.new Jekyll::Utils.symbolize_hash_keys(args)

data/lib/jekyll/antex/guard.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'jekyll/antex/utils'
+
+module Jekyll
+  module Antex
+    class Guard
+      attr_reader :priority, :regexp
+
+      def initialize(priority:, regexp:,
+                     multiline: false, extended: true)
+        @priority = priority.to_i
+        @regexp = Utils.build_regexp source: regexp,
+                                     extended: extended,
+                                     multiline: multiline
+      end
+    end
+  end
+end

data/lib/jekyll/antex/guardian.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module Jekyll
+  module Antex
+    class Guardian
+      attr_reader :guards
+
+      def initialize(tag: 'antex')
+        @guards = []
+        @stash = {}
+        @tag = tag
+      end
+
+      def add_guards(guards)
+        @guards.concat(guards).sort_by!(&:priority).reverse!
+      end
+
+      def apply(content)
+        @content = content.dup
+        @stash = {}
+        stash_guards
+        @content
+      end
+
+      def remove(content)
+        @content = content.dup
+        unstash_guards
+        @content
+      end
+
+      private
+
+      def stash_guards
+        @guards.each do |guard|
+          @content.gsub!(guard.regexp) do
+            uuid = SecureRandom.uuid
+            @stash.store uuid, Regexp.last_match.to_s
+            uuid
+          end
+        end
+      end
+
+      def unstash_guards
+        @stash.each do |uuid, guard_match|
+          @content.gsub! uuid, guard_match
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/antex/options.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
 require 'yaml'
+
+require 'liquid/drop'
+require 'jekyll/drops/drop'
 require 'jekyll/utils'
+# NOTE: not sure why/how utils require drops, though
 
 module Jekyll
   module Antex

data/lib/jekyll/antex/utils.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Antex
+    module Utils
+      def self.build_regexp(source:, extended:, multiline:)
+        options = 0
+        options |= Regexp::EXTENDED if extended
+        options |= Regexp::MULTILINE if multiline
+        Regexp.new source, options
+      end
+    end
+  end
+end

data/lib/jekyll/antex/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Antex
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

data/lib/jekyll/antex.rb

@@ -4,7 +4,10 @@ require 'antex'
 
 require 'jekyll/antex/version'
 require 'jekyll/antex/error'
+require 'jekyll/antex/utils'
 require 'jekyll/antex/options'
+require 'jekyll/antex/guard'
+require 'jekyll/antex/guardian'
 require 'jekyll/antex/alias'
 require 'jekyll/antex/dealiaser'
 require 'jekyll/antex/generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-antex
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Paolo Brasolin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -152,7 +152,10 @@ files:
 - lib/jekyll/antex/defaults.yml
 - lib/jekyll/antex/error.rb
 - lib/jekyll/antex/generator.rb
+- lib/jekyll/antex/guard.rb
+- lib/jekyll/antex/guardian.rb
 - lib/jekyll/antex/options.rb
+- lib/jekyll/antex/utils.rb
 - lib/jekyll/antex/version.rb
 homepage: https://github.com/paolobrasolin/antex
 licenses: