nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Rails.application.assets_manifest.assets instead of json file

Browse source
This commit is contained in:
Benjamin Neff 2017-07-31 22:54:03 +02:00
parent 7f8108e4ac
commit 1007b3cdbd
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/tasks/assets.rake
View file

@ -10,14 +10,13 @@ namespace :assets do
logger = ::Logging::Logger["assets:non_digest_assets"] logger = ::Logging::Logger["assets:non_digest_assets"]
non_digest_assets = Diaspora::Application.config.assets.non_digest_assets non_digest_assets = Diaspora::Application.config.assets.non_digest_assets
manifest_path = Dir.glob(Rails.root.join("public", "assets", ".sprockets-manifest-*.json")).first
JSON.load(File.new(manifest_path))["assets"].each do |logical_path, digested_path| Rails.application.assets_manifest.assets.each do |logical_path, digested_path|
logical_pathname = Pathname.new(logical_path) logical_pathname = Pathname.new(logical_path)
next unless non_digest_assets.any? {|testpath| logical_pathname.fnmatch?(testpath, File::FNM_PATHNAME) } next unless non_digest_assets.any? {|testpath| logical_pathname.fnmatch?(testpath, File::FNM_PATHNAME) }
full_digested_path = File.join(Rails.root, "public/assets", digested_path) full_digested_path = Rails.root.join("public", "assets", digested_path)
full_non_digested_path = File.join(Rails.root, "public/assets", logical_path) full_non_digested_path = Rails.root.join("public", "assets", logical_path)
next unless FileUtils.uptodate?(full_digested_path, [full_non_digested_path]) next unless FileUtils.uptodate?(full_digested_path, [full_non_digested_path])