From 0fabca9a6536dc82cea80a6fca996b8028450cb4 Mon Sep 17 00:00:00 2001 From: Krzysztof Wilczynski Date: Sat, 30 Apr 2011 00:56:12 +0100 Subject: [PATCH] Adding support for hash and string to the function count. Signed-off-by: Krzysztof Wilczynski --- count.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/count.rb b/count.rb index e4bf22e..c4e2283 100644 --- a/count.rb +++ b/count.rb @@ -3,7 +3,7 @@ # # TODO(Krzysztof Wilczynski): We need to add support for regular expression ... -# TODO(Krzysztof Wilczynski): Support for strings and hashes too .. +# TODO(Krzysztof Wilczynski): Support for hash values would be nice too ... module Puppet::Parser::Functions newfunction(:count, :type => :rvalue, :doc => <<-EOS @@ -14,15 +14,20 @@ module Puppet::Parser::Functions raise(Puppet::ParseError, "count(): Wrong number of arguments " + "given (#{arguments.size} for 1)") if arguments.size < 1 - array = arguments[0] + value = arguments[0] + klass = value.class - unless array.is_a?(Array) - raise(Puppet::ParseError, 'count(): Requires array to work with') + unless [Array, Hash, String].include?(klass) + raise(Puppet::ParseError, 'count(): Requires either ' + + 'array, hash or string to work with') end item = arguments[1] if arguments[1] - result = item ? array.count(item) : array.count + value = value.is_a?(Hash) ? value.keys : value + + # No item to look for and count? Then just return current size ... + result = item ? value.count(item) : value.size return result end