Factoring out template rendering to a mixin

2 files changed, 52 insertions, 14 deletions

diff --git a/lib/chef/mixin/template.rb b/lib/chef/mixin/template.rb
new file mode 100644
index 0000000000..e2ea6a3d11
--- /dev/null
+++ b/lib/chef/mixin/template.rb
@@ -0,0 +1,45 @@
+#
+# Author:: Adam Jacob (<adam@hjksolutions.com>)
+# Copyright:: Copyright (c) 2008 HJK Solutions, LLC
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'tempfile'
+require 'erubis'
+
+class Chef
+  module Mixin
+    module Template
+    
+      # Render a template with Erubis.  Takes a template as a string, and a 
+      # context hash.  
+      def render_template(template, context)
+        eruby = Erubis::Eruby.new(template)
+        output = eruby.evaluate(context)
+        final_tempfile = Tempfile.new("chef-rendered-template")
+        final_tempfile.print(output)
+        final_tempfile.close
+        final_tempfile
+      end
+      
+      # Render a string with Erubis.  Takes a string and a context hash.
+      def render_string(string, context)
+        eruby = Erubis::Eruby.new(string)
+        output = eruby.evaluate(context)
+      end
+      
+    end
+  end
+end
diff --git a/lib/chef/provider/template.rb b/lib/chef/provider/template.rb
index 607c99dde5..550a1388bf 100644
--- a/lib/chef/provider/template.rb
+++ b/lib/chef/provider/template.rb
@@ -17,21 +17,25 @@
 #
 
 require File.join(File.dirname(__FILE__), "file")
+require File.join(File.dirname(__FILE__), "..", "mixin", "template")
 require 'uri'
-require 'erubis'
 require 'tempfile'
 
 class Chef
   class Provider
     class Template < Chef::Provider::File
       
+      include Chef::Mixin::Template
+      
       def action_create
         r = Chef::REST.new(Chef::Config[:template_url])
 
         template_url = generate_url(@new_resource.source, "templates")
         raw_template_file = r.get_rest(template_url, true)
-      
-        template_file = render_template(raw_template_file.path)
+        
+        context = @new_resource.variables
+        context[:node] = @node
+        template_file = render_template(::File.read(raw_template_file.path), context)
 
         update = false
       
@@ -59,17 +63,6 @@ class Chef
         set_group if @new_resource.group != nil
         set_mode if @new_resource.mode != nil
       end
-    
-      def render_template(file)
-        eruby = Erubis::Eruby.new(::File.read(file))
-        context = @new_resource.variables
-        context[:node] = @node
-        output = eruby.evaluate(context)
-        final_tempfile = Tempfile.new("chef-rendered-template")
-        final_tempfile.print(output)
-        final_tempfile.close
-        final_tempfile
-      end
       
     end
   end