Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / uriescape.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/uriescape.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
index 45bbed2..4078b86 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
@@ -1,31 +1,34 @@
+require 'uri'
 #
 #  uriescape.rb
+#  Please note: This function is an implementation of a Ruby class and as such may not be entirely UTF8 compatible. To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
 #
-require 'uri'
-
 module Puppet::Parser::Functions
-  newfunction(:uriescape, :type => :rvalue, :doc => <<-EOS
-    Urlencodes a string or array of strings.
-    Requires either a single string or an array as an input.
-    EOS
-  ) do |arguments|
+  newfunction(:uriescape, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Urlencodes a string or array of strings.
+      Requires either a single string or an array as an input.
 
-    raise(Puppet::ParseError, "uriescape(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    @return [String]
+      a string that contains the converted value
+
+    DOC
+             ) do |arguments|
+
+    raise(Puppet::ParseError, "uriescape(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'uriescape(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'uriescape(): Requires either array or string to work with')
     end
 
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? URI.escape(i) : i }
-    else
-      result = URI.escape(value)
-    end
+    result = if value.is_a?(Array)
+               # Numbers in Puppet are often string-encoded which is troublesome ...
+               value.map { |i| i.is_a?(String) ? URI.escape(i) : i }
+             else
+               URI.escape(value)
+             end
 
     return result
   end