spice 1.0.0.pre → 1.0.0.rc

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Release Notes - Spice - Version 1.0.0
 
+* Note: this version of Spice is a major version bump, which means it is *not* backwards-compatible with previous versions.
+
 ## Removed
 
 * Old-style connections are no longer supported. Please use the connection string like Chef uses (ex. http://chef.example.com:4000)
 
+## Improvement
+
+* Complete rewrite! Returned results are now full interactive objects and not just hashes. Create, update, and destroy resources with an ORM-like interface.
+
 # Release Notes - Spice - Version 0.5.0
 
 ## Bug
@@ -15,8 +21,6 @@
 
 * Node support!
 
-
-
 # Release Notes - Spice - Version 0.3.0
 
 ## Bug

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
+  gem 'rake'
   gem 'rspec', '>= 2.8.0'
   gem "webmock", ">= 1.7.10"
   gem "timecop", ">= 0.3.5"
@@ -17,4 +18,5 @@ end
 
 group :doc do
   gem 'yard'
+  gem 'redcarpet'
 end

data/README.md

@@ -1,6 +1,8 @@
-# spice
+# Spice - Chef API Wrapper [![Dependency Status](https://gemnasium.com/danryan/spice.png)][gemnasium]
 
-Spice is a zesty Chef API wrapper. Its primary purpose is to let you easily integrate your apps with a (Chef)[http://opscode.com/chef] server easily.  Spice provides support for the [Chef API](http://wiki.opscode.com/display/chef/Server+API)
+[gemnasium]: https://gemnasium.com/danryan/spice
+
+Spice lets you easily integrate your apps with a [Chef](http://opscode.com/chef) server. Spice provides support for the [Chef API](http://wiki.opscode.com/display/chef/Server+API)
 
 ## Installation
 
@@ -12,7 +14,7 @@ Of course, You can always grab the source from http://github.com/danryan/spice.
 
 ### Deprecation notice
 
-Explicitly setting a `host`, `port`, and `scheme` value has been deprecated in favor of setting a single variable, `server_url`, which matches the format of Chef's client config parameter, `chef_server_url`. The old way of defining `host`, `port`, and `scheme` has been removed.
+Explicitly setting a `host`, `port`, and `scheme` value has been removed in favor of setting a single variable, `server_url`, which matches the format of Chef's client config parameter, `chef_server_url`.
 
 ### Contributors
 

data/Rakefile

@@ -23,4 +23,9 @@ Bundler.require(:doc)
 desc "Generate documentation"
 YARD::Rake::YardocTask.new do |t|
   t.files = [ 'lib/**/*.rb' ]
+end
+
+desc "Generate docs"
+task :doc do
+  sh %{bundle exec rake yard}
 end

data/lib/spice.rb

@@ -1,11 +1,13 @@
-require 'toystore'
-require 'adapter/memory'
+require 'virtus'
+require 'aequitas'
+require 'active_model/callbacks'
+require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/keys'
 require 'mixlib/authentication'
 
 require 'spice/config'
 require 'spice/error'
 require 'spice/authentication'
-require 'spice/chef'
 
 require 'spice/role'
 require 'spice/client'

data/lib/spice/client.rb

@@ -2,12 +2,16 @@ require 'spice/persistence'
 
 module Spice
   class Client
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+    
     endpoint "clients"
     
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :public_key, String
     attribute :private_key, String
@@ -18,12 +22,34 @@ module Spice
     
     validates_presence_of :name, :json_class, :chef_type
 
-
+    after_create :wat
+    def wat
+      puts "WAT"
+    end
+    
     def do_post
       response = connection.post("/clients", :name => name)
       update_attributes(response.body)
       response = connection.get("/clients/#{name}")
       update_attributes(response.body)
     end
+    
+    def do_put
+      response = connection.put("/clients/#{name}", attributes)
+    end
+
+    def self.get(name)
+      connection.client(name)
+    end
+    
+    # Check if the client exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/clients/#{name}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/config.rb

@@ -2,42 +2,61 @@ require 'spice/version'
 
 module Spice
   module Config
+    # The default Chef server URL
     DEFAULT_SERVER_URL = "http://localhost:4000"
     
+    # The default Chef version (changing this will enable disable certain features)
     DEFAULT_CHEF_VERSION = "0.10.8"
-        
+    
+    # The default Spice User-Agent header
     DEFAULT_USER_AGENT = "Spice #{Spice::VERSION}"
     
+    # Default connection options
     DEFAULT_CONNECTION_OPTIONS = {}
     
+    # An array of valid config options
     VALID_OPTIONS_KEYS = [
       :server_url,
       :client_name,
       :key_file,
       :raw_key,
       :chef_version,
-      :adapter,
       :user_agent,
       :connection_options
     ]
     
-    attr_accessor *VALID_OPTIONS_KEYS
+    VALID_OPTIONS_KEYS.each do |key|
+      attr_accessor key
+    end
     
+    # Reset all config options to default when the module is extended
     def self.extended(base)
       base.reset
     end
     
+    # Convenience method to configure Spice in a block
+    # @example Configuring spice
+    #   Spice.setup do |s|
+    #     s.server_url  = "http://chef.example.com:4000"
+    #     s.client_name = "admin"
+    #     s.key_file    = "/home/admin/.chef/admin.pem"
+    #   end
+    # @yieldparam Spice
+    # @yieldreturn Spice    
+    
     def setup
       yield self
       self
     end
     
+    # Create an options hash from valid options keys
     def options
       options = {}
       VALID_OPTIONS_KEYS.each{|k| options[k] = send(k)}
       options
     end
     
+    # Reset all config options to their defaults
     def reset
       self.user_agent = DEFAULT_USER_AGENT
       self.server_url = DEFAULT_SERVER_URL

data/lib/spice/connection.rb

@@ -12,10 +12,12 @@ require 'spice/connection/nodes'
 require 'spice/connection/roles'
 require 'spice/connection/search'
 
+
+
 module Spice
   class Connection
-    include Toy::Store
-    store :memory, {}
+    include Virtus
+    include Aequitas
     
     include Spice::Connection::Clients
     include Spice::Connection::Cookbooks
@@ -28,6 +30,9 @@ module Spice
     include Spice::Connection::Search
     include Spice::Request
         
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :client_name, String
     attribute :key_file, String
     attribute :key, String
@@ -46,6 +51,11 @@ module Spice
       URI.parse(server_url)
     end
 
+    # Perform an HTTP GET request
+    # @param [String] path The relative path
+    # @return [Faraday::Response]
+    # @example Get a list of all nodes
+    #   Spice.connection.get("/nodes")
     def get(path)
       response = request(:headers => build_headers(
         :GET, 
@@ -56,6 +66,12 @@ module Spice
       return response
     end # def get
     
+    # Perform an HTTP POST request
+    # @param [String] path The relative path
+    # @param [Hash] payload The payload to send with the POST request
+    # @return [Faraday::Response]
+    # @example Create a new client named "foo"
+    #   Spice.connection.post("/clients", :name => "foo")
     def post(path, payload)
       response = request(:headers => build_headers(
         :POST, 
@@ -68,7 +84,13 @@ module Spice
       return response
     end # def post
     
-    def put(path, payload, headers={})
+    # Perform an HTTP PUT request
+    # @param [String] path The relative path
+    # @param [Hash] payload The payload to send with the PUT request
+    # @return [Faraday::Response]
+    # @example Make an existing client "foo" an admin
+    #   Spice.connection.put("/clients/foo", :admin => true)
+    def put(path, payload)
       response = request(:headers => build_headers(
         :PUT, 
         "#{parsed_url.path}#{path}", 
@@ -80,7 +102,12 @@ module Spice
       return response
     end # def put
     
-    def delete(path, headers={})
+    # Perform an HTTP DELETE request
+    # @param [String] path The relative path
+    # @return [Faraday::Response]
+    # @example Delete the client "foo"
+    #   Spice.connection.delete("/clients/foo")
+    def delete(path)
       response = request(:headers => build_headers(
         :DELETE, 
         "#{parsed_url.path}#{path}")

data/lib/spice/connection/clients.rb

@@ -1,10 +1,22 @@
 module Spice
   class Connection
     module Clients
+      # A collection of clients
+      # @param [Hash] options An options hash that is passed to {Search#search}
+      # @return [Array<Spice::Client>, Array]
+      # @see Search#search
+      # @example Retrieve all clients with names that begin with "app"
+      #   Spice.clients(:q => "name:app*")
       def clients(options={})
         connection.search('client', options)
       end
 
+      # Retrieve a single client
+      # @param [String] name The client name
+      # @return [Spice::Client]
+      # @raise [Spice::Error::NotFound] raised when client does not exist
+      # @example Retrieve the client named "admin"
+      #   Spice.client("name")
       def client(name)
         attributes = connection.get("/clients/#{name}").body
         Spice::Client.new(attributes)

data/lib/spice/connection/cookbooks.rb

@@ -1,7 +1,11 @@
 module Spice
   class Connection
     module Cookbooks
-      def cookbooks(options={})
+      # Retrieve an array of all cookbooks
+      # @return [Array<Spice::Cookbook>]
+      # @example Retrieve all cookbooks with versions
+      #   Spice.cookbooks
+      def cookbooks
         if Gem::Version.new(Spice.chef_version) >= Gem::Version.new("0.10.0")
           cookbooks = []
           connection.get("/cookbooks").body.each_pair do |key, value|
@@ -17,24 +21,32 @@ module Spice
         end
       end
 
+      # Retrieve a single cookbook
+      # @param [String] name The name of the cookbook
+      # @return [Spice::Cookbook]
+      # @raise [Spice::Error::NotFound] raised when cookbook does not exist
       def cookbook(name)
         if Gem::Version.new(Spice.chef_version) >= Gem::Version.new("0.10.0")
           cookbook = connection.get("/cookbooks/#{name}").body
-          puts cookbook[name]
           versions = cookbook[name]['versions'].map{ |v| v['version'] }
 
           Spice::Cookbook.new(:name => name, :versions => versions)
         else
-          connection.get("/cookbooks").body.keys.map do |cookbook|
-            attributes = connection.get("/cookbooks/#{cookbook}").body.to_a[0]
-            Spice::Cookbook.new(:name => attributes[0], :versions => attributes[1])
-          end
+          cookbook = connection.get("/cookbooks/#{name}").body
+          Spice::Cookbook.new(:name => name, :versions => cookbook[name])
         end
       end
       
+      # Retrieve a single cookbook version
+      # @param [String] name The cookbook name
+      # @param [String] version The cookbook version
+      # @return [Spice::CookbookVersion]
+      # @raise [Spice::Error::NotFound] raised when cookbook version does not exist
       def cookbook_version(name, version)
         attributes = connection.get("/cookbooks/#{name}/#{version}").body
-        Spice::CookbookVersion.new(attributes)
+        duped_attributes = attributes.dup
+        duped_attributes[:_attributes] = attributes['attributes']
+        Spice::CookbookVersion.new(duped_attributes)
       end
       
     end # module Cookbooks

data/lib/spice/connection/data_bags.rb

@@ -1,6 +1,10 @@
 module Spice
   class Connection
     module DataBags
+      # Retrieve an array of all data bags
+      # @return [Array<Spice::DataBag>]
+      # @example Retrieve all data bags
+      #   Spice.data_bags
       def data_bags
         connection.get("/data").body.keys.map do |data_bag|
           items = connection.search(data_bag)
@@ -10,11 +14,20 @@ module Spice
 
       alias :data :data_bags
       
+      # Retrieve a single data bag and its items
+      # @param [String] name The data bag name
+      # @return [Spice::DataBag]
+      # @raise [Spice::Error::NotFound] raised when data bag does not exist
       def data_bag(name)
         items = connection.search(name)
         Spice::DataBag.new(:name => name, :items => items)
       end
 
+      # Retrieve a single data bag item
+      # @param [String] name The data bag name
+      # @param [String] id The data bag item id
+      # @return [Spice::DataBagItem]
+      # @raise [Spice::Error::NotFound] raised when data bag item does not exist
       def data_bag_item(name, id)
         data = connection.get("/data/#{name}/#{id}")
         data.delete('id')

data/lib/spice/connection/environments.rb

@@ -1,10 +1,22 @@
 module Spice
   class Connection
     module Environments
+      # A collection of environments
+      # @param [Hash] options An options hash that is passed to {Search#search}
+      # @return [Array<Spice::Environment>]
+      # @see Search#search
+      # @example Retrieve all environments with names that begin with "prod"
+      #   Spice.environments(:q => "name:prod*")
       def environments(options={})
         connection.search('environment', options)
       end
 
+      # Retrieve a single environment
+      # @param [String] name The environment name
+      # @return [Spice::Environment]
+      # @raise [Spice::Error::NotFound] raised when environment does not exist
+      # @example Retrieve the environment named "production"
+      #   Spice.environment("production")
       def environment(name)
         attributes = connection.get("/environments/#{name}").body
         attributes['attrs'] = attributes.delete('attributes')

data/lib/spice/connection/nodes.rb

@@ -1,10 +1,24 @@
 module Spice
   class Connection
     module Nodes
+      # A collection of nodes
+      # @param [Hash] options An options hash that is passed to {Search#search}
+      # @return [Array<Spice::Node>]
+      # @see Search#search
+      # @example Retrieve all nodes that have the role "base"
+      #   Spice.nodes(:q => "roles:base")
+      # @example Retrieve nodes with role "base" in the "production" environment
+      #   Spice.nodes(:q => "roles:base AND environment:production")
       def nodes(options={})
         connection.search('node', options)
       end
 
+      # Retrieve a  single client
+      # @param [String] name The node name
+      # @return [Spice::Node]
+      # @raise [Spice::Error::NotFound] raised when node does not exist
+      # @example Retrieve the node named "app.example.com"
+      #   Spice.node("app.example.com")
       def node(name)
         node_attributes = connection.get("/nodes/#{name}").body
         Spice::Node.new(node_attributes)

data/lib/spice/connection/roles.rb

@@ -1,10 +1,22 @@
 module Spice
   class Connection
     module Roles
+      # A collection of roles
+      # @param [Hash] options An options hash that is passed to {Search#search}
+      # @return [Array<Spice::Role>]
+      # @see Search#search
+      # @example Retrieve all roles that start with "app_"
+      #   Spice.roles(:q => "name:app_*")
       def roles(options={})
         connection.search('role', options)
       end
 
+      # Retrieve a single role
+      # @param [String] name The role name
+      # @return [Spice::Role]
+      # @raise [Spice::Error::NotFound] raised when role does not exist
+      # @example Retrieve the role "app_server"
+      #   Spice.role("app_server")
       def role(name)
         attributes = connection.get("/roles/#{name}").body
         Spice::Role.new(attributes)

data/lib/spice/connection/search.rb

@@ -3,6 +3,10 @@ require 'cgi'
 module Spice
   class Connection
     module Search
+      # @option options [String] :q The Solr search query string
+      # @option options [String] :sort Order by which to sort the results
+      # @option options [Numeric] :start The number by which to offset the results
+      # @option options [Numeric] :rows The maximum number of rows to return
       def search(index, options={})
         options = {:q => options} if options.is_a? String
         options.symbolize_keys!

data/lib/spice/cookbook.rb

@@ -2,15 +2,33 @@ require 'spice/persistence'
 
 module Spice
   class Cookbook
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "cookbooks"
 
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :versions, Array, :default => []
 
     validates_presence_of :name
+    
+    def self.get(name)
+      connection.cookbook(name)
+    end
+    
+    # Check if the cookbook exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/cookbooks/#{name}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/cookbook_version.rb

@@ -2,23 +2,26 @@ require 'spice/persistence'
 
 module Spice
   class CookbookVersion
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "cookbooks"
 
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :version, String
     attribute :definitions, Array, :default => []
-    attribute :attributes, Array, :default => []
     attribute :files, Array, :default => []
     attribute :providers, Array, :default => []
     attribute :metadata, Hash, :default => {}
     attribute :libraries, Array, :default => []
     attribute :templates, Array, :default => []
     attribute :resources, Array, :default => []
-    attribute :attributes, Array, :default => []
+    attribute :_attributes, Array, :default => []
     attribute :json_class, String, :default => "Chef::CookbookVersion"
     attribute :cookbook_name, String
     attribute :version, String
@@ -29,15 +32,37 @@ module Spice
     validates_presence_of :name
     
     def do_post
-      connection.put("/cookbooks/#{cookbook_name}/#{version}", attributes)
+      duped_attributes = attributes.dup
+      duped_attributes[:attributes] = attributes[:_attributes]
+      duped_attributes.delete(:_attributes)
+      
+      connection.put("/cookbooks/#{cookbook_name}/#{version}", duped_attributes)
     end
     
     def do_put
-      connection.put("/cookbooks/#{cookbook_name}/#{version}", attributes)
+      duped_attributes = attributes.dup
+      duped_attributes[:attributes] = attributes[:_attributes]
+      duped_attributes.delete(:_attributes)
+      
+      connection.put("/cookbooks/#{cookbook_name}/#{version}", duped_attributes)
     end
     
     def do_delete
       connection.delete("/cookbooks/#{cookbook_name}/#{version}")
     end
+    
+    def self.get(name, version)
+      connection.cookbook_version(name, version)
+    end
+    
+    # Check if the cookbook version exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/cookbooks/#{name.split('-').first}/#{version}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/data_bag.rb

@@ -2,12 +2,16 @@ require 'spice/persistence'
 
 module Spice
   class DataBag
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "data"
     
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :items, Array, :default => []
     
@@ -24,5 +28,15 @@ module Spice
     def do_post
       response = connection.post("/data", attributes)
     end
+    
+    # Check if the data bag exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/data/#{name}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/data_bag_item.rb

@@ -1,12 +1,20 @@
 module Spice
   class DataBagItem
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "data"
     
+    # The _id attribute is used as the "id" field in the data bag item. 
+    # "id" is an attribute reserved by ToyStore, the attribute system used by Spice.
+    # @attribute [rw]
+    # @return [String] the _attribute
     attribute :_id, String
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :data, Hash, :default => {}    
     attribute :name, String
     
@@ -18,18 +26,28 @@ module Spice
     
     def do_post
       attrs = data.dup
-      attrs['id'] = attributes['_id']
+      attrs[:id] = attributes[:_id]
       connection.post("/data/#{name}", attrs)
     end
     
     def do_put
       attrs = data.dup
-      attrs['id'] = attributes['_id']
+      attrs[:id] = attributes[:_id]
       connection.put("/data/#{name}/#{_id}", attrs)
     end
     
     def do_delete
       connection.delete("/data/#{name}/#{_id}")
     end
+    
+    # Check if the data bag item exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/data/#{name}/#{_id}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/environment.rb

@@ -2,12 +2,16 @@ require 'spice/persistence'
 
 module Spice
   class Environment
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "environments"
     
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :description, String
     attribute :attrs, Hash, :default => {}
@@ -17,5 +21,12 @@ module Spice
     
     validates_presence_of :name, :description
 
+    # Check if the environment exists on the Chef server
+    def new_record?
+      connection.get("/environments/#{name}")
+      return false
+    rescue Spice::Error::NotFound
+      return true
+    end
   end
 end

data/lib/spice/error.rb

@@ -9,22 +9,22 @@ module Spice
     
   end
   
-  class BadRequest < Error
+  class Error::BadRequest < Error
   end
   
-  class Unauthorized < Error
+  class Error::Unauthorized < Error
   end
   
-  class Forbidden < Error
+  class Error::Forbidden < Error
   end
   
-  class NotFound < Error
+  class Error::NotFound < Error
   end
   
-  class NotAcceptable < Error
+  class Error::NotAcceptable < Error
   end
   
-  class Conflict < Error
+  class Error::Conflict < Error
   end
   
 end

data/lib/spice/node.rb

@@ -2,12 +2,16 @@ require 'spice/persistence'
 
 module Spice
   class Node
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
-    store :memory, {}
+
     endpoint "nodes"
     
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :chef_type, String, :default => "node"
     attribute :json_class, String, :default => "Chef::Node"
@@ -19,5 +23,18 @@ module Spice
         
     validates_presence_of :name
 
+    def self.get(name)
+      connection.node(name)
+    end
+    
+    # Check if the node exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/nodes/#{name}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/persistence.rb

@@ -1,9 +1,26 @@
 module Spice
   module Persistence
     def self.included(base)
-      base.after_create :do_post
-      base.after_update :do_put
-      base.after_destroy :do_delete
+      base.extend ActiveModel::Callbacks
+      base.send(:define_model_callbacks, :create, :update, :destroy)
+      base.send(:after_create, :do_post)
+      base.send(:after_update, :do_put)
+      base.send(:after_destroy, :do_delete)
+    end
+    
+    def create
+      run_callbacks :create do
+      end
+    end
+    
+    def update
+      run_callbacks :update do
+      end
+    end
+    
+    def destroy
+      run_callbacks :destroy do
+      end
     end
 
     def endpoint(ep=nil)
@@ -38,5 +55,8 @@ module Spice
       connection.delete("/#{self.class.endpoint}/#{name}")
     end
 
+    def new_record?
+      raise NotImplementedError, "Override this method in the class that includes this module."
+    end
   end
 end

data/lib/spice/response/client_error.rb

@@ -7,22 +7,26 @@ module Spice
       def on_complete(env)
         case env[:status].to_i
         when 400
-          raise Spice::BadRequest.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::BadRequest.new(error(env[:body]), env[:request_headers])
         when 401
-          raise Spice::Unauthorized.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::Unauthorized.new(error(env[:body]), env[:request_headers])
         when 403
-          raise Spice::Forbidden.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::Forbidden.new(error(env[:body]), env[:request_headers])
         when 404
-          raise Spice::NotFound.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::NotFound.new(error(env[:body]), env[:request_headers])
         when 406
-          raise Spice::NotAcceptable.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::NotAcceptable.new(error(env[:body]), env[:request_headers])
         when 409
-          raise Spice::Conflict.new(error(env[:body]), env[:request_headers])
+          raise Spice::Error::Conflict.new(error(env[:body]), env[:request_headers])
         end
       end
       
       def error(body)
-        body["error"].join(',')
+        if body["error"].kind_of?(Array)
+          body["error"].join(',')
+        else
+          body["error"]
+        end
       end
       
     end

data/lib/spice/role.rb

@@ -2,13 +2,16 @@ require 'spice/persistence'
 
 module Spice
   class Role
-    include Toy::Store
+    include Virtus
+    include Aequitas
     include Spice::Persistence
     extend Spice::Persistence
     
-    store :memory, {}
     endpoint "roles"
     
+    # @macro [attach] attribute
+    # @attribute [rw]
+    # @return [$2] the $1 attribute
     attribute :name, String
     attribute :description, String
     attribute :run_list, Array, :default => []
@@ -18,6 +21,19 @@ module Spice
     attribute :chef_type, String, :default => "role"
 
     validates_presence_of :name, :description
-
+    
+    def self.get(name)
+      connection.role(name)
+    end
+    
+    # Check if the role exists on the Chef server
+    def new_record?
+      begin
+        connection.get("/roles/#{name}")
+        return false
+      rescue Spice::Error::NotFound
+        return true
+      end
+    end
   end
 end

data/lib/spice/version.rb

@@ -1,3 +1,3 @@
 module Spice
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.rc"
 end

data/spice.gemspec

@@ -14,8 +14,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "spice"
   
-  s.add_dependency "toystore", ">= 0.8.2"
-  s.add_dependency "adapter", ">= 0.5.2"
+  s.add_dependency "virtus", ">= 0.3.0"
+  s.add_dependency "aequitas", ">= 0.0.2"
+  s.add_dependency "activemodel"
   s.add_dependency "faraday"
   s.add_dependency "mixlib-authentication", '>= 1.1.4'
   s.add_dependency "yajl-ruby", '>= 1.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spice
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.rc
   prerelease: 6
 platform: ruby
 authors:
@@ -9,33 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: toystore
-  requirement: &70283810072460 !ruby/object:Gem::Requirement
+  name: virtus
+  requirement: &70252408715180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70283810072460
+  version_requirements: *70252408715180
 - !ruby/object:Gem::Dependency
-  name: adapter
-  requirement: &70283810071860 !ruby/object:Gem::Requirement
+  name: aequitas
+  requirement: &70252408714580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70283810071860
+  version_requirements: *70252408714580
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70252408713960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70252408713960
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70283810071480 !ruby/object:Gem::Requirement
+  requirement: &70252408713220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70283810071480
+  version_requirements: *70252408713220
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
-  requirement: &70283810070940 !ruby/object:Gem::Requirement
+  requirement: &70252408711780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70283810070940
+  version_requirements: *70252408711780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70283810070300 !ruby/object:Gem::Requirement
+  requirement: &70252408710960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70283810070300
+  version_requirements: *70252408710960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70283810069820 !ruby/object:Gem::Requirement
+  requirement: &70252408709640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70283810069820
+  version_requirements: *70252408709640
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70283810069360 !ruby/object:Gem::Requirement
+  requirement: &70252408709080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70283810069360
+  version_requirements: *70252408709080
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70283810068880 !ruby/object:Gem::Requirement
+  requirement: &70252408708260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70283810068880
+  version_requirements: *70252408708260
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70283810068280 !ruby/object:Gem::Requirement
+  requirement: &70252408707260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *70283810068280
+  version_requirements: *70252408707260
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70283810067820 !ruby/object:Gem::Requirement
+  requirement: &70252408705920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70283810067820
+  version_requirements: *70252408705920
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70283810067360 !ruby/object:Gem::Requirement
+  requirement: &70252408705040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *70283810067360
+  version_requirements: *70252408705040
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70283810066740 !ruby/object:Gem::Requirement
+  requirement: &70252408704200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: 0.9.0.rc8
   type: :development
   prerelease: false
-  version_requirements: *70283810066740
+  version_requirements: *70252408704200
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70283810066280 !ruby/object:Gem::Requirement
+  requirement: &70252408703560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: 0.4.3.1
   type: :development
   prerelease: false
-  version_requirements: *70283810066280
+  version_requirements: *70252408703560
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70283810065820 !ruby/object:Gem::Requirement
+  requirement: &70252408703080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +175,7 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70283810065820
+  version_requirements: *70252408703080
 description: Spice is a zesty Chef API wrapper. Its primary purpose is to let you
   easily integrate your apps with a Chef server easily.  Spice provides support for
   the entire released Chef API
@@ -187,7 +198,6 @@ files:
 - TODO.md
 - lib/spice.rb
 - lib/spice/authentication.rb
-- lib/spice/chef.rb
 - lib/spice/client.rb
 - lib/spice/config.rb
 - lib/spice/connection.rb
@@ -250,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3673399458224302804
+      hash: -2243516170777733948
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: spice
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Chef API wrapper

data/lib/spice/chef.rb

@@ -1,32 +0,0 @@
-module Spice
-  class Chef
-    attr_accessor :client_name, :key_file, :connection
-    
-    def self.connection
-      @connection ||= Spice.connection
-    end
-    
-    class << self
-      def clients
-        @clients ||= Client.all
-      end
-    
-      def nodes
-        @nodes ||= Node.all
-      end
-    
-      def data_bags
-        @data_bags ||= DataBag.all
-      end
-      
-      def roles
-        @roles ||= Role.all
-      end
-      
-      def cookbooks
-        @cookbooks ||= Cookbook.all
-      end
-    end
-  end
-end
-