ridley 0.2.2 → 0.3.0

data/lib/ridley/connection.rb

@@ -144,6 +144,14 @@ module Ridley
       end
 
       def method_missing(method, *args, &block)
+        if block_given?
+          @self_before_instance_eval ||= eval("self", block.binding)
+        end
+
+        if @self_before_instance_eval.nil?
+          super
+        end
+
         @self_before_instance_eval.send(method, *args, &block)
       end
   end

data/lib/ridley/resource.rb

@@ -245,6 +245,14 @@ module Ridley
       true
     end
 
+    # Reload the attributes of the instantiated resource
+    #
+    # @return [Object]
+    def reload
+      self.attributes = self.class.find(connection, self).attributes
+      self
+    end
+
     # @return [String]
     def chef_id
       attribute(self.class.chef_id)

data/lib/ridley/resources/node.rb

@@ -38,44 +38,16 @@ module Ridley
       super(HashWithIndifferentAccess.new(hash))
     end
 
-    # Set a node level override attribute given the dotted path representation of the Chef
-    # attribute and value
-    # 
-    # @example setting and saving a node level override attribute
-    #
-    #   obj = node.find("jwinsor-1")
-    #   obj.set_override_attribute("my_app.billing.enabled", false)
-    #   obj.save
-    #
-    # @param [String] key
-    # @param [Object] value
-    #
-    # @return [HashWithIndifferentAccess]
-    def set_override_attribute(key, value)
-      attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.override = self.override.merge(attr_hash)
-    end
-
-    # Set a node level default attribute given the dotted path representation of the Chef
-    # attribute and value
-    # 
-    # @example setting and saving a node level default attribute
-    #
-    #   obj = node.find("jwinsor-1")
-    #   obj.set_default_attribute("my_app.billing.enabled", false)
-    #   obj.save
-    #
-    # @param [String] key
-    # @param [Object] value
-    #
-    # @return [HashWithIndifferentAccess]
-    def set_default_attribute(key, value)
-      attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
-      self.default = self.default.merge(attr_hash)
+    # @param [Hash] hash
+    def normal=(hash)
+      super(HashWithIndifferentAccess.new(hash))
     end
 
     # Set a node level normal attribute given the dotted path representation of the Chef
-    # attribute and value
+    # attribute and value.
+    #
+    # @note It is not possible to set any other attribute level on a node and have it persist after
+    #   a Chef Run. This is because all other attribute levels are truncated at the start of a Chef Run. 
     # 
     # @example setting and saving a node level normal attribute
     #
@@ -87,7 +59,7 @@ module Ridley
     # @param [Object] value
     #
     # @return [HashWithIndifferentAccess]
-    def set_normal_attribute(key, value)
+    def set_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
       self.normal = self.normal.merge(attr_hash)
     end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/support/shared_examples/ridley_resource.rb

@@ -234,4 +234,24 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
       @object.name.should eql("reset")
     end
   end
+
+  describe "#reload" do
+    let(:updated_subject) { double('updated_subject', attributes: { fake_attribute: "some_value" }) }
+
+    before(:each) do
+      subject.class.attribute(:fake_attribute)
+      subject.class.stub(:find).with(connection, subject).and_return(updated_subject)
+    end
+
+    it "returns itself" do
+      subject.reload.should eql(subject)
+    end
+
+    it "sets the attributes of self to include those of the reloaded object" do
+      subject.reload
+
+      subject.attributes.should have_key(:fake_attribute)
+      subject.attributes[:fake_attribute].should eql("some_value")
+    end
+  end
 end

data/spec/unit/ridley/resources/node_spec.rb

@@ -55,43 +55,13 @@ describe Ridley::Node do
     end
   end
 
-  describe "#set_override_attribute" do
+  describe "#set_attribute" do
     it "returns a HashWithIndifferentAccess" do
-      subject.set_override_attribute('deep.nested.item', true).should be_a(HashWithIndifferentAccess)
-    end
-
-    it "sets an override node attribute at the nested path" do
-       subject.set_override_attribute('deep.nested.item', true)
-
-       subject.override.should have_key("deep")
-       subject.override["deep"].should have_key("nested")
-       subject.override["deep"]["nested"].should have_key("item")
-       subject.override["deep"]["nested"]["item"].should be_true
-    end
-
-    context "when the override attribute is already set" do
-      it "test" do
-        subject.override = {
-          deep: {
-            nested: {
-              item: false
-            }
-          }
-        }
-        subject.set_override_attribute('deep.nested.item', true)
-        
-        subject.override["deep"]["nested"]["item"].should be_true
-      end
-    end
-  end
-
-  describe "#set_normal_attribute" do
-    it "returns a HashWithIndifferentAccess" do
-      subject.set_normal_attribute('deep.nested.item', true).should be_a(HashWithIndifferentAccess)
+      subject.set_attribute('deep.nested.item', true).should be_a(HashWithIndifferentAccess)
     end
 
     it "sets an normal node attribute at the nested path" do
-       subject.set_normal_attribute('deep.nested.item', true)
+       subject.set_attribute('deep.nested.item', true)
 
        subject.normal.should have_key("deep")
        subject.normal["deep"].should have_key("nested")
@@ -108,43 +78,13 @@ describe Ridley::Node do
             }
           }
         }
-        subject.set_normal_attribute('deep.nested.item', true)
+        subject.set_attribute('deep.nested.item', true)
         
         subject.normal["deep"]["nested"]["item"].should be_true
       end
     end
   end
 
-  describe "#set_default_attribute" do
-    it "returns a HashWithIndifferentAccess" do
-      subject.set_default_attribute('deep.nested.item', true).should be_a(HashWithIndifferentAccess)
-    end
-
-    it "sets an default node attribute at the nested path" do
-       subject.set_default_attribute('deep.nested.item', true)
-
-       subject.default.should have_key("deep")
-       subject.default["deep"].should have_key("nested")
-       subject.default["deep"]["nested"].should have_key("item")
-       subject.default["deep"]["nested"]["item"].should be_true
-    end
-
-    context "when the default attribute is already set" do
-      it "test" do
-        subject.default = {
-          deep: {
-            nested: {
-              item: false
-            }
-          }
-        }
-        subject.set_default_attribute('deep.nested.item', true)
-        
-        subject.default["deep"]["nested"]["item"].should be_true
-      end
-    end
-  end
-
   describe "#eucalyptus?" do
     it "returns true if the eucalyptus automatic attribute is set" do
       subject.automatic = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chozo
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -754146470047240925
+      hash: 3213701153565876278
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23