jekyll-assets 3.0.5 → 3.0.6

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

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

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

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "sprockets"
@@ -154,7 +154,7 @@ module Jekyll
         private
         def write_src!
           [asset_path, map_files].flatten.compact.uniq.each do |v|
-            v = env.find_asset!(strip_base(v), pipeline: :source)
+            next unless (v = env.find_asset(strip_base(v), pipeline: :source))
             path = map_path(v.filename)
 
             write(environment.in_dest_dir(path)) do |f|

data/lib/jekyll/assets/patches/asset.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/patches/cached.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "../utils"
@@ -38,13 +38,13 @@ module Jekyll
         # --
         def find_asset(*)
           super.tap do |v|
-            v.environment = self
+            v&.environment = self
           end
         end
 
         # --
-        def find_asset!(*args)
-          load(resolve!(*args).first).tap do |v|
+        def find_asset!(*a)
+          load(resolve!(*a).first).tap do |v|
             v.environment = self
           end
         end

data/lib/jekyll/assets/patches/find_asset.rb

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

data/lib/jekyll/assets/patches/functions.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/patches/obsolete.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/patches/site.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/plugins.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/plugins/bootstrap.rb

@@ -1,8 +1,8 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
-Jekyll::Assets::Utils.try_require "bootstrap"
-Jekyll::Assets::Utils.try_require "boostrap-sass" do
+Jekyll::Assets::Utils.activate "bootstrap"
+Jekyll::Assets::Utils.activate "boostrap-sass" do
   Bootstrap.load!
 end

data/lib/jekyll/assets/plugins/closure_comments.rb

@@ -0,0 +1,32 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Plugins
+      module ClosureComments
+        def self.call(input)
+          theregex = %r!/\*(\W+@alternat(e|ive)\W+)\*/!
+          input[:data].gsub!(theregex, "/*!\\1*/")
+        end
+      end
+
+      # --
+      %w(text/css text/scss text/sass).each do |v|
+        Sprockets.register_preprocessor v, ClosureComments
+      end
+    end
+  end
+end
+
+# --
+Jekyll::Assets::Hook.register :asset, :before_write do |v|
+  theregex = %r!/\*\!(\W+@alternat(e|ive)\W+)\*/;?!
+
+  if v.content_type == "text/css"
+    src = v.to_s.gsub(theregex, "/*\\1*/")
+    v.metadata[:digest] = Sprockets::DigestUtils.digest(src)
+    v.instance_variable_set(:@source, src)
+  end
+end

data/lib/jekyll/assets/plugins/font-awesome.rb

@@ -1,8 +1,8 @@
 # rubocop:disable Naming/FileName
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
-Jekyll::Assets::Utils.try_require "font-awesome-sass" do
+Jekyll::Assets::Utils.activate "font-awesome-sass" do
   FontAwesome::Sass.load!
 end

data/lib/jekyll/assets/plugins/frontmatter.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/plugins/html/audio.rb

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

data/lib/jekyll/assets/plugins/html/component.rb

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

data/lib/jekyll/assets/plugins/html/css.rb

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

data/lib/jekyll/assets/plugins/html/defaults/audio.rb

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

data/lib/jekyll/assets/plugins/html/defaults/component.rb

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

data/lib/jekyll/assets/plugins/html/defaults/css.rb

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

data/lib/jekyll/assets/plugins/html/defaults/favicon.rb

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

data/lib/jekyll/assets/plugins/html/defaults/img.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "jekyll/assets"
@@ -8,7 +8,7 @@ module Jekyll
   module Assets
     class Default
       class Img < Default
-        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_]+$!
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_+]+$!
 
         # --
         def set_src

data/lib/jekyll/assets/plugins/html/defaults/js.rb

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

data/lib/jekyll/assets/plugins/html/defaults/vid.rb

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

data/lib/jekyll/assets/plugins/html/favicon.rb

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

data/lib/jekyll/assets/plugins/html/img.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "jekyll/assets"
@@ -9,7 +9,7 @@ module Jekyll
   module Assets
     class HTML
       class IMG < HTML
-        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_]+$!
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_+]+$!
 
         # --
         def run

data/lib/jekyll/assets/plugins/html/js.rb

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

data/lib/jekyll/assets/plugins/html/pic.rb

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

data/lib/jekyll/assets/plugins/html/svg.rb

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

data/lib/jekyll/assets/plugins/html/vid.rb

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

data/lib/jekyll/assets/plugins/liquid.rb

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

data/lib/jekyll/assets/plugins/magick.rb

@@ -1,7 +1,7 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
-Jekyll::Assets::Utils.try_require "mini_magick" do
+Jekyll::Assets::Utils.activate("mini_magick") do
   require_relative "proxy/magick"
 end

data/lib/jekyll/assets/plugins/optim.rb

@@ -1,7 +1,7 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
-Jekyll::Assets::Utils.try_require "image_optim" do
+Jekyll::Assets::Utils.activate "image_optim" do
   require_relative "proxy/optim"
 end

data/lib/jekyll/assets/plugins/prefixer.rb

@@ -1,11 +1,11 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "jekyll/assets"
 
 Jekyll::Assets::Utils.javascript? do
