Removing memoization of cursor in criteria

lib/mongoid/criteria.rb

@@ -69,8 +69,7 @@ def ==(other)
       when Criteria
         self.selector == other.selector && self.options == other.options
       when Enumerable
-        @collection ||= execute
-        return (@collection.entries == other)
+        return (execute.entries == other)
       else
         return false
       end
@@ -119,9 +118,8 @@ def fuse(criteria_conditions = {})
     #
     # <tt>criteria.each { |doc| p doc }</tt>
     def each(&block)
-      @collection ||= execute
       if block_given?
-        @collection.each { |doc| yield doc }
+        execute.each { |doc| yield doc }
       end
       self
     end

spec/integration/mongoid/criteria_spec.rb

@@ -2,6 +2,14 @@
 
 describe Mongoid::Criteria do
 
+  before do
+    Person.delete_all
+  end
+
+  after do
+    Person.delete_all
+  end
+
   describe "#excludes" do
 
     before do
@@ -30,6 +38,26 @@
 
   end
 
+  describe "#execute" do
+
+    context "when reiterating" do
+
+      before do
+        @person = Person.create(:title => "Sir", :age => 100, :aliases => ["D", "Durran"], :ssn => "666666666")
+      end
+
+      after do
+        Person.delete_all
+      end
+
+      it "executes the query again" do
+        criteria = Person.all
+        criteria.size.should == 1
+        criteria.should_not be_empty
+      end
+    end
+  end
+
   describe "#max" do
 
     before do

spec/unit/mongoid/criteria_spec.rb

@@ -19,9 +19,9 @@
       before do
         @collection = mock
         @cursor = stub(:count => 1)
-        @cursor.expects(:each).yields(@sir)
-        Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).returns(@cursor)
+        @cursor.expects(:each).at_least_once.yields(@sir)
+        Person.expects(:collection).at_least_once.returns(@collection)
+        @collection.expects(:find).at_least_once.returns(@cursor)
       end
 
       it "executes the criteria and concats the results" do
@@ -31,29 +31,24 @@
 
     end
 
-    context "when the criteria has been executed" do
-
-      before do
-        @criteria.instance_variable_set(:@collection, [ @sir, @madam ])
-      end
-
-      it "concats the results" do
-        results = @criteria + [ @canvas ]
-        results.should == [ @sir, @madam, @canvas ]
-      end
-
-    end
-
     context "when the other is a criteria" do
 
       before do
-        @criteria.instance_variable_set(:@collection, [ @sir, @madam ])
-        @canvas_criteria.instance_variable_set(:@collection, [ @canvas ])
+        @collection = mock
+        @canvas_collection = mock
+        @cursor = stub(:count => 1)
+        @canvas_cursor = stub(:count => 1)
+        @cursor.expects(:each).at_least_once.yields(@sir)
+        @canvas_cursor.expects(:each).at_least_once.yields(@canvas)
+        Person.expects(:collection).at_least_once.returns(@collection)
+        @collection.expects(:find).at_least_once.returns(@cursor)
+        Canvas.expects(:collection).at_least_once.returns(@canvas_collection)
+        @canvas_collection.expects(:find).at_least_once.returns(@canvas_cursor)
       end
 
       it "concats the results" do
         results = @criteria + @canvas_criteria
-        results.should == [ @sir, @madam, @canvas ]
+        results.should == [ @sir, @canvas ]
       end
 
     end
@@ -84,33 +79,6 @@
 
     end
 
-    context "when the criteria has been executed" do
-
-      before do
-        @criteria.instance_variable_set(:@collection, [@sir, @sir, @madam])
-      end
-
-      it "returns the difference" do
-        results = @criteria - [ @sir ]
-        results.should == [ @madam ]
-      end
-
-    end
-
-    context "when the other is a criteria" do
-
-      before do
-        @criteria.instance_variable_set(:@collection, [@sir, @sir, @madam])
-        @canvas_criteria.instance_variable_set(:@collection, [@sir])
-      end
-
-      it "returns the difference" do
-        results = @criteria - @canvas_criteria
-        results.should == [ @madam ]
-      end
-
-    end
-
   end
 
   describe "#[]" do