jekyll-assets 2.0.3 → 2.1.0

data/lib/jekyll/assets/hook.rb

@@ -7,19 +7,18 @@ module Jekyll
     class Hook
       class UnknownHookError < RuntimeError
         def initialize(base: nil, point: nil)
-          return super "Unknown hook  base '#{base}'" if base
-          return super "Unknown hook point '#{point}' given."
+          super "Unknown hook #{base ? "base" : "point"} '#{base || point}'"
         end
       end
 
-      HookAliases = {
+      HOOK_ALIASES = {
         :env => {
           :post_init => :init,
-           :pre_init => :init
+          :pre_init  => :init
         }
       }
 
-      HookPoints = {
+      HOOK_POINTS = {
         :env => [
           :init
         ]
@@ -33,10 +32,10 @@ module Jekyll
       # proc we got and then you can do as you please (such as instance eval)
       # but if you do not give us one then we simply pass the args.
 
-      def self.trigger(base, _point, *args, &block)
+      def self.trigger(base, point_, *args, &block)
         raise ArgumentError, "Do not give args with a block" if args.size > 0 && block_given?
-        if all.has_key?(base) && all[base].has_key?(_point)
-          Set.new.merge(point(base, _point, :early)).merge(point(base, _point)).map do |v|
+        if all.key?(base) && all[base].key?(point_)
+          Set.new.merge(point(base, point_, :early)).merge(point(base, point_)).map do |v|
             block_given?? block.call(v) : v.call(*args)
           end
         end
@@ -44,25 +43,25 @@ module Jekyll
 
       #
 
-      def self.point(base, point, _when = :late)
+      def self.point(base, point, when_ = :late)
         point = all[base][point] ||= {
-           :late => Set.new,
-          :early => Set.new
+          :early => Set.new,
+          :late  => Set.new
         }
 
-        point[_when]
+        point[when_]
       end
 
       #
 
-      def self.register(base, point, _when = :late, &block)
-        raise UnknownHookError.new(base: base) unless HookPoints.has_key?(base)
-        point = HookAliases[base][point] if  HookAliases.fetch(base, {}).has_key?(point)
-        raise UnknownHookError.new(point: point) unless HookPoints[base].include?(point)
+      def self.register(base, point, when_ = :late, &block)
+        raise UnknownHookError, base: base unless HOOK_POINTS.key?(base)
+        point = HOOK_ALIASES[base][point] if HOOK_ALIASES.fetch(base, {}).key?(point)
+        raise UnknownHookError, point: point unless HOOK_POINTS[base].include?(point)
         all[base] ||= {}
 
-        point(base, point, _when). \
-          add(block)
+        point(base, point, when_) \
+          .add(block)
       end
     end
   end

data/lib/jekyll/assets/hooks.rb

@@ -2,18 +2,17 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require_relative "hooks/jekyll/initialize"
-require_relative "hooks/jekyll/write_assets"
-require_relative "hooks/jekyll/asset_drops"
-require_relative "hooks/jekyll/ignore"
+require "jekyll/assets/hooks/jekyll/drops"
+require "jekyll/assets/hooks/jekyll/setup"
+require "jekyll/assets/hooks/jekyll/write"
 
-require_relative "hooks/compression"
-require_relative "hooks/configuration"
-require_relative "hooks/context_patches"
-require_relative "hooks/disable_erb"
-require_relative "hooks/helpers"
-require_relative "hooks/logger"
-require_relative "hooks/sources"
-require_relative "hooks/sprockets"
-require_relative "hooks/version"
-require_relative "hooks/cache"
+require "jekyll/assets/hooks/compression"
+require "jekyll/assets/hooks/configuration"
+require "jekyll/assets/hooks/context_patches"
+require "jekyll/assets/hooks/disable_erb"
+require "jekyll/assets/hooks/helpers"
+require "jekyll/assets/hooks/logger"
+require "jekyll/assets/hooks/sources"
+require "jekyll/assets/hooks/sprockets"
+require "jekyll/assets/hooks/version"
+require "jekyll/assets/hooks/cache"

data/lib/jekyll/assets/hooks/context_patches.rb

@@ -5,13 +5,13 @@
 Jekyll::Assets::Hook.register :env, :init do
   context_class.class_eval do
     alias_method :_old_asset_path, :asset_path
-    def asset_path(asset, opts = {})
+    def asset_path(asset, _ = {})
       out = _old_asset_path asset
 
       return unless out
       path = environment.find_asset(resolve(asset))
       environment.parent.used.add(path)
-    out
+      out
     end
   end
 end

data/lib/jekyll/assets/hooks/helpers.rb

@@ -7,6 +7,6 @@ require "sprockets/helpers"
 Jekyll::Assets::Hook.register :env, :init do
   Sprockets::Helpers.configure do |config|
     config.prefix = prefix_path
-    config.digest =     digest?
+    config.digest = digest?
   end
 end

data/lib/jekyll/assets/hooks/jekyll/{asset_drops.rb → drops.rb}

@@ -3,5 +3,5 @@
 # Encoding: utf-8
 
 Jekyll::Hooks.register :site, :pre_render do |jekyll, payload|
-  payload["assets"] ||= jekyll.sprockets.to_liquid_payload
+  payload["assets"] = jekyll.sprockets.to_liquid_payload
 end

data/lib/jekyll/assets/hooks/jekyll/setup.rb

@@ -0,0 +1,13 @@
+# Frozen-string-literal: true
+# Copyright: 2012-2015 - MIT License
+# Encoding: utf-8
+
+Jekyll::Hooks.register :site, :after_reset do |jekyll|
+  Jekyll::Assets::Env.new(jekyll)
+
+  jekyll.sprockets.excludes.each do |exclude|
+    unless jekyll.config["exclude"].grep(%r!\A#{Regexp.escape(exclude)}/?!).size > 0
+      jekyll.config["exclude"] << exclude
+    end
+  end
+end

data/lib/jekyll/assets/hooks/sources.rb

@@ -3,7 +3,8 @@
 # Encoding: utf-8
 
 Jekyll::Assets::Hook.register :env, :init do
-  (asset_config["sources"] ||= []).each do |path|
+  asset_config["sources"] ||= []
+  asset_config["sources"].each do |path|
     append_path jekyll.in_source_dir(path)
   end
 end

data/lib/jekyll/assets/liquid.rb

@@ -5,9 +5,9 @@
 module Jekyll
   module Assets
     module Liquid
-      require_relative "liquid/drop"
-      require_relative "liquid/filters"
-      require_relative "liquid/tag"
+      require "jekyll/assets/liquid/tag"
+      require "jekyll/assets/liquid/filters"
+      require "jekyll/assets/liquid/drop"
     end
   end
 end

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

@@ -2,7 +2,7 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require "fastimage"
+autoload :FastImage, "fastimage"
 
 module Jekyll
   module Assets
@@ -44,14 +44,14 @@ module Jekyll
 
         private
         def image?
-          %(image/png image/jpeg image/gif).include?(
+          %W(image/png image/jpeg image/gif).include?(
             asset.content_type
           )
         end
 
         private
         def asset
-          return @asset ||= @jekyll.sprockets.find_asset(@path)
+          @asset ||= @jekyll.sprockets.find_asset(@path)
         end
       end
     end

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

@@ -6,20 +6,13 @@ module Jekyll
   module Assets
     module Liquid
       module Filters
-        AcceptableFilters = %W(
-          css
-          image
-          asset_path
-          stylesheet
-          javascript
-          style
-          img
-          js
-        )
+        ACCEPTABLE_FILTERS = %W(css image asset_path stylesheet
+          javascript style img js)
 
-        AcceptableFilters.each do |val|
+        ACCEPTABLE_FILTERS.each do |val|
           define_method val do |path, args = ""|
-            Tag.send(:new, val, "#{path} #{args}", "").render(@context)
+            tag = Tag.send(:new, val, "#{path} #{args}", "")
+            tag.render(@context)
           end
         end
       end

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

@@ -2,21 +2,18 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require "fastimage"
-
 module Jekyll
   module Assets
     module Liquid
       class Tag < ::Liquid::Tag
-        require_relative "tag/proxies"
-        require_relative "tag/proxied_asset"
-        require_relative "tag/defaults"
-        require_relative "tag/parser"
+        autoload :Proxies, "jekyll/assets/liquid/tag/proxies"
+        autoload :ProxiedAsset, "jekyll/assets/liquid/tag/proxied_asset"
+        autoload :Defaults, "jekyll/assets/liquid/tag/defaults"
+        autoload :Parser, "jekyll/assets/liquid/tag/parser"
         attr_reader :args
 
         class << self
-          public \
-            :new
+          public :new
         end
 
         class AssetNotFoundError < StandardError
@@ -38,15 +35,15 @@ module Jekyll
           asset
           css
           js
-        )
+        ).freeze
 
         #
 
         Tags = {
-          "css" => %Q{<link type="text/css" rel="stylesheet" href="%s"%s>},
-          "js"  => %Q{<script type="text/javascript" src="%s"%s></script>},
-          "img" => %Q{<img src="%s"%s>}
-        }
+          "css" => %{<link type="text/css" rel="stylesheet" href="%s"%s>},
+          "js"  => %{<script type="text/javascript" src="%s"%s></script>},
+          "img" => %{<img src="%s"%s>}
+        }.freeze
 
         #
 
@@ -55,7 +52,7 @@ module Jekyll
           "stylesheet" => "css",
           "javascript" => "js",
           "style" => "css"
-        }
+        }.freeze
 
         #
 
@@ -74,25 +71,24 @@ module Jekyll
         #   because of a single asset change.
 
         def render(context)
-          args = Parser.parse_liquid(@args, context)
+          args = @args.parse_liquid(context)
           site = context.registers[:site]
           page = context.registers.fetch(:page, {})
           sprockets = site.sprockets
           page = page["path"]
 
-          asset = find_asset(sprockets)
+          asset = find_asset(args, sprockets)
           add_as_jekyll_dependency(site, sprockets, page, asset)
           process_tag(args, sprockets, asset)
         rescue => e
-          capture_and_out_error \
-            site, e
+          capture_and_out_error site, e
         end
 
         #
 
         private
         def from_alias(tag)
-          Alias.has_key?(tag) ? Alias[tag] : tag
+          Alias.key?(tag) ? Alias[tag] : tag
         end
 
         #
@@ -109,20 +105,18 @@ module Jekyll
         private
         def build_html(args, sprockets, asset, path = get_path(sprockets, asset))
           if @tag == "asset_path"
-            return path
+            path
 
           elsif @tag == "asset" || @tag == "asset_source"
-            return asset.to_s
+            asset.to_s
 
-          elsif args.has_key?(:data) && args[:data].has_key?(:uri)
-            return Tags[@tag] % [
-              asset.data_uri, Parser.to_html(args)
-            ]
+          elsif args.key?(:data) && args[:data].key?(:uri)
+            format(Tags[@tag], asset.data_uri, \
+              args.to_html)
 
           else
