chef-zero 1.0.1 → 1.1

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -16,24 +16,31 @@ module ChefZero
         needed_checksums = JSON.parse(request.body, :create_additions => false)['checksums']
         result_checksums = {}
         needed_checksums.keys.each do |needed_checksum|
-          if data['file_store'].has_key?(needed_checksum)
+          if list_data(request, ['file_store', 'checksums']).include?(needed_checksum)
             result_checksums[needed_checksum] = { :needs_upload => false }
           else
             result_checksums[needed_checksum] = {
               :needs_upload => true,
-              :url => build_uri(request.base_uri, ['file_store', needed_checksum])
+              :url => build_uri(request.base_uri, ['file_store', 'checksums', needed_checksum])
             }
             sandbox_checksums << needed_checksum
           end
         end
 
+        # There is an obvious race condition here.
         id = @next_id.to_s
         @next_id+=1
 
-        data['sandboxes'][id] = { :create_time => Time.now.utc, :checksums => sandbox_checksums }
+        time_str = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
+        time_str = "#{time_str[0..21]}:#{time_str[22..23]}"
+
+        create_data(request, request.rest_path, id, JSON.pretty_generate({
+          :create_time => time_str,
+          :checksums => sandbox_checksums
+        }))
 
         json_response(201, {
-          :uri => build_uri(request.base_uri, request.rest_path + [id.to_s]),
+          :uri => build_uri(request.base_uri, request.rest_path + [id]),
           :checksums => result_checksums,
           :sandbox_id => id
         })

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -48,15 +48,15 @@ module ChefZero
       def search_container(request, index)
         case index
         when 'client'
-          [ data['clients'], Proc.new { |client, name| DataNormalizer.normalize_client(client, name) }, build_uri(request.base_uri, [ 'clients' ]) ]
+          [ ['clients'], Proc.new { |client, name| DataNormalizer.normalize_client(client, name) }, build_uri(request.base_uri, [ 'clients' ]) ]
         when 'node'
-          [ data['nodes'], Proc.new { |node, name| DataNormalizer.normalize_node(node, name) }, build_uri(request.base_uri, [ 'nodes' ]) ]
+          [ ['nodes'], Proc.new { |node, name| DataNormalizer.normalize_node(node, name) }, build_uri(request.base_uri, [ 'nodes' ]) ]
         when 'environment'
-          [ data['environments'], Proc.new { |environment, name| DataNormalizer.normalize_environment(environment, name) }, build_uri(request.base_uri, [ 'environments' ]) ]
+          [ ['environments'], Proc.new { |environment, name| DataNormalizer.normalize_environment(environment, name) }, build_uri(request.base_uri, [ 'environments' ]) ]
         when 'role'
-          [ data['roles'], Proc.new { |role, name| DataNormalizer.normalize_role(role, name) }, build_uri(request.base_uri, [ 'roles' ]) ]
+          [ ['roles'], Proc.new { |role, name| DataNormalizer.normalize_role(role, name) }, build_uri(request.base_uri, [ 'roles' ]) ]
         else
-          [ data['data'][index], Proc.new { |data_bag_item, id| DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') }, build_uri(request.base_uri, [ 'data', index ]) ]
+          [ ['data', index], Proc.new { |data_bag_item, id| DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') }, build_uri(request.base_uri, [ 'data', index ]) ]
         end
       end
 
@@ -101,13 +101,11 @@ module ChefZero
 
         # Get the search container
         container, expander, base_uri = search_container(request, index)
-        if container.nil?
-          raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
-        end
 
         # Search!
         result = []
-        container.each_pair do |name,value|
+        list_data(request, container).each do |name|
+          value = get_data(request, container + [name])
           expanded = expander.call(JSON.parse(value, :create_additions => false), name)
           result << [ name, build_uri(base_uri, [name]), expanded, expand_for_indexing(expanded, index, name) ]
         end

data/lib/chef_zero/endpoints/searches_endpoint.rb

@@ -7,7 +7,7 @@ module ChefZero
       def get(request)
         # Get the result
         result_hash = {}
-        indices = (%w(client environment node role) + data['data'].keys).sort
+        indices = (%w(client environment node role) + data_store.list(['data'])).sort
         indices.each do |index|
           result_hash[index] = build_uri(request.base_uri, request.rest_path + [index])
         end

data/lib/chef_zero/rest_base.rb

@@ -1,5 +1,6 @@
 require 'chef_zero/rest_request'
 require 'chef_zero/rest_error_response'
+require 'chef_zero/data_store/data_not_found_error'
 
 module ChefZero
   class RestBase
@@ -9,8 +10,8 @@ module ChefZero
 
     attr_reader :server
 
-    def data
-      server.data
+    def data_store
+      server.data_store
     end
 
     def call(request)
@@ -35,17 +36,74 @@ module ChefZero
       true
     end
 
-    def get_data(request, rest_path=nil)
+    def get_data(request, rest_path=nil, *options)
       rest_path ||= request.rest_path
-      # Grab the value we're looking for
-      value = data
-      rest_path.each do |path_part|
-        if !value.has_key?(path_part)
+      begin
+        data_store.get(rest_path, request)
+      rescue DataStore::DataNotFoundError
+        if options.include?(:nil)
+          nil
+        else
           raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, rest_path)}")
         end
-        value = value[path_part]
       end
-      value
+    end
+
+    def list_data(request, rest_path=nil)
+      rest_path ||= request.rest_path
+      begin
+        data_store.list(rest_path)
+      rescue DataStore::DataNotFoundError
+        raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, rest_path)}")
+      end
+    end
+
+    def delete_data(request, rest_path=nil)
+      rest_path ||= request.rest_path
+      begin
+        data_store.delete(rest_path)
+      rescue DataStore::DataNotFoundError
+        raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+      end
+    end
+
+    def delete_data_dir(request, rest_path, *options)
+      rest_path ||= request.rest_path
+      begin
+        data_store.delete_dir(rest_path)
+      rescue DataStore::DataNotFoundError
+        raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+      end
+    end
+
+    def set_data(request, rest_path, data, *options)
+      rest_path ||= request.rest_path
+      begin
+        data_store.set(rest_path, request.body, *options)
+      rescue DataStore::DataNotFoundError
+        raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
+      end
+    end
+
+    def create_data(request, rest_path, name, data, *options)
+      rest_path ||= request.rest_path
+      begin
+        data_store.create(rest_path, name, data, *options)
+      rescue DataStore::DataNotFoundError
+        raise RestErrorResponse.new(404, "Parent not found: #{build_uri(request.base_uri, request.rest_path)}")
+      rescue DataStore::DataAlreadyExistsError
+        raise RestErrorResponse.new(409, "Object already exists: #{build_uri(request.base_uri, request.rest_path + [name])}")
+      end
+    end
+
+    def exists_data?(request, rest_path=nil)
+      rest_path ||= request.rest_path
+      data_store.exists?(rest_path)
+    end
+
+    def exists_data_dir?(request, rest_path=nil)
+      rest_path ||= request.rest_path
+      data_store.exists_dir?(rest_path)
     end
 
     def error(response_code, error)

data/lib/chef_zero/rest_router.rb

@@ -2,7 +2,11 @@ module ChefZero
   class RestRouter
     def initialize(routes)
       @routes = routes.map do |route, endpoint|
-        pattern = Regexp.new("^#{route.gsub('*', '[^/]*')}$")
+        if route =~ /\*\*$/
+          pattern = Regexp.new("^#{route[0..-3].gsub('*', '[^/]*')}")
+        else
+          pattern = Regexp.new("^#{route.gsub('*', '[^/]*')}$")
+        end
         [ pattern, endpoint ]
       end
     end

data/lib/chef_zero/server.rb

@@ -24,6 +24,7 @@ require 'timeout'
 require 'chef_zero'
 require 'chef_zero/cookbook_data'
 require 'chef_zero/rest_router'
+require 'chef_zero/data_store/memory_store'
 require 'chef_zero/version'
 
 require 'chef_zero/endpoints/authenticate_user_endpoint'
@@ -73,11 +74,11 @@ module ChefZero
       @server = Puma::Server.new(make_app, Puma::Events.new(STDERR, STDOUT))
       @server.add_tcp_listener(options[:host], options[:port])
 
-      clear_data
+      @data_store = options[:data_store] || DataStore::MemoryStore.new
     end
 
     attr_reader :server
-    attr_reader :data
+    attr_reader :data_store
     attr_reader :url
 
     include ChefZero::Endpoints
@@ -180,15 +181,18 @@ module ChefZero
     def load_data(contents)
       %w(clients environments nodes roles users).each do |data_type|
         if contents[data_type]
-          data[data_type].merge!(dejsonize_children(contents[data_type]))
+          dejsonize_children(contents[data_type]).each_pair do |name, data|
+            data_store.create([data_type], name, data)
+          end
         end
       end
       if contents['data']
-        new_data = {}
         contents['data'].each_pair do |key, data_bag|
-          new_data[key] = dejsonize_children(data_bag)
+          data_store.create_dir(['data'], key, :keep_existing)
+          dejsonize_children(data_bag).each do |item_name, item|
+            data_store.set(['data', key], item_name, item, :create)
+          end
         end
-        data['data'].merge!(new_data)
       end
       if contents['cookbooks']
         contents['cookbooks'].each_pair do |name_version, cookbook|
@@ -198,12 +202,12 @@ module ChefZero
             cookbook_data = CookbookData.to_hash(cookbook, name_version)
           end
           raise "No version specified" if !cookbook_data[:version]
-          data['cookbooks'][cookbook_data[:cookbook_name]] = {} if !data['cookbooks'][cookbook_data[:cookbook_name]]
-          data['cookbooks'][cookbook_data[:cookbook_name]][cookbook_data[:version]] = JSON.pretty_generate(cookbook_data)
+          data_store.create_dir(['cookbooks'], cookbook_data[:cookbook_name], :keep_existing)
+          data_store.set(['cookbooks', cookbook_data[:cookbook_name], cookbook_data[:version]], JSON.pretty_generate(cookbook_data), :create)
           cookbook_data.values.each do |files|
             next unless files.is_a? Array
             files.each do |file|
-              data['file_store'][file[:checksum]] = get_file(cookbook, file[:path])
+              data_store.set(['file_store', 'checksums', file[:checksum]], get_file(cookbook, file[:path]), :create)
             end
           end
         end
@@ -211,24 +215,7 @@ module ChefZero
     end
 
     def clear_data
-      @data = {
-        'clients' => {
-          'chef-validator' => '{ "validator": true }',
-          'chef-webui' => '{ "admin": true }'
-        },
-        'cookbooks' => {},
-        'data' => {},
-        'environments' => {
-          '_default' => '{ "description": "The default Chef environment" }'
-        },
-        'file_store' => {},
-        'nodes' => {},
-        'roles' => {},
-        'sandboxes' => {},
-        'users' => {
-          'admin' => '{ "admin": true }'
-        }
-      }
+      @data_store.clear
     end
 
     def request_handler(&block)
@@ -270,7 +257,7 @@ module ChefZero
         [ '/users', ActorsEndpoint.new(self) ],
         [ '/users/*', ActorEndpoint.new(self) ],
 
-        [ '/file_store/*', FileStoreFileEndpoint.new(self) ],
+        [ '/file_store/**', FileStoreFileEndpoint.new(self) ],
       ])
       router.not_found = NotFoundEndpoint.new
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.0.1'
+  VERSION = '1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -106,6 +106,11 @@ files:
 - lib/chef_zero/core_ext/hash.rb
 - lib/chef_zero/core_ext.rb
 - lib/chef_zero/data_normalizer.rb
+- lib/chef_zero/data_store/chef_fs_store.rb
+- lib/chef_zero/data_store/data_already_exists_error.rb
+- lib/chef_zero/data_store/data_error.rb
+- lib/chef_zero/data_store/data_not_found_error.rb
+- lib/chef_zero/data_store/memory_store.rb
 - lib/chef_zero/endpoints/actor_endpoint.rb
 - lib/chef_zero/endpoints/actors_endpoint.rb
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb