ridley 0.1.0 → 0.2.0

data/lib/ridley/middleware/parse_json.rb

@@ -24,7 +24,7 @@ module Ridley
         #
         # @return [Hash]
         def parse(body)
-          MultiJson.decode(body, symbolize_keys: true)
+          HashWithIndifferentAccess.new MultiJson.decode(body)
         end
 
         # Extracts the type of the response from the response headers
@@ -62,8 +62,7 @@ module Ridley
         #
         # @return [Boolean]
         def json_response?(env)
-          response_type(env) == JSON_TYPE ||
-            looks_like_json?(env)
+          response_type(env) == JSON_TYPE || looks_like_json?(env)
         end
 
         # Examines the body of a request env and returns true if it appears

data/lib/ridley/resource.rb

@@ -68,7 +68,7 @@ module Ridley
 
       # @return [Hash]
       def attribute_defaults
-        @attribute_defaults ||= Hash.new
+        @attribute_defaults ||= HashWithIndifferentAccess.new
       end
 
       # @param [String, Symbol] name

data/lib/ridley/resources/data_bag_item.rb

@@ -98,15 +98,20 @@ module Ridley
       end
     end
 
+    # @return [Ridley::DataBag]
     attr_reader :data_bag
+    # @return [HashWithIndifferentAccess]
+    attr_reader :attributes
 
-    attr_accessor :attributes    
     validates_presence_of :id
 
+    # @param [Ridley::Connection] connection
+    # @param [Ridley::DataBag] data_bag
+    # @param [#to_hash] attributes
     def initialize(connection, data_bag, attributes = {})
       @connection = connection
       @data_bag = data_bag
-      @attributes = attributes
+      self.attributes = attributes
     end
 
     # Alias for accessing the value of the 'id' attribute
@@ -134,6 +139,13 @@ module Ridley
     end
     alias_method :[]=, :attribute=
 
+    # @param [#to_hash] new_attributes
+    #
+    # @return [HashWithIndifferentAccess]
+    def attributes=(new_attributes)
+      @attributes = HashWithIndifferentAccess.new(new_attributes.to_hash)
+    end
+
     # Creates a resource on the target remote or updates one if the resource
     # already exists.
     #
@@ -156,7 +168,7 @@ module Ridley
     #
     # @return [Object]
     def from_hash(hash)
-      hash = hash.to_hash
+      hash = HashWithIndifferentAccess.new(hash.to_hash)
 
       self.attributes = hash.has_key?(:raw_data) ? hash[:raw_data] : hash
       self
@@ -181,6 +193,7 @@ module Ridley
 
     private
 
+      # @return [Ridley::Connection]
       attr_reader :connection
   end
 end

data/lib/ridley/resources/environment.rb

@@ -27,7 +27,7 @@ module Ridley
     attribute :description, default: String.new
     attribute :default_attributes, default: HashWithIndifferentAccess.new
     attribute :override_attributes, default: HashWithIndifferentAccess.new
-    attribute :cookbook_versions, default: Hash.new
+    attribute :cookbook_versions, default: HashWithIndifferentAccess.new
 
     # @param [Hash] hash
     def default_attributes=(hash)
@@ -39,6 +39,10 @@ module Ridley
       super(HashWithIndifferentAccess.new(hash))
     end
 
+    def cookbook_versions=(hash)
+      super(HashWithIndifferentAccess.new(hash))
+    end
+
     # Set an environment level default attribute given the dotted path representation of
     # the Chef attribute and value
     #

data/lib/ridley/resources/node.rb

@@ -91,6 +91,14 @@ module Ridley
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
       self.normal = self.normal.merge(attr_hash)
     end
+
+    def eucalyptus?
+      self.automatic.has_key?(:eucalyptus)
+    end
+
+    def ec2?
+      self.automatic.has_key?(:ec2)
+    end
   end
   
   module DSL

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/ridley.gemspec

