X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fdelete_undef_values.rb;h=b00f5e4d43dbf3b017db5f00a20be8679eb7a549;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=f94d4da8d422edd11ef4fdea34199041867950c7;hpb=ad88f67c13ae0f1a08936dad643f1e3509ab5f40;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
index f94d4da8d..b00f5e4d4 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
@@ -1,33 +1,41 @@
+#
+# delete_undef_values.rb
+#
 module Puppet::Parser::Functions
-  newfunction(:delete_undef_values, :type => :rvalue, :doc => <<-EOS
-Returns a copy of input hash or array with all undefs deleted.
+  newfunction(:delete_undef_values, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Returns a copy of input hash or array with all undefs deleted.
 
-*Examples:*
+    @example Example usage
 
-    $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
+      $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
+      Would return: {a => 'A', b => '', d => false}
 
-Would return: {a => 'A', b => '', d => false}
+      While:
+      $array = delete_undef_values(['A','',undef,false])
+      Would return: ['A','',false]
 
-    $array = delete_undef_values(['A','',undef,false])
+    > *Note:*
+    Since Puppet 4.0.0 the equivalent can be performed with the built-in
+    [`filter`](https://puppet.com/docs/puppet/latest/function.html#filter) function:
+    $array.filter |$val| { $val =~ NotUndef }
+    $hash.filter |$key, $val| { $val =~ NotUndef }
 
-Would return: ['A','',false]
+    @return [Array] The given array now issing of undefined values.
+    DOC
+             ) do |args|
 
-      EOS
-    ) do |args|
+    raise(Puppet::ParseError, "delete_undef_values(): Wrong number of arguments given (#{args.size})") if args.empty?
 
-    raise(Puppet::ParseError,
-          "delete_undef_values(): Wrong number of arguments given " +
-          "(#{args.size})") if args.size < 1
-
-    unless args[0].is_a? Array or args[0].is_a? Hash
-      raise(Puppet::ParseError,
-            "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
+    unless args[0].is_a?(Array) || args[0].is_a?(Hash)
+      raise(Puppet::ParseError, "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
     end
     result = args[0].dup
     if result.is_a?(Hash)
-      result.delete_if {|key, val| val.equal? :undef}
+      result.delete_if { |_, val| val.equal?(:undef) || val.nil? }
     elsif result.is_a?(Array)
       result.delete :undef
+      result.delete nil
     end
     result
   end