jekyll-assets 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8802519985258b4eb676f27beef2393b75b3628067c317c8861966cbbab9b86a
-  data.tar.gz: f522012aa1e7711daa7e0b42306a1bfb5c927116e36964aac2413d94e420a76c
+  metadata.gz: 319eeab72a3d9cb99b7bf888861dcd5e8685c5245b9fa179e587d853bd6b3cad
+  data.tar.gz: 2b53de4cacd344d2bc84aaa3d33df4d6382d77c42baae6bac881aa66bd304656
 SHA512:
-  metadata.gz: 37fd7315a6cd37c70fe25412686f97d767d264a8c25915d2ca629d9e5a011de6ab6e7c9758b82b94288e13b6cef9c665cd9c631ed462a551f5ab56b10401fb20
-  data.tar.gz: 93a4a75a7658df533ffeb64e95f87c532531b0fd0f056c396ff6cdaede8135e0c8bdf868520756a0cbd54a8d942b4cefa290f25b0f10d210cd21341de00e0c33
+  metadata.gz: 8d796a76d2b54a4364426c9bf364dd2252ba65006270bf6cfe2cbb3ee96fcd1cc26aaec958a88d0971a5d3f9c1a89d3c26dc15e8c91dedaed835a431419a397a
+  data.tar.gz: c1a4c4a479b28558976ee59c5c6d32c1f293b9b957bb4b946ee26040930466d3216e42c2dd0dc9b2659fb5dba290c1a592b38f5258b472505556bbf4811ba358

data/lib/jekyll/assets/env.rb

@@ -107,7 +107,9 @@ module Jekyll
           out = Sprockets::Cache::MemoryStore.new if enbl && type == "memory"
           out = Sprockets::Cache::FileStore.new(path) if enbl && type == "file"
           out = Sprockets::Cache::NullStore.new unless enbl
-          Sprockets::Cache.new(out, Logger)
+          out = Sprockets::Cache.new(out, Logger)
+          clear_cache(out)
+          out
         end
       end
 
@@ -151,6 +153,16 @@ module Jekyll
         end
       end
 
+      # --
+      private
+      def clear_cache(cache)
+        if @manifest.new_manifest? && cache && cache.respond_to?(:clear)
+          cache.clear
+        end
+      rescue Errno::ENOENT
+        nil
+      end
+
       # --
       private
       def ignore_caches!

data/lib/jekyll/assets/manifest.rb

@@ -9,6 +9,26 @@ module Jekyll
     class Manifest < Sprockets::Manifest
       attr_reader :data
 
+      # --
+      # Determines if we've a new manifest file.
+      # @note it helps us keep the cache directory clean.
+      # rubocop:disable Style/RedundantReturn
+      # @return [true, false]
+      # --
+      def new_manifest?
+        return @new_manifest
+      end
+
+      # --
+      # Set @new_manifest to false by default.
+      # @override Sprockets::Manifest#initialize
+      # @return See upstream.
+      # --
+      def initialize(*args)
+        @new_manifest = false
+        super
+      end
+
       # --
       # Works around some weird behavior in Sprockets 3.x that seemd to make
       # it so that when you use an absolute path, it was automatically a filter
@@ -29,6 +49,18 @@ module Jekyll
           assets
         )
       end
+
+      # --
+      # rubocop:disable Metrics/LineLength
+      # Allows us to discover the manifest path, but know
+      #   if it's new.
+      # --
+      def find_directory_manifest(dirname)
+        entries = File.directory?(dirname) ? Dir.entries(dirname) : []
+        entry = (f = entries.find { |e| e =~ MANIFEST_RE }) || generate_manifest_path
+        f || @new_manifest = true
+        File.join(dirname, entry)
+      end
     end
   end
 end

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION = "3.0.10"
+    VERSION = "3.0.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs