chef-zero 4.2.3 → 4.3.0

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -1,42 +1,42 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # Typical REST list endpoint (/roles or /data/BAG)
-    class RestListEndpoint < RestBase
-      def initialize(server, identity_keys = [ 'name' ])
-        super(server)
-        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
-        @identity_keys = identity_keys
-      end
-
-      attr_reader :identity_keys
-
-      def get(request)
-        # Get the result
-        result_hash = {}
-        list_data(request).sort.each do |name|
-          result_hash[name] = "#{build_uri(request.base_uri, request.rest_path + [name])}"
-        end
-        json_response(200, result_hash)
-      end
-
-      def post(request)
-        contents = request.body
-        key = get_key(contents)
-        if key.nil?
-          error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
-        else
-          create_data(request, request.rest_path, key, contents)
-          json_response(201, {'uri' => "#{build_uri(request.base_uri, request.rest_path + [key])}"})
-        end
-      end
-
-      def get_key(contents)
-        json = FFI_Yajl::Parser.parse(contents, :create_additions => false)
-        identity_keys.map { |k| json[k] }.select { |v| v }.first
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # Typical REST list endpoint (/roles or /data/BAG)
+    class RestListEndpoint < RestBase
+      def initialize(server, identity_keys = [ 'name' ])
+        super(server)
+        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
+        @identity_keys = identity_keys
+      end
+
+      attr_reader :identity_keys
+
+      def get(request)
+        # Get the result
+        result_hash = {}
+        list_data(request).sort.each do |name|
+          result_hash[name] = "#{build_uri(request.base_uri, request.rest_path + [name])}"
+        end
+        json_response(200, result_hash)
+      end
+
+      def post(request)
+        contents = request.body
+        key = get_key(contents)
+        if key.nil?
+          error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
+        else
+          create_data(request, request.rest_path, key, contents)
+          json_response(201, {'uri' => "#{build_uri(request.base_uri, request.rest_path + [key])}"})
+        end
+      end
+
+      def get_key(contents)
+        json = FFI_Yajl::Parser.parse(contents, :create_additions => false)
+        identity_keys.map { |k| json[k] }.select { |v| v }.first
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -1,63 +1,63 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-require 'chef_zero/rest_error_response'
-
-module ChefZero
-  module Endpoints
-    # Typical REST leaf endpoint (/roles/NAME or /data/BAG/NAME)
-    class RestObjectEndpoint < RestBase
-      def initialize(server, identity_keys = [ 'name' ])
-        super(server)
-        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
-        @identity_keys = identity_keys
-      end
-
-      attr_reader :identity_keys
-
-      def get(request)
-        already_json_response(200, populate_defaults(request, get_data(request)))
-      end
-
-      def put(request)
-        # We grab the old body to trigger a 404 if it doesn't exist
-        old_body = get_data(request)
-        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        key = identity_keys.map { |k| request_json[k] }.select { |v| v }.first
-        key ||= request.rest_path[-1]
-        # If it's a rename, check for conflict and delete the old value
-        rename = key != request.rest_path[-1]
-        if rename
-          begin
-            create_data(request, request.rest_path[0..-2], key, request.body, :data_store_exceptions)
-          rescue DataStore::DataAlreadyExistsError
-            return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
-          end
-          delete_data(request)
-          already_json_response(201, populate_defaults(request, request.body))
-        else
-          set_data(request, request.rest_path, request.body)
-          already_json_response(200, populate_defaults(request, request.body))
-        end
-      end
-
-      def delete(request)
-        result = get_data(request)
-        delete_data(request)
-        already_json_response(200, populate_defaults(request, result))
-      end
-
-      def patch_request_body(request)
-        existing_value = get_data(request, nil, :nil)
-        if existing_value
-          request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-          existing_json = FFI_Yajl::Parser.parse(existing_value, :create_additions => false)
-          merged_json = existing_json.merge(request_json)
-          if merged_json.size > request_json.size
-            return FFI_Yajl::Encoder.encode(merged_json, :pretty => true)
-          end
-        end
-        request.body
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+require 'chef_zero/rest_error_response'
+
+module ChefZero
+  module Endpoints
+    # Typical REST leaf endpoint (/roles/NAME or /data/BAG/NAME)
+    class RestObjectEndpoint < RestBase
+      def initialize(server, identity_keys = [ 'name' ])
+        super(server)
+        identity_keys = [ identity_keys ] if identity_keys.is_a?(String)
+        @identity_keys = identity_keys
+      end
+
+      attr_reader :identity_keys
+
+      def get(request)
+        already_json_response(200, populate_defaults(request, get_data(request)))
+      end
+
+      def put(request)
+        # We grab the old body to trigger a 404 if it doesn't exist
+        old_body = get_data(request)
+        request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        key = identity_keys.map { |k| request_json[k] }.select { |v| v }.first
+        key ||= request.rest_path[-1]
+        # If it's a rename, check for conflict and delete the old value
+        rename = key != request.rest_path[-1]
+        if rename
+          begin
+            create_data(request, request.rest_path[0..-2], key, request.body, :data_store_exceptions)
+          rescue DataStore::DataAlreadyExistsError
+            return error(409, "Cannot rename '#{request.rest_path[-1]}' to '#{key}': '#{key}' already exists")
+          end
+          delete_data(request)
+          already_json_response(201, populate_defaults(request, request.body))
+        else
+          set_data(request, request.rest_path, request.body)
+          already_json_response(200, populate_defaults(request, request.body))
+        end
+      end
+
+      def delete(request)
+        result = get_data(request)
+        delete_data(request)
+        already_json_response(200, populate_defaults(request, result))
+      end
+
+      def patch_request_body(request)
+        existing_value = get_data(request, nil, :nil)
+        if existing_value
+          request_json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+          existing_json = FFI_Yajl::Parser.parse(existing_value, :create_additions => false)
+          merged_json = existing_json.merge(request_json)
+          if merged_json.size > request_json.size
+            return FFI_Yajl::Encoder.encode(merged_json, :pretty => true)
+          end
+        end
+        request.body
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -1,16 +1,16 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-
-module ChefZero
-  module Endpoints
-    # /roles/NAME
-    class RoleEndpoint < RestObjectEndpoint
-      def populate_defaults(request, response_json)
-        role = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
-        role = ChefData::DataNormalizer.normalize_role(role, request.rest_path[3])
-        FFI_Yajl::Encoder.encode(role, :pretty => true)
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /roles/NAME
+    class RoleEndpoint < RestObjectEndpoint
+      def populate_defaults(request, response_json)
+        role = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        role = ChefData::DataNormalizer.normalize_role(role, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(role, :pretty => true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -1,14 +1,14 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /roles/NAME/environments
-    class RoleEnvironmentsEndpoint < RestBase
-      def get(request)
-        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
-        json_response(200, [ '_default' ] + (role['env_run_lists'].keys || []))
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /roles/NAME/environments
+    class RoleEnvironmentsEndpoint < RestBase
+      def get(request)
+        role = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..3]), :create_additions => false)
+        json_response(200, [ '_default' ] + (role['env_run_lists'].keys || []))
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,27 +1,27 @@
-require 'chef_zero/rest_base'
-require 'chef_zero/rest_error_response'
-require 'ffi_yajl'
-
-module ChefZero
-  module Endpoints
-    # /sandboxes/ID
-    class SandboxEndpoint < RestBase
-      def put(request)
-        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request), :create_additions => false)
-        existing_sandbox['checksums'].each do |checksum|
-          if !exists_data?(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum])
-            raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
-          end
-        end
-        delete_data(request)
-        json_response(200, {
-          :guid => request.rest_path[3],
-          :name => request.rest_path[3],
-          :checksums => existing_sandbox['checksums'],
-          :create_time => existing_sandbox['create_time'],
-          :is_completed => true
-        })
-      end
-    end
-  end
-end
+require 'chef_zero/rest_base'
+require 'chef_zero/rest_error_response'
+require 'ffi_yajl'
+
+module ChefZero
+  module Endpoints
+    # /sandboxes/ID
+    class SandboxEndpoint < RestBase
+      def put(request)
+        existing_sandbox = FFI_Yajl::Parser.parse(get_data(request), :create_additions => false)
+        existing_sandbox['checksums'].each do |checksum|
+          if !exists_data?(request, request.rest_path[0..1] + ['file_store', 'checksums', checksum])
+            raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
+          end
+        end
+        delete_data(request)
+        json_response(200, {
+          :guid => request.rest_path[3],
+          :name => request.rest_path[3],
+          :checksums => existing_sandbox['checksums'],
+          :create_time => existing_sandbox['create_time'],
+          :is_completed => true
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -1,50 +1,50 @@
-require 'ffi_yajl'
-require 'chef_zero/rest_base'
-
-module ChefZero
-  module Endpoints
-    # /sandboxes
-    class SandboxesEndpoint < RestBase
-      def initialize(server)
-        super(server)
-        @next_id = 1
-      end
-
-      def post(request)
-        sandbox_checksums = []
-
-        needed_checksums = FFI_Yajl::Parser.parse(request.body, :create_additions => false)['checksums']
-        result_checksums = {}
-        needed_checksums.keys.each do |needed_checksum|
-          if list_data(request, request.rest_path[0..1] + ['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, request.rest_path[0..1] + ['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
-
-        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, FFI_Yajl::Encoder.encode({
-          :create_time => time_str,
-          :checksums => sandbox_checksums
-        }, :pretty => true))
-
-        json_response(201, {
-          :uri => build_uri(request.base_uri, request.rest_path + [id]),
-          :checksums => result_checksums,
-          :sandbox_id => id
-        })
-      end
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/rest_base'
+
+module ChefZero
+  module Endpoints
+    # /sandboxes
+    class SandboxesEndpoint < RestBase
+      def initialize(server)
+        super(server)
+        @next_id = 1
+      end
+
+      def post(request)
+        sandbox_checksums = []
+
+        needed_checksums = FFI_Yajl::Parser.parse(request.body, :create_additions => false)['checksums']
+        result_checksums = {}
+        needed_checksums.keys.each do |needed_checksum|
+          if list_data(request, request.rest_path[0..1] + ['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, request.rest_path[0..1] + ['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
+
+        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, FFI_Yajl::Encoder.encode({
+          :create_time => time_str,
+          :checksums => sandbox_checksums
+        }, :pretty => true))
+
+        json_response(201, {
+          :uri => build_uri(request.base_uri, request.rest_path + [id]),
+          :checksums => result_checksums,
+          :sandbox_id => id
+        })
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -1,192 +1,194 @@
-require 'ffi_yajl'
-require 'chef_zero/endpoints/rest_object_endpoint'
-require 'chef_zero/chef_data/data_normalizer'
-require 'chef_zero/rest_error_response'
-require 'chef_zero/solr/solr_parser'
-require 'chef_zero/solr/solr_doc'
-
-module ChefZero
-  module Endpoints
-    # /search/INDEX
-    class SearchEndpoint < RestBase
-      def get(request)
-        results = search(request)
-        results['rows'] = results['rows'].map { |name,uri,value,search_value| value }
-        json_response(200, results)
-      end
-
-      def post(request)
-        full_results = search(request)
-        keys = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        partial_results = full_results['rows'].map do |name, uri, doc, search_value|
-          data = {}
-          keys.each_pair do |key, path|
-            if path.size > 0
-              value = search_value
-              path.each do |path_part|
-                value = value[path_part] if !value.nil?
-              end
-              data[key] = value
-            else
-              data[key] = nil
-            end
-          end
-          {
-            'url' => uri,
-            'data' => data
-          }
-        end
-        json_response(200, {
-          'rows' => partial_results,
-          'start' => full_results['start'],
-          'total' => full_results['total']
-        })
-      end
-
-      private
-
-      def search_container(request, index)
-        relative_parts, normalize_proc = case index
-        when 'client'
-          [ ['clients'], Proc.new { |client, name| ChefData::DataNormalizer.normalize_client(client, name) } ]
-        when 'node'
-          [ ['nodes'], Proc.new { |node, name| ChefData::DataNormalizer.normalize_node(node, name) } ]
-        when 'environment'
-          [ ['environments'], Proc.new { |environment, name| ChefData::DataNormalizer.normalize_environment(environment, name) } ]
-        when 'role'
-          [ ['roles'], Proc.new { |role, name| ChefData::DataNormalizer.normalize_role(role, name) } ]
-        else
-          [ ['data', index], Proc.new { |data_bag_item, id| ChefData::DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') } ]
-        end
-        [
-          request.rest_path[0..1] + relative_parts,
-          normalize_proc
-        ]
-      end
-
-      def expand_for_indexing(value, index, id)
-        if index == 'node'
-          result = {}
-          deep_merge!(value['default'] || {}, result)
-          deep_merge!(value['normal'] || {}, result)
-          deep_merge!(value['override'] || {}, result)
-          deep_merge!(value['automatic'] || {}, result)
-          result['recipe'] = []
-          result['role'] = []
-          if value['run_list']
-            value['run_list'].each do |run_list_entry|
-              if run_list_entry =~ /^(recipe|role)\[(.*)\]/
-                result[$1] << $2
-              end
-            end
-          end
-          value.each_pair do |key, value|
-            result[key] = value unless %w(default normal override automatic).include?(key)
-          end
-          result
-
-        elsif !%w(client environment role).include?(index)
-          ChefData::DataNormalizer.normalize_data_bag_item(value, index, id, 'GET')
-        else
-          value
-        end
-      end
-
-      def search(request)
-        # Extract parameters
-        index = request.rest_path[3]
-        query_string = request.query_params['q'] || '*:*'
-        solr_query = ChefZero::Solr::SolrParser.new(query_string).parse
-        sort_string = request.query_params['sort']
-        start = request.query_params['start']
-        start = start.to_i if start
-        rows = request.query_params['rows']
-        rows = rows.to_i if rows
-
-        # Get the search container
-        container, expander = search_container(request, index)
-
-        # Search!
-        result = []
-        list_data(request, container).each do |name|
-          value = get_data(request, container + [name])
-          expanded = expander.call(FFI_Yajl::Parser.parse(value, :create_additions => false), name)
-          result << [ name, build_uri(request.base_uri, container + [name]), expanded, expand_for_indexing(expanded, index, name) ]
-        end
-        result = result.select do |name, uri, value, search_value|
-          solr_query.matches_doc?(ChefZero::Solr::SolrDoc.new(search_value, name))
-        end
-        total = result.size
-
-        # Sort
-        if sort_string
-          sort_key, sort_order = sort_string.split(/\s+/, 2)
-          result = result.sort_by { |name,uri,value,search_value| ChefZero::Solr::SolrDoc.new(search_value, name)[sort_key] }
-          result = result.reverse if sort_order == "DESC"
-        end
-
-        # Paginate
-        if start
-          result = result[start..start+(rows||-1)]
-        end
-        {
-          'rows' => result,
-          'start' => start || 0,
-          'total' => total
-        }
-      end
-
-      private
-
-      # Deep Merge core documentation.
-      # deep_merge! method permits merging of arbitrary child elements. The two top level
-      # elements must be hashes. These hashes can contain unlimited (to stack limit) levels
-      # of child elements. These child elements to not have to be of the same types.
-      # Where child elements are of the same type, deep_merge will attempt to merge them together.
-      # Where child elements are not of the same type, deep_merge will skip or optionally overwrite
-      # the destination element with the contents of the source element at that level.
-      # So if you have two hashes like this:
-      #   source = {:x => [1,2,3], :y => 2}
-      #   dest =   {:x => [4,5,'6'], :y => [7,8,9]}
-      #   dest.deep_merge!(source)
-      #   Results: {:x => [1,2,3,4,5,'6'], :y => 2}
-      # By default, "deep_merge!" will overwrite any unmergeables and merge everything else.
-      # To avoid this, use "deep_merge" (no bang/exclamation mark)
-      def deep_merge!(source, dest)
-        # if dest doesn't exist, then simply copy source to it
-        if dest.nil?
-          dest = source; return dest
-        end
-
-        case source
-        when nil
-          dest
-        when Hash
-          source.each do |src_key, src_value|
-            if dest.kind_of?(Hash)
-              if dest[src_key]
-                dest[src_key] = deep_merge!(src_value, dest[src_key])
-              else # dest[src_key] doesn't exist so we take whatever source has
-                dest[src_key] = src_value
-              end
-            else # dest isn't a hash, so we overwrite it completely
-              dest = source
-            end
-          end
-        when Array
-          if dest.kind_of?(Array)
-            dest = dest | source
-          else
-            dest = source
-          end
-        when String
-          dest = source
-        else # src_hash is not an array or hash, so we'll have to overwrite dest
-          dest = source
-        end
-        dest
-      end # deep_merge!
-
-    end
-  end
-end
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+require 'chef_zero/rest_error_response'
+require 'chef_zero/solr/solr_parser'
+require 'chef_zero/solr/solr_doc'
+
+module ChefZero
+  module Endpoints
+    # /search/INDEX
+    class SearchEndpoint < RestBase
+      def get(request)
+        orgname = request.rest_path[1]
+        results = search(request, orgname)
+        results['rows'] = results['rows'].map { |name,uri,value,search_value| value }
+        json_response(200, results)
+      end
+
+      def post(request)
+        orgname = request.rest_path[1]
+        full_results = search(request, orgname)
+        keys = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
+        partial_results = full_results['rows'].map do |name, uri, doc, search_value|
+          data = {}
+          keys.each_pair do |key, path|
+            if path.size > 0
+              value = search_value
+              path.each do |path_part|
+                value = value[path_part] if !value.nil?
+              end
+              data[key] = value
+            else
+              data[key] = nil
+            end
+          end
+          {
+            'url' => uri,
+            'data' => data
+          }
+        end
+        json_response(200, {
+          'rows' => partial_results,
+          'start' => full_results['start'],
+          'total' => full_results['total']
+        })
+      end
+
+      private
+
+      def search_container(request, index, orgname)
+        relative_parts, normalize_proc = case index
+        when 'client'
+          [ ['clients'], Proc.new { |client, name| ChefData::DataNormalizer.normalize_client(client, name, orgname) } ]
+        when 'node'
+          [ ['nodes'], Proc.new { |node, name| ChefData::DataNormalizer.normalize_node(node, name) } ]
+        when 'environment'
+          [ ['environments'], Proc.new { |environment, name| ChefData::DataNormalizer.normalize_environment(environment, name) } ]
+        when 'role'
+          [ ['roles'], Proc.new { |role, name| ChefData::DataNormalizer.normalize_role(role, name) } ]
+        else
+          [ ['data', index], Proc.new { |data_bag_item, id| ChefData::DataNormalizer.normalize_data_bag_item(data_bag_item, index, id, 'DELETE') } ]
+        end
+        [
+          request.rest_path[0..1] + relative_parts,
+          normalize_proc
+        ]
+      end
+
+      def expand_for_indexing(value, index, id)
+        if index == 'node'
+          result = {}
+          deep_merge!(value['default'] || {}, result)
+          deep_merge!(value['normal'] || {}, result)
+          deep_merge!(value['override'] || {}, result)
+          deep_merge!(value['automatic'] || {}, result)
+          result['recipe'] = []
+          result['role'] = []
+          if value['run_list']
+            value['run_list'].each do |run_list_entry|
+              if run_list_entry =~ /^(recipe|role)\[(.*)\]/
+                result[$1] << $2
+              end
+            end
+          end
+          value.each_pair do |key, value|
+            result[key] = value unless %w(default normal override automatic).include?(key)
+          end
+          result
+
+        elsif !%w(client environment role).include?(index)
+          ChefData::DataNormalizer.normalize_data_bag_item(value, index, id, 'GET')
+        else
+          value
+        end
+      end
+
+      def search(request, orgname = nil)
+        # Extract parameters
+        index = request.rest_path[3]
+        query_string = request.query_params['q'] || '*:*'
+        solr_query = ChefZero::Solr::SolrParser.new(query_string).parse
+        sort_string = request.query_params['sort']
+        start = request.query_params['start']
+        start = start.to_i if start
+        rows = request.query_params['rows']
+        rows = rows.to_i if rows
+
+        # Get the search container
+        container, expander = search_container(request, index, orgname)
+
+        # Search!
+        result = []
+        list_data(request, container).each do |name|
+          value = get_data(request, container + [name])
+          expanded = expander.call(FFI_Yajl::Parser.parse(value, :create_additions => false), name)
+          result << [ name, build_uri(request.base_uri, container + [name]), expanded, expand_for_indexing(expanded, index, name) ]
+        end
+        result = result.select do |name, uri, value, search_value|
+          solr_query.matches_doc?(ChefZero::Solr::SolrDoc.new(search_value, name))
+        end
+        total = result.size
+
+        # Sort
+        if sort_string
+          sort_key, sort_order = sort_string.split(/\s+/, 2)
+          result = result.sort_by { |name,uri,value,search_value| ChefZero::Solr::SolrDoc.new(search_value, name)[sort_key] }
+          result = result.reverse if sort_order == "DESC"
+        end
+
+        # Paginate
+        if start
+          result = result[start..start+(rows||-1)]
+        end
+        {
+          'rows' => result,
+          'start' => start || 0,
+          'total' => total
+        }
+      end
+
+      private
+
+      # Deep Merge core documentation.
+      # deep_merge! method permits merging of arbitrary child elements. The two top level
+      # elements must be hashes. These hashes can contain unlimited (to stack limit) levels
+      # of child elements. These child elements to not have to be of the same types.
+      # Where child elements are of the same type, deep_merge will attempt to merge them together.
+      # Where child elements are not of the same type, deep_merge will skip or optionally overwrite
+      # the destination element with the contents of the source element at that level.
+      # So if you have two hashes like this:
+      #   source = {:x => [1,2,3], :y => 2}
+      #   dest =   {:x => [4,5,'6'], :y => [7,8,9]}
+      #   dest.deep_merge!(source)
+      #   Results: {:x => [1,2,3,4,5,'6'], :y => 2}
+      # By default, "deep_merge!" will overwrite any unmergeables and merge everything else.
+      # To avoid this, use "deep_merge" (no bang/exclamation mark)
+      def deep_merge!(source, dest)
+        # if dest doesn't exist, then simply copy source to it
+        if dest.nil?
+          dest = source; return dest
+        end
+
+        case source
+        when nil
+          dest
+        when Hash
+          source.each do |src_key, src_value|
+            if dest.kind_of?(Hash)
+              if dest[src_key]
+                dest[src_key] = deep_merge!(src_value, dest[src_key])
+              else # dest[src_key] doesn't exist so we take whatever source has
+                dest[src_key] = src_value
+              end
+            else # dest isn't a hash, so we overwrite it completely
+              dest = source
+            end
+          end
+        when Array
+          if dest.kind_of?(Array)
+            dest = dest | source
+          else
+            dest = source
+          end
+        when String
+          dest = source
+        else # src_hash is not an array or hash, so we'll have to overwrite dest
+          dest = source
+        end
+        dest
+      end # deep_merge!
+
+    end
+  end
+end