X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fcamelcase.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fcamelcase.rb;h=3c887e26b8a0d5f6c88c24de4e83185b08477d99;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=085b3c6d88faa37bc88cf560cc9f3f72b6237bff;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/camelcase.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/camelcase.rb
index 085b3c6d8..3c887e26b 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/camelcase.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/camelcase.rb
@@ -2,14 +2,16 @@
 #  camelcase.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.
 #
-
 module Puppet::Parser::Functions
-  newfunction(:camelcase, :type => :rvalue, :doc => <<-EOS
-Converts the case of a string or all strings in an array to camel case.
-    EOS
-  ) do |arguments|
+  newfunction(:camelcase, :type => :rvalue, :doc => <<-DOC
+    Converts the case of a string or all strings in an array to camel case.
+
+    Note: from Puppet 6.0.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+  DOC
+             ) do |arguments|
 
-    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     value = arguments[0]
     klass = value.class
@@ -18,12 +20,12 @@ Converts the case of a string or all strings in an array to camel case.
       raise(Puppet::ParseError, 'camelcase(): 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) ? i.split('_').map{|e| e.capitalize}.join : i }
-    else
-      result = value.split('_').map{|e| e.capitalize}.join
-    end
+    result = if value.is_a?(Array)
+               # Numbers in Puppet are often string-encoded which is troublesome ...
+               value.map { |i| i.is_a?(String) ? i.split('_').map { |e| e.capitalize }.join : i }
+             else
+               value.split('_').map { |e| e.capitalize }.join
+             end
 
     return result
   end