jekyll-assets 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2701c57cfcb5392c562676adbce997cf147cc14c
-  data.tar.gz: 29041b98a075e176afe6e8fee3f7530ce668de30
+  metadata.gz: a1fcdef26bcae20f2b556204dc86af8dce96e1ef
+  data.tar.gz: b0c9bd1584b0d25caeff7cd95ddb82f1f8539d9f
 SHA512:
-  metadata.gz: 7b1edea77731a82e6db799968a17ebdf910b9cc00ed7b24955a9fac6724c2aff0ec94650e8f416e20ac575a73c6dfaef767040bcfe11612f8e6cce3504858c47
-  data.tar.gz: c4201b3f5f21352faf4221f528b54d893e8e54361af27c961bc027b0e6cd3205d64275e70f64a2cb4b20765087f00db22ad6b93d449ac385ddc0a98985f4219b
+  metadata.gz: 9261a36b91c351729a9b1081b9e40ed786d6e641044ccda49348a36425698220303dffd4d3b388ce31ef49b3aa50c879b612e940586b89d4a47e0a95f770fecf
+  data.tar.gz: 792001e489b1e36a4b966d3aca54007583a409dc8cfc6a059606f9098daef896b1d3b7b453aa2ba2ffddde9e48e9a4bec26818485a78c9f92809dd78e0f9818e

data/lib/jekyll/assets/env.rb

@@ -272,8 +272,24 @@ module Jekyll
       # integrate with the manifest that deeply because it's hard.
       # --
       def write_all
-        assets = manifest.all.partition { |v| v.is_a?(Liquid::Tag::ProxiedAsset) }
-        manifest.compile(assets.last.map(
+        assets = manifest.all.to_a.compact
+        if assets.size != manifest.all.size
+          Jekyll.logger.error "", "Asset inconsitency, expected "
+            "#{manifest.all.size}, can only write #{
+              assets.size
+            }"
+        end
+
+        assets = manifest.all.group_by do |v|
+          v.is_a?(
+            Liquid::Tag::ProxiedAsset
+          )
+        end
+
+        # These are assets that aren't proxied, they returned fals when
+        # they were asked if they belonged to a proxy.
+
+        manifest.compile(assets[false].map(
           &:logical_path
         ))
 
@@ -282,10 +298,17 @@ module Jekyll
         # caching, so we always write them individually since they will
         # never actually show up inside of the manifest.
 
-        assets.first.map do |asset|
-          asset.write_to(jekyll.in_dest_dir(File.join(asset_config["prefix"],
-            digest?? asset.digest_path : asset.logical_path
-          )))
+        if assets.key?(true)
+          unless assets[true].empty?
+            Pathutil.new(in_cache_dir)
+              .mkdir_p
+          end
+
+          assets[true].map do |asset|
+            asset.write_to(jekyll.in_dest_dir(File.join(asset_config["prefix"],
+              digest?? asset.digest_path : asset.logical_path
+            )))
+          end
         end
       end
 
@@ -294,7 +317,9 @@ module Jekyll
       # --
       private
       def strip_path(path)
-        path.sub(jekyll.in_source_dir("/"), "")
+        path.sub(jekyll.in_source_dir("/"),
+          ""
+        )
       end
     end
   end

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

@@ -21,5 +21,9 @@ Jekyll::Assets::Hook.register :env, :init do
     self.cache = begin
       Sprockets::Cache::MemoryStore.new
     end
+
+  else
+    Jekyll.logger.info "", "Caching disabled however, " \
+      "if you use proxies it could still possibly be created."
   end
 end

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

@@ -37,9 +37,15 @@ module Jekyll
             # @return [nil]
             # --
             def set_integrity
+              digest = Sprockets::DigestUtils.integrity_uri(
+                Digest::SHA384.digest(
+                  @asset.to_s
+                )
+              )
+
               @args.args[:html] ||= {}
               if @env.asset_config["features"]["integrity"]
-                @args.args[:html]["integrity"] = @asset.integrity
+                @args.args[:html]["integrity"] = digest
                 @args.args[:html]["crossorigin"] = "anonymous" \
                   unless @args.args[:html]["crossorigin"]
               end

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

@@ -92,7 +92,7 @@ module Jekyll
 
           def to_html
             (self[:html] || {}).map do |key, val|
-              %( #{key}="#{val}")
+              val == true || val == "true" ? key.to_s : %( #{key}="#{val}")
             end.join
           end
 

data/lib/jekyll/assets/manifest.rb

@@ -42,10 +42,14 @@ module Jekyll
           )
         end
 
+        # --
+
         filenames = []
         concurrent_compressors = []
         concurrent_writers = []
 
+        # --
+
         find(*args) do |asset|
           files[asset.digest_path] = {
             "mtime" => asset.mtime.iso8601,
@@ -55,15 +59,23 @@ module Jekyll
             "size" => asset.bytesize
           }
 
+          # --
+
           assets[asset.logical_path] = asset.digest_path
           alias_logical_path = self.class.compute_alias_logical_path(
             asset.logical_path
           )
 
+          # --
+
           if alias_logical_path
             assets[alias_logical_path] = asset.digest_path
           end
 
+          # Unlike upstream, we allow users to disble digesting, this is
+          # where we actually and truthfully only diverge from upstream in
+          # that we disable or enable the digested or logical path.
+
           target = \
           if environment.digest?
             File.join(dir,
@@ -75,16 +87,21 @@ module Jekyll
             )
           end
 
-          if File.exist?(target)
-            logger.debug(
-              "Skipping #{target}, already exists"
-            )
-          else
+          # --
+
+          if !environment.digest? || !File.exist?(target)
             logger.info "Writing #{target}"
             write_file = Concurrent::Future.execute { asset.write_to target }
             concurrent_writers << write_file
+
+          else
+            logger.debug(
+              "Skipping #{target}, already exists"
+            )
           end
 
+          # --
+
           filenames << asset.filename
           next if environment.skip_gzip?
           gzip = Utils::Gzip.new(asset)
@@ -92,6 +109,10 @@ module Jekyll
             environment.mime_types
           )
 
+          # This is technically ignored usptream, we don't allow our
+          # assets to write `.tar.gz` files by default, however, we leave
+          # this here just incase someobody overrides that method.
+
           if File.exist?("#{target}.gz")
             logger.debug(
               "Skipping #{target}.gz, already exists"
@@ -107,11 +128,15 @@ module Jekyll
           end
         end
 
+        # --
+
         concurrent_writers.each(&:wait!)
         concurrent_compressors.each(
           &:wait!
         )
 
+        # --
+
         save
         filenames
       end

data/lib/jekyll/assets/patches/sprockets/asset.rb

@@ -1,19 +1,24 @@
-# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
-# ----------------------------------------------------------------------------
 
 module Sprockets
   class Asset
+
+    # --
+    # List all the liquid tags this asset used.
+    # --
     def liquid_tags
       metadata[:liquid_tags] ||= begin
         Set.new
       end
     end
 
-    # ------------------------------------------------------------------------
 
+    # --
+    # Pull out the data uri.
+    # @return [String]
+    # --
     def data_uri
       "data:#{content_type};base64,#{Rack::Utils.escape(
         Base64.encode64(to_s)

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.2.5"
+    VERSION="2.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets