mongoid 0.9.8 → 0.9.9

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

@@ -11,11 +11,13 @@ describe Mongoid::Commands::Save do
                      :valid? => true,
                      :run_callbacks => true,
                      :parent => nil,
-                     :attributes => {})
+                     :attributes => {},
+                     :new_record= => false)
       @document = stub(:collection => @doc_collection,
                        :run_callbacks => true,
                        :parent => @parent,
-                       :attributes => {})
+                       :attributes => {},
+                       :new_record= => false)
     end
 
     context "when document is valid" do

data/spec/unit/mongoid/commands_spec.rb

@@ -59,7 +59,7 @@ describe Mongoid::Commands do
 
     context "when validation fails" do
 
-      it "it raises a ValidationsError" do
+      it "it raises an error" do
         Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
         lambda { @person.save! }.should raise_error
       end
@@ -79,7 +79,7 @@ describe Mongoid::Commands do
 
       context "when validation fails" do
 
-        it "it raises a ValidationsError" do
+        it "it raises an error " do
           Mongoid::Commands::Create.expects(:execute).with(@person).returns(false)
           lambda { @person.save! }.should raise_error
         end
@@ -90,19 +90,6 @@ describe Mongoid::Commands do
 
   end
 
-  describe "#quick_save" do
-
-    before do
-      @person = Person.new
-    end
-
-    it "delegates to the QuickSave command" do
-      Mongoid::Commands::QuickSave.expects(:execute).with(@person).returns(true)
-      @person.quick_save
-    end
-
-  end
-
   describe "#update_attributes" do
 
     it "delegates to the Save command" do
@@ -125,7 +112,7 @@ describe Mongoid::Commands do
 
     context "when validation fails" do
 
-      it "it raises a ValidationsError" do
+      it "it raises an error" do
         Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
         lambda { @person.update_attributes!({}) }.should raise_error
       end
@@ -162,7 +149,7 @@ describe Mongoid::Commands do
 
     context "when validation fails" do
 
-      it "raises an exception" do
+      it "raises an error" do
         person = stub(:errors => stub(:empty? => false))
         Mongoid::Commands::Create.expects(:execute).returns(person)
         lambda { Person.create! }.should raise_error

data/spec/unit/mongoid/criteria_spec.rb

@@ -138,11 +138,6 @@ describe Mongoid::Criteria do
         @criteria.count.should == 44
       end
 
-    end
-
-    context "when type is :first" do
-
-
     end
 
     context "when type is not :first" do

data/spec/unit/mongoid/document_spec.rb

@@ -101,8 +101,8 @@ describe Mongoid::Document do
         @address = Address.new
       end
 
-      it "returns nil" do
-        Address.collection.should be_nil
+      it "raises an error" do
+        lambda { Address.collection }.should raise_error
       end
 
     end
@@ -439,46 +439,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#read_attribute" do
-
-    context "when attribute does not exist" do
-
-      before do
-        @person = Person.new
-      end
-
-      it "returns the default value" do
-        @person.age.should == 100
-      end
-
-    end
-
-  end
-
-  describe "#remove_attribute" do
-
-    context "when the attribute exists" do
-
-      it "removes the attribute" do
-        person = Person.new(:title => "Sir")
-        person.remove_attribute(:title)
-        person.title.should be_nil
-      end
-
-    end
-
-    context "when the attribute does not exist" do
-
-      it "does nothing" do
-        person = Person.new
-        person.remove_attribute(:title)
-        person.title.should be_nil
-      end
-
-    end
-
-  end
-
   describe "#reload" do
 
     before do
@@ -539,112 +499,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#write_attribute" do
-
-    context "when attribute does not exist" do
-
-      before do
-        @person = Person.new
-      end
-
-      it "returns the default value" do
-        @person.age = nil
-        @person.age.should == 100
-      end
-
-    end
-
-    context "when field has a default value" do
-
-      before do
-        @person = Person.new
-      end
-
-      it "should allow overwriting of the default value" do
-        @person.terms = true
-        @person.terms.should be_true
-      end
-
-    end
-
-  end
-
-  describe "#write_attributes" do
-
-    context "typecasting" do
-
-      before do
-        @person = Person.new
-        @attributes = { :age => "50" }
-      end
-
-      it "properly casts values" do
-        @person.write_attributes(@attributes)
-        @person.age.should == 50
-      end
-
-    end
-
-    context "on a parent document" do
-
-      context "when the parent has a has many through a has one" 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
-
-        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
-
-    end
-
-    context "on a child document" do
-
-      context "when child is part of a has one" do
-
-        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" }
-        end
-
-      end
-
-      context "when child is part of a has many" do
-
-        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" } ]
-        end
-
-      end
-
-    end
-
-  end
-
   context "validations" do
 
     context "when defining using macros" do
@@ -807,16 +661,32 @@ describe Mongoid::Document do
 
         context "when association is a has_one" do
 
-          it "fails when the association fails validation" do
-            Person.class_eval do
-              validates_associated :name
+          context "when the associated is not nil" do
+
+            it "fails when the association fails validation" do
+              Person.class_eval do
+                validates_associated :name
+              end
+              Name.class_eval do
+                validates_presence_of :first_name
+              end
+              @person.name = Name.new
+              @person.valid?.should be_false
+              @person.errors.on(:name).should_not be_nil
             end
-            Name.class_eval do
-              validates_presence_of :first_name
+
+          end
+
+          context "when the associated is nil" do
+
+            it "fails when the association fails validation" do
+              Person.class_eval do
+                validates_associated :name
+              end
+              @person.valid?.should be_false
+              @person.errors.on(:name).should_not be_nil
             end
-            @person.name = Name.new
-            @person.valid?.should be_false
-            @person.errors.on(:name).should_not be_nil
+
           end
 
         end

data/spec/unit/mongoid/errors_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+describe Mongoid::Errors do
+
+  describe Mongoid::Errors::InvalidOptions do
+
+    describe "#message" do
+
+      context "default" do
+
+        before do
+          @error = Mongoid::Errors::InvalidOptions.new
+        end
+
+        it "returns the class name" do
+          @error.message.should == @error.class.name
+        end
+
+      end
+
+    end
+
+  end
+
+  describe Mongoid::Errors::InvalidDatabase do
+
+    describe "#message" do
+
+      context "default" do
+
+        before do
+          @error = Mongoid::Errors::InvalidDatabase.new
+        end
+
+        it "returns the class name" do
+          @error.message.should == @error.class.name
+        end
+
+      end
+
+    end
+
+  end
+
+  describe Mongoid::Errors::Validations do
+
+    describe "#message" do
+
+      context "default" do
+
+        before do
+          @errors = stub(:full_messages => "Testing")
+          @error = Mongoid::Errors::Validations.new(@errors)
+        end
+
+        it "contains the errors' full messages" do
+          @error.message.should include("Testing")
+        end
+
+      end
+
+    end
+
+  end
+
+  describe Mongoid::Errors::InvalidCollection do
+
+    describe "#message" do
+
+      context "default" do
+
+        before do
+          @klass = Address
+          @error = Mongoid::Errors::InvalidCollection.new(@klass)
+        end
+
+        it "contains class is not allowed" do
+          @error.message.should include("Address is not allowed")
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -05:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,11 +100,12 @@ files:
 - lib/mongoid.rb
 - lib/mongoid/associations.rb
 - lib/mongoid/associations/belongs_to.rb
+- lib/mongoid/associations/belongs_to_related.rb
 - lib/mongoid/associations/has_many.rb
+- lib/mongoid/associations/has_many_related.rb
 - lib/mongoid/associations/has_one.rb
+- lib/mongoid/associations/has_one_related.rb
 - lib/mongoid/associations/options.rb
-- lib/mongoid/associations/relates_to_many.rb
-- lib/mongoid/associations/relates_to_one.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/commands.rb
 - lib/mongoid/commands/create.rb
@@ -112,12 +113,12 @@ files:
 - lib/mongoid/commands/delete_all.rb
 - lib/mongoid/commands/destroy.rb
 - lib/mongoid/commands/destroy_all.rb
-- lib/mongoid/commands/quick_save.rb
 - lib/mongoid/commands/save.rb
 - lib/mongoid/commands/validate.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/document.rb
 - lib/mongoid/dynamic_finder.rb
+- lib/mongoid/errors.rb
 - lib/mongoid/extensions.rb
 - lib/mongoid/extensions/array/accessors.rb
 - lib/mongoid/extensions/array/assimilation.rb
@@ -147,12 +148,13 @@ files:
 - spec/integration/mongoid/document_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/mongoid/associations/belongs_to_related_spec.rb
 - spec/unit/mongoid/associations/belongs_to_spec.rb
+- spec/unit/mongoid/associations/has_many_related_spec.rb
 - spec/unit/mongoid/associations/has_many_spec.rb
+- spec/unit/mongoid/associations/has_one_related_spec.rb
 - spec/unit/mongoid/associations/has_one_spec.rb
 - spec/unit/mongoid/associations/options_spec.rb
-- spec/unit/mongoid/associations/relates_to_many_spec.rb
-- spec/unit/mongoid/associations/relates_to_one_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
@@ -160,13 +162,13 @@ files:
 - spec/unit/mongoid/commands/delete_spec.rb
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
-- spec/unit/mongoid/commands/quick_save_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
 - spec/unit/mongoid/commands/validate_spec.rb
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb
+- spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb
@@ -221,12 +223,13 @@ test_files:
 - spec/integration/mongoid/associations_spec.rb
 - spec/integration/mongoid/document_spec.rb
 - spec/spec_helper.rb
+- spec/unit/mongoid/associations/belongs_to_related_spec.rb
 - spec/unit/mongoid/associations/belongs_to_spec.rb
+- spec/unit/mongoid/associations/has_many_related_spec.rb
 - spec/unit/mongoid/associations/has_many_spec.rb
+- spec/unit/mongoid/associations/has_one_related_spec.rb
 - spec/unit/mongoid/associations/has_one_spec.rb
 - spec/unit/mongoid/associations/options_spec.rb
-- spec/unit/mongoid/associations/relates_to_many_spec.rb
-- spec/unit/mongoid/associations/relates_to_one_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
@@ -234,13 +237,13 @@ test_files:
 - spec/unit/mongoid/commands/delete_spec.rb
 - spec/unit/mongoid/commands/destroy_all_spec.rb
 - spec/unit/mongoid/commands/destroy_spec.rb
-- spec/unit/mongoid/commands/quick_save_spec.rb
 - spec/unit/mongoid/commands/save_spec.rb
 - spec/unit/mongoid/commands/validate_spec.rb
 - spec/unit/mongoid/commands_spec.rb
 - spec/unit/mongoid/criteria_spec.rb
 - spec/unit/mongoid/document_spec.rb
 - spec/unit/mongoid/dynamic_finder_spec.rb
+- spec/unit/mongoid/errors_spec.rb
 - spec/unit/mongoid/extensions/array/accessors_spec.rb
 - spec/unit/mongoid/extensions/array/assimilation_spec.rb
 - spec/unit/mongoid/extensions/array/conversions_spec.rb