spice 0.8.0 → 1.0.0.pre

data/lib/spice/request.rb

@@ -0,0 +1,27 @@
+require 'faraday'
+# require 'spice/request/auth'
+require 'spice/response/parse_json'
+require 'spice/response/client_error'
+
+module Spice
+  module Request
+    def request(options={})
+      default_options = {
+        :headers => {
+          :accept => 'application/json',
+          :content_type => 'application/json',
+          :user_agent => Spice.user_agent
+        }
+      }
+
+      Faraday.new(
+        default_options.deep_merge(Spice.connection_options).deep_merge(options)
+      ) do |builder|
+        # builder.use Spice::Request::Auth
+        builder.use Spice::Response::ClientError
+        builder.use Spice::Response::ParseJSON
+        builder.adapter(:net_http)
+      end
+    end
+  end
+end

data/lib/spice/request/auth.rb

@@ -0,0 +1,14 @@
+module Spice
+  module Request
+    class Auth < Faraday::Middleware
+      
+      def initialize(app, options)
+        @app, @options = app, options
+      end
+      
+      def call(env)
+        
+      end
+    end
+  end
+end

data/lib/spice/response/client_error.rb

@@ -0,0 +1,30 @@
+require 'faraday'
+
+module Spice
+  module Response
+    class ClientError < Faraday::Response::Middleware
+      
+      def on_complete(env)
+        case env[:status].to_i
+        when 400
+          raise Spice::BadRequest.new(error(env[:body]), env[:request_headers])
+        when 401
+          raise Spice::Unauthorized.new(error(env[:body]), env[:request_headers])
+        when 403
+          raise Spice::Forbidden.new(error(env[:body]), env[:request_headers])
+        when 404
+          raise Spice::NotFound.new(error(env[:body]), env[:request_headers])
+        when 406
+          raise Spice::NotAcceptable.new(error(env[:body]), env[:request_headers])
+        when 409
+          raise Spice::Conflict.new(error(env[:body]), env[:request_headers])
+        end
+      end
+      
+      def error(body)
+        body["error"].join(',')
+      end
+      
+    end
+  end
+end

data/lib/spice/response/parse_json.rb

@@ -0,0 +1,24 @@
+require 'faraday'
+require 'yajl'
+
+module Spice
+  module Response
+    class ParseJSON < Faraday::Response::Middleware
+      
+      def parse(body)
+        case body
+        when ''
+          nil
+        when 'true'
+          true
+        when 'false'
+          false
+        else
+          Yajl.load(body)
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/spice/role.rb

@@ -1,30 +1,23 @@
+require 'spice/persistence'
+
 module Spice
-  class Role < Spice::Chef
-    def self.all(options={})
-      connection.get("/roles")
-    end
+  class Role
+    include Toy::Store
+    include Spice::Persistence
+    extend Spice::Persistence
     
-    def self.[](name)
-      connection.get("/roles/#{name}")
-    end
+    store :memory, {}
+    endpoint "roles"
     
-    def self.show(options={})
-      name = options.delete(:name)
-      connection.get("/roles/#{name}")
-    end
-    
-    def self.create(options={})
-      connection.post("/roles", options)
-    end
-    
-    def self.update(options={})
-      name = options.delete(:name)
-      connection.put("/roles/#{name}", options)
-    end
-    
-    def self.delete(options={})
-      name = options.delete(:name)
-      connection.delete("/roles/#{name}", options)
-    end
+    attribute :name, String
+    attribute :description, String
+    attribute :run_list, Array, :default => []
+    attribute :default_attributes, Hash, :default => {}
+    attribute :override_attributes, Hash, :default => {}
+    attribute :json_class, String, :default => "Chef::Role"
+    attribute :chef_type, String, :default => "role"
+
+    validates_presence_of :name, :description
+
   end
 end

data/lib/spice/version.rb

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

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ Spork.prefork do
   require 'rspec'
   require 'webmock/rspec'
   require 'timecop'
-  require 'rest-client'
   require 'fakefs'
   require 'fileutils'
   

data/spice.gemspec

@@ -14,10 +14,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "spice"
   
-  s.add_dependency "rake", ">= 0.9.2"
-  s.add_dependency "rest-client", '>= 1.6.6'
+  s.add_dependency "toystore", ">= 0.8.2"
+  s.add_dependency "adapter", ">= 0.5.2"
+  s.add_dependency "faraday"
   s.add_dependency "mixlib-authentication", '>= 1.1.4'
