diff options
author | Malte Swart <chef@malteswart.de> | 2013-04-16 23:39:59 +0200 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-23 10:23:46 -0700 |
commit | 972bc2f61685979e5b76f5481e3b1af2bd010d0e (patch) | |
tree | 782325dd308823965325dcf7b52d9587c9fd667c | |
parent | 45e8bf3c416dff31d133a2ff8844bbbf63fb0c80 (diff) | |
download | chef-972bc2f61685979e5b76f5481e3b1af2bd010d0e.tar.gz |
CHEF-4101: DeepMerge - support overwriting hash values with nil
-rw-r--r-- | lib/chef/mixin/deep_merge.rb | 9 | ||||
-rw-r--r-- | spec/unit/mixin/deep_merge_spec.rb | 14 |
2 files changed, 20 insertions, 3 deletions
diff --git a/lib/chef/mixin/deep_merge.rb b/lib/chef/mixin/deep_merge.rb index a8a4737758..5e3327a526 100644 --- a/lib/chef/mixin/deep_merge.rb +++ b/lib/chef/mixin/deep_merge.rb @@ -29,7 +29,6 @@ class Chef class InvalidSubtractiveMerge < ArgumentError; end - OLD_KNOCKOUT_PREFIX = "!merge:".freeze # Regex to match the "knockout prefix" that was used to indicate @@ -86,8 +85,12 @@ class Chef when Hash if dest.kind_of?(Hash) source.each do |src_key, src_value| - if dest[src_key] - dest[src_key] = deep_merge!(src_value, dest[src_key]) + if dest.has_key? src_key + if dest[src_key].nil? + dest[src_key] = nil + else + dest[src_key] = deep_merge!(src_value, dest[src_key]) + end else # dest[src_key] doesn't exist so we take whatever source has raise_if_knockout_used!(src_value) dest[src_key] = src_value diff --git a/spec/unit/mixin/deep_merge_spec.rb b/spec/unit/mixin/deep_merge_spec.rb index 76f5c68a29..dbc49e68f2 100644 --- a/spec/unit/mixin/deep_merge_spec.rb +++ b/spec/unit/mixin/deep_merge_spec.rb @@ -236,6 +236,20 @@ describe Chef::Mixin::DeepMerge, "deep_merge!" do @dm.deep_merge!(hash_src, hash_dst) hash_dst.should == {"item" => "orange"} end + + it 'should overwrite hashes with nil' do + hash_src = {"item" => { "1" => "2"}, "other" => true } + hash_dst = {"item" => nil } + @dm.deep_merge!(hash_src, hash_dst) + hash_dst.should == {"item" => nil, "other" => true } + end + + it 'should overwrite strings with nil' do + hash_src = {"item" => "to_overwrite", "other" => false } + hash_dst = {"item" => nil } + @dm.deep_merge!(hash_src, hash_dst) + hash_dst.should == {"item" => nil, "other" => false } + end end # deep_merge! # Chef specific |