Add @cache to Moped::Cursor for out-of-block iteration

lib/moped/cursor.rb

@@ -11,7 +11,7 @@ class Cursor
     # @attribute [r] kill_cursor_op The kill cursor message.
     # @attribute [r] query_op The query message.
     # @attribute [r] session The session.
-    attr_reader :get_more_op, :kill_cursor_op, :query_op, :session
+    attr_reader :get_more_op, :kill_cursor_op, :query_op, :session, :cache
 
     # Iterate over the results of the query.
     #
@@ -24,12 +24,12 @@ class Cursor
     #
     # @since 1.0.0
     def each
-      documents = load_docs
-      documents.each { |doc| yield doc }
+      @cache ||= load_docs
+      yield @cache.shift while @cache.any?
       while more?
         return kill if limited? && @limit <= 0
-        documents = get_more
-        documents.each { |doc| yield doc }
+        @cache = get_more
+        yield @cache.shift while @cache.any?
       end
     end
 

spec/moped/cursor_spec.rb

@@ -67,5 +67,25 @@
         cursor.request_limit.should eq(100)
       end
     end
+
+    context "when the cursor is iterated upon out-of-block" do
+
+      before do
+        session[:users].insert({ "name" => "create" })
+      end
+
+      let(:query) do
+        session[:users].find.limit(1)
+      end
+
+      let(:cursor) do
+        described_class.new(session, query.operation)
+      end
+
+      it "advances the cursor_id" do
+        cursor.take(1)
+        cursor.take(1).should be_empty
+      end
+    end
   end
 end