ridley 0.6.3 → 0.7.0.beta

data/lib/ridley/errors.rb

@@ -15,7 +15,7 @@ module Ridley
       end
 
       def message
-        errors.full_messages.join(', ')
+        errors.values
       end
       alias_method :to_s, :message
     end

data/lib/ridley/resource.rb

@@ -1,17 +1,7 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  module Resource
-    extend ActiveSupport::Concern
-    include ActiveModel::AttributeMethods
-    include ActiveModel::Validations
-    include ActiveModel::Serializers::JSON
-    include Comparable
-
-    included do
-      attribute_method_suffix('=')
-    end
-
-    module ClassMethods
+  class Resource
+    class << self
       # @return [String, nil]
       def chef_id
         @chef_id
@@ -62,29 +52,6 @@ module Ridley
         attribute(:json_class, default: klass)
       end
 
-      # @return [Set]
-      def attributes
-        @attributes ||= Set.new
-      end
-
-      # @return [Hash]
-      def attribute_defaults
-        @attribute_defaults ||= HashWithIndifferentAccess.new
-      end
-
-      # @param [String, Symbol] name
-      # @option options [Object] :default
-      #   defines the default value for the attribute
-      #
-      # @return [Set]
-      def attribute(name, options = {})
-        if options.has_key?(:default)
-          default_for_attribute(name, options[:default])
-        end
-        define_attribute_method(name)
-        attributes << name.to_sym
-      end
-
       # @param [Ridley::Connection] connection
       #
       # @return [Array<Object>]
@@ -164,67 +131,16 @@ module Ridley
         resource = new(connection, object.to_hash)
         new(connection, connection.put("#{self.resource_path}/#{resource.chef_id}", resource.to_json).body)
       end
-
-      private
-
-        def default_for_attribute(name, value)
-          attribute_defaults[name.to_sym] = value
-        end
     end
 
+    include Chozo::VariaModel
+    include Comparable
+
     # @param [Ridley::Connection] connection
-    # @param [Hash] attributes
-    def initialize(connection, attributes = {})
+    # @param [Hash] new_attrs
+    def initialize(connection, new_attrs = {})
       @connection = connection
-      self.attributes = self.class.attribute_defaults.deep_merge(attributes)
-    end
-
-    # @param [String, Symbol] key
-    #
-    # @return [Object]
-    def attribute(key)
-      if instance_variable_defined?("@#{key}")
-        instance_variable_get("@#{key}")
-      else
-        self.class.attribute_defaults[key]
-      end
-    end
-    alias_method :[], :attribute
-
-    # @param [String, Symbol] key
-    # @param [Object] value
-    #
-    # @return [Object]
-    def attribute=(key, value)
-      instance_variable_set("@#{key}", value)
-    end
-    alias_method :[]=, :attribute=
-
-    # @param [String, Symbol] key
-    #
-    # @return [Boolean]
-    def attribute?(key)
-      attribute(key).present?
-    end
-
-    # @return [Hash]
-    def attributes
-      {}.tap do |attrs|
-        self.class.attributes.each do |attr|
-          attrs[attr] = attribute(attr)
-        end
-      end
-    end
-
-    # @param [#to_hash] new_attributes
-    #
-    # @return [Hash]
-    def attributes=(new_attributes)
-      new_attributes.to_hash.symbolize_keys!
-
-      self.class.attributes.each do |attr_name|
-        send(:attribute=, attr_name, new_attributes[attr_name.to_sym])
-      end
+      mass_assign(new_attrs)
     end
 
     # Creates a resource on the target remote or updates one if the resource
@@ -237,7 +153,7 @@ module Ridley
     def save
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      self.attributes = self.class.create(connection, self).attributes
+      mass_assign(self.class.create(connection, self).attributes)
       true
     rescue Errors::HTTPConflict
       self.update
@@ -254,7 +170,7 @@ module Ridley
     def update
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      self.attributes = self.class.update(connection, self).attributes
+      mass_assign(self.class.update(connection, self).attributes)
       true
     end
 
@@ -262,44 +178,13 @@ module Ridley
     #
     # @return [Object]
     def reload
