diff --git a/lib/puppet/functions/puppetdb/create_subsetting_resource_hash.rb b/lib/puppet/functions/puppetdb/create_subsetting_resource_hash.rb index c81618d..4f9708e 100644 --- a/lib/puppet/functions/puppetdb/create_subsetting_resource_hash.rb +++ b/lib/puppet/functions/puppetdb/create_subsetting_resource_hash.rb @@ -1,18 +1,18 @@ Puppet::Functions.create_function(:'puppetdb::create_subsetting_resource_hash') do dispatch :create_subsetting_resource_hash do required_param 'Hash', :java_args required_param 'Any', :params end def create_subsetting_resource_hash(java_args, params) resource_hash = {} - java_args.each { |k,v| + java_args.each do |k, v| item_params = { 'subsetting' => k, 'value' => (v || '') } item_params.merge!(params) - resource_hash.merge!({ "'#{k}'" => item_params }) - } + resource_hash.merge!("'#{k}'" => item_params) + end resource_hash end end diff --git a/lib/puppet/functions/puppetdb/flatten_java_args.rb b/lib/puppet/functions/puppetdb/flatten_java_args.rb index c3972e7..f6ba39d 100644 --- a/lib/puppet/functions/puppetdb/flatten_java_args.rb +++ b/lib/puppet/functions/puppetdb/flatten_java_args.rb @@ -1,12 +1,12 @@ Puppet::Functions.create_function(:'puppetdb::flatten_java_args') do dispatch :flatten_java_args do optional_param 'Hash', :java_args return_type 'String' end def flatten_java_args(java_args = {}) args = '' - java_args.each {|k,v| args += "#{k}#{v} "} + java_args.each { |k, v| args += "#{k}#{v} " } "\"#{args.chomp(' ')}\"" end end diff --git a/spec/functions/create_subsetting_resource_hash_spec.rb b/spec/functions/create_subsetting_resource_hash_spec.rb index 70b7784..7ad8cc6 100644 --- a/spec/functions/create_subsetting_resource_hash_spec.rb +++ b/spec/functions/create_subsetting_resource_hash_spec.rb @@ -1,11 +1,13 @@ require 'spec_helper' -describe 'puppetdb::create_subsetting_resource_hash' do +describe 'puppetdb::create_subsetting_resource_hash' do it { is_expected.not_to eq(nil) } it { is_expected.to run.with_params.and_raise_error(ArgumentError) } - it { is_expected.to run.with_params({'test' => 1}).and_raise_error(ArgumentError) } + it { is_expected.to run.with_params('test' => 1).and_raise_error(ArgumentError) } it { is_expected.to run.with_params('foo', 'bar').and_raise_error(ArgumentError) } - it { is_expected.to run.with_params({'foo' => 1 }, {'bar' => 2}, {'baz' => 3}).and_raise_error(ArgumentError) } - it { is_expected.to run.with_params({'foo' => 1, 'bar' => 2}, {'baz' => 3}) - .and_return({"'foo'"=>{"subsetting"=>"foo", "value"=>1, "baz"=>3}, "'bar'"=>{"subsetting"=>"bar", "value"=>2, "baz"=>3}}) } + it { is_expected.to run.with_params({ 'foo' => 1 }, { 'bar' => 2 }, 'baz' => 3).and_raise_error(ArgumentError) } + it { + is_expected.to run.with_params({ 'foo' => 1, 'bar' => 2 }, 'baz' => 3) + .and_return("'foo'" => { 'subsetting' => 'foo', 'value' => 1, 'baz' => 3 }, "'bar'" => { 'subsetting' => 'bar', 'value' => 2, 'baz' => 3 }) + } end diff --git a/spec/functions/flatten_java_args_spec.rb b/spec/functions/flatten_java_args_spec.rb index eb7a42e..ad40f75 100644 --- a/spec/functions/flatten_java_args_spec.rb +++ b/spec/functions/flatten_java_args_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' -describe 'puppetdb::flatten_java_args' do +describe 'puppetdb::flatten_java_args' do it { is_expected.not_to eq(nil) } - it { is_expected.to run.with_params.and_return("\"\"") } - it { is_expected.to run.with_params({'test' => 1}, {'foo' => 2}).and_raise_error(ArgumentError) } + it { is_expected.to run.with_params.and_return('""') } + it { is_expected.to run.with_params({ 'test' => 1 }, 'foo' => 2).and_raise_error(ArgumentError) } it { is_expected.to run.with_params('foo').and_raise_error(ArgumentError) } - it { is_expected.to run.with_params({'foo' => 1 }).and_return("\"foo1\"") } + it { is_expected.to run.with_params('foo' => 1).and_return('"foo1"') } end