-            return Tags[@tag] % [
-              path, Parser.to_html(args)
-            ]
+            format(Tags[@tag], path, \
+              args.to_html)
           end
         end
 
@@ -130,8 +124,7 @@ module Jekyll
 
         private
         def get_path(sprockets, asset)
-          sprockets.prefix_path(sprockets.digest?? asset.digest_path : \
-            asset.logical_path)
+          sprockets.prefix_path(sprockets.digest?? asset.digest_path : asset.logical_path)
         end
 
         #
@@ -148,14 +141,15 @@ module Jekyll
         #
 
         private
-        def find_asset(sprockets)
-          file, _sprockets = @args[:file], @args[:sprockets] ||= {}
-          if !(out = sprockets.find_asset(file, _sprockets))
-            raise AssetNotFoundError, @args[:file]
+        def find_asset(args, sprockets)
+          file = args[:file]
+          sprockets_ = args[:sprockets] ||= {}
+          if !(out = sprockets.find_asset(file, sprockets_))
+            raise AssetNotFoundError, args[:file]
           else
             out.liquid_tags << self
-            !args.has_proxies?? out : ProxiedAsset.new( \
-              out, @args, sprockets, self)
+            !args.proxies?? out : ProxiedAsset.new( \
+              out, args, sprockets, self)
           end
         end
 