-      self.attributes = self.class.find(connection, self).attributes
+      mass_assign(self.class.find(connection, self).attributes)
       self
     end
 
     # @return [String]
     def chef_id
-      attribute(self.class.chef_id)
-    end
-
-    # @param [String] json
-    # @option options [Boolean] :symbolize_keys
-    # @option options [Class, Symbol, String] :adapter
-    #
-    # @return [Object]
-    def from_json(json, options = {})
-      self.attributes = MultiJson.decode(json, options)
-      self
-    end
-
-    # @param [#to_hash] hash
-    #
-    # @return [Object]
-    def from_hash(hash)
-      self.attributes = hash.to_hash
-      self
-    end
-
-    # @option options [Boolean] :symbolize_keys
-    # @option options [Class, Symbol, String] :adapter
-    #
-    # @return [String]
-    def to_json(options = {})
-      MultiJson.encode(self.attributes, options)
-    end
-    alias_method :as_json, :to_json
-
-    def to_hash
-      self.attributes
+      get_attribute(self.class.chef_id)
     end
 
     def to_s

data/lib/ridley/resources/client.rb

@@ -1,8 +1,6 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class Client
-    include Ridley::Resource
-
+  class Client < Ridley::Resource
     class << self
       # Retrieves a client from the remote connection matching the given chef_id
       # and regenerates it's private key. An instance of the updated object will
@@ -28,25 +26,31 @@ module Ridley
     set_chef_json_class "Chef::ApiClient"
     set_resource_path "clients"
 
-    attribute :name
-    validates_presence_of :name
+    attribute :name,
+      type: String,
+      required: true
 
-    attribute :admin, default: false
-    validates_inclusion_of :admin, in: [ true, false ]
+    attribute :admin,
+      type: Boolean,
+      required: true,
+      default: false
 
-    attribute :validator, default: false
-    validates_inclusion_of :validator, in: [ true, false ]
+    attribute :validator,
+      type: Boolean,
+      required: true,
+      default: false
 
-    attribute :certificate
-    attribute :public_key
-    attribute :private_key
-    attribute :orgname
+    attribute :certificate,
+      type: String
 
-    def attributes
-      # @todo JW: reflect on the connection type to determine if we need to strip the
-      # json_class attribute. Only OHC/OPC needs this stripped.
-      super.except(:json_class)
-    end
+    attribute :public_key,
+      type: String
+
+    attribute :private_key,
+      type: [ String, Boolean ]
+
+    attribute :orgname,
+      type: String
 
     # Regenerates the private key of the instantiated client object. The new
     # private key will be set to the value of the 'private_key' accessor
@@ -58,6 +62,16 @@ module Ridley
       self.private_key = true
       self.save
     end
+
+    # Override to_json to reflect to massage the returned attributes based on the type
+    # of connection. Only OHC/OPC requires the json_class attribute is not present.
+    def to_json
+      if connection.hosted?
+        attributes.except(:json_class).to_json
+      else
+        super
+      end
+    end
   end
 
   module DSL

data/lib/ridley/resources/cookbook.rb

@@ -1,8 +1,6 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class Cookbook    
-    include Ridley::Resource
-
+  class Cookbook < Ridley::Resource
     class << self
       # Save a new Cookbook Version of the given name, version with the
       # given manifest of files and checksums.
@@ -34,8 +32,8 @@ module Ridley
     set_chef_json_class "Chef::Cookbook"
     set_resource_path "cookbooks"
 
-    attribute :name
-    validates_presence_of :name
+    attribute :name,
+      required: true
   end
 
   module DSL

data/lib/ridley/resources/data_bag.rb

@@ -25,9 +25,7 @@ module Ridley
   end
 
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class DataBag
-    include Ridley::Resource
-
+  class DataBag < Ridley::Resource
     class << self
       # @param [Ridley::Connection] connection
       # @param [String, #chef_id] object
@@ -56,8 +54,8 @@ module Ridley
     set_chef_id "name"
     set_resource_path "data"
 
-    attribute :name
-    validates_presence_of :name
+    attribute :name,
+      required: true
 
     def item
       DBIChainLink.new(self, connection)

