mongoid 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/mongoid.rb

@@ -65,9 +65,20 @@ require "mongoid/document"
 module Mongoid #:nodoc
 
   class << self
-    #direct all calls to the configuration
-    def method_missing(name, *args)
-      Config.instance.send(name, *args)
+
+    delegate \
+      :allow_dynamic_fields,
+      :allow_dynamic_fields=,
+      :database,
+      :database=,
+      :persist_in_safe_mode,
+      :persist_in_safe_mode=,
+      :raise_not_found_error,
+      :raise_not_found_error=, :to => :config
+
+    protected
+    def config
+      Config.instance
     end
   end
 

data/lib/mongoid/commands.rb

@@ -59,10 +59,14 @@ module Mongoid #:nodoc:
       # <tt>document.save(false) # save without validations</tt>
       #
       # Returns: true if validation passes, false if not.
-      def save(validate = true, safe = false)
+      def save(validate = true)
         new = new_record?
         run_callbacks(:before_create) if new
-        saved = Save.execute(self, validate, safe)
+        begin
+          saved = Save.execute(self, validate)
+        rescue Mongo::OperationFailure => e
+          errors.add(:mongoid, e.message)
+        end
         run_callbacks(:after_create) if new
         saved
       end
@@ -76,7 +80,7 @@ module Mongoid #:nodoc:
       #
       # Returns: true if validation passes
       def save!
-        return save(true, true) || (raise Errors::Validations.new(self.errors))
+        return save(true) || (raise Errors::Validations.new(self.errors))
       end
 
       # Update the document attributes and persist the document to the
@@ -119,7 +123,13 @@ module Mongoid #:nodoc:
       #
       # Returns: the +Document+.
       def create(attributes = {})
-        Create.execute(new(attributes))
+        document = new(attributes)
+        begin
+          Create.execute(document)
+        rescue Mongo::OperationFailure => e
+          document.errors.add(:mongoid, e.message)
+        end
+        document
       end
 
       # Create a new +Document+. This will instantiate a new document and save
@@ -132,9 +142,9 @@ module Mongoid #:nodoc:
       #
       # Returns: the +Document+.
       def create!(attributes = {})
-        document = Create.execute(new(attributes), true, true)
-        raise Errors::Validations.new(self.errors) unless document.errors.empty?
-        return document
+        document = Create.execute(new(attributes), true)
+        raise Errors::Validations.new(document.errors) unless document.errors.empty?
+        document
       end
 
       # Delete all documents given the supplied conditions. If no conditions

data/lib/mongoid/commands/create.rb

@@ -10,9 +10,9 @@ module Mongoid #:nodoc:
       # doc: A new +Document+ that is going to be persisted.
       #
       # Returns: +Document+.
-      def self.execute(doc, validate = true, safe = false)
+      def self.execute(doc, validate = true)
         doc.run_callbacks :before_create
-        Save.execute(doc, validate, safe)
+        Save.execute(doc, validate)
         doc.run_callbacks :after_create
         return doc
       end

data/lib/mongoid/commands/deletion.rb

@@ -6,7 +6,12 @@ module Mongoid #:nodoc
       # otherwise delete it from it's collection.
       def delete(doc)
         parent = doc._parent
-        parent ? parent.remove(doc) : doc.collection.remove(:_id => doc.id)
+        if parent
+          parent.remove(doc)
+          parent.save
+        else
+          doc.collection.remove(:_id => doc.id)
+        end
       end
     end
   end

data/lib/mongoid/commands/save.rb

@@ -9,13 +9,13 @@ module Mongoid #:nodoc:
       #
       # doc: A +Document+ that is going to be persisted.
       #
-      # Returns: +Document+ if validation passes, +false+ if not.
-      def self.execute(doc, validate = true, safe = false)
+      # Returns: +true+ if validation passes, +false+ if not.
+      def self.execute(doc, validate = true)
         return false if validate && !doc.valid?
         doc.run_callbacks :before_save
         parent = doc._parent
-        doc.new_record = false
-        if parent ? Save.execute(parent, validate, safe) : doc.collection.save(doc.attributes, :safe => safe)
+        if parent ? Save.execute(parent, validate) : doc.collection.save(doc.raw_attributes, :safe => Mongoid.persist_in_safe_mode)
+          doc.new_record = false
           doc.run_callbacks :after_save
           return true
         else

data/lib/mongoid/config.rb

@@ -3,11 +3,16 @@ module Mongoid #:nodoc
   class Config #:nodoc
     include Singleton
 
-    attr_accessor :raise_not_found_error, :allow_dynamic_fields
+    attr_accessor \
+      :allow_dynamic_fields,
+      :persist_in_safe_mode,
+      :raise_not_found_error
 
