jekyll-antex 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8af04a4d3122b7e58926aed907120b7bef5e4d5cfb660be03c625f1e0ec48d4
-  data.tar.gz: 4066bd201baba8f6bdcf724f38ea8991eb011da58f1da13831d32547781ade9c
+  metadata.gz: 04f40e277c4a44f0177d6528c0b23cf3fe814d02b0d62bf8b33285649f6ff77a
+  data.tar.gz: 86af7068b8c90b17ddeed5e17ecb5406868374c8ab2516dd40805c1ef415fd73
 SHA512:
-  metadata.gz: 86ebce737fc0c681b040f329d46aee48198d528a25e0bab5bbbecebc5da5215fb5f462bd385a5f211e97063b45639feaf76cfa0343ac19ec7fd28ccf0091c530
-  data.tar.gz: 381bc28893d16e442f07567eddee15b08bab1eed15387eb4b3793dbc8e35949a61dcaa0d79e98b1716db5268762d99c6e91304c806a81e914eeaaf111658eee3
+  metadata.gz: 8bc58c1233337a4a117b66a6adf30398e166f5b2f87aef95dcac232031c8fd1911e3997a656f3b02d6ee587e5fb76fbe6095ecaba8aafa6527a2ba654c20f348
+  data.tar.gz: ad91f452823da9f27eb777238ae95cff9fea0803fe5a8dc0dc142d642aa818dd5192dd832a054526040cf6bbe1f79a49ee83cbdd72607ee99945a05ab7e5f6b7

data/lib/jekyll/antex/alias.rb

@@ -7,7 +7,6 @@ module Jekyll
     class InvalidRegexp < Error; end
 
     Alias = Struct.new(:priority, :regexp, :options, keyword_init: true) do
-
       def initialize(*args)
         super
         validate_regexp!

data/lib/jekyll/antex/block.rb

@@ -9,6 +9,10 @@ require 'jekyll/antex/options'
 
 module Jekyll
   module Antex
+    class << self
+      attr_accessor :jobs
+    end
+
     class Block < Liquid::Block
       def initialize(tag, markup, tokens)
         @markup = markup
@@ -18,45 +22,47 @@ module Jekyll
       def render(context)
         options = build_options registers: context.registers, markup: @markup
         job = ::Antex::Job.new snippet: super, options: options
-        job.run!
+        Jekyll::Antex.jobs.store(job.hash, job)
         add_static_file context.registers[:site], job
-        render_html job
+        self.class.render_html(job)
       end
 
       private
 
-      def render_html(job)
-        img_tag = render_img_tag src: img_url(job),
-                                 set_box: job.set_box
+      def self.render_html(job)
+        img_tag = render_img_tag job
         classes = job.options['classes'].join(' ')
         "<span class='#{classes}'>#{img_tag}</span>"
       end
 
-      def render_img_tag(src:, set_box:, precision: 3)
+      def self.render_img_tag(job)
+        "<img data-antex='#{job.hash}' src='#{img_url(job)}' />"
+      end
+
+      def self.render_style_attribute(job_set_box, precision: 3)
         <<~IMG_TAG.gsub(/(\s\s+)/m, ' ').strip!
-          <img style='margin: #{set_box.mt.round(precision)}ex
-                              #{set_box.mr.round(precision)}ex
-                              #{set_box.mb.round(precision)}ex
-                              #{set_box.ml.round(precision)}ex;
-                      height: #{set_box.th.round(precision)}ex;
-                      width:  #{set_box.wd.round(precision)}ex;'
-              src='#{src}' />
+          style='margin: #{job_set_box.mt.round(precision)}ex
+                         #{job_set_box.mr.round(precision)}ex
+                         #{job_set_box.mb.round(precision)}ex
+                         #{job_set_box.ml.round(precision)}ex;
+                 height: #{job_set_box.th.round(precision)}ex;
+                 width:  #{job_set_box.wd.round(precision)}ex;'
         IMG_TAG
       end
 
       def add_static_file(site, job)
         site.static_files << Jekyll::StaticFile.new(
-          site, *static_file_paths(job)
+          site, *self.class.static_file_paths(job)
         )
       end
 
-      def img_url(job)
+      def self.img_url(job)
         _, dest_dir, filename = static_file_paths job
         url_path_prefix = job.options['url_path_prefix'] || '/'
         File.join url_path_prefix, dest_dir, filename
       end
 