data/lib/ridley/resources/data_bag_item.rb

@@ -1,9 +1,6 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class DataBagItem
-    include ActiveModel::Validations
-    include ActiveModel::Serialization
-
+  class DataBagItem < Ridley::Resource
     class << self
       # @param [Ridley::Connection] connection
       #
@@ -98,52 +95,28 @@ module Ridley
       end
     end
 
+    set_assignment_mode :carefree
+
     # @return [Ridley::DataBag]
     attr_reader :data_bag
-    # @return [HashWithIndifferentAccess]
-    attr_reader :attributes
 
-    validates_presence_of :id
+    attribute :id,
+      type: String,
+      required: true
 
     # @param [Ridley::Connection] connection
     # @param [Ridley::DataBag] data_bag
-    # @param [#to_hash] attributes
-    def initialize(connection, data_bag, attributes = {})
-      @connection = connection
+    # @param [#to_hash] new_attrs
+    def initialize(connection, data_bag, new_attrs = {})
+      super(connection, new_attrs)
       @data_bag = data_bag
-      self.attributes = attributes
     end
 
     # Alias for accessing the value of the 'id' attribute
     #
     # @return [String]
     def chef_id
-      @attributes[:id]
-    end
-    alias_method :id, :chef_id
-
-    # @param [String, Symbol] key
-    #
-    # @return [Object]
-    def attribute(key)
-      @attributes[key]
-    end
-    alias_method :[], :attribute
-
-    # @param [String, Symbol] key
-    # @param [Object] value
-    #
-    # @return [Object]
-    def attribute=(key, value)
-      @attributes[key] = value
-    end
-    alias_method :[]=, :attribute=
-
-    # @param [#to_hash] new_attributes
-    #
-    # @return [HashWithIndifferentAccess]
-    def attributes=(new_attributes)
-      @attributes = HashWithIndifferentAccess.new(new_attributes.to_hash)
+      get_attribute(:id)
     end
 
     # Creates a resource on the target remote or updates one if the resource
@@ -157,10 +130,10 @@ module Ridley
     def save
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      self.attributes = self.class.create(connection, data_bag, self).attributes
+      mass_assign(self.class.create(connection, data_bag, self).attributes)
       true
     rescue Errors::HTTPConflict
-      self.attributes = self.class.update(connection, data_bag, self).attributes
+      self.update
       true
     end
 
@@ -169,7 +142,7 @@ module Ridley
     # @return [Hash] decrypted attributes
     def decrypt
       decrypted_hash = Hash[attributes.map { |key, value| [key, key == "id" ? value : decrypt_value(value)] }]
-      self.attributes = HashWithIndifferentAccess.new(decrypted_hash)
+      mass_assign(decrypted_hash)
     end
 
     def decrypt_value(value)
@@ -183,27 +156,36 @@ module Ridley
       YAML.load(decrypted_value)
     end
 
-    # @param [#to_hash] hash
+    # Reload the attributes of the instantiated resource
     #
     # @return [Object]
-    def from_hash(hash)
-      hash = HashWithIndifferentAccess.new(hash.to_hash)
-
-      self.attributes = hash.has_key?(:raw_data) ? hash[:raw_data] : hash
+    def reload
+      mass_assign(self.class.find(connection, data_bag, self).attributes)
       self
     end
 
-    # @option options [Boolean] :symbolize_keys
-    # @option options [Class, Symbol, String] :adapter
+    # Updates the instantiated resource on the target remote with any changes made
+    # to self
     #
-    # @return [String]
-    def to_json(options = {})
-      MultiJson.encode(self.attributes, options)
+    # @raise [Errors::InvalidResource]
+    #   if the resource does not pass validations
+    #
+    # @return [Boolean]
+    def update
+      raise Errors::InvalidResource.new(self.errors) unless valid?
+
+      mass_assign(sself.class.update(connection, data_bag, self).attributes)
+      true
     end
-    alias_method :as_json, :to_json
 