@@ -16,7 +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 'chozo', '>= 0.0.3'
   s.add_runtime_dependency 'yajl-ruby'
   s.add_runtime_dependency 'mixlib-log'
   s.add_runtime_dependency 'mixlib-authentication'

data/spec/acceptance/data_bag_item_resource_spec.rb

@@ -69,7 +69,13 @@ describe "DataBag API operations", type: "acceptance" do
   describe "retrieving a data bag item" do
     it "returns the desired item in the data bag" do
       attributes = {
-        id: "appconfig", host: "host.local", port: 80, admin: false, servers: ["one"]
+        "id" => "appconfig",
+        "host" => "host.local",
+        "port" => 80,
+        "admin" => false,
+        "servers" => [
+          "one"
+        ]
       }
       @databag.item.create(attributes)
 
@@ -80,8 +86,8 @@ describe "DataBag API operations", type: "acceptance" do
   describe "deleting a data bag item" do
     let(:attributes) do
       {
-        id: "appconfig",
-        host: "host.local"
+        "id" => "appconfig",
+        "host" => "host.local"
       }
     end
 
@@ -90,16 +96,16 @@ describe "DataBag API operations", type: "acceptance" do
     end
 
     it "returns the deleted data bag item" do
-      dbi = @databag.item.delete(attributes[:id])
+      dbi = @databag.item.delete(attributes["id"])
 
       dbi.should be_a(Ridley::DataBagItem)
       dbi.attributes.should eql(attributes)
     end
 
     it "deletes the data bag item from the server" do
-      @databag.item.delete(attributes[:id])
+      @databag.item.delete(attributes["id"])
 
-      @databag.item.find(attributes[:id]).should be_nil
+      @databag.item.find(attributes["id"]).should be_nil
     end
   end
 

data/spec/acceptance/environment_resource_spec.rb

