jekyll-assets 2.1.3 → 2.2.0

data/lib/jekyll/assets/env.rb

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Jekyll
   module Assets
@@ -12,9 +14,28 @@ module Jekyll
         def liquid_proxies
           Liquid::Tag::Proxies
         end
+
+        # --------------------------------------------------------------------
+
+        def init(jekyll)
+          new(jekyll)
+          jekyll.sprockets.excludes.map(&jekyll.config["exclude"].method(:<<))
+          jekyll.config["keep_files"] |= jekyll.sprockets.asset_config["prefix"] \
+            .gsub(/\A\//, "").to_a
+        end
+      end
+
+      # ----------------------------------------------------------------------
+      # Disables GZIP.  You should be using your server to do this and even
+      # if you don't, there are far better and more efficient algorithms out
+      # right now that are in beta.  Try Googling Googles new compression.
+      # ----------------------------------------------------------------------
+
+      def skip_gzip?
+        true
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def excludes
         excludes = Set.new
@@ -22,7 +43,7 @@ module Jekyll
         excludes
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def all_unparsed_assets
         @unparsed_assets ||= logical_paths.select do |(_, val)|
@@ -30,48 +51,61 @@ module Jekyll
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def to_liquid_payload
         jekyll.sprockets.all_unparsed_assets.each_with_object({}) do |(key, val), hash|
-          hash[key] = Jekyll::Assets::Liquid::Drop.new(val, jekyll)
+          hash[key] = Jekyll::Assets::Liquid::Drop.new(
+            val, jekyll
+          )
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def initialize(path, jekyll = nil)
-        jekyll, path = path, nil if path.is_a?(Jekyll::Site)
-        @jekyll = jekyll
-        @used = Set.new
+        (jekyll = path; path = nil) if path.is_a?(Jekyll::Site)
 
+        @used = Set.new
+        @jekyll = jekyll
         path ? super(path) : super()
         Hook.trigger :env, :init do |hook|
-          hook.arity > 0 || 0 > hook.arity ? hook.call(self) : instance_eval(&hook)
+          hook.arity > 0 || 0 > hook.arity ? hook.call(self) : instance_eval(
+            &hook
+          )
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def liquid_proxies
         self.class.liquid_proxies
       end
 
+      # ----------------------------------------------------------------------
       # Make sure a path falls withint our cache dir.
+      # ----------------------------------------------------------------------
 
       def in_cache_dir(*paths)
-        cache_dir = asset_config["cache"] || ".asset-cache"
-        jekyll.in_source_dir(cache_dir, *paths)
+        jekyll.in_source_dir(asset_config["cache"] || ".asset-cache",
+          *paths
+        )
       end
 
+      # ----------------------------------------------------------------------
       # Merged form of `#extra_assets`
+      # ----------------------------------------------------------------------
 
       def all_assets
-        Set.new(@used).merge extra_assets
+        Set.new(@used).merge(
+          extra_assets
+        )
       end
 
+      # ----------------------------------------------------------------------
       # Assets you tell us you want to always compile, even if you do not
       # use them.  Just like Rails this is probably normally used.
+      # ----------------------------------------------------------------------
 
       def extra_assets
         assets = asset_config["assets"] ||= []
@@ -80,53 +114,63 @@ module Jekyll
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def cdn?
         !dev? && asset_config.key?("cdn") && \
           asset_config["cdn"]
       end
 
-      #
+      # ----------------------------------------------------------------------
+      # rubocop:disable Style/ExtraSpacing
+      # ----------------------------------------------------------------------
 
       def baseurl
         ary = []
 
         ary << jekyll.config["baseurl"] unless cdn? && asset_config["skip_baseurl_with_cdn"]
         ary <<  asset_config[ "prefix"] unless cdn? && asset_config[ "skip_prefix_with_cdn"]
+
         File.join(*ary.delete_if do |val|
           val.nil? || val.empty?
         end)
       end
 
-      #
+      # ----------------------------------------------------------------------
+      # rubocop:enable Style/ExtraSpacing
+      # ----------------------------------------------------------------------
 
       def dev?
         %W(development test).include?(Jekyll.env)
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def compress?(what)
-        !!asset_config["compress"] \
-          .fetch(what, false)
+        !!asset_config["compress"].fetch(
+          what, false
+        )
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def asset_config
         jekyll.config["assets"] ||= {}
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def digest?
-        !!asset_config["digest"]
+        !!asset_config[
+          "digest"
+        ]
       end
 
+      # ----------------------------------------------------------------------
       # Prefix path prefixes the path with the baseurl and the cdn if it
       # exists and is in the right mode to use it.  Otherwise it will only use
       # the baseurl and asset prefix.  All of these can be adjusted.
+      # ----------------------------------------------------------------------
 
       def prefix_path(path = nil)
         cdn = asset_config["cdn"]
@@ -140,37 +184,45 @@ module Jekyll
         url.chomp("/")
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def cached
-        Cached.new(self)
+        return @cached ||= Cached.new(
+          self
+        )
       end
 
-      #
+      # ----------------------------------------------------------------------
+
+      def manifest
+        return @manifest ||= Manifest.new(self, jekyll.in_dest_dir(
+          asset_config["prefix"]
+        ))
+      end
+
+      # ----------------------------------------------------------------------
+      # Write assets with the manifest if they aren't proxied assets.  If
+      # they are then we go on to write them ourselves.  We don't necessarily
+      # integrate with the manifest that deeply because it's hard.
+      # ----------------------------------------------------------------------
 
       def write_all
-        past = self.class.past ||= Set.new
-        (@used.any?? all_assets : past).each do |obj|
-          if past.add(obj) && path = as_path(obj)
-            obj.write_to path
-          end
+        assets = all_assets.partition { |v| v.is_a?(Liquid::Tag::ProxiedAsset) }
+        manifest.compile(assets.last.map(&:logical_path))
+
+        assets.first.map do |asset|
+          asset.write_to(jekyll.in_dest_dir(File.join(asset_config["prefix"],
+            digest?? asset.digest_path : asset.logical_path
+          )))
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def strip_path(path)
         path.sub(jekyll.in_source_dir("/"), "")
       end
-
-      #
-
-      private
-      def as_path(v)
-        path = digest?? v.digest_path : v.logical_path
-        jekyll.in_dest_dir(File.join(asset_config[ "prefix"], path))
-      end
     end
   end
 end

data/lib/jekyll/assets/hook.rb

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Jekyll
   module Assets
@@ -11,6 +13,8 @@ module Jekyll
         end
       end
 
+      # ----------------------------------------------------------------------
+
       HOOK_ALIASES = {
         :env => {
           :post_init => :init,
@@ -18,22 +22,28 @@ module Jekyll
         }
       }
 
+      # ----------------------------------------------------------------------
+
       HOOK_POINTS = {
         :env => [
           :init
         ]
       }
 
+      # ----------------------------------------------------------------------
+
       def self.all
         @_all ||= {}
       end
 
+      # ----------------------------------------------------------------------
       # Trigger a hook, giving an optional block where we pass you the,
       # 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)
-        raise ArgumentError, "Do not give args with a block" if args.size > 0 && block_given?
+        raise ArgumentError, "Do not give args with a block" if !args.empty? && block_given?
         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)
