jekyll-assets 3.0.7 → 3.0.8

data/lib/jekyll/assets/html.rb

@@ -10,13 +10,9 @@ module Jekyll
     class HTML < Extensible
       attr_reader :doc
 
-      # --
-      # rubocop:disable Style/RedundantReturn
       # --
       def self.skips
-        return %i(
-          inline path data pic
-        )
+        %i(inline path data pic)
       end
 
       # --
@@ -31,7 +27,6 @@ module Jekyll
       # Search for plugins and runners and then run them.
       # @param [Sprockets::Asset] the current asset.
       # @note look inside of plugins for examples.
-      # rubocop:enable Style/RedundantReturn
       # @return [String] the final result.
       # @param [Env] env the env.
       # --

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

@@ -6,15 +6,13 @@ module Jekyll
   module Assets
     module Patches
       module SassFunctions
+        SprocketsString = ::Sprockets::Autoload::Sass::Script::String
+
         def asset_path(path, options = {})
           path, args = path.value.split(%r!\s+!, 2)
-          path, = URI.split(path)[5..8]
-          path = "#{path} #{args}"
-
-          # We strip the query string, and the fragment.
-          path = sprockets_context.asset_path(path, options)
-          ::Sprockets::Autoload::Sass::Script::String.new \
-            path, :string
+          path, fragment = URI.split(path).values_at(5, 8)
+          path = sprockets_context.asset_path("#{path} #{args}", options)
+          SprocketsString.new [path, fragment].compact.join("#")
         end
       end
     end

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

@@ -0,0 +1,79 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+if Jekyll::Assets::Utils.activate("crass")
+  module Jekyll
+    module Assets
+      module Plugins
+        NODER = %r!/\*\! @alternate \*/!
+        RTEST = %r!#{Regexp.union(%w(-ms- -webkit- -moz- -o-).freeze)}!
+        NODE1 = { node: :whitespace, pos: 28, raw: " " }.freeze
+        NODE2 = {
+          raw: "/*! @alternate */",
+          pos: 0, # It's ignored. @see Crass::Parser.stringify
+          value: "! @alternate ",
+          node: :comment,
+        }.freeze
+
+        NODE3 = {
+          raw: "/* @alternate */",
+          pos: 0, # It's ignored. @see Crass::Parser.stringify
+          value: "@alternate ",
+          node: :comment,
+        }.freeze
+
+        class Alternates
+          def call(input)
+            comp = input[:environment].asset_config[:compression]
+            data = Crass.parse(input[:data] || "", preserve_comments: true)
+            data.each do |v|
+              next unless v[:node] == :style_rule
+              v[:children] = v[:children].each_with_object([]) do |c, a|
+                if alternate?(c)
+                  a << (comp ? NODE2 : NODE3)
+                  a << NODE1
+                end
+
+                a << c
+              end
+            end
+
+            {
+              data: Crass::Parser.stringify(data, {
+                preserve_comments: true,
+              }),
+            }
+          end
+
+          private
+          def alternate?(c)
+            c[:node] == :property && (
+              c[:name] =~ RTEST || c[:value] =~ RTEST
+            )
+          end
+        end
+
+        # --
+        # When compression is enabled we need to make sure to
+        # run an extra step, because when compression is being
+        # ran, we have to guard with /*! so we've to strip.
+        # --
+        Hook.register :asset, :after_compression do |_, o, t|
+          next unless t == "text/css"
+
+          o.update({
+            # Remember we guard against compression.
+            data: o[:data].gsub(NODER, " #{NODE3[:raw]} "),
+          })
+        end
+
+        # --
+        Hook.register :env, :after_init, priority: 2 do
+          register_bundle_processor "text/css",
+            Alternates.new
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -36,7 +36,7 @@ module Jekyll
         def complex(doc)
           @args[:img] ||= {}
           args = @args.to_h(html: true, skip: HTML.skips)
-          @args[:img][:src] = asset.digest_path
+          @args[:img][:src] = @args[:src]
           _, sources = kv
 
           doc.picture @args[:picture] do

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

@@ -39,7 +39,7 @@ module Jekyll
       # Because we need to keep some support for 3.x we register it
       #   two different ways depending on the type of Sprockets.
       # --
-      if !Env.old_sprockets?
+      if !Utils.old_sprockets?
         Liquid::TYPES.each do |k, v|
           to = Utils.strip_secondary_content_type(k)
           charset = Sprockets.mime_types[to][:charset]

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

@@ -18,7 +18,7 @@ Jekyll::Assets::Utils.javascript? do
       })
     end
 