-      def static_file_paths(job)
+      def self.static_file_paths(job)
         work_dir_prefix = %r{^#{Regexp.escape job.dirs['work']}(?=\/|$)}
         # base, dir, name
         [
@@ -75,5 +81,3 @@ module Jekyll
     end
   end
 end
-
-Liquid::Template.register_tag('antex', Jekyll::Antex::Block)

data/lib/jekyll/antex/dealiaser.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'jekyll/antex/alias'
+require 'jekyll/antex/guard'
+require 'jekyll/antex/stasher'
+require 'jekyll/antex/options'
+
+module Jekyll
+  module Antex
+    module Dealiaser
+      def self.run(resource)
+        options = build_options(resource)
+        guarder = build_guarder(options)
+        aliaser = build_aliaser(options)
+        content = aliaser.lift(guarder.lift(resource.content))
+        aliaser.bake(&method(:dealias_tag))
+        guarder.drop(aliaser.drop(content))
+      end
+
+      def self.build_options(resource)
+        Jekyll::Antex::Options.build(
+          Jekyll::Antex::Options::DEFAULTS,
+          resource.site.config['antex'] || {},
+          resource.data['antex'] || {}
+        )
+      end
+
+      def self.build_guarder(options)
+        Jekyll::Antex::Stasher.new(
+          options['guards'].values.map(&Guard.method(:new))
+        )
+      end
+
+      def self.build_aliaser(options)
+        Jekyll::Antex::Stasher.new(
+          options['aliases'].values.map(&Alias.method(:new))
+        )
+      end
+
+      def self.dealias_tag(match, matcher)
+        markup = YAML.safe_load match[:markup] if match.names.include?('markup')
+        markup = YAML.dump Options.build(matcher.options || {}, markup || {})
+        code = match['code']
+        "{% antex #{markup} %}#{code}{% endantex %}"
+      end
+    end
+  end
+end

data/lib/jekyll/antex/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Antex
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/jekyll/antex.rb

@@ -3,10 +3,51 @@
 require 'antex'
 
 require 'jekyll/antex/version'
-require 'jekyll/antex/error'
-require 'jekyll/antex/options'
-require 'jekyll/antex/guard'
-require 'jekyll/antex/stasher'
-require 'jekyll/antex/alias'
-require 'jekyll/antex/generator'
+require 'jekyll/antex/dealiaser'
 require 'jekyll/antex/block'
+
+require 'byebug'
+
+module Jekyll
+  module Antex
+    def self.run_jobs
+      jobs_count = Jekyll::Antex.jobs.count
+      Jekyll.logger.writer << "Compiling TeX: ".rjust(20)
+      Jekyll::Antex.jobs.values.each_with_index do |job, i|
+        progress = "job " + i.next.to_s.rjust(jobs_count.to_s.length) + " of #{jobs_count} "
+        Jekyll.logger.writer << progress
+        job.run!
+        Jekyll.logger.writer << "\b" * progress.length
+      end
+      Jekyll.logger.writer << "#{jobs_count} jobs completed.\n"
+    end
+
+    def self.inject_style_attributes(output)
+      output.gsub(/data-antex="(?<hash>.*?)"/) do
+        job = Jekyll::Antex.jobs[Regexp.last_match[:hash]]
+        Jekyll::Antex::Block.render_style_attribute(job.set_box)
+      end
+    end
+  end
+end
+
+# NOTE: I'm conflicted, but regexp flags in yaml must be easy to use.
+SafeYAML::OPTIONS[:whitelisted_tags].push('!ruby/regexp')
+
+Jekyll::Hooks.register :site, :pre_render do
+  Jekyll::Antex.jobs = {}
+end
+
+# NOTE: we're not registering :posts since they are included in :documents.
+Jekyll::Hooks.register [:documents, :pages], :pre_render do |resource|
+  resource.content = Jekyll::Antex::Dealiaser.run(resource)
+end
+
+Liquid::Template.register_tag('antex', Jekyll::Antex::Block)
+
+Jekyll::Hooks.register :site, :post_render do |site|
+  Jekyll::Antex.run_jobs
+  [*site.pages, *site.documents].each do |resource|
+    resource.output = Jekyll::Antex.inject_style_attributes(resource.output)
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-antex
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Paolo Brasolin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: antex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: antex
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -162,9 +162,9 @@ files:
 - lib/jekyll/antex.rb
 - lib/jekyll/antex/alias.rb
 - lib/jekyll/antex/block.rb
+- lib/jekyll/antex/dealiaser.rb
 - lib/jekyll/antex/defaults.yml
 - lib/jekyll/antex/error.rb
-- lib/jekyll/antex/generator.rb
 - lib/jekyll/antex/guard.rb
 - lib/jekyll/antex/options.rb
 - lib/jekyll/antex/stasher.rb

data/lib/jekyll/antex/generator.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll'
-require 'jekyll/utils'
-
-require 'jekyll/antex/alias'
-require 'jekyll/antex/guard'
-require 'jekyll/antex/stasher'
-require 'jekyll/antex/options'
-
-# NOTE: I'm pretty conflicted about this.
-SafeYAML::OPTIONS[:whitelisted_tags].push('!ruby/regexp')
-
-module Jekyll
-  module Antex
-    class Generator < Jekyll::Generator
-      def generate(site)
-        site.pages.each do |page|
-          dealias_resource_content! site: site, resource: page
-        end
-
-        # NOTE: jekyll deprecated direct access to site.posts.each
-        site.posts.docs.each do |post|
-          dealias_resource_content! site: site, resource: post
-        end
-      end
-
-      private
-
-      def dealias_resource_content!(site:, resource:)
-        options = build_options site: site, resource: resource
-        guardian = Jekyll::Antex::Stasher.new(build_guards(options['guards']))
-        dealiaser = Jekyll::Antex::Stasher.new(build_aliases(options['aliases']))
-        resource.content = guardian.lift(resource.content)
-        resource.content = dealiaser.lift(resource.content)
-        dealiaser.bake(&self.class.method(:dealias_tag))
-        resource.content = dealiaser.drop(resource.content)
-        resource.content = guardian.drop(resource.content)
-      end
-
-      def build_options(site:, resource:)
-        Jekyll::Antex::Options.build Jekyll::Antex::Options::DEFAULTS,
-                                     site.config['antex'] || {},
-                                     resource.data['antex'] || {}
-      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)
-        end
-      end
-
-      def self.dealias_tag(match, matcher)
-        markup = YAML.safe_load match[:markup] if match.names.include?('markup')
-        markup = YAML.dump Options.build(matcher.options || {}, markup || {})
-        code = match['code']
-        "{% antex #{markup} %}#{code}{% endantex %}"
-      end
-    end
-  end
-end