Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasks

Fix cache_digest rake tasks

2 files changed, 14 insertions, 6 deletions

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 147e5b47db..aaa9322c4e 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Bring `cache_digest` rake tasks up-to-date with the latest API changes
+
+    *Jiri Pospisil*
+
 *   Allow custom `:host` option to be passed to `asset_url` helper that
     overwrites `config.action_controller.asset_host` for particular asset.
 
diff --git a/actionview/lib/action_view/tasks/dependencies.rake b/actionview/lib/action_view/tasks/dependencies.rake
index 1b9426c0e5..b39f7d583b 100644
--- a/actionview/lib/action_view/tasks/dependencies.rake
+++ b/actionview/lib/action_view/tasks/dependencies.rake
@@ -2,16 +2,20 @@ namespace :cache_digests do
   desc 'Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)'
   task :nested_dependencies => :environment do
     abort 'You must provide TEMPLATE for the task to run' unless ENV['TEMPLATE'].present?
-    template, format = ENV['TEMPLATE'].split(".")
-    format ||= :html
-    puts JSON.pretty_generate ActionView::Digestor.new(template, format, ApplicationController.new.lookup_context).nested_dependencies
+    puts JSON.pretty_generate ActionView::Digestor.new(name: template_name, finder: finder).nested_dependencies
   end
 
   desc 'Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)'
   task :dependencies => :environment do
     abort 'You must provide TEMPLATE for the task to run' unless ENV['TEMPLATE'].present?
-    template, format = ENV['TEMPLATE'].split(".")
-    format ||= :html
-    puts JSON.pretty_generate ActionView::Digestor.new(template, format, ApplicationController.new.lookup_context).dependencies
+    puts JSON.pretty_generate ActionView::Digestor.new(name: template_name, finder: finder).dependencies
+  end
+
+  def template_name
+    ENV['TEMPLATE'].split('.', 2).first
+  end
+
+  def finder
+    ApplicationController.new.lookup_context
   end
 end