Fix: remove empty hashes.

sunggun-yu · Jan 14, 2016 · 2b7d9a3 · 2b7d9a3 · Gopalvisualpath · Jan 4, 2017
1 parent 097543e
commit 2b7d9a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libraries/mongodb3_helper.rb b/libraries/mongodb3_helper.rb
@@ -7,7 +7,12 @@ def mongodb_config(config)
 class Hash
   def compact
     inject({}) do |new_hash, (k, v)|
-      new_hash[k] = v.is_a?(Hash) ? v.compact : v unless v.nil?
+      if v.is_a?(Hash)
+        v = v.compact
+        new_hash[k] = v unless v.empty?
+      else
+        new_hash[k] = v unless v.nil?
+      end
       new_hash
     end
   end

diff --git a/test/libraries/mongodb3_helper_spec.rb b/test/libraries/mongodb3_helper_spec.rb
@@ -9,7 +9,7 @@
     end
   end
   context '#mongodb_config' do
-    let(:config) { Chef::Node::ImmutableMash.new('systemLog' => { 'verbosity' => nil, 'path' => '/var/log' }) }
+    let(:config) { Chef::Node::ImmutableMash.new('systemLog' => { 'verbosity' => nil, 'path' => '/var/log', 'empty' => { 'foo' => nil } }) }
     it 'with an immutable Mash' do
       expect(YAML.load(subject.mongodb_config(config))).to eq('systemLog' => { 'path' => '/var/log' })
     end