ridley 0.0.5 → 0.0.6

data/README.md

@@ -274,6 +274,54 @@ Unlike a role, node, client, or environment, a data bag is a container for other
     conn.search(:node)
     conn.search(:node, "name:ridley-test.local")
 
+## Manipulating Attributes
+
+Using Ridley you can quickly manipulate node or environment attributes. Attributes are identified by a dotted path notation.
+
+    default[:my_app][:billing][:enabled] => "my_app.billing.enabled"
+
+Given the previous example you could set the default node attribute with the `set_default_attribute` function on a Node object
+
+### Node Attributes
+
+Setting the `default[:my_app][:billing][:enabled]` node level default attribute on the node "jwinsor-1"
+
+    conn = Ridley.connection
+    conn.sync do
+      obj = node.find("jwinsor-1")
+      obj.set_default_attribute("my_app.billing.enabled", false)
+      obj.save
+    end
+
+Other attribute precedence levels can be set with their own respective set attribute functions
+
+    conn = Ridley.connection
+    conn.sync do
+      obj = node.find("jwinsor-1")
+      obj.set_override_attribute("my_app.proxy.enabled", false)
+      obj.set_normal_attribute("my_app.webapp.enabled", false)
+    end
+
+### Environment Attributes
+
+Setting a default environment attribute is just like setting a node level default attribute
+
+    conn = Ridley.connection
+    conn.sync do
+      obj = environment.find("production")
+      obj.set_default_attribute("my_app.proxy.enabled", false)
+      obj.save
+    end
+
+And the same goes for setting an environment level override attribute
+
+    conn = Ridley.connection
+    conn.sync do
+      obj = environment.find("production")
+      obj.set_override_attribute("my_app.webapp.enabled", false)
+      obj.save
+    end
+
 # Authors and Contributors
 
 * Jamie Winsor (<jamie@vialstudios.com>)

data/lib/ridley.rb

@@ -8,6 +8,7 @@ require 'active_support/core_ext'
 require 'forwardable'
 require 'set'
 require 'thread'
+require 'chozo/core_ext'
 
 require 'ridley/version'
 require 'ridley/errors'

data/lib/ridley/resources/environment.rb

@@ -25,9 +25,55 @@ module Ridley
     validates_presence_of :name
 
     attribute :description, default: String.new
-    attribute :default_attributes, default: Hash.new
-    attribute :override_attributes, default: Hash.new
+    attribute :default_attributes, default: HashWithIndifferentAccess.new
+    attribute :override_attributes, default: HashWithIndifferentAccess.new
     attribute :cookbook_versions, default: Hash.new
+
+    # @param [Hash] hash
+    def default_attributes=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
+    # @param [Hash] hash
+    def override_attributes=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
+    # Set an environment level default attribute given the dotted path representation of
+    # the Chef attribute and value
+    #
+    # @example setting and saving an environment level default attribute
+    #
+    #   obj = environment.find("production")
+    #   obj.set_defualt_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_attributes = self.default_attributes.merge(attr_hash)
+    end
+
+    # Set an environment level override attribute given the dotted path representation of
+    # the Chef attribute and value
+    # 
+    # @example setting and saving an environment level override attribute
+    #
+    #   obj = environment.find("production")
+    #   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_attributes = self.override_attributes.merge(attr_hash)
+    end
   end
 
   module DSL

data/lib/ridley/resources/node.rb

@@ -12,11 +12,85 @@ module Ridley
     validates_presence_of :name
 
     attribute :chef_environment, default: "_default"
-    attribute :automatic, default: Hash.new
-    attribute :normal, default: Hash.new
-    attribute :default, default: Hash.new
-    attribute :override, default: Hash.new
+    attribute :automatic, default: HashWithIndifferentAccess.new
+    attribute :normal, default: HashWithIndifferentAccess.new
+    attribute :default, default: HashWithIndifferentAccess.new
+    attribute :override, default: HashWithIndifferentAccess.new
     attribute :run_list, default: Array.new
+
+    # @param [Hash] hash
+    def automatic=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
+    # @param [Hash] hash
+    def normal=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
+    # @param [Hash] hash
+    def default=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
+    # @param [Hash] hash
+    def override=(hash)
+      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)
+    end
+
+    # Set a node level normal attribute given the dotted path representation of the Chef
+    # attribute and value
+    # 
+    # @example setting and saving a node level normal attribute
+    #
+    #   obj = node.find("jwinsor-1")
+    #   obj.set_normal_attribute("my_app.billing.enabled", false)
+    #   obj.save
+    #
+    # @param [String] key
+    # @param [Object] value
+    #
+    # @return [HashWithIndifferentAccess]
+    def set_normal_attribute(key, value)
+      attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
+      self.normal = self.normal.merge(attr_hash)
+    end
   end
   
   module DSL

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/ridley.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.version       = Ridley::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
+  s.add_runtime_dependency 'chozo', '>= 0.0.2'
   s.add_runtime_dependency 'yajl-ruby'
   s.add_runtime_dependency 'mixlib-log'
   s.add_runtime_dependency 'mixlib-authentication'

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

@@ -70,4 +70,92 @@ describe Ridley::Environment do
       end
     end
   end
+
+  let(:connection) { double('connection') }
+
+  subject { Ridley::Environment.new(connection) }
+
+  describe "#default_attributes=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.default_attributes = {
+          "key" => "value"
+        }
+
+        subject.default_attributes.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#override_attributes=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.override_attributes = {
+          "key" => "value"
+        }
+
+        subject.override_attributes.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#set_override_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_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
+      it "test" do
+        subject.override_attributes = {
+          deep: {
+            nested: {
+              item: false
+            }
+          }
+        }
+        subject.set_override_attribute('deep.nested.item', true)
+        
+        subject.override_attributes["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 override node attribute at the nested path" do
+       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
+    end
+
+    context "when the override attribute is already set" do
+      it "test" do
+        subject.default_attributes = {
+          deep: {
+            nested: {
+              item: false
+            }
+          }
+        }
+        subject.set_default_attribute('deep.nested.item', true)
+        
+        subject.default_attributes["deep"]["nested"]["item"].should be_true
+      end
+    end
+  end
 end

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

@@ -2,4 +2,146 @@ require 'spec_helper'
 
 describe Ridley::Node do
   it_behaves_like "a Ridley Resource", Ridley::Node
+
+  let(:connection) { double("connection") }
+
+  subject { Ridley::Node.new(connection) }
+
+  describe "#override=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.override = {
+          "key" => "value"
+        }
+
+        subject.override.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#automatic=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.automatic = {
+          "key" => "value"
+        }
+
+        subject.automatic.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#normal=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.normal = {
+          "key" => "value"
+        }
+
+        subject.normal.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#default=" do
+    context "given a Hash" do
+      it "returns a HashWithIndifferentAccess" do
+        subject.default = {
+          "key" => "value"
+        }
+
+        subject.default.should be_a(HashWithIndifferentAccess)
+      end
+    end
+  end
+
+  describe "#set_override_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)
+    end
+
+    it "sets an normal node attribute at the nested path" do
+       subject.set_normal_attribute('deep.nested.item', true)
+
+       subject.normal.should have_key("deep")
+       subject.normal["deep"].should have_key("nested")
+       subject.normal["deep"]["nested"].should have_key("item")
+       subject.normal["deep"]["nested"]["item"].should be_true
+    end
+
+    context "when the normal attribute is already set" do
+      it "test" do
+        subject.normal = {
+          deep: {
+            nested: {
+              item: false
+            }
+          }
+        }
+        subject.set_normal_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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chozo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -418,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3051717703450695836
+      hash: -3992965463787136581
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23