From: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Date: Sat, 30 Apr 2011 01:40:04 +0000 (+0100)
Subject: Now prefix will convert everything into string which is the same
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b26d5b2f3be95737ea2df63ffccea5354d37d81e;p=puppet-stdlib.git

Now prefix will convert everything into string which is the same
as join would do.  Also function is now more robust in error detection.

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

diff --git a/prefix.rb b/prefix.rb
index 572ff4e..0e0cee2 100644
--- a/prefix.rb
+++ b/prefix.rb
@@ -19,11 +19,20 @@ module Puppet::Parser::Functions
 
     prefix = arguments[1] if arguments[1]
 
-    result = array.collect { |i| prefix ? prefix + i : i }
+    if prefix
+      unless prefix.is_a?(String)
+        raise(Puppet::ParseError, 'prefix(): Requires string to work with')
+      end
+    end
+
+    # Turn everything into string same as join would do ...
+    result = array.collect do |i|
+      i = i.to_s
+      prefix ? prefix + i : i
+    end
 
     return result
   end
 end
 
 # vim: set ts=2 sw=2 et :
-