-    def to_hash
-      self.attributes
+    # @param [#to_hash] hash
+    #
+    # @return [Object]
+    def from_hash(hash)
+      hash = HashWithIndifferentAccess.new(hash.to_hash)
+
+      mass_assign(hash.has_key?(:raw_data) ? hash[:raw_data] : hash)
+      self
     end
 
     def to_s

data/lib/ridley/resources/environment.rb

@@ -1,8 +1,6 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class Environment
-    include Ridley::Resource
-    
+  class Environment < Ridley::Resource    
     class << self
       # Delete all of the environments on the remote connection. The
       # '_default' environment will never be deleted.
@@ -21,27 +19,20 @@ module Ridley
     set_chef_json_class "Chef::Environment"
     set_resource_path "environments"
 
-    attribute :name
-    validates_presence_of :name
-
-    attribute :description, default: String.new
-    attribute :default_attributes, default: HashWithIndifferentAccess.new
-    attribute :override_attributes, default: HashWithIndifferentAccess.new
-    attribute :cookbook_versions, default: HashWithIndifferentAccess.new
-
-    # @param [Hash] hash
-    def default_attributes=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    attribute :name,
+      required: true
 
-    # @param [Hash] hash
-    def override_attributes=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    attribute :description,
+      default: String.new
 
-    def cookbook_versions=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    attribute :default_attributes,
+      default: Hashie::Mash.new
+    
+    attribute :override_attributes,
+      default: Hashie::Mash.new
+    
+    attribute :cookbook_versions,
+      default: Hashie::Mash.new
 
     # Set an environment level default attribute given the dotted path representation of
     # the Chef attribute and value

data/lib/ridley/resources/node.rb

@@ -1,6 +1,6 @@
 module Ridley 
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class Node
+  class Node < Ridley::Resource
     class << self
       # @overload bootstrap(connection, nodes, options = {})
       #   @param [Ridley::Connection] connection
@@ -68,50 +68,40 @@ module Ridley
       end
     end
 
-    include Ridley::Resource
-
     set_chef_id "name"
     set_chef_type "node"
     set_chef_json_class "Chef::Node"
     set_resource_path "nodes"
 
-    attribute :name
-    validates_presence_of :name
+    attribute :name,
+      required: true
+
+    attribute :chef_environment,
+      default: "_default"
+
+    attribute :automatic,
+      default: Hashie::Mash.new
+
+    attribute :normal,
+      default: Hashie::Mash.new
 
-    attribute :chef_environment, default: "_default"
-    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
+    attribute :default,
+      default: Hashie::Mash.new
+
+    attribute :override,
+      default: Hashie::Mash.new
+
+    attribute :run_list,
+      default: Array.new
 
     alias_method :normal_attributes, :normal
     alias_method :automatic_attributes, :automatic
     alias_method :default_attributes, :default
     alias_method :override_attributes, :override
 
-    # @param [Hash] hash
-    def normal=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
     alias_method :normal_attributes=, :normal=
-
-    # @param [Hash] hash
-    def automatic=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
     alias_method :automatic_attributes=, :automatic=
-
-    # @param [Hash] hash
-    def default=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
     alias_method :default_attributes=, :default=
-
-    # @param [Hash] hash
-    def override=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
     alias_method :override_attributes=, :override=
 
     # Set a node level normal attribute given the dotted path representation of the Chef
@@ -123,14 +113,14 @@ module Ridley
     # @example setting and saving a node level normal attribute
     #
     #   obj = node.find("jwinsor-1")
-    #   obj.set_attribute("my_app.billing.enabled", false)
+    #   obj.set_chef_attribute("my_app.billing.enabled", false)
     #   obj.save
     #
     # @param [String] key
     # @param [Object] value
     #
     # @return [HashWithIndifferentAccess]
-    def set_attribute(key, value)
+    def set_chef_attribute(key, value)
       attr_hash = HashWithIndifferentAccess.from_dotted_path(key, value)
       self.normal = self.normal.deep_merge(attr_hash)
     end

data/lib/ridley/resources/role.rb

@@ -1,31 +1,28 @@
 module Ridley
   # @author Jamie Winsor <jamie@vialstudios.com>
-  class Role
-    include Ridley::Resource
-
+  class Role < Ridley::Resource
     set_chef_id "name"
     set_chef_type "role"
     set_chef_json_class "Chef::Role"
     set_resource_path "roles"
 
-    attribute :name
-    validates_presence_of :name
+    attribute :name,
+      required: true
 
-    attribute :description, default: String.new
-    attribute :default_attributes, default: HashWithIndifferentAccess.new
-    attribute :override_attributes, default: HashWithIndifferentAccess.new
-    attribute :run_list, default: Array.new
-    attribute :env_run_lists, default: Hash.new
+    attribute :description,
+      default: String.new
 
-    # @param [Hash] hash
-    def default_attributes=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    attribute :default_attributes,
+      default: Hashie::Mash.new
 
-    # @param [Hash] hash
-    def override_attributes=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    attribute :override_attributes,
+      default: Hashie::Mash.new
+
+    attribute :run_list,
+      default: Array.new
+
+    attribute :env_run_lists,
+      default: Hash.new
 
     # Set a role level override attribute given the dotted path representation of the Chef
     # attribute and value

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.6.3"
+  VERSION = "0.7.0.beta"
 end

data/lib/ridley.rb

@@ -4,7 +4,6 @@ require 'celluloid'
 require 'faraday'
 require 'addressable/uri'
 require 'multi_json'
-require 'active_model'
 require 'active_support/inflector'
 require 'forwardable'
 require 'thread'

data/ridley.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'json', '>= 1.5.0'
   s.add_runtime_dependency 'multi_json', '>= 1.0.4'
-  s.add_runtime_dependency 'chozo', '>= 0.2.2'
+  s.add_runtime_dependency 'chozo', '>= 0.4.1'
   s.add_runtime_dependency 'mixlib-log'
   s.add_runtime_dependency 'mixlib-authentication'
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday'
-  s.add_runtime_dependency 'activemodel', '>= 3.2.0'
   s.add_runtime_dependency 'activesupport', '>= 3.2.0'
   s.add_runtime_dependency 'celluloid'
   s.add_runtime_dependency 'net-ssh'

data/spec/support/shared_examples/ridley_resource.rb

@@ -1,5 +1,5 @@
 shared_examples_for "a Ridley Resource" do |resource_klass|
-  let(:connection) { double('connection') }
+  let(:connection) { double('connection', hosted?: true) }
   let(:active_connection) { double('active-connection') }
   let(:response) { double('response') }
 
@@ -99,40 +99,6 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
 
   subject { resource_klass.new(connection) }
 
-  describe "#attribute" do
-    it "returns the value of the attribute of the corresponding identifier" do
-      subject.attributes.each do |attr, value|
-        subject.attribute(attr).should eql(value)
-      end
-    end
-  end
-
-  describe "#attribute=" do
-    it "assigns the desired to the attribute of the corresponding identifier" do
-      subject.attributes.each do |attr, value|
-        subject.send(:attribute=, attr, "testval")
-      end
-
-      subject.attributes.each do |attr, value|
-        subject.attribute(attr).should eql("testval")
-      end
-    end
-  end
-
-  describe "#attributes" do
-    it "returns a hash of attributes" do
-      subject.attributes.should be_a(Hash)
-    end
-
-    it "includes attribute_defaults in the attributes" do
-      subject.class.stub(:attributes).and_return(Set.new([:val_one]))
-      subject.class.stub(:attribute_defaults).and_return(val_one: "value")
-
-      subject.attributes.should have_key(:val_one)
-      subject.attributes[:val_one].should eql("value")
-    end
-  end
-
   describe "#save" do
     context "when the object is valid" do
       before(:each) { subject.stub(:valid?).and_return(true) }
@@ -212,62 +178,6 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     end
   end
 
