Merge pull request #175 from mitio/better_precache_mtimes

Set the mtime of pre-cached files to the mtime of the newest file from the corresponding package

Author: jashkenas

lib/jammit/packager.rb

@@ -38,13 +38,13 @@ def initialize
     # changed since their last package build.
     def precache_all(output_dir=nil, base_url=nil)
       output_dir ||= File.join(PUBLIC_ROOT, Jammit.package_path)
-      cacheable(:js, output_dir).each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
+      cacheable(:js, output_dir).each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir, nil, newest_mtime(p, :js)) }
       cacheable(:css, output_dir).each do |p|
-        cache(p, 'css', pack_stylesheets(p), output_dir)
+        mtime = newest_mtime(p, :css)
+        cache(p, 'css', pack_stylesheets(p), output_dir, nil, mtime)
         if Jammit.embed_assets
-          cache(p, 'css', pack_stylesheets(p, :datauri), output_dir, :datauri)
+          cache(p, 'css', pack_stylesheets(p, :datauri), output_dir, :datauri, mtime)
           if Jammit.mhtml_enabled && base_url
-            mtime = Time.now
             asset_url = "#{base_url}#{Jammit.asset_url(p, :css, :mhtml, mtime)}"
             cache(p, 'css', pack_stylesheets(p, :mhtml, asset_url), output_dir, :mhtml, mtime)
           end
@@ -73,6 +73,11 @@ def individual_urls(package, extension)
       package_for(package, extension)[:urls]
     end
 
+    # Return the modification time of the newest file in the package
+    def newest_mtime(package, extension)
+      package_for(package, extension)[:paths].map { |path| File.mtime(path) }.max
+    end
+
     # Return the compressed contents of a stylesheet package.
     def pack_stylesheets(package, variant=nil, asset_url=nil)
       @compressor.compress_css(package_for(package, :css)[:paths], variant, asset_url)