ridley 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76add10f7d0cfee05331ae99481f011e868261db
-  data.tar.gz: 571ef4c873bbb8ab9697d87f008b0f6dfea9fdbb
+  metadata.gz: 364ab83ba70393de488496c740ddaea1cb57c005
+  data.tar.gz: c74c206b7a81f701e5ece67934416f30ecf27754
 SHA512:
-  metadata.gz: a9e15f5a280702aa0b60f05dfddf10da424c0ab4c0c885cc92fe8e29bb47ba0b115fa015e26f605012c4809fca15af79b4557be197e1c75269f3b350b7d24fc1
-  data.tar.gz: 1b1daa08465102f140943cbc8f4209d15136f6c3006d25f4fb87b85e843ae0f9984cbd56476a19d4ed86bd3097a27261179512f50d390ee6516d2587ec5bdace
+  metadata.gz: 280a4d6de7745a0027dd883f27106a5b6f9d2f5aca5c5fb546dc482a0779d7c6d45f328cbb1c7f296db8ab5f9097f1a09720a4d9afd39d54ac48f4e47a42bb00
+  data.tar.gz: 98912ddbe6146749ebef916ba3b11f5b581af8e7bd32b8e518d64acabad946ee3afc7811c8ddbd0a6530ea86948ded06f44e324b32eed551cb7a0c49f9b2be15

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.4.4
+
+* [#248](https://github.com/RiotGames/ridley/pull/248) Fix some edge cases and styling for deleting attributes from an environment
+* [#247](https://github.com/RiotGames/ridley/pull/247) Add support for removing attributes from a node
+
 # 2.4.3
 
 * [#245](https://github.com/RiotGames/ridley/pull/245) Fix for numeric and boolean attribute types

data/lib/ridley/chef_objects/environment_object.rb

@@ -62,9 +62,10 @@ module Ridley
     #   the dotted path to an attribute
     # 
     # @return [Hashie::Mash]
-    def delete_default_attribute(key)
-      delete_attribute(key, :default)
+    def unset_default_attribute(key)
+      unset_attribute(key, :default)
     end
+    alias :delete_default_attribute :unset_default_attribute
 
     # Removes a environment override attribute given its dotted path
     # representation. Returns the override attributes of the environment.
@@ -73,9 +74,10 @@ module Ridley
     #   the dotted path to an attribute
     # 
     # @return [Hashie::Mash]
-    def delete_override_attribute(key)
-      delete_attribute(key, :override)
+    def unset_override_attribute(key)
+      unset_attribute(key, :override)
     end
+    alias :delete_override_attribute :unset_override_attribute
 
     private
 
@@ -87,18 +89,26 @@ module Ridley
       #   the precedence level to delete the attribute from
       # 
       # @return [Hashie::Mash]
-      def delete_attribute(key, precedence)
-        dotted_path = key.split('.')
-        leaf_key = dotted_path.pop
-        case precedence
-        when :default
-          attributes_to_change = self.default_attributes  
-        when :override
-          attributes_to_change = self.override_attributes
+      def unset_attribute(key, precedence)
+        keys = key.split(".")
+        leaf_key = keys.pop
+  
+        attributes_to_change = case precedence
+                               when :default
+                                 self.default_attributes  
+                               when :override
+                                 self.override_attributes
+                               end
+  
+        leaf_attributes = keys.inject(attributes_to_change) do |attributes, key|
+          if attributes[key] && attributes[key].kind_of?(Hashie::Mash)
+            attributes = attributes[key]
+          else 
+            return attributes_to_change
+          end
         end
-        leaf_hash = dotted_path.inject(attributes_to_change) { |hash, element| hash[element] unless hash == nil }
-        leaf_hash.delete(leaf_key) unless leaf_hash.nil?
-        attributes_to_change
+        leaf_attributes.delete(leaf_key)
+        return attributes_to_change
       end
   end
 end

data/lib/ridley/chef_objects/node_object.rb

@@ -51,6 +51,7 @@ module Ridley
     #   obj.save
     #
     # @param [String] key
+    #   dotted path to key to be unset
     # @param [Object] value
     #
     # @return [Hashie::Mash]
@@ -59,6 +60,34 @@ module Ridley
       self.normal = self.normal.deep_merge(attr_hash)
     end
 
+    # Unset a node level normal attribute given the dotted path representation of the Chef
+    # attribute and value.
+    #
+    # @example unsetting and saving a node level normal attribute
+    #
+    #   obj = node.find("foonode")
+    #   obj.unset_chef_attribute("my_app.service_one.service_state")
+    #   obj.save
+    #
+    # @param [String] key
+    #   dotted path to key to be unset
+    #
+    # @return [Hashie::Mash]
+    def unset_chef_attribute(key)
+      keys = key.split(".")
+      leaf_key = keys.pop
+      attributes = keys.inject(self.normal) do |attributes, key|
+        if attributes[key] && attributes[key].kind_of?(Hashie::Mash)
+          attributes = attributes[key]
+        else 
+          return self.normal
+        end
+      end
+
+      attributes.delete(leaf_key)
+      return self.normal
+    end
+
     # Returns the public hostname of the instantiated node. This hostname should be used for
     # public communications to the node.
     #

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/spec/unit/ridley/chef_objects/environment_object_spec.rb

@@ -5,12 +5,12 @@ describe Ridley::EnvironmentObject do
 
   describe "#set_override_attribute" do
     it "sets an override node attribute at the nested path" do
-       subject.set_override_attribute('deep.nested.item', true)
+      subject.set_override_attribute('deep.nested.item', true)
 
-       subject.override_attributes.should have_key("deep")
-       subject.override_attributes["deep"].should have_key("nested")
-       subject.override_attributes["deep"]["nested"].should have_key("item")
-       subject.override_attributes["deep"]["nested"]["item"].should be_true
+      subject.override_attributes.should have_key("deep")
+      subject.override_attributes["deep"].should have_key("nested")
+      subject.override_attributes["deep"]["nested"].should have_key("item")
+      subject.override_attributes["deep"]["nested"]["item"].should be_true
     end
 
     context "when the override attribute is already set" do
@@ -31,12 +31,12 @@ describe Ridley::EnvironmentObject do
 
   describe "#set_default_attribute" do
     it "sets an override node attribute at the nested path" do
-       subject.set_default_attribute('deep.nested.item', true)
+      subject.set_default_attribute('deep.nested.item', true)
 
-       subject.default_attributes.should have_key("deep")
-       subject.default_attributes["deep"].should have_key("nested")
-       subject.default_attributes["deep"]["nested"].should have_key("item")
-       subject.default_attributes["deep"]["nested"]["item"].should be_true
+      subject.default_attributes.should have_key("deep")
+      subject.default_attributes["deep"].should have_key("nested")
+      subject.default_attributes["deep"]["nested"].should have_key("item")
+      subject.default_attributes["deep"]["nested"]["item"].should be_true
     end
 
     context "when the override attribute is already set" do
@@ -54,62 +54,65 @@ describe Ridley::EnvironmentObject do
       end
     end
 
-    describe "#delete_default_attribute" do
-      let(:delete_default_attribute) { subject.delete_default_attribute(attribute_key) }
-      let(:attribute_key) { "hello.world" }
+    shared_examples_for "attribute deleter" do
+      let(:precedence) { raise "You must provide the precedence level (let(:precedence) { \"default\" } in the shared example context" }
+      let(:delete_attribute) { subject.send(:"delete_#{precedence}_attribute", delete_attribute_key) }
+      let(:set_attribute_value) { true }
+      let(:attributes) { { "hello" => { "world" => set_attribute_value } } }
+      let(:delete_attribute_key) { "hello.world" }
 
       before do
-        subject.set_default_attribute(attribute_key, true)
+        subject.send(:"#{precedence}_attributes=", attributes)
       end
 
-      it "removes the default attribute" do
-        delete_default_attribute
-        expect(subject.default_attributes[:hello][:world]).to be_nil
+      it "removes the attribute" do
+        delete_attribute
+        expect(subject.send(:"#{precedence}_attributes")[:hello][:world]).to be_nil
       end
 
       context "when the attribute does not exist" do
-        let(:delete_default_attribute) { subject.delete_default_attribute("not.existing") }
+        let(:delete_attribute_key) { "not.existing" }
 
         it "does not delete anything" do
-          delete_default_attribute
-          expect(subject.default_attributes[:hello][:world]).to be_true
+          delete_attribute
+          expect(subject.send(:"#{precedence}_attributes")[:hello][:world]).to eq(set_attribute_value)
         end
       end
 
       context "when an internal hash is nil" do
-        let(:delete_default_attribute) { subject.delete_default_attribute("never.not.existing") }
+        let(:delete_attribute_key) { "never.not.existing" }
 
         before do
-          subject.default_attributes = Hash.new
+          subject.send(:"#{precedence}_attributes=", Hash.new)
         end
 
         it "does not delete anything" do
-          delete_default_attribute
-          expect(subject.default_attributes).to be_empty
+          delete_attribute
+          expect(subject.send(:"#{precedence}_attributes")).to be_empty
         end
       end
-    end
 
-    describe "#delete_override_attribute" do
-      let(:delete_override_attribute) { subject.delete_override_attribute(attribute_key) }
-      let(:attribute_key) { "hello.world" }
+      ["string", true, :symbol, ["array"], Object.new].each do |nonattrs|
+        context "when the attribute chain is partially set, interrupted by a #{nonattrs.class}" do
+          let(:attributes) { { "hello" => set_attribute_value } }
+          let(:set_attribute_value) { nonattrs }
 
-      before do
-        subject.set_override_attribute(attribute_key, true)
+          it "leaves the attributes unchanged" do
+            expect(subject.send(:"unset_#{precedence}_attribute", delete_attribute_key).to_hash).to eq(attributes)
+          end
+        end
       end
+    end
 
-      it "removes the override attribute" do
-        delete_override_attribute
-        expect(subject.override_attributes[:hello][:world]).to be_nil
+    describe "#delete_default_attribute" do
+      it_behaves_like "attribute deleter" do
+        let(:precedence) { "default" }
       end
+    end
 
-      context "when the attribute does not exist" do
-        let(:delete_override_attribute) { subject.delete_override_attribute("not.existing") }
-
-        it "does not delete anything" do
-          delete_override_attribute
-          expect(subject.override_attributes[:hello][:world]).to be_true
-        end
+    describe "#delete_override_attribute" do
+      it_behaves_like "attribute deleter" do
+        let(:precedence) { "override" }
       end
     end
   end

data/spec/unit/ridley/chef_objects/node_object_spec.rb

@@ -55,7 +55,7 @@ describe Ridley::NodeObject do
   end
 
   describe "#set_chef_attribute" do
-    it "sets an normal node attribute at the nested path" do
+    it "sets a normal node attribute at the nested path" do
        subject.set_chef_attribute('deep.nested.item', true)
 
        subject.normal.should have_key("deep")
@@ -80,6 +80,43 @@ describe Ridley::NodeObject do
     end
   end
 
+  describe "#unset_chef_attribute" do
+    context "when the attribute is set" do
+      before do
+        subject.normal = { foo: { bar: { baz: true } } }
+      end
+
+      it "unsets a normal node attribute at the nested path" do
+        subject.unset_chef_attribute("foo.bar.baz")
+        expect(subject.normal[:foo][:bar][:baz]).to be_nil
+      end
+    end
+
+    ["string", true, :symbol, ["array"], Object.new].each do |nonattrs|
+      context "when the attribute chain is partially set, interrupted by a #{nonattrs.class}" do
+        let(:attributes) { { 'foo' => { 'bar' => nonattrs } } }
+        before do
+          subject.normal = attributes
+        end
+
+        it "leaves the attributes unchanged" do
+          expect(subject.unset_chef_attribute("foo.bar.baz").to_hash).to eq(attributes)
+        end
+      end
+    end
+
+    context "when the attribute is not set" do
+      let(:attributes) { { 'bizz' => { 'bar' => { 'baz' => true } } } }
+      before do
+        subject.normal = attributes
+      end
+
+      it "leaves the attributes unchanged" do
+        expect(subject.unset_chef_attribute("foo.bar.baz").to_hash).to eq(attributes)
+      end
+    end
+  end
+
   describe "#cloud?" do
     it "returns true if the cloud automatic attribute is set" do
       subject.automatic = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable