mongoid 0.10.6 → 0.11.0

data/spec/unit/mongoid/criteria_spec.rb

@@ -19,7 +19,7 @@ describe Mongoid::Criteria do
 
       before do
         Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :title => "Sir" }, {}).returns(@cursor)
+        @collection.expects(:find).with({ :title => "Sir", :_type => "Person" }, {}).returns(@cursor)
       end
 
       it "executes the criteria and returns the element at the index" do
@@ -42,7 +42,7 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
+        @collection.expects(:group).with([:field1], {:_type => "Person"}, {:count => 0}, @reduce)
         @criteria.only(:field1).aggregate
       end
 
@@ -57,7 +57,7 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {}, {:count => 0}, @reduce)
+        @collection.expects(:group).with([:field1], {:_type => "Person"}, {:count => 0}, @reduce)
         @criteria.only(:field1).aggregate(Person)
       end
 
@@ -69,7 +69,7 @@ describe Mongoid::Criteria do
 
     it "adds the $all query to the selector" do
       @criteria.all(:title => ["title1", "title2"])
-      @criteria.selector.should == { :title => { "$all" => ["title1", "title2"] } }
+      @criteria.selector.should == { :_type => "Person", :title => { "$all" => ["title1", "title2"] } }
     end
 
     it "returns self" do
@@ -84,7 +84,7 @@ describe Mongoid::Criteria do
 
       it "adds the clause to the selector" do
         @criteria.and(:title => "Title", :text => "Text")
-        @criteria.selector.should == { :title => "Title", :text => "Text" }
+        @criteria.selector.should == { :_type => "Person", :title => "Title", :text => "Text" }
       end
 
     end
@@ -93,7 +93,7 @@ describe Mongoid::Criteria do
 
       it "adds the $where clause to the selector" do
         @criteria.and("this.date < new Date()")
-        @criteria.selector.should == { "$where" => "this.date < new Date()" }
+        @criteria.selector.should == { :_type => "Person", "$where" => "this.date < new Date()" }
       end
 
     end
@@ -172,7 +172,7 @@ describe Mongoid::Criteria do
 
       before do
         @criteria = Mongoid::Criteria.new(Person)
-        @selector = { :test => "Testing" }
+        @selector = { :_type => "Person", :test => "Testing" }
         @criteria.where(@selector)
         @collection = mock
         @cursor = mock
@@ -202,7 +202,7 @@ describe Mongoid::Criteria do
 
       before do
         Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :title => "Sir" }, {}).returns(@cursor)
+        @collection.expects(:find).with({ :_type => "Person", :title => "Sir" }, {}).returns(@cursor)
       end
 
       it "executes the criteria" do
@@ -217,7 +217,7 @@ describe Mongoid::Criteria do
 
       before do
         Person.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :title => "Sir" }, {}).returns(@cursor)
+        @collection.expects(:find).with({ :_type => "Person", :title => "Sir" }, {}).returns(@cursor)
       end
 
       it "calls each on the existing results" do
@@ -277,7 +277,7 @@ describe Mongoid::Criteria do
 
     it "adds the $ne query to the selector" do
       @criteria.excludes(:title => "Bad Title", :text => "Bad Text")
-      @criteria.selector.should == { :title => { "$ne" => "Bad Title"}, :text => { "$ne" => "Bad Text" } }
+      @criteria.selector.should == { :_type => "Person", :title => { "$ne" => "Bad Title"}, :text => { "$ne" => "Bad Text" } }
     end
 
     it "returns self" do
@@ -348,7 +348,7 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
+        @collection.expects(:group).with([:field1], {:_type => "Person"}, {:group => []}, @reduce).returns(@grouping)
         @criteria.only(:field1).group
       end
 
@@ -363,7 +363,7 @@ describe Mongoid::Criteria do
       end
 
       it "calls group on the collection with the aggregate js" do
-        @collection.expects(:group).with([:field1], {}, {:group => []}, @reduce).returns(@grouping)
+        @collection.expects(:group).with([:field1], {:_type => "Person"}, {:group => []}, @reduce).returns(@grouping)
         @criteria.only(:field1).group
       end
 
@@ -376,7 +376,7 @@ describe Mongoid::Criteria do
     it "adds the _id query to the selector" do
       id = Mongo::ObjectID.new.to_s
       @criteria.id(id)
