diff options
author | mh <mh@immerda.ch> | 2011-05-17 21:19:58 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-05-17 21:19:58 +0200 |
commit | ad2be0a0f8eb24149761a8bade28ef9c222af1af (patch) | |
tree | 21c9f2994f895cfeea09a199d67cac5842f45c16 | |
parent | 3827e73d67bece1b901d2bb2630a955aa737454c (diff) | |
download | puppet-common-ad2be0a0f8eb24149761a8bade28ef9c222af1af.tar.gz puppet-common-ad2be0a0f8eb24149761a8bade28ef9c222af1af.tar.bz2 |
add hash_merge function
-rw-r--r-- | lib/puppet/parser/functions/hash_merge.rb | 10 | ||||
-rw-r--r-- | spec/unit/parser/functions/hash_merge.rb | 34 |
2 files changed, 44 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/hash_merge.rb b/lib/puppet/parser/functions/hash_merge.rb new file mode 100644 index 0000000..831c754 --- /dev/null +++ b/lib/puppet/parser/functions/hash_merge.rb @@ -0,0 +1,10 @@ +Puppet::Parser::Functions::newfunction( + :hash_merge, + :type => :rvalue, + :doc => "Merges two hashes + + Example: hash_merge({'a' => 1 ,'b' => 2},{'b' => 3, 'c' => 4}) -> {'a' => 1 ,'b' => 3, 'c' => 4}" +) do |args| + raise Puppet::ParseError, 'hash_merge() needs two arguments' if args.length != 2 + args[0].merge(args[1]) +end diff --git a/spec/unit/parser/functions/hash_merge.rb b/spec/unit/parser/functions/hash_merge.rb new file mode 100644 index 0000000..0bd8fc1 --- /dev/null +++ b/spec/unit/parser/functions/hash_merge.rb @@ -0,0 +1,34 @@ +#! /usr/bin/env ruby + +require File.dirname(__FILE__) + '/../../../spec_helper' + +describe "the hash_merge function" do + + before :each do + @scope = Puppet::Parser::Scope.new + end + + it "should exist" do + Puppet::Parser::Functions.function("hash_merge").should == "function_hash_merge" + end + + it "should raise a ParseError if there is less than 2 arguments" do + lambda { @scope.function_hash_merge(["foo"]) }.should( raise_error(Puppet::ParseError)) + end + + it "should raise a ParseError if there is more than 2 arguments" do + lambda { @scope.function_hash_merge(["foo", "bar", "gazonk"]) }.should( raise_error(Puppet::ParseError)) + end + + it "should merge the two hashes" do + result = @scope.function_hash_merge([{'a' => 1 ,'b' => 2},{'b' => 3, 'c' => 4}]) + result.should == {'a' => 1 ,'b' => 3, 'c' => 4} + end + + it "should leave the argument untouched" do + a = {'a' => 1 ,'b' => 2} + result = @scope.function_hash_merge([{'a' => 1 ,'b' => 2},{'b' => 3, 'c' => 4}]) + a.should == {'a' => 1 ,'b' => 2} + end + +end |