chef-zero 0.9.2 → 0.9.3

data/lib/chef_zero/rest_base.rb

@@ -15,26 +15,21 @@ module ChefZero
     end
 
     def call(env)
+      rest_path = env['PATH_INFO'].split('/').select { |part| part != "" }
+      method = env['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']}"]
+      end
+      if json_only && !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
-        rest_path = env['PATH_INFO'].split('/').select { |part| part != "" }
-        method = env['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']}"]
-        end
-        if json_only && !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))
-        rescue RestErrorResponse => e
-          error(e.response_code, e.error)
-        end
-      rescue
-        Chef::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
-        raise
+        self.send(method, RestRequest.new(env))
+      rescue RestErrorResponse => e
+        error(e.response_code, e.error)
       end
     end
 

data/lib/chef_zero/router.rb

@@ -13,14 +13,19 @@ module ChefZero
     attr_accessor :not_found
 
     def call(env)
-      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("/")
-      routes.each do |route, endpoint|
-        if route.match(clean_path)
-          return endpoint.call(env)
+      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("/")
+        routes.each do |route, endpoint|
+          if route.match(clean_path)
+            return endpoint.call(env)
+          end
         end
+        not_found.call(env)
+      rescue
+        Chef::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
+        [500, {"Content-Type" => "text/plain"}, "Exception raised!  #{$!.inspect}\n#{$!.backtrace.join("\n")}"]
       end
-      not_found.call(env)
     end
   end
 end

data/lib/chef_zero/rspec.rb

@@ -18,8 +18,8 @@ module ChefZero
       @client_key = value
     end
 
-    def when_the_chef_server(description, &block)
-      context "When the Chef server #{description}" do
+    def when_the_chef_server(description, *tags, &block)
+      context "When the Chef server #{description}", *tags do
         before :each do
           unless ChefZero::RSpec.server
             # Set up configuration so that clients will point to the server
@@ -34,9 +34,19 @@ module ChefZero
             ChefZero::RSpec.server.clear_data
           end
 
+          @old_chef_server_url = Chef::Config.chef_server_url
+          @old_node_name = Chef::Config.node_name
+          @old_client_key = Chef::Config.client_key
           Chef::Config.chef_server_url = ChefZero::RSpec.server.url
           Chef::Config.node_name = 'admin'
           Chef::Config.client_key = ChefZero::RSpec.client_key
+          Chef::Config.http_retry_count = 0
+        end
+
+        after :each do
+          Chef::Config.chef_server_url = @old_chef_server_url
+          Chef::Config.node_name = @old_node_name
+          Chef::Config.client_key = @old_client_key
         end
 
         def self.client(name, client)

data/lib/chef_zero/server.rb

@@ -151,15 +151,15 @@ module ChefZero
     def load_data(contents)
       %w(clients environments nodes roles users).each do |data_type|
         if contents[data_type]
-          dejsonize_children!(contents[data_type])
-          data[data_type].merge!(contents[data_type])
+          data[data_type].merge!(dejsonize_children(contents[data_type]))
         end
       end
       if contents['data']
-        contents['data'].values.each do |data_bag|
-          dejsonize_children!(data_bag)
+        new_data = {}
+        contents['data'].each_pair do |key, data_bag|
+          new_data[key] = dejsonize_children(data_bag)
         end
-        data['data'].merge!(contents['data'])
+        data['data'].merge!(new_data)
       end
       if contents['cookbooks']
         contents['cookbooks'].each_pair do |name_version, cookbook|
@@ -243,10 +243,12 @@ module ChefZero
       router
     end
 
-    def dejsonize_children!(hash)
+    def dejsonize_children(hash)
+      result = {}
       hash.each_pair do |key, value|
-        hash[key] = JSON.pretty_generate(value) if value.is_a?(Hash)
+        result[key] = value.is_a?(Hash)  ? JSON.pretty_generate(value) : value
       end
+      result
     end
 
     def get_file(directory, path)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef