mongoid-pre 2.0.0.beta1 → 2.0.0.pre

data/spec/unit/mongoid/associations_spec.rb

@@ -94,18 +94,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe "#associations" do
-
-    before do
-      @person = Person.new
-    end
-
-    it "is a hash with name keys and meta data values" do
-      @person.associations["addresses"].should be_a_kind_of(Mongoid::Associations::MetaData)
-    end
-  end
-
-  describe ".embedded_in" do
+  describe ".belongs_to" do
 
     it "creates a reader for the association" do
       address = Address.new
@@ -141,7 +130,7 @@ describe Mongoid::Associations do
     context "when inverse_of not supplied" do
 
       it "raises an error" do
-        lambda { Person.class_eval { embedded_in :nothing } }.should raise_error
+        lambda { Person.class_eval { belongs_to :nothing } }.should raise_error
       end
 
     end
@@ -210,18 +199,6 @@ describe Mongoid::Associations do
 
     end
 
-    context "when attributes are nil" do
-
-      before do
-        @writer = @canvas.build_writer(nil)
-      end
-
-      it "defaults them to empty" do
-        @writer.should be_a_kind_of(Writer)
-      end
-
-    end
-
   end
 
   describe "#create_*" do
@@ -274,7 +251,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe ".embeds_many" do
+  describe ".has_many" do
 
     it "adds a new Association to the collection" do
       person = Person.new
@@ -350,7 +327,7 @@ describe Mongoid::Associations do
 
   end
 
-  describe ".embeds_one" do
+  describe ".has_one" do
 
     before do
       @person = Person.new
@@ -421,7 +398,7 @@ describe Mongoid::Associations do
   describe ".reflect_on_association" do
 
     it "returns the association class for the name" do
-      Person.reflect_on_association(:addresses).should == :embeds_many
+      Person.reflect_on_association(:addresses).should == :has_many
     end
 
   end
@@ -440,10 +417,6 @@ describe Mongoid::Associations do
       @game.should respond_to(:person)
     end
 
-    it "defaults the foreign_key option to the name_id" do
-      @game.associations["person"].foreign_key.should == "person_id"
-    end
-
     context "when document is root level" do
 
       it "puts an index on the foreign key" do
@@ -453,22 +426,6 @@ describe Mongoid::Associations do
 
     end
 
-    context "when using object ids" do
-
-      before do
-        Mongoid.use_object_ids = true
-      end
-
-      after do
-        Mongoid.use_object_ids = false
-      end
-
-      it "sets the foreign key as an object id" do
-        Game.expects(:field).with("person_id", :type => Mongo::ObjectID)
-        Game.belongs_to_related :person
-      end
-    end
-
   end
 
   describe ".has_one_related" do
@@ -525,34 +482,15 @@ describe Mongoid::Associations do
 
     context "when associations exist" do
 
-      context "when the document is a new record" do
-
-        before do
-          @related = stub(:id => "100", :person= => true)
-          @person = Person.new
-          @person.posts = [@related]
-        end
-
-        it "saves each association" do
-          @related.expects(:save).returns(@related)
-          @person.update_associations(:posts)
-        end
-
+      before do
+        @related = stub(:id => "100", :person= => true)
+        @person = Person.new
+        @person.posts = [@related]
       end
 
-      context "when the document is not new" do
-
-        before do
-          @related = stub(:id => "100", :person= => true)
-          @person = Person.new
-          @person.instance_variable_set(:@new_record, false)
-          @person.posts = [@related]
-        end
-
-        it "does not save each association" do
-          @person.update_associations(:posts)
-        end
-
+      it "saves each association" do
+        @related.expects(:save).returns(@related)
+        @person.update_associations(:posts)
       end
 
     end

data/spec/unit/mongoid/attributes_spec.rb

@@ -142,17 +142,6 @@ describe Mongoid::Attributes do
 
   describe "#process" do
 
-    context "when passing non accessible fields" do
-
-      before do
-        @person = Person.new(:owner_id => 6)
-      end
-
-      it "does not set the value" do
-        @person.owner_id.should be_nil
-      end
-    end
-
     context "when attributes dont have fields defined" do
 
       before do
@@ -342,23 +331,10 @@ describe Mongoid::Attributes do
 
       it "returns the default value" do
         @person.age.should == 100
-        @person.pets.should == false
       end
 
     end
 
-    context "when attribute is not accessible" do
-
-      before do
-        @person = Person.new
-        @person.owner_id = 5
-      end
-
-      it "returns the value" do
-        @person.read_attribute(:owner_id).should == 5
-      end
-    end
-
   end
 
   describe "#remove_attribute" do
@@ -415,91 +391,83 @@ describe Mongoid::Attributes do
 
   end
 
-  describe "#attributes=" do
-    it 'should be a alias of write_attributes' do
-
-    end
-  end
-
-  [:attributes=, :write_attributes].each do |method|
-    describe "##{method}" do
+  describe "#write_attributes" do
 
-      context "typecasting" do
+    context "typecasting" do
 
-        before do
-          @person = Person.new
-          @attributes = { :age => "50" }
-        end
-
-        it "properly casts values" do
-          @person.send(method, @attributes)
-          @person.age.should == 50
-        end
+      before do
+        @person = Person.new
+        @attributes = { :age => "50" }
+      end
 
-        it "allows passing of nil" do
-          @person.send(method, nil)
-          @person.age.should == 100
-        end
+      it "properly casts values" do
+        @person.write_attributes(@attributes)
+        @person.age.should == 50
+      end
 
+      it "allows passing of nil" do
+        @person.write_attributes(nil)
+        @person.age.should == 100
       end
 
-      context "on a parent document" do
+    end
 
-        context "when the parent has a has many through a has one" do
+    context "on a parent document" do
 
-          before do
-            @owner = PetOwner.new(:title => "Mr")
-            @pet = Pet.new(:name => "Fido")
-            @owner.pet = @pet
-            @vet_visit = VetVisit.new(:date => Date.today)
-            @pet.vet_visits = [@vet_visit]
-          end
+      context "when the parent has a has many through a has one" do
 
-          it "does not overwrite child attributes if not in the hash" do
-            @owner.send(method, { :pet => { :name => "Bingo" } })
-            @owner.pet.name.should == "Bingo"
-            @owner.pet.vet_visits.size.should == 1
-          end
+        before do
+          @owner = PetOwner.new(:title => "Mr")
+          @pet = Pet.new(:name => "Fido")
+          @owner.pet = @pet
+          @vet_visit = VetVisit.new(:date => Date.today)
+          @pet.vet_visits = [@vet_visit]
+        end
 
+        it "does not overwrite child attributes if not in the hash" do
+          @owner.write_attributes({ :pet => { :name => "Bingo" } })
+          @owner.pet.name.should == "Bingo"
+          @owner.pet.vet_visits.size.should == 1
         end
 
       end
 
-      context "on a child document" do
+    end
 
-        context "when child is part of a has one" do
+    context "on a child document" do
 
-          before do
-            @person = Person.new(:title => "Sir", :age => 30)
-            @name = Name.new(:first_name => "Test", :last_name => "User")
-            @person.name = @name
-          end
+      context "when child is part of a has one" do
 