-  s.add_dependency "yajl-ruby", '>= 0.8.3'
+  s.add_dependency "yajl-ruby", '>= 1.1.0'
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency "webmock", ">= 1.6.2"

metadata

@@ -1,41 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: spice
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 1.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Dan Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70290097785760 !ruby/object:Gem::Requirement
+  name: toystore
+  requirement: &70283810072460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70290097785760
+  version_requirements: *70283810072460
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &70290097785000 !ruby/object:Gem::Requirement
+  name: adapter
+  requirement: &70283810071860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70290097785000
+  version_requirements: *70283810071860
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70283810071480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70283810071480
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
-  requirement: &70290097783860 !ruby/object:Gem::Requirement
+  requirement: &70283810070940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +54,21 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70290097783860
+  version_requirements: *70283810070940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70290097783040 !ruby/object:Gem::Requirement
+  requirement: &70283810070300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290097783040
+  version_requirements: *70283810070300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70290097782240 !ruby/object:Gem::Requirement
+  requirement: &70283810069820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70290097782240
+  version_requirements: *70283810069820
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70290097780700 !ruby/object:Gem::Requirement
+  requirement: &70283810069360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70290097780700
+  version_requirements: *70283810069360
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70290097773160 !ruby/object:Gem::Requirement
+  requirement: &70283810068880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70290097773160
+  version_requirements: *70283810068880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70290097772220 !ruby/object:Gem::Requirement
+  requirement: &70283810068280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *70290097772220
+  version_requirements: *70283810068280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70290097771180 !ruby/object:Gem::Requirement
+  requirement: &70283810067820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70290097771180
+  version_requirements: *70283810067820
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70290097769520 !ruby/object:Gem::Requirement
+  requirement: &70283810067360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *70290097769520
+  version_requirements: *70283810067360
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70290097768040 !ruby/object:Gem::Requirement
+  requirement: &70283810066740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: 0.9.0.rc8
   type: :development
   prerelease: false
-  version_requirements: *70290097768040
+  version_requirements: *70283810066740
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70290097759060 !ruby/object:Gem::Requirement
+  requirement: &70283810066280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: 0.4.3.1
   type: :development
   prerelease: false
-  version_requirements: *70290097759060
+  version_requirements: *70283810066280
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70290097756480 !ruby/object:Gem::Requirement
+  requirement: &70283810065820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +164,7 @@ dependencies:
         version: 1.0.3
   type: :development
   prerelease: false
-  version_requirements: *70290097756480
+  version_requirements: *70283810065820
 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
@@ -178,15 +189,30 @@ files:
 - lib/spice/authentication.rb
 - lib/spice/chef.rb
 - lib/spice/client.rb
+- lib/spice/config.rb
 - lib/spice/connection.rb
+- lib/spice/connection/authentication.rb
+- lib/spice/connection/clients.rb
+- lib/spice/connection/cookbooks.rb
+- lib/spice/connection/data_bags.rb
+- lib/spice/connection/environments.rb
+- lib/spice/connection/nodes.rb
+- lib/spice/connection/roles.rb
+- lib/spice/connection/search.rb
 - lib/spice/cookbook.rb
-- lib/spice/core_ext/hash.rb
+- lib/spice/cookbook_version.rb
 - lib/spice/data_bag.rb
+- lib/spice/data_bag_item.rb
 - lib/spice/environment.rb
+- lib/spice/error.rb
 - lib/spice/mock.rb
 - lib/spice/node.rb
+- lib/spice/persistence.rb
+- lib/spice/request.rb
+- lib/spice/request/auth.rb
+- lib/spice/response/client_error.rb
+- lib/spice/response/parse_json.rb
 - lib/spice/role.rb
-- lib/spice/search.rb
 - lib/spice/version.rb
 - spec/spec_helper.rb
 - spec/spice/authentication_spec.rb
@@ -224,16 +250,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1280305717282640060
+      hash: -3673399458224302804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1280305717282640060
+      version: 1.3.1
 requirements: []
 rubyforge_project: spice
 rubygems_version: 1.8.10

data/lib/spice/core_ext/hash.rb

@@ -1,21 +0,0 @@
-module Spice
-  module CoreExt
-    module Hash
-
-      def symbolize_keys!
-        keys.each do |key|
-          self[(key.to_sym rescue key) || key] = delete(key)
-        end
-        self
-      end
-      def symbolize_keys
-        dup.symbolize_keys!
-      end
-      
-    end
-  end
-end
-
-class Hash
-  include Spice::CoreExt::Hash
-end