chef_cap 0.1.1 → 0.1.2

data/Gemfile

@@ -4,7 +4,8 @@ gemspec
 
 group :development do
   gem "rspec-rails", "2.1"
-  gem 'wirble'
+  gem "wirble"
+  gem "gemcutter"
 end
 
 group :test do

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/recipes/lib/chef_cap_helper.rb

@@ -6,6 +6,7 @@ class ChefCapHelper
 
     def parse_hash(hash, prefix = nil)
       hash.each do |key, value|
+        next if value.nil?
         if value.is_a? Hash
           parse_hash(value, [prefix, key].compact.join("_"))
         else

data/spec/chef_cap_helper_spec.rb

@@ -1,6 +1,53 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-describe ChefDnaParser do
+describe ChefCapHelper do
+
+  describe ".parse_hash" do
+    before do
+      @configuration = mock
+      ChefCapConfiguration.configuration = @configuration
+    end
+
+    context "when given a hash with hashes" do
+
+      context "given a prefix" do
+        it "should call itself recursively" do
+          @configuration.should_receive(:set).with(:prefix_somehash_somekey, "somevalue")
+          ChefCapHelper.parse_hash({"somehash" => {"somekey" => "somevalue"}}, "prefix")
+        end
+      end
+
+      context "given no prefix" do
+        it "should call itself recursively" do
+          @configuration.should_receive(:set).with(:somehash_somekey, "somevalue")
+          ChefCapHelper.parse_hash({"somehash" => {"somekey" => "somevalue"}})
+        end
+      end
+    end
+
+    context "when given a hash with non-hashes" do
+
+      context "given a prefix" do
+        it "should set the key to prefix_key on the configuration" do
+          @configuration.should_receive(:set).with(:prefix_somekey, "somevalue")
+          ChefCapHelper.parse_hash({"somekey" => "somevalue"}, "prefix")
+        end
+      end
+
+      context "given no prefix" do
+
+        it "should set the key value pair on the configuration" do
+          @configuration.should_receive(:set).with(:somekey, "somevalue")
+          ChefCapHelper.parse_hash({"somekey" => "somevalue"})
+        end
+      end
+    end
+
+    it "should unset null values" do
+      @configuration.should_not_receive(:set)
+      ChefCapHelper.parse_hash({"somekey" => nil})
+    end
+  end
 
   describe ".recursive_merge" do
 
@@ -20,6 +67,8 @@ describe ChefDnaParser do
       resulting_hash["key"].should == ["value"]
       resulting_hash = ChefCapHelper.recursive_merge(original_hash, "key", {:key => :value})
       resulting_hash["key"].should == {:key => :value}
+      resulting_hash = ChefCapHelper.recursive_merge(original_hash, "key", nil)
+      resulting_hash["key"].should be_nil
     end
 
     it "uniquely merges the values of two arrays" do
@@ -41,6 +90,8 @@ describe ChefDnaParser do
 
       resulting_hash = ChefCapHelper.recursive_merge(original_hash, "key", {"one" => "nottwo"})
       resulting_hash["key"].should == { "one" => "nottwo" }
+      resulting_hash = ChefCapHelper.recursive_merge(original_hash, "key", {"one" => nil})
+      resulting_hash["key"].should == { "one" => nil }
     end
 
     it "merge will overwrite hashes with arrays" do

data/spec/chef_cap_spec.rb

@@ -528,12 +528,14 @@ describe "chef_cap" do
               "four": "shouldbeoverwritten",
               "five": "stringtype"
             },
+            "somevalue": "shouldbeoverwrittenwithnull",
             "run_list": ["shared"]
           },
           "roles": {
             "role1": {
               "string": "overwritten",
               "simple": ["merged"],
+              "somevalue": null,
               "run_list": ["role1", "roleshared"]
             },
             "role2": {
@@ -569,11 +571,13 @@ describe "chef_cap" do
             server_session.things_that_were_set["node_hash_for_localhost"]["simple"].should == ["one", "two", "merged"]
             server_session.things_that_were_set["node_hash_for_localhost"]["complicated"].should == {"three"=>{"alsoshared"=>["merged"], "shared"=>"overwritten"}, "four"=>"overwritten", "five"=>["newtype"]}
             server_session.things_that_were_set["node_hash_for_localhost"]["string"].should == "overwritten"
+            server_session.things_that_were_set["node_hash_for_localhost"]["somevalue"].should be_nil
             server_session.things_that_were_set["node_hash_for_localhost"]["run_list"].should == ["everything", "shared", "role1", "roleshared", "role2"]
           elsif server_session.things_that_were_set.keys.include? "node_hash_for_otherhost"
             server_session.things_that_were_set["node_hash_for_otherhost"]["simple"].should == ["one", "two"]
             server_session.things_that_were_set["node_hash_for_otherhost"]["complicated"].should == {"three"=>{"alsoshared"=>["merged"], "shared"=>"overwritten"}, "four"=>"overwritten", "five"=>["newtype"]}
             server_session.things_that_were_set["node_hash_for_otherhost"]["string"].should == "shouldbeoverwritten"
+            server_session.things_that_were_set["node_hash_for_otherhost"]["somevalue"].should == "shouldbeoverwrittenwithnull"
             server_session.things_that_were_set["node_hash_for_otherhost"]["run_list"].should == ["everything", "shared", "role2", "roleshared"]
           end
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency