sprockets 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6633bafc9b6d1b1570fa828078c0b4e60979bfe1
-  data.tar.gz: 804e028afbdb65c793f4f11d8e6af5d2109d55e3
+  metadata.gz: faadf5a06d9bd72e3aea6d55c30d04dc5521b3b9
+  data.tar.gz: 8f383977d36ebfa7ab7033304d01bb67a95665fc
 SHA512:
-  metadata.gz: ef28f9483212866abe219015449ea9e2f277860a8823b01ccc5898f6265848ed67d828bca494b8c8abc366efa74bb5591043eb19f07f47171bb778718c71661e
-  data.tar.gz: e63e469b61325f97a91625197c213ec92aba3e2720027b4070c6ffd0463e5c7d4a1f09ffee2b0cd2b1c4b24d714e724558fe57467e0a73834c78af9ac6e223d1
+  metadata.gz: b42b6cb6a38a4301f18c419a903c3e3d352fd001067ab66a25d75e98ba091e599269d452041f0bb195190fdf60d74e077d13676c7a810889230f76442443aa0f
+  data.tar.gz: 5f386a5ef36a610d4a84f74283b5eeb7afa32567f47c6dab8c4ee0151d59b856d6d0995f0c7cc0de7e31fd283cad02f72c85d38aa779b023dd77a39fe9066c15

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**3.3.3** (August 21, 2015)
+
+* Remove more absolute paths from cache contents.
+
 **3.3.2** (August 19, 2015)
 
 * Fix cache contents to use relative paths instead of absolute paths.

data/lib/sprockets/loader.rb

@@ -78,8 +78,16 @@ module Sprockets
           asset[:uri]       = expand_from_root(asset[:uri])
           asset[:load_path] = expand_from_root(asset[:load_path])
           asset[:filename]  = expand_from_root(asset[:filename])
-          asset[:metadata][:included].map!     { |uri| expand_from_root(uri) } if asset[:metadata][:included]
-          asset[:metadata][:dependencies].map! { |uri| uri.start_with?("file-digest://") ? expand_from_root(uri) : uri } if asset[:metadata][:dependencies]
+          asset[:metadata][:included].map!          { |uri| expand_from_root(uri) } if asset[:metadata][:included]
+          asset[:metadata][:links].map!             { |uri| expand_from_root(uri) } if asset[:metadata][:links]
+          asset[:metadata][:stubbed].map!           { |uri| expand_from_root(uri) } if asset[:metadata][:stubbed]
+          asset[:metadata][:required].map!          { |uri| expand_from_root(uri) } if asset[:metadata][:required]
+          asset[:metadata][:dependencies].map!      { |uri| uri.start_with?("file-digest://") ? expand_from_root(uri) : uri } if asset[:metadata][:dependencies]
+
+          asset[:metadata].each_key do |k|
+            next unless k =~ /_dependencies\z/
+            asset[:metadata][k].map! { |uri| expand_from_root(uri) }
+          end
         end
         asset
       end
@@ -196,17 +204,39 @@ module Sprockets
         if cached_asset[:metadata]
           # Deep dup to avoid modifying `asset`
           cached_asset[:metadata] = cached_asset[:metadata].dup
-          if cached_asset[:metadata][:included]
+          if cached_asset[:metadata][:included] && !cached_asset[:metadata][:included].empty?
             cached_asset[:metadata][:included] = cached_asset[:metadata][:included].dup
-            cached_asset[:metadata][:included] = cached_asset[:metadata][:included].map {|uri| compress_from_root(uri) }
+            cached_asset[:metadata][:included].map! { |uri| compress_from_root(uri) }
+          end
+
+          if cached_asset[:metadata][:links] && !cached_asset[:metadata][:links].empty?
+            cached_asset[:metadata][:links] = cached_asset[:metadata][:links].dup
+            cached_asset[:metadata][:links].map! { |uri| compress_from_root(uri) }
+          end
+
+          if cached_asset[:metadata][:stubbed] && !cached_asset[:metadata][:stubbed].empty?
+            cached_asset[:metadata][:stubbed] = cached_asset[:metadata][:stubbed].dup
+            cached_asset[:metadata][:stubbed].map! { |uri| compress_from_root(uri) }
+          end
+
+          if cached_asset[:metadata][:required] && !cached_asset[:metadata][:required].empty?
+            cached_asset[:metadata][:required] = cached_asset[:metadata][:required].dup
+            cached_asset[:metadata][:required].map! { |uri| compress_from_root(uri) }
           end
 
-          if cached_asset[:metadata][:dependencies]
+          if cached_asset[:metadata][:dependencies] && !cached_asset[:metadata][:dependencies].empty?
             cached_asset[:metadata][:dependencies] = cached_asset[:metadata][:dependencies].dup
             cached_asset[:metadata][:dependencies].map! do |uri|
               uri.start_with?("file-digest://".freeze) ? compress_from_root(uri) : uri
             end
           end
+
+          # compress all _dependencies in metadata like `sass_dependencies`
+          cached_asset[:metadata].each do |key, value|
+            next unless key =~ /_dependencies\z/
+            cached_asset[:metadata][key] = value.dup
+            cached_asset[:metadata][key].map! {|uri| compress_from_root(uri) }
+          end
         end
 
         # Unloaded asset and stored_asset now have a different URI
@@ -256,7 +286,7 @@ module Sprockets
       #
       #   [["environment-version", "environment-paths", "processors:type=text/css&file_type=text/css",
       #     "file-digest:///Full/path/app/assets/stylesheets/application.css",
-      #     "processors:type=text/css&file_type=text/css&pipeline=self",
+      #     "processors:type=text/css&file_digesttype=text/css&pipeline=self",
       #     "file-digest:///Full/path/app/assets/stylesheets"]]
       #
       # Where the first entry is a Set of dependencies for last generated version of that asset.
@@ -276,7 +306,7 @@ module Sprockets
 
         history = cache.get(key) || []
         history.each_with_index do |deps, index|
-          deps = deps.map { |path| path.start_with?("file-digest://") ? expand_from_root(path) : path }
+          deps.map! { |path| path.start_with?("file-digest://") ? expand_from_root(path) : path }
           if asset = yield(deps)
             cache.set(key, history.rotate!(index)) if index > 0
             return asset
@@ -284,7 +314,7 @@ module Sprockets
         end
 
         asset = yield
-        deps = asset[:metadata][:dependencies].map do |uri|
+        deps  = asset[:metadata][:dependencies].dup.map! do |uri|
           uri.start_with?("file-digest://") ? compress_from_root(uri) : uri
         end
         cache.set(key, history.unshift(deps).take(limit))

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sprockets
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rack-based asset packaging system