From 1007b3cdbd3171e45ea45ba3356e429b8700f66f Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 31 Jul 2017 22:54:03 +0200
Subject: [PATCH] Use Rails.application.assets_manifest.assets instead of json
file
---
lib/tasks/assets.rake | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 917630f62e..39083eea30 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -10,14 +10,13 @@ namespace :assets do
logger = ::Logging::Logger["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)
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_non_digested_path = File.join(Rails.root, "public/assets", logical_path)
+ full_digested_path = Rails.root.join("public", "assets", digested_path)
+ full_non_digested_path = Rails.root.join("public", "assets", logical_path)
next unless FileUtils.uptodate?(full_digested_path, [full_non_digested_path])
--
GitLab