Add the default value to the "loadyaml" function

This value will be returned if the is no file
to load or a file could not be parsed.
It's similar to the "parseyaml" function's
default value.

Add the "loadjson" function too

4 files changed, 126 insertions, 3 deletions

diff --git a/spec/acceptance/loadjson_spec.rb b/spec/acceptance/loadjson_spec.rb
new file mode 100644
index 0000000..2992c37
--- /dev/null
+++ b/spec/acceptance/loadjson_spec.rb
@@ -0,0 +1,52 @@
+#! /usr/bin/env ruby -S rspec
+require 'spec_helper_acceptance'
+
+tmpdir = default.tmpdir('stdlib')
+
+describe 'loadjson function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+  describe 'success' do
+    it 'loadjsons array of values' do
+      shell("echo '{\"aaa\":1,\"bbb\":2,\"ccc\":3,\"ddd\":4}' > #{tmpdir}/testjson.json")
+      pp = <<-EOS
+      $o = loadjson('#{tmpdir}/testjson.json')
+      notice(inline_template('loadjson[aaa] is <%= @o["aaa"].inspect %>'))
+      notice(inline_template('loadjson[bbb] is <%= @o["bbb"].inspect %>'))
+      notice(inline_template('loadjson[ccc] is <%= @o["ccc"].inspect %>'))
+      notice(inline_template('loadjson[ddd] is <%= @o["ddd"].inspect %>'))
+      EOS
+
+      apply_manifest(pp, :catch_failures => true) do |r|
+        expect(r.stdout).to match(/loadjson\[aaa\] is 1/)
+        expect(r.stdout).to match(/loadjson\[bbb\] is 2/)
+        expect(r.stdout).to match(/loadjson\[ccc\] is 3/)
+        expect(r.stdout).to match(/loadjson\[ddd\] is 4/)
+      end
+    end
+
+    it 'returns the default value if there is no file to load' do
+      pp = <<-EOS
+      $o = loadjson('#{tmpdir}/no-file.json', {'default' => 'value'})
+      notice(inline_template('loadjson[default] is <%= @o["default"].inspect %>'))
+      EOS
+
+      apply_manifest(pp, :catch_failures => true) do |r|
+        expect(r.stdout).to match(/loadjson\[default\] is "value"/)
+      end
+    end
+
+    it 'returns the default value if the file was parsed with an error' do
+      shell("echo '!' > #{tmpdir}/testjson.json")
+      pp = <<-EOS
+      $o = loadjson('#{tmpdir}/testjson.json', {'default' => 'value'})
+      notice(inline_template('loadjson[default] is <%= @o["default"].inspect %>'))
+      EOS
+
+      apply_manifest(pp, :catch_failures => true) do |r|
+        expect(r.stdout).to match(/loadjson\[default\] is "value"/)
+      end
+    end
+  end
+  describe 'failure' do
+    it 'fails with no arguments'
+  end
+end
diff --git a/spec/acceptance/loadyaml_spec.rb b/spec/acceptance/loadyaml_spec.rb
index 1e910a9..ba3f0b7 100644
--- a/spec/acceptance/loadyaml_spec.rb
+++ b/spec/acceptance/loadyaml_spec.rb
@@ -26,6 +26,29 @@ describe 'loadyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('op
         expect(r.stdout).to match(/loadyaml\[ddd\] is 4/)
       end
     end
+
+    it 'returns the default value if there is no file to load' do
+      pp = <<-EOS
+      $o = loadyaml('#{tmpdir}/no-file.yaml', {'default' => 'value'})
+      notice(inline_template('loadyaml[default] is <%= @o["default"].inspect %>'))
+      EOS
+
+      apply_manifest(pp, :catch_failures => true) do |r|
+        expect(r.stdout).to match(/loadyaml\[default\] is "value"/)
+      end
+    end
+
+    it 'returns the default value if the file was parsed with an error' do
+      shell("echo '!' > #{tmpdir}/testyaml.yaml")
+      pp = <<-EOS
+      $o = loadyaml('#{tmpdir}/testyaml.yaml', {'default' => 'value'})
+      notice(inline_template('loadyaml[default] is <%= @o["default"].inspect %>'))
+      EOS
+
+      apply_manifest(pp, :catch_failures => true) do |r|
+        expect(r.stdout).to match(/loadyaml\[default\] is "value"/)
+      end
+    end
   end
   describe 'failure' do
     it 'fails with no arguments'
diff --git a/spec/functions/loadjson_spec.rb b/spec/functions/loadjson_spec.rb
new file mode 100644
index 0000000..12a9b82
--- /dev/null
+++ b/spec/functions/loadjson_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe 'loadjson' do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params().and_raise_error(ArgumentError, /wrong number of arguments/i) }
+
+  context 'when a non-existing file is specified' do
+    let(:filename) { '/tmp/doesnotexist' }
+    before {
+      File.expects(:exists?).with(filename).returns(false).once
+      PSON.expects(:load).never
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
+
+  context 'when an existing file is specified' do
+    let(:filename) { '/tmp/doesexist' }
+    let(:data) { { 'key' => 'value' } }
+    let(:json) { '{"key":"value"}' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      File.expects(:read).with(filename).returns(json).once
+      PSON.expects(:load).with(json).returns(data).once
+    }
+    it { is_expected.to run.with_params(filename).and_return(data) }
+  end
+
+  context 'when the file could not be parsed' do
+    let(:filename) { '/tmp/doesexist' }
+    let(:json) { '{"key":"value"}' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      File.expects(:read).with(filename).returns(json).once
+      PSON.stubs(:load).with(json).once.raises StandardError, 'Something terrible have happened!'
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
+end
diff --git a/spec/functions/loadyaml_spec.rb b/spec/functions/loadyaml_spec.rb
index ffc714d..9f16a1a 100755
--- a/spec/functions/loadyaml_spec.rb
+++ b/spec/functions/loadyaml_spec.rb
@@ -2,16 +2,17 @@ require 'spec_helper'
 
 describe 'loadyaml' do
   it { is_expected.not_to eq(nil) }
-  it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+  it { is_expected.to run.with_params().and_raise_error(ArgumentError, /wrong number of arguments/i) }
+
   context 'when a non-existing file is specified' do
     let(:filename) { '/tmp/doesnotexist' }
     before {
       File.expects(:exists?).with(filename).returns(false).once
       YAML.expects(:load_file).never
     }
-    it { is_expected.to run.with_params(filename).and_return(nil) }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
   end
+
   context 'when an existing file is specified' do
     let(:filename) { '/tmp/doesexist' }
     let(:data) { { 'key' => 'value' } }
@@ -21,4 +22,13 @@ describe 'loadyaml' do
     }
     it { is_expected.to run.with_params(filename).and_return(data) }
   end
+
+  context 'when the file could not be parsed' do
+    let(:filename) { '/tmp/doesexist' }
+    before {
+      File.expects(:exists?).with(filename).returns(true).once
+      YAML.stubs(:load_file).with(filename).once.raises StandardError, 'Something terrible have happened!'
+    }
+    it { is_expected.to run.with_params(filename, {'default' => 'value'}).and_return({'default' => 'value'}) }
+  end
 end