@@ -168,7 +162,7 @@ module Jekyll
         def capture_and_out_error(site, error)
           if error.is_a?(Sass::SyntaxError)
             file = error.sass_filename.gsub(/#{Regexp.escape(site.source)}\//, "")
-            Jekyll.logger.error(%Q{Error in #{file}:#{error.sass_line}  #{error}})
+            Jekyll.logger.error(%{Error in #{file}:#{error.sass_line} #{error}})
           else
             Jekyll.logger.error \
               "", error.to_s

data/lib/jekyll/assets/liquid/tag/defaults.rb

@@ -3,14 +3,13 @@ module Jekyll
     module Liquid
       class Tag
         module Defaults
-          require_relative "defaults/image"
-
+          autoload :Image, "jekyll/assets/liquid/tag/defaults/image"
           # TODO: In 3.0 env needs to be enforced, right now it's not
           #   because it's maintain 2.0 API.
 
           module_function
           def set_defaults_for!(tag, args, asset, env = nil)
-            constants.select { |const| const_get(const).is_for?(tag) }.each do |const|
+            constants.select { |const| const_get(const).for?(tag) }.each do |const|
               const_get(const).new(args, asset, env).set!
             end
           end

data/lib/jekyll/assets/liquid/tag/defaults/image.rb

@@ -8,7 +8,7 @@ module Jekyll
       class Tag
         module Defaults
           class Image
-            def self.is_for?(tag)
+            def self.for?(tag)
               tag == "img" || tag == "image"
             end
 
@@ -16,9 +16,9 @@ module Jekyll
             #   for now it's not enforced to maintain the 2.0 API.
 
             def initialize(args, asset, env = nil)
+              @args = args
               @asset = asset
-              @env   =   env
-              @args  =  args
+              @env = env
             end
 
             #
@@ -34,8 +34,8 @@ module Jekyll
             def set_img_alt
               if !@env || @env.asset_config["features"]["automatic_img_alt"]
                 @args[:html] ||= {}
-                if !@args[:html].has_key?("alt")
-                  then @args[:html]["alt"] = @asset.logical_path
+                unless @args[:html].key?("alt")
+                  @args[:html]["alt"] = @asset.logical_path
                 end
               end
             end

data/lib/jekyll/assets/liquid/tag/parser.rb

@@ -2,9 +2,6 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require_relative "proxies"
-require "forwardable"
-
 module Jekyll
   module Assets
     module Liquid
@@ -23,7 +20,7 @@ module Jekyll
           extend Forwardable
 
           def_delegator :@args, :each
-          def_delegator :@args, :has_key?
+          def_delegator :@args, :key?
           def_delegator :@args, :fetch
           def_delegator :@args, :store
           def_delegator :@args, :to_h
@@ -32,7 +29,7 @@ module Jekyll
 
           #
 
-          Accept = {
+          ACCEPT = {
             "css" => "text/css", "js" => "application/javascript"
           }
 
@@ -54,53 +51,38 @@ module Jekyll
 
           #
 
-          def initialize(args, tag)
-            @raw_args, @tags = args, tag
-            @tag = tag
-            parse_raw
-            set_accept
-          end
+          def initialize(args, tag, processed: false, raw_args: nil)
+            if processed && raw_args
+              @args = args
+              @raw_args = raw_args
+              @tag = tag
 
-          # TODO: In 3.0 this needs to be removed and put on the class,
-          #   but because we need to work around the way that Liquid currently
-          #   works it needs to remain.
+            elsif processed && !raw_args
+              raise ArgumentError, "You must provide raw_args if you pre-process." \
+                "Please provide the raw args."
 
-          def parse_liquid!(context)
-            @args = self.class.parse_liquid(@args, context)
+            else
+              @tag = tag
+              @raw_args = args
+              parse_raw
+              set_accept
+            end
           end
 
           #
 
-          def self.parse_liquid(hash, context)
-            hash = hash.to_h if hash.is_a?(self)
-            return hash unless context.is_a?(::Liquid::Context)
-            liquid = context.registers[:site].liquid_renderer.file( \
-              "(jekyll:assets)")
-
-            hash.inject({}) do |hash_, (key, val)|
-              val = liquid.parse(val).render(context) if val.is_a?(String)
-              val = parse_liquid(val, context) if val.is_a?(Hash)
-              hash_.update(
-                key => val
-              )
-            end
+          def parse_liquid(context)
+            return self unless context.is_a?(Object::Liquid::Context)
+            liquid = context.registers[:site].liquid_renderer.file("(jekyll:assets)")
+            out = parse_hash_liquid(to_h, liquid, context)
+            self.class.new(out, @tag, raw_args: @raw_args, \
+              processed: true)
           end
 
-          # TODO: In 3.0 this needs to be put on the class, but because
-          #  we need to work around the way that Liquid currently works in
-          #  2.0.1 it needs to stay.
-
           def to_html
-            self.class.to_html(@args)
-          end
-
-          #
-
-          def self.to_html(hash)
-            hash.fetch(:html, {}).map do |key, val|
-              %Q{ #{key}="#{val}"}
-            end. \
-            join
+            (self[:html] || {}).map do |key, val|
+              %{ #{key}="#{val}"}
+            end.join
           end
 
           #
@@ -114,22 +96,32 @@ module Jekyll
 
           #
 
-          def has_proxies?
+          def proxies?
             proxies.any?
           end
 
           #
 
+          private
+          def parse_hash_liquid(hash_, liquid, context)
+            hash_.each_with_object({}) do |(key, val), hash|
+              val = liquid.parse(val).render(context) if val.is_a?(String)
+              val = parse_hash_liquid(val, liquid, context) if val.is_a?(Hash)
+              hash[key] = val
+            end
+          end
+
+          #
+
           private
           def parse_raw
-            @args = from_shellwords.each_with_index.inject({}) do |hash, (key, index)|
+            @args = from_shellwords.each_with_index.each_with_object({}) do |(key, index), hash|
               if index == 0 then hash.store(:file, key)
               elsif key =~ /:/ && (key = key.split(/(?<!\\):/))
                 parse_col hash, key
 
               else
-                (hash[:html] ||= {})[key] = \
-                  true
+                (hash[:html] ||= {})[key] = true
               end
 
               hash
@@ -141,17 +133,17 @@ module Jekyll
           private
           def parse_col(hash, key)
             key.push(key.delete_at(-1).gsub(/\\:/, ":"))
-            if key.size == 3 then as_proxy hash, key
-              elsif key.size == 2 then as_bool_or_html hash, key
-              else raise UnescapedColonError
-            end
+            return as_proxy hash, key if key.size == 3
+            return as_bool_or_html hash, key if key.size == 2
+            raise UnescapedColonError
           end
 
           #
 
           private
           def as_bool_or_html(hash, key)
-            okey = key; key, sub_key = key
+            okey = key
+            key, sub_key = key
             if Proxies.has?(key, @tag, "@#{sub_key}")
               (hash[key.to_sym] ||= {})[sub_key.to_sym] = true
             else
@@ -178,11 +170,11 @@ module Jekyll
 
           private
           def set_accept
-            if Accept.has_key?(@tag) && (!@args.has_key?(:sprockets) || \
-                  !@args[:sprockets].has_key?(:accept))
+            if ACCEPT.key?(@tag) && (!@args.key?(:sprockets) || \
+                  !@args[:sprockets].key?(:accept))
 
               (@args[:sprockets] ||= {})[:accept] = \
-                Accept[@tag]
+                ACCEPT[@tag]
             end
           end