-      @criteria.selector.should == { :_id => id }
+      @criteria.selector.should == { :_type => "Person", :_id => id }
     end
 
     it "returns self" do
@@ -390,7 +390,7 @@ describe Mongoid::Criteria do
 
     it "adds the $in clause to the selector" do
       @criteria.in(:title => ["title1", "title2"], :text => ["test"])
-      @criteria.selector.should == { :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] } }
+      @criteria.selector.should == { :_type => "Person", :title => { "$in" => ["title1", "title2"] }, :text => { "$in" => ["test"] } }
     end
 
     it "returns self" do
@@ -399,6 +399,15 @@ describe Mongoid::Criteria do
 
   end
 
+  describe "#initialize" do
+
+    it "sets the _type value on the selector" do
+      criteria = Mongoid::Criteria.new(Person)
+      criteria.selector.should == { :_type => "Person" }
+    end
+
+  end
+
   describe "#last" do
 
     context "when documents exist" do
@@ -488,7 +497,7 @@ describe Mongoid::Criteria do
         before do
           @other = Mongoid::Criteria.new(Person)
           @other.where(:name => "Chloe").order_by([[:name, :asc]])
-          @selector = { :title => "Sir", :age => 30, :name => "Chloe" }
+          @selector = { :_type => "Person", :title => "Sir", :age => 30, :name => "Chloe" }
           @options = { :skip => 40, :limit => 20, :sort => [[:name, :asc]] }
         end
 
@@ -504,7 +513,7 @@ describe Mongoid::Criteria do
 
         before do
           @other = Mongoid::Criteria.new(Person)
-          @selector = { :title => "Sir", :age => 30 }
+          @selector = { :_type => "Person", :title => "Sir", :age => 30 }
           @options = { :skip => 40, :limit => 20 }
         end
 
@@ -528,7 +537,7 @@ describe Mongoid::Criteria do
 
     it "merges the criteria with the next one" do
       @new_criteria = @criteria.accepted
-      @new_criteria.selector.should == { :title => "Sir", :terms => true }
+      @new_criteria.selector.should == { :_type => "Person", :title => "Sir", :terms => true }
     end
 
     context "chaining more than one scope" do
@@ -539,7 +548,7 @@ describe Mongoid::Criteria do
 
       it "returns the final merged criteria" do
         @criteria.selector.should ==
-          { :title => "Sir", :terms => true, :age => { "$gt" => 50 } }
+          { :_type => "Person", :title => "Sir", :terms => true, :age => { "$gt" => 50 } }
       end
 
     end
@@ -578,7 +587,7 @@ describe Mongoid::Criteria do
 
     it "adds the exclusion to the selector" do
       @criteria.not_in(:title => ["title1", "title2"], :text => ["test"])
-      @criteria.selector.should == { :title => { "$nin" => ["title1", "title2"] }, :text => { "$nin" => ["test"] } }
+      @criteria.selector.should == { :_type => "Person", :title => { "$nin" => ["title1", "title2"] }, :text => { "$nin" => ["test"] } }
     end
 
     it "returns self" do
@@ -730,7 +739,7 @@ describe Mongoid::Criteria do
       @collection = mock
       Person.expects(:collection).returns(@collection)
       @criteria = Person.where(:_id => "1").skip(60).limit(20)
-      @collection.expects(:find).with({:_id => "1"}, :skip => 60, :limit => 20).returns([])
+      @collection.expects(:find).with({:_type => "Person", :_id => "1"}, :skip => 60, :limit => 20).returns([])
       @results = @criteria.paginate
     end
 
@@ -858,7 +867,7 @@ describe Mongoid::Criteria do
         end
 
         it "returns a criteria with a selector from the conditions" do
-          @criteria.selector.should == { :title => "Test" }
+          @criteria.selector.should == { :_type => "Person", :title => "Test" }
         end
 
         it "returns a criteria with klass Person" do
@@ -874,7 +883,7 @@ describe Mongoid::Criteria do
         end
 
         it "returns a criteria with a selector from the conditions" do
-          @criteria.selector.should == { :title => "Test" }
+          @criteria.selector.should == { :_type => "Person", :title => "Test" }
         end
 
         it "returns a criteria with klass Person" do
@@ -890,7 +899,7 @@ describe Mongoid::Criteria do
         end
 
         it "returns a criteria with a selector from the conditions" do
-          @criteria.selector.should == { :title => "Test" }
+          @criteria.selector.should == { :_type => "Person", :title => "Test" }
         end
 
         it "returns a criteria with klass Person" do
@@ -905,7 +914,7 @@ describe Mongoid::Criteria do
         end
 
         it "adds the criteria and the options" do
-          @criteria.selector.should == { :title => "Test" }
+          @criteria.selector.should == { :_type => "Person", :title => "Test" }
           @criteria.options.should == { :skip => 10 }
         end
 
@@ -923,7 +932,7 @@ describe Mongoid::Criteria do
 
         it "adds the clause to the selector" do
           @criteria.where(:title => "Title", :text => "Text")
-          @criteria.selector.should == { :title => "Title", :text => "Text" }
+          @criteria.selector.should == { :_type => "Person", :title => "Title", :text => "Text" }
         end
 
       end
@@ -934,7 +943,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching an all clause" do
             @criteria.where(:title.all => ["Sir"])
-            @criteria.selector.should == { :title => { "$all" => ["Sir"] } }
+            @criteria.selector.should == { :_type => "Person", :title => { "$all" => ["Sir"] } }
           end
 
         end
@@ -943,7 +952,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching an exists clause" do
             @criteria.where(:title.exists => true)
-            @criteria.selector.should == { :title => { "$exists" => true } }
+            @criteria.selector.should == { :_type => "Person", :title => { "$exists" => true } }
           end
 
         end
@@ -952,7 +961,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a gt clause" do
             @criteria.where(:age.gt => 30)
-            @criteria.selector.should == { :age => { "$gt" => 30 } }
+            @criteria.selector.should == { :_type => "Person", :age => { "$gt" => 30 } }
           end
 
         end
@@ -961,7 +970,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a gte clause" do
             @criteria.where(:age.gte => 33)
-            @criteria.selector.should == { :age => { "$gte" => 33 } }
+            @criteria.selector.should == { :_type => "Person", :age => { "$gte" => 33 } }
           end
 
         end
@@ -970,7 +979,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching an in clause" do
             @criteria.where(:title.in => ["Sir", "Madam"])
-            @criteria.selector.should == { :title => { "$in" => ["Sir", "Madam"] } }
+            @criteria.selector.should == { :_type => "Person", :title => { "$in" => ["Sir", "Madam"] } }
           end
 
         end
@@ -979,7 +988,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a lt clause" do
             @criteria.where(:age.lt => 34)
-            @criteria.selector.should == { :age => { "$lt" => 34 } }
+            @criteria.selector.should == { :_type => "Person", :age => { "$lt" => 34 } }
           end
 
         end
@@ -988,7 +997,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a lte clause" do
             @criteria.where(:age.lte => 33)
-            @criteria.selector.should == { :age => { "$lte" => 33 } }
+            @criteria.selector.should == { :_type => "Person", :age => { "$lte" => 33 } }
           end
 
         end
@@ -997,7 +1006,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a ne clause" do
             @criteria.where(:age.ne => 50)
-            @criteria.selector.should == { :age => { "$ne" => 50 } }
+            @criteria.selector.should == { :_type => "Person", :age => { "$ne" => 50 } }
           end
 
         end
@@ -1006,7 +1015,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a nin clause" do
             @criteria.where(:title.nin => ["Esquire", "Congressman"])
-            @criteria.selector.should == { :title => { "$nin" => ["Esquire", "Congressman"] } }
+            @criteria.selector.should == { :_type => "Person", :title => { "$nin" => ["Esquire", "Congressman"] } }
           end
 
         end
@@ -1015,7 +1024,7 @@ describe Mongoid::Criteria do
 
           it "returns those matching a size clause" do
             @criteria.where(:aliases.size => 2)
-            @criteria.selector.should == { :aliases => { "$size" => 2 } }
+            @criteria.selector.should == { :_type => "Person", :aliases => { "$size" => 2 } }
           end
 
         end
@@ -1028,7 +1037,7 @@ describe Mongoid::Criteria do
 
       it "adds the $where clause to the selector" do
         @criteria.where("this.date < new Date()")
-        @criteria.selector.should == { "$where" => "this.date < new Date()" }
+        @criteria.selector.should == { :_type => "Person", "$where" => "this.date < new Date()" }
       end
 
     end

data/spec/unit/mongoid/document_spec.rb

@@ -4,14 +4,16 @@ describe Mongoid::Document do
 
   before do
     @collection = stub(:name => "people")
-    @database = stub(:collection => @collection)
+    @canvas_collection = stub(:name => "canvases")
+    @database = mock
     Mongoid.stubs(:database).returns(@database)
+    @database.stubs(:collection).with("people").returns(@collection)
+    @database.stubs(:collection).with("canvases").returns(@canvas_collection)
   end
 
   after do
-    Person.instance_variable_set(:@collection, nil)
-    @database = nil
-    @collection = nil
+    Person._collection = nil
+    Canvas._collection = nil
   end
 
   describe "#==" do
@@ -54,6 +56,14 @@ describe Mongoid::Document do
 
     end
 
+    context "when comapring parent to its subclass" do
+
+      it "returns false" do
+        Canvas.new.should_not == Firefox.new
+      end
+
+    end
+
   end
 
   describe "#alias_method_chain" do
@@ -126,15 +136,28 @@ describe Mongoid::Document do
 
   end
 
-  describe ".collection_name" do
+  describe ".collection_name=" do
+
+    context "on a parent class" do
+
+      it "sets the collection name on the document class" do
+        Patient.collection_name = "pats"
+        Patient.collection_name.should == "pats"
+      end
 
-    before do
-      @coll = stub(:name => "population")
     end
 
-    it "sets the collection name on the document class" do
-      Mongoid.database.expects(:collection).with("population").returns(@coll)
-      Patient.collection.should == @coll
+    context "on a subclass" do
+
+      after do
+        Canvas.collection_name = "canvases"
+      end
+
+      it "sets the collection name for the entire hierarchy" do
+        Firefox.collection_name = "browsers"
+        Canvas.collection_name.should == "browsers"
+      end
+
     end
 
   end
@@ -149,12 +172,28 @@ describe Mongoid::Document do
 
   describe "#defaults" do
 
-    before do
-      @game = Game.new
+    context "on parent classes" do
+
+      before do
+        @shape = Shape.new
+      end
+
+      it "does not return subclass defaults" do
+        @shape.defaults.should == { "x" => 0, "y" => 0 }
+      end
+
     end
 
-    it "returns the class defaults" do
-      @game.defaults.should == { "high_score" => 500, "score" => 0 }
+    context "on subclasses" do
+
+      before do
+        @circle = Circle.new
+      end
+
+      it "has the parent and child defaults" do
+        @circle.defaults.should == { "x" => 0, "y" => 0, "radius" => 0 }
+      end
+
     end
 
   end
@@ -199,6 +238,15 @@ describe Mongoid::Document do
 
     end
 
+    context "when a subclass is embedded" do
+
+      it "returns true" do
+        circle = Circle.new
+        circle.should be_embedded
+      end
+
+    end
+
   end
 
   describe ".field" do
@@ -232,7 +280,8 @@ describe Mongoid::Document do
 
       it "allows proper access to the object" do
         @person.mixed_drink.should == @drink
-        @person.attributes[:mixed_drink].except(:_id).should == { "name" => "Jack and Coke" }
+        @person.attributes[:mixed_drink].except(:_id).except(:_type).should ==
+          { "name" => "Jack and Coke" }
       end
 
     end
@@ -275,6 +324,38 @@ describe Mongoid::Document do
 
   end
 
+  describe "#fields" do
+
+    context "on parent classes" do
+
+      before do
+        @shape = Shape.new
+      end
+
+      it "does not return subclass fields" do
+        @shape.fields.keys.should include("x")
+        @shape.fields.keys.should include("y")
+        @shape.fields.keys.should_not include("radius")
+      end
+
+    end
+
+    context "on subclasses" do
+
+      before do
+        @circle = Circle.new
+      end
+
+      it "has the parent and child fields" do
+        @circle.fields.keys.should include("x")
+        @circle.fields.keys.should include("y")
+        @circle.fields.keys.should include("radius")
+      end
+
+    end
+
+  end
+
   describe ".human_name" do
 
     it "returns the class name underscored and humanized" do
@@ -315,12 +396,21 @@ describe Mongoid::Document do
 
     end
 
+    context "when indexing a subclass" do
+
+      it "sets the index on the root class collection" do
+        @canvas_collection.expects(:create_index).with(:name, true)
+        Firefox.index :name, :unique => true
+      end
+
+    end
+
   end
 
   describe ".instantiate" do
 
     before do
-      @attributes = { :_id => "1", :title => "Sir", :age => 30 }
+      @attributes = { :_id => "1", :_type => "Person", :title => "Sir", :age => 30 }
       @person = Person.new(@attributes)
     end
 
@@ -364,6 +454,18 @@ describe Mongoid::Document do
 
     end
 
+    context "when key is on a subclass" do
+
+      before do
+        Firefox.key :name
+      end
+
+      it "sets the key for the entire hierarchy" do
+        Canvas.primary_key.should == [:name]
+      end
+
+    end
+
   end
 
   describe "#new" do
@@ -434,6 +536,14 @@ describe Mongoid::Document do
 
     end
 
+    context "without a type specified" do
+
+      it "sets the type" do
+        Person.new._type.should == "Person"
+      end
+
+    end
+
   end
 
   describe "#new_record?" do
@@ -464,7 +574,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#parent" do
+  describe "#_parent" do
 
     before do
       @attributes = { :title => "Sir",
@@ -477,7 +587,7 @@ describe Mongoid::Document do
     context "when document is embedded" do
 
       it "returns the parent document" do
-        @person.addresses.first.parent.should == @person
+        @person.addresses.first._parent.should == @person
       end
 
     end
@@ -485,7 +595,7 @@ describe Mongoid::Document do
     context "when document is root" do
 
       it "returns nil" do
-        @person.parent.should be_nil
+        @person._parent.should be_nil
       end
 
     end
@@ -501,7 +611,7 @@ describe Mongoid::Document do
 
     it "sets the parent on each element" do
       @child.parentize(@parent, :child)
-      @child.parent.should == @parent
+      @child._parent.should == @parent
     end
 
   end
@@ -555,7 +665,7 @@ describe Mongoid::Document do
 
   end
 
-  describe "#root" do
+  describe "#_root" do
 
     before do
       @person = Person.new(:title => "Mr")
@@ -568,7 +678,7 @@ describe Mongoid::Document do
     context "when document is the root" do
 
       it "returns self" do
-        @person.root.should == @person
+        @person._root.should == @person
       end
 
     end
@@ -576,7 +686,7 @@ describe Mongoid::Document do
     context "when document is embedded one level" do
 
       it "returns the parent" do
-        @phone_number.root.should == @person
+        @phone_number._root.should == @person
       end
 
     end
@@ -584,7 +694,39 @@ describe Mongoid::Document do
     context "when document is embedded multiple levels" do
 
       it "returns the top level parent" do
-        @country_code.root.should == @person
+        @country_code._root.should == @person
+      end
+
+    end
+
+  end
+
+  describe ".store_in" do
+
+    context "on a parent class" do
+
+      before do
+        Patient.store_in :population
+      end
+
+      it "sets the collection name for the document" do
+        Patient.collection_name.should == "population"
+      end
+
+    end
+
+    context "on a subclass" do
+
+      before do
+        Firefox.store_in :browsers
+      end
+
+      after do
+        Firefox.store_in :canvases
+      end
+
+      it "changes the collection name for the entire hierarchy" do
+        Canvas.collection_name.should == "browsers"
       end
 
     end
@@ -733,10 +875,14 @@ describe Mongoid::Document do
 
       before do
         @person = Person.new
+        @canvas = Canvas.new
+        @firefox = Firefox.new
       end
 
       after do
         Person.validations.clear
+        Canvas.validations.clear
+        Firefox.validations.clear
       end
 
       describe "#validates_acceptance_of" do
@@ -843,12 +989,35 @@ describe Mongoid::Document do
 
       describe "#validates_presence_of" do
 
-        it "fails if the field is nil" do
-          Person.class_eval do
-            validates_presence_of :title
+        context "on a parent class" do
+
+          it "fails if the field is nil on the parent" do
+            Person.class_eval do
+              validates_presence_of :title
+            end
+            @person.valid?.should be_false
+            @person.errors.on(:title).should_not be_nil
           end
-          @person.valid?.should be_false
-          @person.errors.on(:title).should_not be_nil
+
+          it "fails if the field is nil on a subclass" do
+            Canvas.class_eval do
+              validates_presence_of :name
+            end
+            @firefox.valid?.should be_false
+            @firefox.errors.on(:name).should_not be_nil
+          end
+
+        end
+
+        context "on a subclass" do
+
+          it "parent class does not get subclass validations" do
+            Firefox.class_eval do
+              validates_presence_of :name
+            end
+            @canvas.valid?.should be_true
+          end
+
         end
 
       end