-  describe "#from_hash" do
-    before(:each) do
-      subject.class.attribute(:name)
-      @object = subject.from_hash(name: "reset")
-    end
-
-    it "returns an instance of the implementing class" do
-      @object.should be_a(subject.class)
-    end
-
-    it "assigns the attributes to the values of the corresponding keys in the given Hash" do
-      @object.name.should eql("reset")
-    end
-  end
-
-  describe "#to_hash" do
-    it "returns a hash" do
-      subject.to_hash.should be_a(Hash)
-    end
-
-    it "delegates to .attributes" do
-      subject.should_receive(:attributes)
-
-      subject.to_hash
-    end
-  end
-
-  describe "#to_json" do
-    it "serializes the objects attributes using MultiJson" do
-      MultiJson.should_receive(:encode).with(subject.attributes, kind_of(Hash))
-
-      subject.to_json
-    end
-
-    it "returns the seralized value" do
-      MultiJson.stub(:encode).and_return("{}")
-
-      subject.to_json.should eql("{}")
-    end
-  end
-
-  describe "#from_json" do
-    before(:each) do
-      subject.class.attribute(:name)
-      @object = subject.from_json(%({"name": "reset"}))
-    end
-
-    it "returns an instance of the implementing class" do
-      @object.should be_a(subject.class)
-    end
-
-    it "assigns the attributes to the values of the corresponding keys in the given JSON" do
-      @object.name.should eql("reset")
-    end
-  end
-
   describe "#reload" do
     let(:updated_subject) { double('updated_subject', attributes: { fake_attribute: "some_value" }) }
 

data/spec/unit/ridley/resource_spec.rb

@@ -5,95 +5,19 @@ describe Ridley::Resource do
   
   describe "ClassMethods" do
     subject do
-      Class.new do
-        include Ridley::Resource
-      end
+      Class.new(Ridley::Resource)
     end
 
     it_behaves_like "a Ridley Resource", subject.call
 
     describe "::initialize" do
-      it "has an empty Hash for attributes if no attributes have been defined" do
-        klass = subject.new(connection)
-
-        klass.attributes.should be_empty
-      end
-
-      it "assigns the given attributes to the attribute hash if the attribute is defined on the class" do
-        subject.attribute(:name)
-        klass = subject.new(connection, name: "a name")
-
-        klass.name.should eql("a name")
-        klass.attributes.should have_key(:name)
-      end
-
-      it "skips attributes which are not defined on the class when assigning attributes" do
-        klass = subject.new(connection, fake: "not here")
-
-        klass.attributes.should_not have_key(:fake)
-      end
-
-      it "merges the default values for attributes into the attributes hash" do
-        subject.stub(:attributes).and_return(Set.new([:name]))
-        subject.should_receive(:attribute_defaults).and_return(name: "whatever")
-        klass = subject.new(connection)
-
-        klass.attributes[:name].should eql("whatever")
-      end
-
-      it "explicit attributes take precedence over defaults" do
-        subject.stub(:attributes).and_return(Set.new([:name]))
-        subject.stub(:attribute_defaults).and_return(name: "default")
-
-        klass = subject.new(connection, name: "explicit_name")
-
-        klass.attributes[:name].should eql("explicit_name")
-      end
-    end
-
-    describe "::attributes" do
-      it "returns a Set" do
-        subject.attributes.should be_a(Set)
-      end
-    end
-
-    describe "::attribute" do
-      it "adds the given symbol to the attributes Set" do
-        subject.attribute(:name)
-
-        subject.attributes.should include(:name)
-      end
-
-      it "convers the given string into a symbol and adds it to the attributes Set" do
-        subject.attribute('last_name')
-
-        subject.attributes.should include(:last_name)
-      end
-
-      describe "setting a default value for the attribute" do
-        it "allows a string as the default value for the attribute" do
-          subject.attribute(:name, default: "jamie")
-
-          subject.attribute_defaults[:name].should eql("jamie")
-        end
-
-        it "allows a false boolean as the default value for the attribute" do
-          subject.attribute(:admin, default: false)
-
-          subject.attribute_defaults[:admin].should eql(false)
-        end
+      it "mass assigns the given attributes" do
+        new_attrs = {
+          name: "a name"
+        }
 