-          it "sets the child attributes on the parent" do
-            @name.send(method, :first_name => "Test2", :last_name => "User2")
-            @person.attributes[:name].should ==
-              { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2", "_type" => "Name" }
-          end
+        before do
+          @person = Person.new(:title => "Sir", :age => 30)
+          @name = Name.new(:first_name => "Test", :last_name => "User")
+          @person.name = @name
+        end
 
+        it "sets the child attributes on the parent" do
+          @name.write_attributes(:first_name => "Test2", :last_name => "User2")
+          @person.attributes[:name].should ==
+            { "_id" => "test-user", "first_name" => "Test2", "last_name" => "User2", "_type" => "Name" }
         end
 
-        context "when child is part of a has many" do
+      end
 
-          before do
-            @person = Person.new(:title => "Sir")
-            @address = Address.new(:street => "Test")
-            @person.addresses << @address
-          end
+      context "when child is part of a has many" do
 
-          it "updates the child attributes on the parent" do
-            @address.send(method, "street" => "Test2")
-            @person.attributes[:addresses].should ==
-              [ { "_id" => "test", "street" => "Test2", "_type" => "Address" } ]
-          end
+        before do
+          @person = Person.new(:title => "Sir")
+          @address = Address.new(:street => "Test")
+          @person.addresses << @address
+        end
 
+        it "updates the child attributes on the parent" do
+          @address.write_attributes("street" => "Test2")
+          @person.attributes[:addresses].should ==
+            [ { "_id" => "test", "street" => "Test2", "_type" => "Address" } ]
         end
 
       end
+
     end
 
   end

data/spec/unit/mongoid/collection_spec.rb

@@ -40,52 +40,6 @@ describe Mongoid::Collection do
     end
   end
 
-  describe "#directed" do
-
-    context "when an enslave option is not passed" do
-
-      before do
-        slaves.expects(:empty?).returns(false)
-      end
-
-      before do
-        Person.enslave
-      end
-
-      after do
-        Person.enslaved = false
-      end
-
-      it "uses the default" do
-        collection.directed.should == slaves
-      end
-    end
-
-    context "when an enslave option is passed" do
-
-      before do
-        slaves.expects(:empty?).returns(false)
-      end
-
-      it "overwrites the default" do
-        collection.directed(:enslave => true).should == slaves
-      end
-    end
-
-    context "when cached option is passed" do
-
-      let(:options) do
-        { :cache => true }
-      end
-
-      it "removed the cache option" do
-        collection.directed(options).should == master
-        options[:cache].should be_nil
-      end
-    end
-
-  end
-
   describe "#find" do
 
     before do

data/spec/unit/mongoid/commands/delete_all_spec.rb

@@ -15,45 +15,44 @@ describe Mongoid::Commands::DeleteAll do
       before do
         @collection = mock
         @conditions = { :conditions => { :title => "Sir" } }
-        @cursor = stub(:count => 30)
       end
 
       it "deletes each document that the criteria finds" do
         @klass.expects(:collection).returns(@collection)
-        @collection.expects(:find).with(@conditions[:conditions].merge(:_type => "Person")).returns(@cursor)
-        @collection.expects(:remove).with(@conditions[:conditions].merge(:_type => "Person"), :safe => true)
+        @collection.expects(:remove).with(@conditions[:conditions].merge(:_type => "Person"))
         Mongoid::Commands::DeleteAll.execute(@klass, @conditions)
       end
+
     end
 
     context "when no conditions supplied" do
 
       before do
         @collection = mock
-        @cursor = stub(:count => 30)
       end
 
       it "drops the collection" do
         @klass.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :_type => "Person" }).returns(@cursor)
-        @collection.expects(:remove).with({ :_type => "Person" }, { :safe => true })
+        @collection.expects(:remove).with(:_type => "Person")
         Mongoid::Commands::DeleteAll.execute(@klass)
       end
+
     end
 
     context "when empty conditions supplied" do
 
       before do
         @collection = mock
-        @cursor = stub(:count => 30)
       end
 
       it "drops the collection" do
         @klass.expects(:collection).returns(@collection)
-        @collection.expects(:find).with({ :_type => "Person" }).returns(@cursor)
-        @collection.expects(:remove).with({ :_type => "Person" }, { :safe => true })
+        @collection.expects(:remove).with(:_type => "Person")
         Mongoid::Commands::DeleteAll.execute(@klass, {})
       end
+
     end
+
   end
+
 end

data/spec/unit/mongoid/commands/delete_spec.rb

@@ -14,12 +14,6 @@ describe Mongoid::Commands::Delete do
       Mongoid::Commands::Delete.execute(@document)
     end
 
-    it "sets the destroyed flag to true" do
-      @collection.expects(:remove).with({ :_id => @document.id }).returns(true)
-      @document.expects(:destroyed=).with(true)
-      Mongoid::Commands::Delete.execute(@document)
-    end
-
     context "when the document is embedded" do
 
       before do
@@ -33,6 +27,9 @@ describe Mongoid::Commands::Delete do
         Mongoid::Commands::Delete.execute(@address)
         @parent.addresses.should be_empty
       end
+
     end
+
   end
+
 end

data/spec/unit/mongoid/commands/destroy_all_spec.rb

@@ -17,5 +17,7 @@ describe Mongoid::Commands::DestroyAll do
       Mongoid::Commands::Destroy.expects(:execute).with(@doc)
       Mongoid::Commands::DestroyAll.execute(@klass, @conditions)
     end
+
   end
+
 end

data/spec/unit/mongoid/commands/destroy_spec.rb

@@ -23,29 +23,22 @@ describe Mongoid::Commands::Destroy do
       Mongoid::Commands::Destroy.execute(@document)
     end
 
-    it "sets the destroy flag on the document" do
-      @document.expects(:run_callbacks).with(:destroy).yields
-      @collection.expects(:remove).with({ :_id => @document.id }).returns(true)
-      @document.expects(:destroyed=).with(true)
-      Mongoid::Commands::Destroy.execute(@document)
-    end
-
     context "when the document is embedded" do
 
       before do
         @parent = Person.new
         @address = Address.new(:street => "Genoa Pl")
         @parent.addresses << @address
-        @collection = mock
-        Person.expects(:collection).returns(@collection)
       end
 
       it "removes the document from the parent attributes" do
         @parent.addresses.should == [@address]
-        @collection.expects(:save).returns(true)
         Mongoid::Commands::Destroy.execute(@address)
         @parent.addresses.should be_empty
       end
+
     end
+
   end
+
 end

data/spec/unit/mongoid/commands_spec.rb

@@ -37,22 +37,6 @@ describe Mongoid::Commands do
         @person = Person.new
       end
 
-      context "when validation fails" do
-
-        it "it raises an error" do
-          Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
-          @person.save.should be_false
-        end
-
-        it "should run callback before_create and no after_create" do
-          @person.expects(:run_callbacks).with(:create).yields.returns(false)
-          Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
-          @person.expects(:run_callbacks).with(:after_create).never
-          @person.save.should be_false
-        end
-
-      end
-
       it "delegates to the save command" do
         Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save
@@ -85,9 +69,10 @@ describe Mongoid::Commands do
         @person = Person.new
       end
 
-      it "lets the error bubble up" do
+      it "returns false" do
         Mongoid::Commands::Save.expects(:execute).raises(Mongo::OperationFailure.new("Operation Failed"))
-        lambda { @person.save }.should raise_error
+        @person.save
+        @person.errors[:mongoid].should == [ "Operation Failed" ]
       end
 
     end
@@ -200,8 +185,14 @@ describe Mongoid::Commands do
         Mongoid::Commands::Save.expects(:execute).raises(Mongo::OperationFailure.new("Operation Failed"))
       end
 
-      it "lets the error bubble up" do
-        lambda { Person.create }.should raise_error
+      it "returns the document with errors" do
+        person = Person.create
+        person.errors[:mongoid].should == [ "Operation Failed" ]
+      end
+
+      it "keeps the document's new record flag" do
+        person = Person.create
+        person.should be_a_new_record
       end
 
     end

data/spec/unit/mongoid/config_spec.rb

@@ -39,13 +39,6 @@ describe Mongoid::Config do
     end
   end
 
-  describe "#persist_types" do
-
-    it "defaults to true" do
-      config.persist_types.should == true
-    end
-  end
-
   describe "#persist_in_safe_mode=" do
 
     context "when setting to true" do
@@ -66,10 +59,6 @@ describe Mongoid::Config do
         config.persist_in_safe_mode = false
       end
 
-      after do
-        config.persist_in_safe_mode = true
-      end
-
       it "sets the value" do
         config.persist_in_safe_mode.should == false
       end
@@ -166,11 +155,4 @@ describe Mongoid::Config do
 
   end
 
-  describe "#use_object_ids" do
-
-    it "defaults to false" do
-      config.use_object_ids.should == false
-    end
-  end
-
 end