[CHEF-3249] Refactor template name resolution out to a separate class for DRYness and readability. While here let's also extend the API to support local templates, as well as templates from other cookbooks.

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/chef/mixin/template.rb b/lib/chef/mixin/template.rb
index c25f5f6e1f..9288264fcd 100644
--- a/lib/chef/mixin/template.rb
+++ b/lib/chef/mixin/template.rb
@@ -30,10 +30,10 @@ class Chef
                 "include a node variable if you plan to use it."
         end
 
-        def render(partial_name, variables = nil)
-          raise "You cannot render partials in this context" unless @partial_resolver
+        def render(partial_name, options = {})
+          raise "You cannot render partials in this context" unless @template_finder
 
-          if variables
+          if variables = options.delete(:variables)
             context = {}
             context.merge!(variables)
             context[:node] = node
@@ -41,7 +41,7 @@ class Chef
             context = self.dup
           end
 
-          template_location = @partial_resolver.call(partial_name)
+          template_location = @template_finder.find(partial_name, options)
           eruby = Erubis::Eruby.new(IO.read(template_location))
           output = eruby.evaluate(context)
         end