spice 1.0.0.rc → 1.0.0

data/lib/spice/connection/search.rb

@@ -7,7 +7,8 @@ module Spice
       # @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={})
+      def search(index, options=Mash.new)
+        index = index.to_s
         options = {:q => options} if options.is_a? String
         options.symbolize_keys!
 
@@ -22,28 +23,27 @@ module Spice
         params = options.collect{ |k, v| "#{k}=#{CGI::escape(v.to_s)}"}.join("&")
         case index
         when 'node'
-          connection.get("/search/#{CGI::escape(index.to_s)}?#{params}").body['rows'].map do |node|
-            Spice::Node.new(node)
+          get("/search/#{CGI::escape(index.to_s)}?#{params}")['rows'].map do |node|
+            Spice::Node.get_or_new(node)
           end
         when 'role'
-          connection.get("/search/#{CGI::escape(index.to_s)}?#{params}").body['rows'].map do |role|
-            Spice::Role.new(role)
+          get("/search/#{CGI::escape(index.to_s)}?#{params}")['rows'].map do |role|
+            Spice::Role.get_or_new(role)
           end
         when 'client'
-          connection.get("/search/#{CGI::escape(index.to_s)}?#{params}").body['rows'].map do |client|
-            Spice::Client.new(client)
+          get("/search/#{CGI::escape(index.to_s)}?#{params}")['rows'].map do |client|
+            Spice::Client.get_or_new(client)
           end
         when 'environment'
-          connection.get("/search/#{CGI::escape(index.to_s)}?#{params}").body['rows'].map do |env|
+          get("/search/#{CGI::escape(index.to_s)}?#{params}")['rows'].map do |env|
             env['attrs'] = env.delete('attributes')
-            Spice::Environment.new(env)
+            Spice::Environment.get_or_new(env)
           end
         else
           # assume it's a data bag
-          connection.get("/search/#{CGI::escape(index.to_s)}?#{params}").body['rows'].map do |db|
+          get("/search/#{CGI::escape(index.to_s)}?#{params}")['rows'].map do |db|
             data = db['raw_data']
-            id = data.delete('id')
-            Spice::DataBagItem.new(:_id => id, :data => data, :name => index)
+            Spice::DataBagItem.get_or_new(data)
           end
         end
       end # def search

data/lib/spice/cookbook.rb

@@ -1,34 +1,8 @@
-require 'spice/persistence'
+require 'spice/base'
 
 module Spice
-  class Cookbook
-    include Virtus
-    include Aequitas
-    include Spice::Persistence
-    extend Spice::Persistence
+  class Cookbook < Base
+    attr_reader :name, :versions
 
-    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

@@ -1,68 +1,16 @@
-require 'spice/persistence'
+require 'spice/base'
 
 module Spice
-  class CookbookVersion
-    include Virtus
-    include Aequitas
-    include Spice::Persistence
-    extend Spice::Persistence
+  class CookbookVersion < Base
+    attr_reader :name, :version, :definitions, :files, :providers, :metadata,
+      :libraries, :templates, :resources, :attributes, :cookbook_name, 
+      :recipes, :root_files
 
-    endpoint "cookbooks"
-
-    # @macro [attach] attribute
-    # @attribute [rw]
-    # @return [$2] the $1 attribute
-    attribute :name, String
-    attribute :version, String
-    attribute :definitions, 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 :json_class, String, :default => "Chef::CookbookVersion"
-    attribute :cookbook_name, String
-    attribute :version, String
-    attribute :recipes, Array, :default => []
-    attribute :root_files, Array, :default => []
-    attribute :chef_type, String, :default => "cookbook_version"
-    
-    validates_presence_of :name
-    
-    def do_post
-      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
-      duped_attributes = attributes.dup
-      duped_attributes[:attributes] = attributes[:_attributes]
-      duped_attributes.delete(:_attributes)
-      
-      connection.put("/cookbooks/#{cookbook_name}/#{version}", duped_attributes)
+    def initialize(attrs=Mash.new)
+      super
+      @attrs['json_class'] ||= "Chef::CookbookVersion"
+      @attrs['chef_type'] ||= 'cookbook_version'
     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/core_ext/array.rb

@@ -0,0 +1,7 @@
+class Array
+
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end # def extract_options!
+
+end

data/lib/spice/core_ext/enumerable.rb

@@ -0,0 +1,11 @@
+module Enumerable
+
+  def threaded_map
+    threads = []
+    each do |object|
+      threads << Thread.new{yield object}
+    end
+    threads.map(&:value)
+  end
+
+end

data/lib/spice/core_ext/hash.rb

@@ -0,0 +1,49 @@
+class Hash
+
+  # Return a hash that includes everything but the given keys.
+  #
+  # @param keys [Array, Set]
+  # @return [Hash]
+  def except(*keys)
+    self.dup.except!(*keys)
+  end
+
+  # Replaces the hash without the given keys.
+  #
+  # @param keys [Array, Set]
+  # @return [Hash]
+  def except!(*keys)
+    keys.each{|key| delete(key)}
+    self
+  end
+
+  # Merges self with another hash, recursively
+  #
+  # @param hash [Hash] The hash to merge
+  # @return [Hash]
+  def deep_merge(hash)
+    target = self.dup
+    hash.keys.each do |key|
+      if hash[key].is_a?(Hash) && self[key].is_a?(Hash)
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+      target[key] = hash[key]
+    end
+    target
+  end
+
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end unless defined? stringify_keys
+  
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end unless defined? symbolize_keys
+end

data/lib/spice/core_ext/mash.rb

@@ -0,0 +1,219 @@
+# Copyright (c) 2009 Dan Kubb
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# ---
+# ---
+
+# Some portions of blank.rb and mash.rb are verbatim copies of software
+# licensed under the MIT license. That license is included below:
+
+# Copyright (c) 2005-2008 David Heinemeier Hansson
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# This class has dubious semantics and we only have it so that people can write
+# params[:key] instead of params['key'].
+class Mash < Hash
+
+  # @param constructor<Object>
+  #   The default value for the mash. Defaults to an empty hash.
+  #
+  #  [Alternatives]
+  #   If constructor is a Hash, a new mash will be created based on the keys of
+  #   the hash and no default value will be set.
+  def initialize(constructor = {})
+    if constructor.is_a?(Hash)
+      super()
+      update(constructor)
+    else
+      super(constructor)
+    end
+  end
+
+  # @param orig<Object> Mash being copied
+  #
+  # @return [Object] A new copied Mash
+  def initialize_copy(orig)
+    super
+    # Handle nested values
+    each do |k,v|
+      if v.kind_of?(Mash) || v.is_a?(Array)
+        self[k] = v.dup
+      end
+    end
+    self
+  end
+
+  # @param key<Object> The default value for the mash. Defaults to nil.
+  #
+  #  [Alternatives]
+  #   If key is a Symbol and it is a key in the mash, then the default value will
+  #   be set to the value matching the key.
+  def default(key = nil)
+    if key.is_a?(Symbol) && include?(key = key.to_s)
+      self[key]
+    else
+      super
+    end
+  end
+
+  alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+  alias_method :regular_update, :update unless method_defined?(:regular_update)
+
+  # @param key<Object> The key to set.
+  # @param value<Object>
+  #   The value to set the key to.
+  #
+  # @see Mash#convert_key
+  # @see Mash#convert_value
+  def []=(key, value)
+    regular_writer(convert_key(key), convert_value(value))
+  end
+
+  # @param other_hash<Hash>
+  #   A hash to update values in the mash with. The keys and the values will be
+  #   converted to Mash format.
+  #
+  # @return [Mash] The updated mash.
+  def update(other_hash)
+    other_hash.each_pair { |key, value| regular_writer(convert_key(key), convert_value(value)) }
+    self
+  end
+
+  alias_method :merge!, :update
+
+  # @param key<Object> The key to check for. This will be run through convert_key.
+  #
+  # @return [Boolean] True if the key exists in the mash.
+  def key?(key)
+    super(convert_key(key))
+  end
+
+  # def include? def has_key? def member?
+  alias_method :include?, :key?
+  alias_method :has_key?, :key?
+  alias_method :member?, :key?
+
+  # @param key<Object> The key to fetch. This will be run through convert_key.
+  # @param extras<Array> Default value.
+  #
+  # @return [Object] The value at key or the default value.
+  def fetch(key, *extras)
+    super(convert_key(key), *extras)
+  end
+
+  # @param indices<Array>
+  #   The keys to retrieve values for. These will be run through +convert_key+.
+  #
+  # @return [Array] The values at each of the provided keys
+  def values_at(*indices)
+    indices.collect {|key| self[convert_key(key)]}
+  end
+
+  # @param hash<Hash> The hash to merge with the mash.
+  #
+  # @return [Mash] A new mash with the hash values merged in.
+  def merge(hash)
+    self.dup.update(hash)
+  end
+
+  # @param key<Object>
+  #   The key to delete from the mash.\
+  def delete(key)
+    super(convert_key(key))
+  end
+
+  # @return [Mash] A new mash without the selected keys.
+  #
+  # @example
+  #   { :one => 1, :two => 2, :three => 3 }.except(:one)
+  #     #=> { "two" => 2, "three" => 3 }
+  def except(*keys)
+    super(*keys.map {|k| convert_key(k)})
+  end
+
+  # Used to provide the same interface as Hash.
+  #
+  # @return [Mash] This mash unchanged.
+  def stringify_keys!; self end
+
+  # @return [Hash] The mash as a Hash with symbolized keys.
+  def symbolize_keys
+    h = Hash.new(default)
+    each { |key, val| h[key.to_sym] = val }
+    h
+  end
+
+  # @return [Hash] The mash as a Hash with string keys.
+  def to_hash
+    Hash.new(default).merge(self)
+  end
+
+  # @return [Mash] Convert a Hash into a Mash
+  # The input Hash's default value is maintained
+  def self.from_hash(hash)
+    mash = Mash.new(hash)
+    mash.default = hash.default
+    mash
+  end
+
+  protected
+  # @param key<Object> The key to convert.
+  #
+  # @api private
+  def convert_key(key)
+    key.kind_of?(Symbol) ? key.to_s : key
+  end
+
+  # @param value<Object> The value to convert.
+  #
+  # @return [Object]
+  #   The converted value. A Hash or an Array of hashes, will be converted to
+  #   their Mash equivalents.
+  #
+  # @api private
+  def convert_value(value)
+    if value.class == Hash
+      Mash.from_hash(value)
+    elsif value.is_a?(Array)
+      value.collect { |e| convert_value(e) }
+    else
+      value
+    end
+  end
+end