diff options
author | Bryan Jen <bryan.jen@gmail.com> | 2015-09-14 10:40:35 -0700 |
---|---|---|
committer | Bryan Jen <bryan.jen@gmail.com> | 2015-09-14 10:40:35 -0700 |
commit | c0df8192ee5c2f606ae99c2a3115002962901dea (patch) | |
tree | e3f076d9e4174c5ef08cb22fbd8c57a26a8c23fe /lib/puppet/parser/functions/parsejson.rb | |
parent | 2a7a93ffb49b2ae63d4fd09982fd8c382c1f4b5a (diff) | |
parent | eb948c4a0dc36790c5444fc236b0154c3d716c58 (diff) | |
download | puppet-stdlib-c0df8192ee5c2f606ae99c2a3115002962901dea.tar.gz puppet-stdlib-c0df8192ee5c2f606ae99c2a3115002962901dea.tar.bz2 |
Merge pull request #511 from dmitryilyin/parseyaml_default
[MODULES-2462] Improve parseyaml function
Diffstat (limited to 'lib/puppet/parser/functions/parsejson.rb')
-rw-r--r-- | lib/puppet/parser/functions/parsejson.rb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/puppet/parser/functions/parsejson.rb b/lib/puppet/parser/functions/parsejson.rb index a9a16a4..f822fc4 100644 --- a/lib/puppet/parser/functions/parsejson.rb +++ b/lib/puppet/parser/functions/parsejson.rb @@ -3,21 +3,22 @@ # module Puppet::Parser::Functions - newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS -This function accepts JSON as a string and converts into the correct Puppet -structure. - EOS + newfunction(:parsejson, :type => :rvalue, :arity => -2, :doc => <<-EOS +This function accepts JSON as a string and converts it into the correct +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| + raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1 - if (arguments.size != 1) then - raise(Puppet::ParseError, "parsejson(): Wrong number of arguments "+ - "given #{arguments.size} for 1") + begin + PSON::load(arguments[0]) || arguments[1] + rescue Exception + arguments[1] end - json = arguments[0] - - # PSON is natively available in puppet - PSON.load(json) end end |