summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2015-02-27 17:40:32 -0800
committerTravis Fields <travis@puppetlabs.com>2015-03-02 10:45:43 -0800
commit85e81f9bdf9d482338c504ff3c658993a24978a0 (patch)
treeca1ace730605023a3eac479c1be5307856482d0a /lib/puppet/parser/functions
parentcd6568039f53a59c145239012e9ada14685eed88 (diff)
downloadpuppet-stdlib-85e81f9bdf9d482338c504ff3c658993a24978a0.tar.gz
puppet-stdlib-85e81f9bdf9d482338c504ff3c658993a24978a0.tar.bz2
Loosen the restrictions of upcase and allow for recursion of the objects and only worry if the object responds to upcase
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r--lib/puppet/parser/functions/upcase.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
index 2b05db4..0226a88 100644
--- a/lib/puppet/parser/functions/upcase.rb
+++ b/lib/puppet/parser/functions/upcase.rb
@@ -17,22 +17,22 @@ Will return:
) do |arguments|
raise(Puppet::ParseError, "upcase(): Wrong number of arguments " +
- "given (#{arguments.size} for 1)") if arguments.size < 1
+ "given (#{arguments.size} for 1)") if arguments.size != 1
value = arguments[0]
- unless value.is_a?(Array) || value.is_a?(String) || value.is_a?(Hash)
+ unless value.is_a?(Array) || value.is_a?(Hash) || value.respond_to?(:upcase)
raise(Puppet::ParseError, 'upcase(): Requires an ' +
- 'array, string or hash to work with')
+ 'array, hash or object that responds to upcase in order to work')
end
if value.is_a?(Array)
# Numbers in Puppet are often string-encoded which is troublesome ...
- result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
+ result = value.collect { |i| function_upcase([i]) }
elsif value.is_a?(Hash)
result = {}
value.each_pair do |k, v|
- result.merge!({k.upcase => v.collect! { |p| p.upcase }})
+ result[function_upcase([k])] = function_upcase([v])
end
else
result = value.upcase