chef-zero 0.9.4 → 0.9.5

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -9,7 +9,9 @@ module ChefZero
         container = get_data(request)
         contents = request.body
         name = JSON.parse(contents, :create_additions => false)[identity_key]
-        if container[name]
+        if name.nil?
+          error(400, "Must specify '#{identity_key}' in JSON")
+        elsif container[name]
           error(409, "Object already exists")
         else
           container[name] = {}

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,8 +1,8 @@
 module ChefZero
   module Endpoints
     class NotFoundEndpoint
-      def call(env)
-        return [404, {"Content-Type" => "application/json"}, "Object not found: #{env['REQUEST_PATH']}"]
+      def call(request)
+        return [404, {"Content-Type" => "application/json"}, "Object not found: #{request.env['REQUEST_PATH']}"]
       end
     end
   end

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -25,7 +25,9 @@ module ChefZero
         container = get_data(request)
         contents = request.body
         key = get_key(contents)
-        if container[key]
+        if key.nil?
+          error(400, "Must specify '#{identity_key}' in JSON")
+        elsif container[key]
           error(409, 'Object already exists')
         else
           container[key] = contents

data/lib/chef_zero/rest_base.rb

@@ -14,20 +14,19 @@ module ChefZero
       server.data
     end
 
-    def call(env)
-      rest_path = env['PATH_INFO'].split('/').select { |part| part != "" }
-      method = env['REQUEST_METHOD'].downcase.to_sym
+    def call(request)
+      method = request.method.downcase.to_sym
       if !self.respond_to?(method)
         accept_methods = [:get, :put, :post, :delete].select { |m| self.respond_to?(m) }
         accept_methods_str = accept_methods.map { |m| m.to_s.upcase }.join(', ')
-        return [405, {"Content-Type" => "text/plain", "Allow" => accept_methods_str}, "Bad request method for '#{env['REQUEST_PATH']}': #{env['REQUEST_METHOD']}"]
+        return [405, {"Content-Type" => "text/plain", "Allow" => accept_methods_str}, "Bad request method for '#{request.env['REQUEST_PATH']}': #{request.env['REQUEST_METHOD']}"]
       end
-      if json_only && !env['HTTP_ACCEPT'].split(';').include?('application/json')
+      if json_only && !request.env['HTTP_ACCEPT'].split(';').include?('application/json')
         return [406, {"Content-Type" => "text/plain"}, "Must accept application/json"]
       end
       # Dispatch to get()/post()/put()/delete()
       begin
-        self.send(method, RestRequest.new(env))
+        self.send(method, request)
       rescue RestErrorResponse => e
         error(e.response_code, e.error)
       end

data/lib/chef_zero/rest_request.rb

@@ -37,6 +37,20 @@ module ChefZero
         params
       end
     end
+
+    def to_s
+      result = "#{method} #{rest_path.join('/')}"
+      if query_params.size > 0
+        result << "?#{query_params.map { |k,v| "#{k}=#{v}" }.join('&') }"
+      end
+      if body.chomp != ''
+        result << "\n--- #{method} BODY ---\n"
+        result << body
+        result << "\n" if !body.end_with?("\n")
+        result << "--- END #{method} BODY ---"
+      end
+      result
+    end
   end
 end
 

data/lib/chef_zero/{router.rb → rest_router.rb}

@@ -1,7 +1,7 @@
 require 'chef/log'
 
 module ChefZero
-  class Router
+  class RestRouter
     def initialize(routes)
       @routes = routes.map do |route, endpoint|
         pattern = Regexp.new("^#{route.gsub('*', '[^/]*')}$")
@@ -12,16 +12,16 @@ module ChefZero
     attr_reader :routes
     attr_accessor :not_found
 
-    def call(env)
+    def call(request)
       begin
-        Chef::Log.debug "#{env['REQUEST_METHOD']} #{env['PATH_INFO']}#{env['QUERY_STRING'] != '' ? "?" + env['QUERY_STRING'] : ''}"
-        clean_path = "/" + env['PATH_INFO'].split('/').select { |part| part != "" }.join("/")
+        Chef::Log.debug "Request: #{request}"
+        clean_path = "/" + request.rest_path.join("/")
         routes.each do |route, endpoint|
           if route.match(clean_path)
-            return endpoint.call(env)
+            return endpoint.call(request)
           end
         end
-        not_found.call(env)
+        not_found.call(request)
       rescue
         Chef::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
         [500, {"Content-Type" => "text/plain"}, "Exception raised!  #{$!.inspect}\n#{$!.backtrace.join("\n")}"]

data/lib/chef_zero/rspec.rb

@@ -1,6 +1,7 @@
 require 'thin'
 require 'tempfile'
 require 'chef_zero/server'
+require 'chef_zero/rest_request'
 require 'chef/config'
 
 module ChefZero
@@ -17,6 +18,12 @@ module ChefZero
     def self.client_key=(value)
       @client_key = value
     end
+    def self.request_log
+      @request_log ||= []
+    end
+    def self.clear_request_log
+      @request_log = []
+    end
 
     def when_the_chef_server(description, *tags, &block)
       context "When the Chef server #{description}", *tags do
@@ -24,15 +31,19 @@ module ChefZero
           unless ChefZero::RSpec.server
             # Set up configuration so that clients will point to the server
             Thin::Logging.silent = true
-            ChefZero::RSpec.server = ChefZero::Server.new(:port => 8889, :signals => false)
+            ChefZero::RSpec.server = ChefZero::Server.new(:port => 8889, :signals => false, :log_requests => true)
             ChefZero::RSpec.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
             ChefZero::RSpec.client_key.write(ChefZero::PRIVATE_KEY)
             ChefZero::RSpec.client_key.close
             # Start the server
             ChefZero::RSpec.server.start_background
+            ChefZero::RSpec.server.on_response do |request, response|
+              ChefZero::RSpec.request_log << [ request, response ]
+            end
           else
             ChefZero::RSpec.server.clear_data
           end
+          ChefZero::RSpec.clear_request_log
 
           @old_chef_server_url = Chef::Config.chef_server_url
           @old_node_name = Chef::Config.node_name

data/lib/chef_zero/server.rb

@@ -20,7 +20,7 @@ require 'rubygems'
 require 'thin'
 require 'openssl'
 require 'chef_zero'
-require 'chef_zero/router'
+require 'chef_zero/rest_router'
 require 'timeout'
 require 'chef_zero/cookbook_data'
 
@@ -125,6 +125,14 @@ module ChefZero
       end
     end
 
+    def on_request(&block)
+      @on_request_proc = block
+    end
+
+    def on_response(&block)
+      @on_response_proc = block
+    end
+
     # Load data in a nice, friendly form:
     # {
     #   'roles' => {
@@ -205,7 +213,7 @@ module ChefZero
     private
 
     def make_app
-      router = Router.new([
+      router = RestRouter.new([
         [ '/authenticate_user', AuthenticateUserEndpoint.new(self) ],
         [ '/clients', ActorsEndpoint.new(self) ],
         [ '/clients/*', ActorEndpoint.new(self) ],
@@ -240,7 +248,18 @@ module ChefZero
         [ '/file_store/*', FileStoreFileEndpoint.new(self) ],
       ])
       router.not_found = NotFoundEndpoint.new
-      router
+
+      return proc do |env|
+        request = RestRequest.new(env)
+        if @on_request_proc
+          @on_request_proc.call(request)
+        end
+        response = router.call(request)
+        if @on_response_proc
+          @on_response_proc.call(request, response)
+        end
+        response
+      end
     end
 
     def dejsonize_children(hash)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -90,7 +90,7 @@ files:
 - lib/chef_zero/rest_base.rb
 - lib/chef_zero/rest_error_response.rb
 - lib/chef_zero/rest_request.rb
-- lib/chef_zero/router.rb
+- lib/chef_zero/rest_router.rb
 - lib/chef_zero/rspec.rb
 - lib/chef_zero/server.rb
 - lib/chef_zero/solr/query/binary_operator.rb