mongoid 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/mongoid/criteria.rb

@@ -69,8 +69,7 @@ module Mongoid #:nodoc:
       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 @@ module Mongoid #:nodoc:
     #
     # <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

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]

data/spec/integration/mongoid/criteria_spec.rb

@@ -2,6 +2,14 @@ require "spec_helper"
 
 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 @@ describe Mongoid::Criteria do
 
   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

data/spec/unit/mongoid/criteria_spec.rb

@@ -19,9 +19,9 @@ describe Mongoid::Criteria do
       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 @@ describe Mongoid::Criteria do
 
     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 @@ describe Mongoid::Criteria do
 
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Durran Jordan