From cc45c435b7f62f83f0d0cd4b952a5c05ccfaaac9 Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice-puppet@daysofwonder.com>
Date: Sun, 23 Nov 2008 00:01:04 +0100
Subject: Fix #1741 - refactor TemplateWrapper, test for template function

---
 lib/puppet/parser/functions/template.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/puppet/parser/functions')

diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb
index e62c3b326..2eaace1d7 100644
--- a/lib/puppet/parser/functions/template.rb
+++ b/lib/puppet/parser/functions/template.rb
@@ -9,10 +9,11 @@ Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc =>
             # Use a wrapper, so the template can't get access to the full
             # Scope object.
             debug "Retrieving template %s" % file
-            wrapper = Puppet::Parser::TemplateWrapper.new(self, file)
 
+            wrapper = Puppet::Parser::TemplateWrapper.new(self)
+            wrapper.file = file
             begin
-                wrapper.result()
+                wrapper.result
             rescue => detail
                 raise Puppet::ParseError,
                     "Failed to parse template %s: %s" %
-- 
cgit 


From 607958cb7fe178596930b1506b69807dc78d111b Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice-puppet@daysofwonder.com>
Date: Sun, 23 Nov 2008 00:01:23 +0100
Subject: Fix #1741 - Add inline_template function

---
 lib/puppet/parser/functions/inline_template.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/puppet/parser/functions/inline_template.rb

(limited to 'lib/puppet/parser/functions')

diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb
new file mode 100644
index 000000000..289740873
--- /dev/null
+++ b/lib/puppet/parser/functions/inline_template.rb
@@ -0,0 +1,21 @@
+Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => 
+    "Evaluate a template string and return its value.  See `the templating docs 
+    </trac/puppet/wiki/PuppetTemplating>`_ for more information.  Note that 
+    if multiple template strings are specified, their output is all concatenated 
+    and returned as the output of the function.") do |vals|
+        require 'erb'
+
+        vals.collect do |string|
+            # Use a wrapper, so the template can't get access to the full
+            # Scope object.
+
+            wrapper = Puppet::Parser::TemplateWrapper.new(self)
+            begin
+                wrapper.result(string)
+            rescue => detail
+                raise Puppet::ParseError,
+                    "Failed to parse inline template: %s" %
+                        [detail]
+            end
+        end.join("")
+end
-- 
cgit