-    Jekyll::Assets::Hook.register :env, :after_init do
+    Jekyll::Assets::Hook.register :env, :after_init, priority: 1 do
       config = asset_config[:plugins][:css][:autoprefixer]
       AutoprefixerRails.install(self, jekyll.safe ? config : {
         # Your configuration here.

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

@@ -27,8 +27,12 @@ module Jekyll
           img = ::MiniMagick::Image.open(@file)
           magick_format(img) if @args[:magick][:format]
           img.combine_options do |c|
-            runners.each do |m|
-              method(m).arity == 2 ? send(m, img, c) : send(m, c)
+            @args[:magick].keys.reject { |k| k == :format }.each do |k|
+              m = "magick_#{k}"
+
+              if self.class.private_method_defined?(m)
+                method(m).arity == 2 ? send(m, img, c) : send(m, c)
+              end
             end
           end
 
@@ -125,6 +129,10 @@ module Jekyll
           width, height = img.width / 2, img.height / 2 if @args[:magick].key?(:half)
           cmd.resize "#{width}x#{height}" if width && height
         end
+
+        alias magick_double magick_preset_resize
+        alias magick_quarter magick_preset_resize
+        alias magick_half magick_preset_resize
       end
     end
   end

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

@@ -78,7 +78,7 @@ Jekyll::Assets::Hook.register :config, :before_merge do |c|
 end
 
 # --
-Jekyll::Hooks.register [:pages, :documents, :posts], :post_render do |d|
+Jekyll::Hooks.register %i(pages documents posts), :post_render do |d|
   if d.site.sprockets.asset_config["plugins"]["img"]["searcher"]
     if d.output_ext == ".html"
       Jekyll::Assets::Plugins::Searcher.new(d).run

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

@@ -0,0 +1,47 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+unless Jekyll::Assets::Utils.old_sprockets?
+  require_relative "srcmap/css"
+  require_relative "srcmap/javascript"
+  require_relative "srcmap/writer"
+
+  module Jekyll
+    module Assets
+      module Plugins
+        module SrcMap
+          NAME = "%<name>s.map"
+          DIR_NAME = "source-maps"
+          DIR = Pathutil.new(DIR_NAME)
+          EXT = ".map"
+
+          # --
+          # @return [String] the map name.
+          # Take the path, and attach the map extension.
+          # @note this just saves logic.
+          # --
+          def self.map_path(env:, asset:)
+            [
+              path({
+                asset: asset,
+                env: env,
+              }),
+              EXT,
+            ].join
+          end
+
+          # --
+          # @note this is used for anything in source-maps.
+          # Strip the filename and return a relative sourcemap path.
+          # @return [Pathutil] the path.
+          # --
+          def self.path(env:, asset:)
+            DIR.join(env.strip_paths(asset.is_a?(Sprockets::Asset) ?
+              asset.filename : asset))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Plugins
+      Hook.register :asset, :after_compression, priority: 3 do |i, o, t|
+        next unless t == "text/css"
+
+        env = i[:environment]
+        asset = env.find_asset!(i[:filename], pipeline: :source)
+        path = asset.filename.sub(env.jekyll.in_source_dir + "/", "")
+        url = SrcMap.map_path(asset: asset, env: env)
+        url = env.prefix_url(url)
+
+        o.update({
+          data: <<~CSS
+            #{o[:data].strip}
+            /*# sourceMappingURL=#{url} */
+            /*# sourceURL=#{path} */
+          CSS
+        })
+      end
+
+      # --
+      Hook.register :env, :after_init, priority: 1 do
+        next if asset_config[:compression]
+        if asset_config[:source_maps]
+          then asset_config[:compression] = true
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/plugins/srcmap/javascript.rb

@@ -0,0 +1,29 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+require "sprockets"
+
+module Jekyll
+  module Assets
+    module Plugins
+      Hook.register :asset, :after_compression, priority: 3 do |i, o, t|
+        next unless t == "application/javascript"
+
+        env = i[:environment]
+        asset = env.find_asset!(i[:filename], pipeline: :source)
+        path = asset.filename.sub(env.jekyll.in_source_dir + "/", "")
+        url = SrcMap.map_path(asset: asset, env: env)
+        url = env.prefix_url(url)
+
+        o.update({
+          data: <<~TXT
+            #{o[:data].strip}
+            //# sourceMappingURL=#{url}
+            //# sourceURL=#{path}
+          TXT
+        })
+      end
+    end
+  end
+end

data/lib/jekyll/assets/plugins/srcmap/writer.rb

@@ -0,0 +1,187 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
+# Encoding: utf-8
+
+require "sprockets"
+require "pathutil"
+
+module Jekyll
+  module Assets
+    module Plugins
+      module SrcMap
+        class Writer < Sprockets::Exporters::Base
+          alias env environment
+
+          def skip?(_)
+            !env.asset_config[:source_maps] ||
+              !asset.metadata[:map]
+          end
+
+          # --
+          def call
+            clean_file!
+            clean_sources!
+            write_map!
+            write_src!
+          end
+
+          # --
+          # Provides our custom manifest key, full of files.
+          # @note We push everything from the file we are writing to the maps.
+          # @return [Array<String>]
+          # --
+          def files
+            @files ||= begin
+              key = "sourceMapFiles"
+              out = env.manifest.data[key] ||= []
+              unless Manifest.keep_keys.include?(key)
+                Manifest.keep_keys << key
+              end
+
+              out
+            end
+          end
+
+          # --
+          # @return [HashWithIndifferentAccess]
+          # @note do not modify the original map.
+          # Provides a modifible SourceMap
+          # --
+          private
+          def map
+            @map ||= asset.metadata[:map]
+              .with_indifferent_access
+          end
+
+          # --
+          # @return [HashWithIndifferentAccess]
+          # @note this is frozen so you can't modify.
+          # Provides an unmodifiable SourceMap
+          # --
+          private
+          def original_map
+            @original_map ||= asset.metadata[:map]
+              .with_indifferent_access.freeze
+          end
+
+          # --
+          # @note something like _assets/*
+          # Makes sure that the name sits in the asset path.
+          # @return [String]
+          # --
+          private
+          def clean_file!
+            map[:file] = base.join(map[:file]).to_s
+          end
+
+          # --
+          private
+          def clean_sources!
+            if map[:sources]
+              then map[:sources] = map[:sources].map do |v|
+                base.join(strip_src(v))
+              end
+            else
+              map[:sections].each do |v|
+                v[:map][:sources] = v[:map][:sources].map do |vv|
+                  base.join(strip_src(vv))
+                end
+              end
+            end
+
+            map
+          end
+
+          # --
+          private
+          def strip_src(path)
+            path = Pathutil.new(path)
+            base = path.basename.gsub(%r!\.source!, "")
+            return path.dirname.join(base).to_s unless path.dirname == "."
+            base.to_s if path.dirname == "."
+          end
+
+          # --
+          # @note we shim this on name.
+          # Privates the base directory in the source.
+          # @return [String]
+          # --
+          private
+          def base
+            Pathutil.new(asset.filename.sub(env.jekyll
+              .in_source_dir + "/", "")).dirname
+          end
+
+          # --
+          # rubocop:disable Layout/BlockEndNewline
+          # rubocop:disable Layout/MultilineBlockLayout
+          # rubocop:disable Style/BlockDelimiters
+          # --
+          private
+          def map_files
+            return original_map[:sources] if original_map.key?(:sources)
+            original_map[:sections].map { |v| v[:map][:sources] \
+              if v.key?(:map) }.flatten.compact
+          end
+
+          # --
+          # rubocop:enable Layout/BlockEndNewline
+          # rubocop:enable Layout/MultilineBlockLayout
+          # rubocop:enable Style/BlockDelimiters
+          # --
+          private
+          def write_map!
+            path = SrcMap.map_path(asset: asset, env: env)
+            write(env.in_dest_dir(path)) do |f|
+              files.push(path)
+              f.write(map.to_json)
+              files.uniq!
+            end
+          end
+
+          # --
+          private
+          def strip_base(asset)
+            return asset if asset.is_a?(Sprockets::Asset)
+            asset.sub(base + "/", "")
+          end
+
+          # --
+          private
+          def write_src!
+            [asset_path, map_files].flatten.compact.uniq.each do |v|
+              next unless (v = env.find_asset(strip_base(v), pipeline: :source))
+              path = map_path(v.filename)
+
+              write(environment.in_dest_dir(path)) do |f|
+                f.write(v.source)
+                files.push(path.to_s)
+                  .uniq!
+              end
+            end
+          end
+
+          # --
+          private
+          def asset_path
+            base.join(env.strip_paths(@asset.filename)).to_s
+          end
+
+          # --
+          private
+          def map_path(file)
+            asset = base.join(env.strip_paths(file))
+            SrcMap.path({
+              asset: asset, env: env
+            })
+          end
+        end
+
+        # --
+        Hook.register :env, :after_init, priority: 3 do
+          register_exporter("*/*", Writer)
+        end
+      end
+    end
+  end
+end