sprockets 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce2476cd245660b43d7f43d8c73e49e8dba8f8b
-  data.tar.gz: 04a112134ed6023fc75a5f5932b9ce1e51200d55
+  metadata.gz: 52d2bf02cdc6fea8149c3e97e01f3beb73206ffd
+  data.tar.gz: 0c7a54162f7423cce7008406f80139d52269676f
 SHA512:
-  metadata.gz: 67ae5f33aea980377bbab8a8f70b0fb0364a12696bc1c76c6813b03a11be59091d3630562d16cd0eeccfce1348661dc447989bdc54e34d0598578497f2d14c78
-  data.tar.gz: 611067448c1962a8a1fea6d50d0e236834f0244f66274ebd87f3bd0b2f2216ad67cdbe548186c3e34e28079bbbf4395286ad384eb13f48680c02a290478c7cd2
+  metadata.gz: 0133bd2b3561392e0ad2b17fac3fa2843234b5fd90c44de782882f709dafbe62008babd0ada300e98325cb99792dfa2cb1902c6fbba69b728787208b04ee83af
+  data.tar.gz: a2ac64bbcac2aac490a9192da4d9aa23aeb1998296953df9af8627075cdb9c14b9cd7f6f5c106a397ba1ad637edb93dc27016d91f64f894556af2f5a993c888a

data/lib/sprockets/errors.rb

@@ -8,5 +8,4 @@ module Sprockets
   class ConversionError         < NotFound; end
   class FileNotFound            < NotFound; end
   class FileOutsidePaths        < NotFound; end
-  class VersionNotFound         < NotFound; end
 end

data/lib/sprockets/loader.rb

@@ -26,8 +26,13 @@ module Sprockets
     def load(uri)
       filename, params = parse_asset_uri(uri)
       if params.key?(:id)
-        asset = cache.fetch("asset-uri:#{VERSION}#{uri}") do
-          load_asset_by_id_uri(uri, filename, params)
+        unless asset = cache.get("asset-uri:#{VERSION}:#{uri}", true)
+          id = params.delete(:id)
+          uri_without_id = build_asset_uri(filename, params)
+          asset = load_asset_by_uri(uri_without_id, filename, params)
+          if asset[:id] != id
+            @logger.warn "Sprockets load error: Tried to find #{uri}, but latest was id #{asset[:id]}"
+          end
         end
       else
         asset = fetch_asset_from_dependency_cache(uri, filename) do |paths|
@@ -45,28 +50,7 @@ module Sprockets
     end
 
     private
-      def load_asset_by_id_uri(uri, filename, params)
-        # Internal assertion, should be routed through load_asset_by_uri
-        unless id = params.delete(:id)
-          raise ArgumentError, "expected uri to have an id: #{uri}"
-        end
-
-        uri = build_asset_uri(filename, params)
-        asset = load_asset_by_uri(uri, filename, params)
-
-        if id && asset[:id] != id
-          raise VersionNotFound, "could not find specified id: #{uri}##{id}"
-        end
-
-        asset
-      end
-
       def load_asset_by_uri(uri, filename, params)
-        # Internal assertion, should be routed through load_asset_by_id_uri
-        if params.key?(:id)
-          raise ArgumentError, "expected uri to have no id: #{uri}"
-        end
-
         unless file?(filename)
           raise FileNotFound, "could not find file: #{filename}"
         end
@@ -118,6 +102,7 @@ module Sprockets
             length: source.bytesize
           )
         else
+          dependencies << build_file_digest_uri(filename)
           metadata = {
             digest: file_digest(filename),
             length: self.stat(filename).size,
@@ -145,11 +130,12 @@ module Sprockets
         asset[:mtime] = metadata[:dependencies].map { |u|
           if u.start_with?("file-digest:")
             s = self.stat(parse_file_digest_uri(u))
-            s ? s.mtime.to_i : 1211698800
+            s ? s.mtime.to_i : nil
           else
-            1211698800
+            nil
           end
-        }.max
+        }.compact.max
+        asset[:mtime] ||= self.stat(filename).mtime.to_i
 
         cache.set("asset-uri:#{VERSION}:#{asset[:uri]}", asset, true)
         cache.set("asset-uri-digest:#{VERSION}:#{uri}:#{asset[:dependencies_digest]}", asset[:uri], true)

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack