Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
index f7c2896..76b392f 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
@@ -1,28 +1,28 @@
 #
 # parsejson.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts it into the correct
-Puppet structure.
+  newfunction(:parsejson, :type => :rvalue, :doc => <<-DOC
+    @summary
+      This function accepts JSON as a string and converts it into the correct
+      Puppet structure.
+
+    @return
+      convert JSON into Puppet structure
 
-The optional second argument can be used to pass a default value that will
-be returned if the parsing of YAML string have failed.
-  EOS
-  ) do |arguments|
+    > *Note:*
+      The optional second argument can be used to pass a default value that will
+      be returned if the parsing of YAML string have failed.
+  DOC
+             ) do |arguments|
     raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
 
     begin
-      PSON::load(arguments[0]) || arguments[1]
+      PSON.load(arguments[0]) || arguments[1]
     rescue StandardError => e
-      if arguments[1]
-        arguments[1]
-      else
-        raise e
-      end
+      raise e unless arguments[1]
+      arguments[1]
     end
-
   end
 end