@@ -41,7 +51,7 @@ module Jekyll
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def self.point(base, point, when_ = :late)
         point = all[base][point] ||= {
@@ -52,7 +62,7 @@ module Jekyll
         point[when_]
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def self.register(base, point, when_ = :late, &block)
         raise UnknownHookError, base: base unless HOOK_POINTS.key?(base)

data/lib/jekyll/assets/hooks.rb

@@ -1,18 +1,18 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require_relative "hooks/jekyll/drops"
 require_relative "hooks/jekyll/setup"
 require_relative "hooks/jekyll/write"
-
 require_relative "hooks/compression"
-require_relative "hooks/configuration"
-require_relative "hooks/context_patches"
-require_relative "hooks/disable_erb"
+require_relative "hooks/config"
 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_relative "hooks/erb"

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

@@ -1,9 +1,17 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 Jekyll::Assets::Hook.register :env, :init do
-  if (cache_dir = asset_config.fetch("cache", ".asset-cache"))
-    self.cache = Sprockets::Cache::FileStore.new(jekyll.in_source_dir(cache_dir))
+  cache_dir = asset_config.fetch("cache",
+    ".asset-cache"
+  )
+
+  if cache_dir
+    self.cache = Sprockets::Cache::FileStore.new(
+      jekyll.in_source_dir(cache_dir)
+    )
   end
 end

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

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 Jekyll::Assets::Hook.register :env, :init do
   if compress?("css")
@@ -9,7 +11,15 @@ Jekyll::Assets::Hook.register :env, :init do
 
   if compress?("js")
     try_require "uglifier" do
-      self.js_compressor = :uglify
+      if !jekyll.safe && (opts = self.asset_config.fetch("external", {}).fetch("uglifier", nil))
+        self.js_compressor = Uglifier.new(
+          opts.symbolize_keys
+        )
+
+      else
+        self.js_compressor = \
+          :uglify
+      end
     end
   end
 end

data/lib/jekyll/assets/hooks/{configuration.rb → config.rb}

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 Jekyll::Assets::Hook.register :env, :init, :early do
   jekyll.config["assets"] = Jekyll::Assets::Config.merge(asset_config)

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

@@ -0,0 +1,15 @@
+# ----------------------------------------------------------------------------
+# Frozen-string-literal: true
+# Copyright: 2012 - 2016 - MIT License
+# Encoding: utf-8
+# ----------------------------------------------------------------------------
+
+Jekyll::Assets::Hook.register :env, :init, :early do
+  self.config = hash_reassoc(config, :engines) do |hash|
+    hash.delete(
+      ".erb"
+    )
+
+    hash
+  end
+end

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

@@ -1,11 +1,12 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
-
-require "sprockets/helpers"
+# ----------------------------------------------------------------------------
 
 Jekyll::Assets::Hook.register :env, :init do
   Sprockets::Helpers.configure do |config|
+    config.manifest = manifest
     config.prefix = prefix_path
     config.digest = digest?
   end

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

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 Jekyll::Hooks.register :site, :pre_render do |jekyll, payload|
   payload["assets"] = jekyll.sprockets.to_liquid_payload

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

@@ -1,13 +1,11 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - 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
+  Jekyll::Assets::Env.init(
+    jekyll
+  )
 end