diff options
author | Brice Figureau <brice-puppet@daysofwonder.com> | 2008-11-23 00:01:23 +0100 |
---|---|---|
committer | Brice Figureau <brice-puppet@daysofwonder.com> | 2008-11-29 12:00:21 +0100 |
commit | 607958cb7fe178596930b1506b69807dc78d111b (patch) | |
tree | a1e5691285d5af2a4f3c378993f85d3d478f57e3 | |
parent | cc45c435b7f62f83f0d0cd4b952a5c05ccfaaac9 (diff) | |
download | puppet-607958cb7fe178596930b1506b69807dc78d111b.tar.gz puppet-607958cb7fe178596930b1506b69807dc78d111b.tar.xz puppet-607958cb7fe178596930b1506b69807dc78d111b.zip |
Fix #1741 - Add inline_template function
-rw-r--r-- | lib/puppet/parser/functions/inline_template.rb | 21 | ||||
-rw-r--r-- | spec/unit/parser/functions/inline_template.rb | 59 |
2 files changed, 80 insertions, 0 deletions
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 diff --git a/spec/unit/parser/functions/inline_template.rb b/spec/unit/parser/functions/inline_template.rb new file mode 100644 index 000000000..19e1a3b2a --- /dev/null +++ b/spec/unit/parser/functions/inline_template.rb @@ -0,0 +1,59 @@ +#!/usr/bin/env ruby + +require File.dirname(__FILE__) + '/../../../spec_helper' + +describe "the inline_template function" do + + before :each do + @scope = Puppet::Parser::Scope.new() + end + + it "should exist" do + Puppet::Parser::Functions.function("inline_template").should == "function_inline_template" + end + + it "should create a TemplateWrapper when called" do + tw = stub_everything 'template_wrapper' + + Puppet::Parser::TemplateWrapper.expects(:new).returns(tw) + + @scope.function_inline_template("test") + end + + it "should pass the template string to TemplateWrapper.result" do + tw = stub_everything 'template_wrapper' + Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw) + + tw.expects(:result).with("test") + + @scope.function_inline_template("test") + end + + it "should return what TemplateWrapper.result returns" do + tw = stub_everything 'template_wrapper' + Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw) + + tw.expects(:result).returns("template contents evaluated") + + @scope.function_inline_template("test").should == "template contents evaluated" + end + + it "should concatenate template wrapper outputs for multiple templates" do + tw1 = stub_everything "template_wrapper1" + tw2 = stub_everything "template_wrapper2" + Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw1,tw2) + tw1.stubs(:result).returns("result1") + tw2.stubs(:result).returns("result2") + + @scope.function_inline_template(["1","2"]).should == "result1result2" + end + + it "should raise an error if the template raises an error" do + tw = stub_everything 'template_wrapper' + Puppet::Parser::TemplateWrapper.stubs(:new).returns(tw) + tw.stubs(:result).raises + + lambda { @scope.function_inline_template("1") }.should raise_error(Puppet::ParseError) + end + +end
\ No newline at end of file |