Permalink
Browse files

Added support for new manifest format used by turbo-sprockets-rails3

  • Loading branch information...
1 parent aac2014 commit 996d8466c69f9412abea30a2cb1e6ffa0b2189e6 @ndbroadbent committed Oct 2, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/asset_sync/storage.rb
@@ -60,9 +60,11 @@ def always_upload_files
def get_local_files
if self.config.manifest
if File.exists?(self.config.manifest_path)
- yml = YAML.load(IO.read(self.config.manifest_path))
+ yml = YAML.load_file(self.config.manifest_path)
log "Using: Manifest #{self.config.manifest_path}"
- return yml.values.map { |f| File.join(self.config.assets_prefix, f) }
+ # Support for new manifest format used by turbo-sprockets-rails3
+ files = yml[:digest_files] ? yml[:digest_files] : yml
+ return files.values.map { |f| File.join(self.config.assets_prefix, f) }
else
log "Warning: manifest.yml not found at #{self.config.manifest_path}"
end

0 comments on commit 996d846

Please sign in to comment.