jekyll-assets 3.0.5 → 3.0.6

data/Rakefile

@@ -1,8 +1,40 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2017 - 2018 - MIT License
+# Author: Jordon Bedwell
 # Encoding: utf-8
 
-task(:spec) { exec "script/test" }
-task(:test) { exec "script/test" }
-task(:rubocop) { exec "script/lint" }
-task(:lint) { exec "script/lint" }
+# --
+# 🔖
+# RSpec, MiniTest, Whatever.
+# --
+task :spec do
+  exec "script/test"
+end
+# --
+# 🔖
+# RSpec, MiniTest, Whatever.
+# --
+task :test do
+  exec "script/test"
+end
+# --
+# 🔖
+# @see .rubocop.yml
+# Rubocop.
+# --
+task :rubocop do
+  exec "script/lint"
+end
+# --
+# 🔖
+# @see .rubocop.yml
+# Rubocop.
+# --
+task :lint do
+  exec "script/lint"
+end
+
+# --
+Dir.glob("script/rake.d/*.rake").each do |v|
+  load v
+end

data/lib/jekyll-assets.rb

@@ -1,5 +1,5 @@
 # rubocop:disable Naming/FileName
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Frozen-string-literal: true
 # Encoding: utf-8
 

data/lib/jekyll/assets.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "pathutil"
@@ -18,7 +18,18 @@ def require_all(*globs)
 end
 
 require_relative "assets/env"
-Jekyll::Hooks.register(:site, :post_read) {  |o| Jekyll::Assets::Env.new(o) }
-Jekyll::Hooks.register :site, :post_write do |o|
+Jekyll::Hooks.register :site, :post_read, priority: 99 do |o|
+  unless o.sprockets
+    Jekyll::Assets::Env.new(o)
+  end
+end
+
+# --
+# Post render hook.
+# We need to run really early because we want to have our
+#   stuff block and be done just incase something else relies
+#   on our stuff to do their stuff.  Such as reloaders.
+# --
+Jekyll::Hooks.register :site, :post_render, priority: 99 do |o|
   o&.sprockets&.write_all
 end

data/lib/jekyll/assets/config.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "jekyll"

data/lib/jekyll/assets/context.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "context"

data/lib/jekyll/assets/default.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "extensible"

data/lib/jekyll/assets/drop.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "liquid/drop"

data/lib/jekyll/assets/env.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "pathutil"
@@ -14,6 +14,8 @@ require_relative "drop"
 require_relative "version"
 require_relative "filters"
 require_relative "manifest"
+require_relative "writer"
+require_relative "reader"
 require_relative "config"
 require_relative "logger"
 require_relative "hook"
@@ -32,13 +34,17 @@ module Jekyll
       attr_reader :asset_config
       attr_reader :jekyll
 
+      # --
+      rb_delegate :old?, to: :"self.class"
+      rb_delegate :old_sprockets?, {
+        to: :"self.class",
+      }
+
       # --
       def initialize(jekyll = nil)
         @asset_config = Config.new(jekyll.config["assets"] ||= {})
-        Logger.debug "Callings hooks for env, before_init" do
-          Hook.trigger :env, :before_init do |h|
-            instance_eval(&h)
-          end
+        Hook.trigger :env, :before_init do |h|
+          instance_eval(&h)
         end
 
         super()
@@ -46,6 +52,7 @@ module Jekyll
         @assets_to_write = []
         @manifest = Manifest.new(self, in_dest_dir)
         @jekyll.sprockets = self
+        @total_time = 0.000000
         @logger = Logger
         @cache = nil
 
@@ -56,10 +63,8 @@ module Jekyll
         precompile!
         copy_raw!
 
-        Logger.debug "Calling hooks for env, after_init" do
-          Hook.trigger :env, :after_init do |h|
-            instance_eval(&h)
-          end
+        Hook.trigger :env, :after_init do |h|
+          instance_eval(&h)
         end
       end
 
@@ -68,6 +73,30 @@ module Jekyll
         !asset_config[:gzip]
       end
 
+      # --
+      def find_asset(v, *a)
+        msg = "Searched for, and rendered #{v} in %<time>s"
+        out = Logger.with_timed_logging msg do
+          super(v, *a)
+        end
+
+        # We keep track.
+        @total_time += out[:time]
+        out[:result]
+      end
+
+      # --
+      def find_asset!(v, *a)
+        msg = "Searched for, and rendered #{v} in %<time>s"
+        out = Logger.with_timed_logging msg do
+          super(v, *a)
+        end
+
+        # We keep track.
+        @total_time += out[:time]
+        out[:result]
+      end
+
       # --
       # @note this is configurable with :caching -> :type
       # Create a cache, or a null cache (if no caching) for caching.
@@ -118,17 +147,18 @@ module Jekyll
         end
       end
 
+      # --
+      class << self
+        alias old? old_sprockets?
+      end
+
       # --
       def write_all
         remove_old_assets unless asset_config[:digest]
         manifest.compile(*assets_to_write); @asset_to_write = []
-        Logger.debug "Calling hooks for env, after_write" do
-          Hook.trigger :env, :after_write do |h|
-            instance_eval(&h)
-          end
-        end
-
-        true
+        Hook.trigger(:env, :after_write) { |h| instance_eval(&h) }
+        Logger.debug "took #{format(@total_time.round(2).to_s,
+          '%.2f')}s"
       end
 
       # ---
@@ -149,10 +179,13 @@ module Jekyll
       # --
       private
       def enable_compression!
+        self.js_compressor, self.css_compressor = nil, nil
+
         return unless asset_config[:compression]
         config = asset_config[:compressors][:uglifier].symbolize_keys
         self. js_compressor = Sprockets::UglifierCompressor.new(config)
-        self.css_compressor = :scss
+        Utils.activate("sassc") { self.css_compressor = :scssc } unless old?
+        self.css_compressor ||= :scss
       end
 
       # --
@@ -169,7 +202,7 @@ module Jekyll
       def precompile!
         assets = asset_config[:precompile]
         assets.map do |v|
-          v !~ %r!\*! ? @assets_to_write |= [sv] : glob_paths(v).each do |sv|
+          v !~ %r!\*! ? @assets_to_write |= [v] : glob_paths(v).each do |sv|
             @assets_to_write |= [sv]
           end
         end
@@ -207,7 +240,7 @@ module Jekyll
 
       require_relative "map" unless old_sprockets?
       Hook.register :env, :after_init, priority: 3 do
-        unless self.class.old_sprockets?
+        unless old?
           Map.register_on(self)
         end
       end

data/lib/jekyll/assets/extensible.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 module Jekyll

data/lib/jekyll/assets/filters.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "context"

data/lib/jekyll/assets/hook.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 module Jekyll
@@ -52,10 +52,34 @@ module Jekyll
             2 => [],
             3 => [],
           },
+
+          before_read: {
+            1 => [],
+            2 => [],
+            3 => [],
+          },
+
+          after_read: {
+            1 => [],
+            2 => [],
+            3 => [],
+          },
+
+          before_write: {
+            1 => [],
+            2 => [],
+            3 => [],
+          },
+
+          after_write: {
+            1 => [],
+            2 => [],
+            3 => [],
+          },
         },
 
         liquid: {
-          pre_render: {
+          before_render: {
             1 => [],
             2 => [],
             3 => [],
@@ -110,7 +134,11 @@ module Jekyll
       # @return [nil]
       # --
       def self.trigger(*point, &block)
-        get_point(*point).map do |v|
+        hooks = get_point(*point)
+        Logger.debug "messaging hooks on #{point.last} " \
+          "through #{point.first}"
+
+        hooks.map do |v|
           block.call(v)
         end
       end

data/lib/jekyll/assets/html.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "extensible"

data/lib/jekyll/assets/logger.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "jekyll"
@@ -8,26 +8,68 @@ module Jekyll
   module Assets
     class Logger
       PREFIX = "Assets: "
+      COLORS = {
+        error: :red,
+        debug: :yellow,
+        info:  :cyan,
+      }.freeze
+
+      # --
       def self.logger
         self
       end
 
       # --
-      # @note this is to be removed after 3.6.
-      # Creates self methods so that we can accept blocks.
-      # @param [String,Proc] message the message that to log.
+      def self.with_timed_logging(msg, type: :debug)
+        s, t, out = Time.now, nil, yield; Logger.send(type) do
+          format("\n#{msg}", {
+            time: "#{t = Time.now - s}s",
+          })
+        end
+
+        {
+          result: out, time: t
+        }
+      end
+
+      # --
+      def self.err_file(file)
+        Jekyll.logger.error("Asset File", file)
+      end
+
+      # --
+      def self.colorize?
+        @color ||= begin
+          Jekyll.env == "development" && system("test -t 2")
+        end
+      end
+
+      # --
+      # Makes a logging method
+      # @param type [Symbol] the type of logger.
       # @return nil
       # --
-      %i(warn error info debug).each do |v|
-        define_singleton_method v do |message = nil, &block|
-          message = block.call if block
-          Jekyll.logger.send(v, PREFIX, message)
+      def self.make_logger(type:)
+        define_singleton_method type do |m = nil, &b|
+          m = (b ? b.call : m).gsub(Pathutil.pwd + "/", "")
+          r = m =~ %r!writing\s+!i ? :debug : type
+          Jekyll.logger.send(r, PREFIX, m)
         end
       end
 
       # --
-      def self.efile(file)
-        Jekyll.logger.error("Asset File", file)
+      private_class_method :make_logger
+
+      # --
+      # @note this is to be removed after 3.6.
+      # Creates self methods so that we can accept blocks.
+      # @param [String,Proc] message the message that to log.
+      # @return nil
+      # --
+      %i(warn error info debug).each do |v|
+        make_logger({
+          type: v,
+        })
       end
     end
   end

data/lib/jekyll/assets/manifest.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "sprockets/manifest"

data/lib/jekyll/assets/map.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "map/css"
@@ -10,7 +10,7 @@ require "pathutil"
 module Jekyll
   module Assets
     module Map
-      NAME = "%s.map"
+      NAME = "%<name>s.map"
       DIR_NAME = "source-maps"
       DIR = Pathutil.new(DIR_NAME)
       EXT = ".map"

data/lib/jekyll/assets/map/css.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "sprockets"