+    # Defaults the configuration options to true.
     def initialize
-      @raise_not_found_error = true
       @allow_dynamic_fields = true
+      @persist_in_safe_mode = true
+      @raise_not_found_error = true
     end
 
     # Sets the Mongo::DB to be used.

data/lib/mongoid/document.rb

@@ -163,12 +163,20 @@ module Mongoid #:nodoc:
       def initialize(attrs = {})
         @attributes = {}
         process(attrs)
-        @attributes = defaults.merge(@attributes)
+        @attributes = attributes_with_defaults(@attributes)
         @new_record = true if id.nil?
         document = yield self if block_given?
         identify
       end
 
+      # apply default values to attributes - calling procs as required
+      def attributes_with_defaults(attributes = {})
+        default_values = defaults.merge(attributes)
+        default_values.each do |key, val|
+          default_values[key] = val.call if val.respond_to?(:call)
+        end
+      end
+
       # Returns the class name plus its attributes.
       def inspect
         attrs = fields.map { |name, field| "#{name}: #{@attributes[name].inspect}" } * ", "
@@ -215,6 +223,11 @@ module Mongoid #:nodoc:
         add_observer(object)
       end
 
+      # Return the attributes hash.
+      def raw_attributes
+        @attributes
+      end
+
       # Reloads the +Document+ attributes from the database.
       def reload
         @attributes = collection.find_one(:_id => id)

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-22}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"

data/spec/integration/mongoid/commands_spec.rb

@@ -43,34 +43,108 @@ describe Mongoid::Commands do
 
   describe "#delete" do
 
-    before do
-      @person.save
-    end
+    context "deleting a root document" do
+
+      before do
+        @person.save
+      end
+
+      it "deletes the document" do
+        @person.delete
+        lambda { Person.find(@person.id) }.should raise_error
+      end
+
+      it "returns true" do
+        @person.delete.should be_true
+      end
 
-    it "deletes the document" do
-      @person.delete
-      lambda { Person.find(@person.id) }.should raise_error
     end
 
-    it "returns true" do
-      @person.delete.should be_true
+    context "deleting an embedded document" do
+
+      before do
+        @address = Address.new(:street => "Bond Street")
+        @person.addresses << @address
+      end
+
+      context "when the document is not yet saved" do
+
+        it "removes the document from the parent" do
+          @address.delete
+          @person.addresses.should be_empty
+          @person.attributes[:addresses].should be_empty
+        end
+
+      end
+
+      context "when the document has been saved" do
+
+        before do
+          @address.save
+        end
+
+        it "removes the object from the parent and database" do
+          @address.delete
+          from_db = Person.find(@person.id)
+          from_db.addresses.should be_empty
+        end
+
+      end
+
     end
 
   end
 
   describe "#destroy" do
 
-    before do
-      @person.save
-    end
+    context "destroying a root document" do
+
+      before do
+        @person.save
+      end
+
+      it "destroys the document" do
+        @person.destroy
+        lambda { Person.find(@person.id) }.should raise_error
+      end
+
+      it "returns true" do
+        @person.destroy.should be_true
+      end
 
-    it "deletes the document" do
-      @person.destroy
-      lambda { Person.find(@person.id) }.should raise_error
     end
 
-    it "returns true" do
-      @person.destroy.should be_true
+    context "deleting an embedded document" do
+
+      before do
+        @address = Address.new(:street => "Bond Street")
+        @person.addresses << @address
+      end
+
+      context "when the document is not yet saved" do
+
+        it "removes the document from the parent" do
+          @address.destroy
+          @person.addresses.should be_empty
+          @person.attributes[:addresses].should be_empty
+        end
+
+      end
+
+      context "when the document has been saved" do
+
+        before do
+          @address.save
+        end
+
+        it "removes the object from the parent and database" do
+          @address.destroy
+          from_db = Person.find(@person.id)
+          from_db.addresses.should be_empty
+        end
+
+      end
+
     end
 
   end

data/spec/integration/mongoid/document_spec.rb

@@ -154,7 +154,7 @@ describe Mongoid::Document do
     context "when the document is not found" do
 
       it "creates a new document" do
-        person = Person.find_or_create_by(:title => "Senorita")
+        person = Person.find_or_create_by(:title => "Senorita", :ssn => "1234567")
         person.title.should == "Senorita"
         person.should_not be_a_new_record
       end

data/spec/integration/mongoid/extensions_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Extensions do
 
     context "when value is an empty string" do
 