@@ -124,9 +124,9 @@ describe "Environment API operations", type: "acceptance" do
 
     it "saves a new set of 'default_attributes'" do
       target.default_attributes = default_attributes = {
-        attribute_one: "val_one",
-        nested: {
-          other: "val"
+        "attribute_one" => "val_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 
@@ -140,9 +140,9 @@ describe "Environment API operations", type: "acceptance" do
 
     it "saves a new set of 'override_attributes'" do
       target.override_attributes = override_attributes = {
-        attribute_one: "val",
-        nested: {
-          other: "val"
+        "attribute_one" => "val_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 
@@ -156,8 +156,8 @@ describe "Environment API operations", type: "acceptance" do
 
     it "saves a new set of 'cookbook_versions'" do
       target.cookbook_versions = cookbook_versions = {
-        nginx: "1.2.0",
-        tomcat: "1.3.0"
+        "nginx" => "1.2.0",
+        "tomcat" => "1.3.0"
       }
 
       connection.sync do

data/spec/acceptance/node_resource_spec.rb

@@ -131,9 +131,9 @@ describe "Node API operations", type: "acceptance" do
 
     it "saves a new set of 'normal' attributes" do
       target.normal = normal = {
-        attribute_one: "value_one",
-        nested: {
-          other: "val"
+        "attribute_one" => "value_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 
@@ -147,9 +147,9 @@ describe "Node API operations", type: "acceptance" do
 
     it "saves a new set of 'default' attributes" do
       target.default = defaults = {
-        attribute_one: "val_one",
-        nested: {
-          other: "val"
+        "attribute_one" => "val_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 
@@ -163,9 +163,9 @@ describe "Node API operations", type: "acceptance" do
 
     it "saves a new set of 'automatic' attributes" do
       target.automatic = automatics = {
-        attribute_one: "val_one",
-        nested: {
-          other: "val"
+        "attribute_one" => "val_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 
@@ -179,9 +179,9 @@ describe "Node API operations", type: "acceptance" do
 
     it "saves a new set of 'override' attributes" do
       target.override = overrides = {
-        attribute_one: "val_one",
-        nested: {
-          other: "val"
+        "attribute_one" => "val_one",
+        "nested" => {
+          "other" => "val"
         }
       }
 

data/spec/acceptance/role_resource_spec.rb

@@ -142,8 +142,8 @@ describe "Role API operations", type: "acceptance" do
 
     it "saves a new env_run_lists" do
       target.env_run_lists = env_run_lists = {
-        production: ["recipe[one]"],
-        development: ["recipe[two]"]
+        "production" => ["recipe[one]"],
+        "development" => ["recipe[two]"]
       }
 
       connection.sync do
@@ -167,9 +167,9 @@ describe "Role API operations", type: "acceptance" do
 
     it "saves a new default_attributes" do
       target.default_attributes = defaults = {
-        attribute_one: "value_one",
-        nested: {
-          other: false
+        "attribute_one" => "value_one",
+        "nested" => {
+          "other" => false
         }
       }
 
@@ -183,9 +183,9 @@ describe "Role API operations", type: "acceptance" do
 
     it "saves a new override_attributes" do
       target.override_attributes = overrides = {
-        attribute_two: "value_two",
-        nested: {
-          other: false
+        "attribute_two" => "value_two",
+        "nested" => {
+          "other" => false
         }
       }
 

data/spec/acceptance/search_resource_spec.rb

@@ -22,9 +22,10 @@ describe "Search API operations", type: "acceptance" do
     it "returns an array of indexes" do
       indexes = connection.search_indexes
 
-      indexes.should include(:role)
-      indexes.should include(:node)
-      indexes.should include(:client)
+      indexes.should include("role")
+      indexes.should include("node")
+      indexes.should include("client")
+      indexes.should include("environment")
     end
   end
 

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

@@ -10,27 +10,27 @@ describe Ridley::DataBagItem do
     context "when JSON has a 'raw_data' field" do
       let(:response) do
         {
-          name: "data_bag_item_ridley-test_appconfig",
-          raw_data: {
-            id: "appconfig",
-            host: "host.local"
+          "name" => "data_bag_item_ridley-test_appconfig",
+          "raw_data" => {
+            "id" => "appconfig",
+            "host" => "host.local"
           },
-          json_class: "Chef::DataBagItem",
-          data_bag: "ridley-test",
-          chef_type: "data_bag_item"
+          "json_class" => "Chef::DataBagItem",
+          "data_bag" => "ridley-test",
+          "chef_type" => "data_bag_item"
         }
       end
 
       it "returns a new object from attributes in the 'raw_data' field" do
-        subject.from_hash(response).attributes.should eql(response[:raw_data])
+        subject.from_hash(response).attributes.should eql(response["raw_data"])
       end
     end
 
     context "when JSON does not contain a 'raw_data' field" do
       let(:response) do
         {
-          id: "appconfig",
-          host: "host.local"
+          "id" => "appconfig",
+          "host" => "host.local"
         }
       end
 

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

@@ -144,4 +144,36 @@ describe Ridley::Node do
       end
     end
   end
+
+  describe "#eucalyptus?" do
+    it "returns true if the eucalyptus automatic attribute is set" do
+      subject.automatic = {
+        "eucalyptus" => Hash.new
+      }
+
+      subject.eucalyptus?.should be_true
+    end
+
+    it "returns false if the eucalyptus automatic attribute is not set" do
+      subject.automatic.delete(:eucalyptus)
+
+      subject.eucalyptus?.should be_false
+    end
+  end
+
+  describe "#ec2?" do
+    it "returns true if the ec2 automatic attribute is set" do
+      subject.automatic = {
+        "ec2" => Hash.new
+      }
+
+      subject.ec2?.should be_true
+    end
+
+    it "returns false if the ec2 automatic attribute is not set" do
+      subject.automatic.delete(:ec2)
+
+      subject.ec2?.should be_false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chozo
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1428878148981436287
+      hash: 1117487299346141240
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23