@@ -79,7 +79,18 @@ def platform?(*args)
       end
 
       def search(*args, &block)
-        Chef::Search::Query.new.search(*args, &block)
+        # If you pass a block, or have at least the start argument, do raw result parsing
+        # 
+        # Otherwise, do the iteration for the end user
+        if Kernel.block_given? || args.length >= 4 
+          Chef::Search::Query.new.search(*args, &block)
+        else 
+          results = Array.new
+          Chef::Search::Query.new.search(*args) do |o|
+            results << o 
+          end
+          results
+        end
       end
 
       def data_bag(bag)
 
@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: search
+# Recipe:: default
+#
+# Copyright 2009, Opscode
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# We have to sleep at least 10 seconds to confirm that the data has made it 
+# into the index.  We can only rely on this because we are in a test environment
+# in real-land Chef, the index is only eventually consistent.. and may take a
+# variable amount of time.
+
+
+sleep 10
+objects, start, total = search(:users, "*:*", nil, 0, 10) 
+
+objects.each do |entry|
+  file "#{node[:tmpdir]}/#{entry["id"]}"
+end
+
+
@@ -24,7 +24,7 @@
 
 
 sleep 10
-objects, start, rows = search(:users, "*:*") 
+objects = search(:users, "*:*")
 
 objects.each do |entry|
   file "#{node[:tmpdir]}/#{entry["id"]}"
 
@@ -26,3 +26,14 @@ Feature: Search Data
       And a file named 'francis' should exist
       And a file named 'axl_rose' should exist
 
+  Scenario: Search the user index without a block, with manual paging
+    Given a validated node
+      And it includes the recipe 'search::search_data_manual'
+      And a 'data_bag' named 'users' exists
+      And a 'data_bag_item' named 'francis' exists
+      And a 'data_bag_item' named 'axl_rose' exists
+     When I run the chef-client
+     Then the run should exit '0'
+      And a file named 'francis' should exist
+      And a file named 'axl_rose' should exist
+