-      let(:person) { Person.new }
+      let(:person) { Person.new(:ssn => "555555555555555") }
 
       before do
         Person.validates_numericality_of :blood_alcohol_content, :allow_blank => true

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ class Person
   field :aliases, :type => Array
   field :map, :type => Hash
   field :score, :type => Integer
-  field :blood_alcohol_content, :type => Float
+  field :blood_alcohol_content, :type => Float, :default => lambda{ 0.0 }
   field :ssn
 
   index :age

data/spec/unit/mongoid/associations/has_many_spec.rb

@@ -353,8 +353,15 @@ describe Mongoid::Associations::HasMany do
 
     context "when no class method exists" do
 
-      it "delegates to the array" do
+      before do
+        @association = Mongoid::Associations::HasMany.new(
+          @document,
+          Mongoid::Associations::Options.new(:name => :addresses)
+        )
+      end
 
+      it "delegates to the array" do
+        @association.entries.size.should == 2
       end
 
     end

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

@@ -9,19 +9,19 @@ describe Mongoid::Commands::Create do
     end
 
     it "executes a save command" do
-      Mongoid::Commands::Save.expects(:execute).with(@document, true, false).returns(@document)
+      Mongoid::Commands::Save.expects(:execute).with(@document, true).returns(@document)
       Mongoid::Commands::Create.execute(@document)
     end
 
     it "runs the before and after create callbacks" do
       @document.expects(:run_callbacks).with(:before_create)
-      Mongoid::Commands::Save.expects(:execute).with(@document, true, false).returns(@document)
+      Mongoid::Commands::Save.expects(:execute).with(@document, true).returns(@document)
       @document.expects(:run_callbacks).with(:after_create)
       Mongoid::Commands::Create.execute(@document)
     end
 
     it "returns the document" do
-      Mongoid::Commands::Save.expects(:execute).with(@document, true, false).returns(@document)
+      Mongoid::Commands::Save.expects(:execute).with(@document, true).returns(@document)
       Mongoid::Commands::Create.execute(@document).should == @document
     end
 

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

@@ -11,12 +11,12 @@ describe Mongoid::Commands::Save do
                      :valid? => true,
                      :run_callbacks => true,
                      :_parent => nil,
-                     :attributes => {},
+                     :raw_attributes => {},
                      :new_record= => false)
       @document = stub(:collection => @doc_collection,
                        :run_callbacks => true,
                        :_parent => @parent,
-                       :attributes => {},
+                       :raw_attributes => {},
                        :new_record= => false)
     end
 
@@ -39,7 +39,7 @@ describe Mongoid::Commands::Save do
       context "when the document has a parent" do
 
         it "executes a save on the parent" do
-          @parent_collection.expects(:save).with(@parent.attributes, :safe => false)
+          @parent_collection.expects(:save).with(@parent.raw_attributes, :safe => true)
           Mongoid::Commands::Save.execute(@document)
         end
 
@@ -52,7 +52,7 @@ describe Mongoid::Commands::Save do
         end
 
         it "calls save on the document collection" do
-          @doc_collection.expects(:save).with(@document.attributes, :safe => false)
+          @doc_collection.expects(:save).with(@document.raw_attributes, :safe => true)
           Mongoid::Commands::Save.execute(@document)
         end
 

data/spec/unit/mongoid/commands_spec.rb

@@ -27,7 +27,7 @@ describe Mongoid::Commands do
   describe "#save" do
 
     it "delegates to the Save command" do
-      Mongoid::Commands::Save.expects(:execute).with(@person, true, false).returns(true)
+      Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
       @person.save
     end
 
@@ -38,13 +38,13 @@ describe Mongoid::Commands do
       end
 
       it "delegates to the save command" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, false).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save
       end
 
       it "runs the before and after create callbacks" do
         @person.expects(:run_callbacks).with(:before_create)
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, false).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.expects(:run_callbacks).with(:after_create)
         @person.save
       end
@@ -58,12 +58,26 @@ describe Mongoid::Commands do
       end
 
       it "passes the validate param to the command" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, false, false).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, false).returns(true)
         @person.save(false)
       end
 
     end
 
+    context "when the database raises an error" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "returns false" do
+        Mongoid::Commands::Save.expects(:execute).raises(Mongo::OperationFailure.new("Operation Failed"))
+        @person.save
+        @person.errors.on(:mongoid).should == "Operation Failed"
+      end
+
+    end
+
   end
 
   describe "#save!" do
@@ -71,7 +85,7 @@ describe Mongoid::Commands do
     context "when validation passes" do
 
       it "it returns the person" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save!
       end
 
@@ -80,7 +94,7 @@ describe Mongoid::Commands do
     context "when validation fails" do
 
       it "it raises an error" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(false)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
         lambda { @person.save! }.should raise_error
       end
 
