Adding support for strings to the the function unique.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

diff --git a/unique.rb b/unique.rb
index 617b451f2629722c0dfe927febcdedddc1a42c08..ce7ea70373dc41262ecacda2ab252c1d91161b47 100644 (file)
--- a/unique.rb
+++ b/unique.rb
@@ -2,8 +2,6 @@
 # unique.rb
 #
 
-# TODO(Krzysztof Wilczynski): Support for strings would be nice too ...
-
 module Puppet::Parser::Functions
   newfunction(:unique, :type => :rvalue, :doc => <<-EOS
     EOS
@@ -12,13 +10,24 @@ module Puppet::Parser::Functions
     raise(Puppet::ParseError, "unique(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
-    array = arguments[0]
+    value = arguments[0]
+    klass = value.class
 
-    if not array.is_a?(Array)
-      raise(Puppet::ParseError, 'unique(): Requires an array to work with')
+    if not [Array, String].include?(klass)
+      raise(Puppet::ParseError, 'unique(): Requires either an ' +
+        'array or string to work with')
     end
 
-    result = array.uniq
+    result = value.clone
+
+    string_type = value.is_a?(String) ? true : false
+
+    # We turn any string value into an array to be able to shuffle ...
+    result = string_type ? result.split('') : result
+
+    result = result.uniq
+
+    result = string_type ? result.join : result
 
     return result
   end