-        it "allows a true boolean as the default value for the attribute" do
-          subject.attribute(:admin, default: true)
-
-          subject.attribute_defaults[:admin].should eql(true)
-        end
-
-        it "allows nil as the default value for the attribute" do
-          subject.attribute(:certificate, default: nil)
-
-          subject.attribute_defaults[:certificate].should be_nil
-        end
+        subject.any_instance.should_receive(:mass_assign).with(new_attrs)
+        subject.new(connection, new_attrs)
       end
     end
 
@@ -119,13 +43,6 @@ describe Ridley::Resource do
 
         subject.chef_json_class.should eql("Chef::Environment")
       end
-
-      it "sets the value of the :json_class attribute default to the given value" do
-        subject.set_chef_json_class("Chef::Environment")
-
-        subject.attribute_defaults.should have_key(:json_class)
-        subject.attribute_defaults[:json_class].should eql("Chef::Environment")
-      end
     end
 
     describe "::set_chef_id" do
@@ -162,50 +79,17 @@ describe Ridley::Resource do
   end
 
   subject do
-    Class.new do
-      include Ridley::Resource
-    end.new(connection)
+    Class.new(Ridley::Resource).new(connection)
   end
 
-  describe "#attribute?" do
-    context "if the class has the attribute defined" do
-      before(:each) do
-        subject.class.attribute(:name)
-      end
-
-      it "returns false if the attribute has no value" do
-        subject.name = nil
-
-        subject.attribute?(:name).should be_false
-      end
-
-      it "returns true if the attribute has a value" do
-        subject.name = "reset"
-
-        subject.attribute?(:name).should be_true
-      end
-    end
-
-    context "if the class has the attribute defined with a default value" do
-      before(:each) do
-        subject.class.attribute(:name, default: "exception")
-      end
-
-      it "returns true if the attribute has not been explicitly set" do
-        subject.attribute?(:name).should be_true
-      end
-    end
-
-    context "if the class does not have the attribute defined" do
-      it "returns false" do
-        subject.attribute?(:name).should be_false
-      end
+  describe "#attributes=" do
+    subject do
+      Class.new(Ridley::Resource) do
+        attribute :name
+      end.new(connection)
     end
-  end
 
-  describe "#attributes=" do
     it "assigns the hash of attributes to the objects attributes" do
-      subject.class.attribute(:name)
       subject.attributes = { name: "reset" }
 
       subject.attributes[:name].should eql("reset")
@@ -214,9 +98,7 @@ describe Ridley::Resource do
 
   describe "comparable" do
     subject do
-      Class.new do
-        include Ridley::Resource
-
+      Class.new(Ridley::Resource) do
         set_chef_id "name"
 
         attribute "name"
@@ -253,9 +135,7 @@ describe Ridley::Resource do
 
   describe "uniqueness" do
     subject do
-      Class.new do
-        include Ridley::Resource
-
+      Class.new(Ridley::Resource) do
         set_chef_id "name"
 
         attribute "name"

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

@@ -75,35 +75,7 @@ describe Ridley::Environment do
 
   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)
 
@@ -130,10 +102,6 @@ describe Ridley::Environment do
   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)
 

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

@@ -50,61 +50,9 @@ describe Ridley::Node do
 
   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_attribute" do
-    it "returns a HashWithIndifferentAccess" do
-      subject.set_attribute('deep.nested.item', true).should be_a(HashWithIndifferentAccess)
-    end
-
+  describe "#set_chef_attribute" do
     it "sets an normal node attribute at the nested path" do
-       subject.set_attribute('deep.nested.item', true)
+       subject.set_chef_attribute('deep.nested.item', true)
 
        subject.normal.should have_key("deep")
        subject.normal["deep"].should have_key("nested")
@@ -121,7 +69,7 @@ describe Ridley::Node do
             }
           }
         }
-        subject.set_attribute('deep.nested.item', true)
+        subject.set_chef_attribute('deep.nested.item', true)
         
         subject.normal["deep"]["nested"]["item"].should be_true
       end

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

@@ -7,35 +7,7 @@ describe Ridley::Role do
 
   subject { Ridley::Role.new(connection) }
 
-  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 "#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 "#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)
 
@@ -62,10 +34,6 @@ describe Ridley::Role do
   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)
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.7.0.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -320,12 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3636346058198245509
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23