@@ -93,14 +107,14 @@ describe Mongoid::Commands do
       end
 
       it "delegates to the save command" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.save!
       end
 
       context "when validation fails" do
 
         it "it raises an error " do
-          Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(false)
+          Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
           lambda { @person.save! }.should raise_error
         end
 
@@ -108,7 +122,7 @@ describe Mongoid::Commands do
 
       it "runs the before and after create callbacks" do
         @person.expects(:run_callbacks).with(:before_create)
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.expects(:run_callbacks).with(:after_create)
         @person.save!
       end
@@ -120,7 +134,7 @@ describe Mongoid::Commands do
   describe "#update_attributes" do
 
     it "delegates to the Save command" do
-      Mongoid::Commands::Save.expects(:execute).with(@person, true, false).returns(true)
+      Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
       @person.update_attributes({})
     end
 
@@ -131,7 +145,7 @@ describe Mongoid::Commands do
     context "when validation passes" do
 
       it "it returns the person" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, false).returns(true)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
         @person.update_attributes({}).should be_true
       end
 
@@ -140,7 +154,7 @@ describe Mongoid::Commands do
     context "when validation fails" do
 
       it "it raises an error" do
-        Mongoid::Commands::Save.expects(:execute).with(@person, true, true).returns(false)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
         lambda { @person.update_attributes!({}) }.should raise_error
       end
 
@@ -160,6 +174,25 @@ describe Mongoid::Commands do
       Person.create.should_not be_nil
     end
 
+    context "when the database raises an error" do
+
+      before do
+        @person = Person.new
+        Mongoid::Commands::Save.expects(:execute).raises(Mongo::OperationFailure.new("Operation Failed"))
+      end
+
+      it "returns the document with errors" do
+        person = Person.create
+        person.errors.on(: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
+
   end
 
   describe ".create!" do
@@ -179,7 +212,7 @@ describe Mongoid::Commands 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
+        lambda { Person.create! }.should raise_error(Mongoid::Errors::Validations)
       end
 
     end

data/spec/unit/mongoid/config_spec.rb

@@ -20,6 +20,34 @@ describe Mongoid::Config do
 
   end
 
+  describe "#persist_in_safe_mode=" do
+
+    context "when setting to true" do
+
+      before do
+        config.persist_in_safe_mode = true
+      end
+
+      it "sets the value" do
+        config.persist_in_safe_mode.should == true
+      end
+
+    end
+
+    context "when setting to false" do
+
+      before do
+        config.persist_in_safe_mode = false
+      end
+
+      it "sets the value" do
+        config.persist_in_safe_mode.should == false
+      end
+
+    end
+
+  end
+
   describe "#raise_not_found_error=" do
 
     context "when setting to true" do

data/spec/unit/mongoid/document_spec.rb

@@ -305,6 +305,7 @@ describe Mongoid::Document do
         person = Person.new
         person.attributes.empty?.should be_false
         person.age.should == 100
+        person.blood_alcohol_content.should == 0.0
       end
 
     end

data/spec/unit/mongoid/extensions/array/conversions_spec.rb

@@ -10,8 +10,8 @@ describe Mongoid::Extensions::Array::Conversions do
         Person.new(:_id => 2, :title => "Madam")
       ]
       array.mongoidize.should ==
-        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100, :_type => "Person" }),
-          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person" }) ]
+        [ HashWithIndifferentAccess.new({ :_id => 1, :title => "Sir", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0 }),
+          HashWithIndifferentAccess.new({ :_id => 2, :title => "Madam", :age => 100, :_type => "Person", "blood_alcohol_content" => 0.0 }) ]
     end
 
   end

data/spec/unit/mongoid/extensions/object/conversions_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Extensions::Object::Conversions do
 
     it "returns its attributes" do
       Person.new(:_id => 1, :title => "Sir").mongoidize.should ==
-        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person" }
+        { "_id" => 1, "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0 }
     end
 
   end
@@ -28,7 +28,7 @@ describe Mongoid::Extensions::Object::Conversions do
     context "when object has attributes" do
 
       before do
-        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person" }
+        @attributes = { "_id" => "test", "title" => "Sir", "age" => 100, "_type" => "Person", "blood_alcohol_content" => 0.0 }
         @person = Person.new(@attributes)
       end
 

data/spec/unit/mongoid/scope_spec.rb

@@ -2,6 +2,10 @@ require "spec_helper"
 
 describe Mongoid::Scope do
 
+  before do
+    Person.delete_all
+  end
+
   describe "#==" do
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -05:00
+date: 2010-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency