Allow performing query with no timeout.

Fixes #33.
mongomapper · Jul 3, 2013 · c75a99f · c75a99f
1 parent 0e257fb
commit c75a99f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/plucky/query.rb b/lib/plucky/query.rb
@@ -66,14 +66,18 @@ def paginate(opts={})
 
       def find_each(opts={})
         query = clone.amend(opts)
-        cursor = query.cursor
 
         if block_given?
-          cursor.each { |doc| yield doc }
-          cursor.rewind!
+          result = nil
+          query.cursor do |cursor|
+            result = cursor
+            cursor.each { |doc| yield doc }
+            cursor.rewind!
+          end
+          result
+        else
+          query.cursor
         end
-
-        cursor
       end
 
       def find_one(opts={})
@@ -228,8 +232,8 @@ def options_hash
       @options.to_hash
     end
 
-    def cursor
-      @collection.find(criteria_hash, options_hash)
+    def cursor(&block)
+      @collection.find(criteria_hash, options_hash, &block)
     end
 
   private