-  Jekyll::Assets::Utils.try_require "autoprefixer-rails" do
+  Jekyll::Assets::Utils.activate "autoprefixer-rails" do
     Jekyll::Assets::Hook.register :config, :before_merge do |c|
       c.deep_merge!({
         plugins: {

data/lib/jekyll/assets/plugins/proxy/magick.rb

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

data/lib/jekyll/assets/plugins/proxy/optim.rb

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

data/lib/jekyll/assets/plugins/searcher.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "pathutil"
@@ -66,8 +66,22 @@ module Jekyll
   end
 end
 
+# --
+Jekyll::Assets::Hook.register :config, :before_merge do |c|
+  c.deep_merge!({
+    plugins: {
+      img: {
+        searcher: false,
+      },
+    },
+  })
+end
+
+# --
 Jekyll::Hooks.register [:pages, :documents, :posts], :post_render do |d|
-  if d.output_ext == ".html"
-    Jekyll::Assets::Plugins::Searcher.new(d).run
+  if d.site.sprockets.asset_config["plugins"]["img"]["searcher"]
+    if d.output_ext == ".html"
+      Jekyll::Assets::Plugins::Searcher.new(d).run
+    end
   end
 end

data/lib/jekyll/assets/proxy.rb

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

data/lib/jekyll/assets/reader.rb

@@ -0,0 +1,33 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+module SprocketsFileReaderPatches
+  def call(input)
+    before_hook(input); out = super; after_hook(out); out
+  end
+
+  # --
+  private
+  def before_hook(input)
+    Jekyll::Assets::Hook.trigger :asset, :before_read do |v|
+      v.call(input)
+    end
+  end
+
+  # --
+  private
+  def after_hook(input)
+    Jekyll::Assets::Hook.trigger :asset, :after_read do |v|
+      v.call(input)
+    end
+  end
+end
+
+module Sprockets
+  class FileReader
+    class << self
+      prepend SprocketsFileReaderPatches
+    end
+  end
+end

data/lib/jekyll/assets/tag.rb

@@ -1,5 +1,5 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2017 - MIT License
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require "fastimage"
@@ -53,7 +53,7 @@ module Jekyll
 
         args = Liquid::Tag::Parser.new(@args)
         args = env.parse_liquid(args, ctx: ctx)
-        raise Sprockets::FileNotFound, "UNKNOWN" unless args.key?(:argv1)
+        raise_unfound_asset_on(ctx: ctx, with: args) unless args.key?(:argv1)
         asset = external(ctx, args: args) if env.external?(args)
         asset ||= internal(ctx, args: args)
         [args, asset]
@@ -61,17 +61,15 @@ module Jekyll
 
       # --
       # @return [String]
-      # rubocop:disable Metrics/AbcSize
       # Render the tag, run the proxies, set the defaults.
       # @note Defaults are ran twice just incase the content type
       #   changes, at that point there might be something that
       #   has to change in the new content.
       # --
       def render(ctx)
-        env = ctx.registers[:site].sprockets
+        env = ctx.registers[:site].sprockets; args, asset = render_raw(ctx)
+        env.logger.debug args.to_h(html: false).inspect
 
-        args, asset = render_raw(ctx)
-        env.logger.debug args&.to_h(html: false).inspect
         return_or_build(ctx, args: args, asset: asset) do
           HTML.build({
             args: args,
@@ -80,11 +78,17 @@ module Jekyll
           })
         end
       # --
+      rescue Sprockets::FileNotFound => e
+        e_not_found(e, {
+          args: args,
+          ctx: ctx,
+        })
+      # --
       rescue ExecJS::RuntimeError => e
-        env.logger.error e.message
-        env.logger.efile args[:argv1]
-        raise ExecJS::RuntimeError, \
-          "JS Error"
+        e_exjs(e, {
+          args: args,
+          ctx: ctx,
+        })
       # --
       # @note you can --trace to get this same info
       # Handle errors that Sass ships because Jekyll finds
@@ -93,9 +97,10 @@ module Jekyll
       # never get it. That's not very good.
       # --
       rescue Sass::SyntaxError => e
-        env.logger.error e.message
-        env.logger.efile env.strip_paths(e.backtrace.first)
-        raise Sass::SyntaxError, "Sass Error"
+        e_sass(e, {
+          args: args,
+          ctx: ctx,
+        })
       end
 
       # --
@@ -168,6 +173,42 @@ module Jekyll
 
         out
       end
+
+      # --
+      private
+      def raise_unfound_asset_on(ctx:, with:)
+        raise Sprockets::FileNotFound, "Unknown asset `#{with[:argv1]}'" \
+          " in #{ctx.registers[:page]['relative_path']}"
+      end
+
+      # --
+      def e_not_found(e, ctx:)
+        lines = e.message.each_line.to_a
+        page = ctx.registers[:page]&.[]("relative_path")
+        lines[0] = lines[0].strip + " in `#{page || 'Untraceable'}'\n"
+        raise e.class, lines.join
+      end
+
+      # --
+      private
+      def e_exjs(e, ctx:, args:)
+        env = ctx.registers[:site].sprockets
+
+        env.logger.error e.message
+        env.logger.efile args[:argv1]
+        raise e.class, "JS Error"
+      end
+
+      # --
+      private
+      def e_sass(e, ctx:, args:)
+        env = ctx.registers[:site].sprockets
+
+        env.logger.error e.message
+        env.logger.efile env.strip_paths(e.backtrace.first)
+        env.logger.error "error from file #{args[:argv1]}"
+        raise e.class, "Sass Error"
+      end
     end
   end
 end