mongoid 0.10.4 → 0.10.5

data/HISTORY

@@ -1,3 +1,11 @@
+=== 0.10.5
+
+- Documents that are embedded not properly respond to
+  Document#destroy and Document#delete.
+
+- Documents can now be saved sans validation with
+  Document#save(false)
+
 === 0.10.4
 
 - Documents no longer inherit from Mongoid::Document.
@@ -15,4 +23,3 @@
   now set the name of the database collection to persist to.
 
 - Mongoid::Criteria#select becomes Mongoid::Criteria#only
-

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.10.5

data/lib/mongoid/commands.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "mongoid/commands/create"
+require "mongoid/commands/deletion"
 require "mongoid/commands/delete"
 require "mongoid/commands/delete_all"
 require "mongoid/commands/destroy"
@@ -46,17 +47,17 @@ module Mongoid #:nodoc:
       end
 
       # Save the +Document+. Delegates to the Save command.
-      def save
-        new_record? ? Create.execute(self) : Save.execute(self)
+      def save(validate = true)
+        new_record? ? Create.execute(self, validate) : Save.execute(self, validate)
       end
 
       # Save the +Document+. Delegates to the Save command. If the command
       # returns false then a +ValidationError+ will be raised.
       def save!
         if new_record?
-          return Create.execute(self) || (raise Errors::Validations.new(self.errors))
+          return Create.execute(self, true) || (raise Errors::Validations.new(self.errors))
         else
-          return Save.execute(self) || (raise Errors::Validations.new(self.errors))
+          return Save.execute(self, true) || (raise Errors::Validations.new(self.errors))
         end
       end
 

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)
+      def self.execute(doc, validate = true)
         doc.run_callbacks :before_create
-        Save.execute(doc)
+        Save.execute(doc, validate)
         doc.run_callbacks :after_create
         return doc
       end

data/lib/mongoid/commands/delete.rb

@@ -2,13 +2,14 @@
 module Mongoid #:nodoc:
   module Commands
     class Delete
+      extend Deletion
       # Performs a delete of the supplied +Document+ without any callbacks.
       #
       # Options:
       #
       # doc: A new +Document+ that is going to be deleted.
       def self.execute(doc)
-        doc.collection.remove(:_id => doc.id)
+        delete(doc)
       end
     end
   end

data/lib/mongoid/commands/deletion.rb

@@ -0,0 +1,12 @@
+module Mongoid #:nodoc
+  module Commands #:nodoc
+    module Deletion #:nodoc
+      # If the +Document+ has a parent, delete it from the parent's attributes,
+      # otherwise delete it from it's collection.
+      def delete(doc)
+        parent = doc.parent
+        parent ? parent.remove(doc) : doc.collection.remove(:_id => doc.id)
+      end
+    end
+  end
+end

data/lib/mongoid/commands/destroy.rb

@@ -2,6 +2,7 @@
 module Mongoid #:nodoc:
   module Commands
     class Destroy
+      extend Deletion
       # Performs a destroy of the supplied +Document+, with the necessary
       # callbacks. It then deletes the record from the collection.
       #
@@ -10,7 +11,7 @@ module Mongoid #:nodoc:
       # doc: A new +Document+ that is going to be destroyed.
       def self.execute(doc)
         doc.run_callbacks :before_destroy
-        doc.collection.remove(:_id => doc.id)
+        delete(doc)
         doc.run_callbacks :after_destroy
       end
     end

data/lib/mongoid/commands/save.rb

@@ -10,8 +10,8 @@ module Mongoid #:nodoc:
       # doc: A +Document+ that is going to be persisted.
       #
       # Returns: +Document+ if validation passes, +false+ if not.
-      def self.execute(doc)
-        return false unless doc.valid?
+      def self.execute(doc, validate = true)
+        return false if validate && !doc.valid?
         doc.run_callbacks :before_save
         parent = doc.parent
         doc.new_record = false

data/lib/mongoid/document.rb

@@ -253,6 +253,15 @@ module Mongoid #:nodoc:
         @attributes = collection.find_one(:_id => id).with_indifferent_access
       end
 
+      # Remove a child document from this parent +Document+. Will reset the
+      # memoized association and notify the parent of the change.
+      def remove(child)
+        name = child.association_name
+        @attributes.remove(name, child.attributes)
+        remove_instance_variable("@#{name}")
+        notify
+      end
+
       # Return the root +Document+ in the object graph. If the current +Document+
       # is the root object in the graph it will return self.
       def root

data/lib/mongoid/extensions/hash/accessors.rb

@@ -3,6 +3,21 @@ module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Hash #:nodoc:
       module Accessors #:nodoc:
+
+        # Remove a set of attributes from a hash. If the attributes are
+        # contained in an array it will remove it from the array, otherwise it
+        # will delete the child attribute completely.
+        def remove(key, attrs)
+          elements = self[key]
+          if elements
+            key.singular? ? self[key] = nil : elements.delete(attrs)
+          end
+        end
+
+        # Inserts new attributes into the hash. If the elements are present in
+        # the hash it will update them, otherwise it will add the new
+        # attributes into the hash as either a child hash or child array of
+        # hashes.
         def insert(key, attrs)
           elements = self[key]
           if elements

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.10.4"
+  s.version = "0.10.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/create.rb",
      "lib/mongoid/commands/delete.rb",
      "lib/mongoid/commands/delete_all.rb",
+     "lib/mongoid/commands/deletion.rb",
      "lib/mongoid/commands/destroy.rb",
      "lib/mongoid/commands/destroy_all.rb",
      "lib/mongoid/commands/save.rb",

data/spec/integration/mongoid/document_spec.rb

@@ -257,6 +257,30 @@ describe Mongoid::Document do
 
     end
 
+    context "without validation" do
+
+      before do
+        @comment = Comment.new
+      end
+
+      it "always persists" do
+        @comment.save(false).should be_true
+      end
+
+    end
+
+    context "with failing validation" do
+
+      before do
+        @comment = Comment.new
+      end
+
+      it "returns false" do
+        @comment.save.should_not be_valid
+      end
+
+    end
+
   end
 
   context "when has many exists through a has one" do

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).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).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).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/delete_spec.rb

@@ -6,7 +6,7 @@ describe Mongoid::Commands::Delete do
 
     before do
       @collection = mock
-      @document = stub(:collection => @collection, :id => "1")
+      @document = stub(:collection => @collection, :id => "1", :parent => false)
     end
 
     it "removes the document from its collection" do
@@ -14,6 +14,22 @@ describe Mongoid::Commands::Delete do
       Mongoid::Commands::Delete.execute(@document)
     end
 
+    context "when the document is embedded" do
+
+      before do
+        @parent = Person.new
+        @address = Address.new(:street => "Genoa Pl")
+        @parent.addresses << @address
+      end
+
+      it "removes the document from the parent attributes" do
+        @parent.addresses.should == [@address]
+        Mongoid::Commands::Delete.execute(@address)
+        @parent.addresses.should be_empty
+      end
+
+    end
+
   end
 
 end

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

@@ -8,7 +8,8 @@ describe Mongoid::Commands::Destroy do
       @collection = stub_everything
       @document = stub(:run_callbacks => true,
                        :collection => @collection,
-                       :id => "1")
+                       :id => "1",
+                       :parent => false)
     end
 
     it "runs the before and after destroy callbacks" do
@@ -22,6 +23,22 @@ describe Mongoid::Commands::Destroy do
       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
+      end
+
+      it "removes the document from the parent attributes" do
+        @parent.addresses.should == [@address]
+        Mongoid::Commands::Destroy.execute(@address)
+        @parent.addresses.should be_empty
+      end
+
+    end
+
   end
 
 end

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

@@ -72,6 +72,18 @@ describe Mongoid::Commands::Save do
 
     end
 
+    context "when saving without validation" do
+
+      before do
+        @document.stubs(:valid?).returns(false)
+      end
+
+      it "ignores validation and returns true" do
+        Mongoid::Commands::Save.execute(@document, false).should be_true
+      end
+
+    end
+
   end
 
   context "when the document is embedded" do

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).returns(true)
+      Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
       @person.save
     end
 
@@ -38,12 +38,25 @@ describe Mongoid::Commands do
       end
 
       it "delegates to the Create command" do
-        Mongoid::Commands::Create.expects(:execute).with(@person).returns(@person)
+        Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(true)
         @person.save
       end
 
     end
 
+    context "when not validating" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "passes the validate param to the command" do
+        Mongoid::Commands::Create.expects(:execute).with(@person, false).returns(true)
+        @person.save(false)
+      end
+
+    end
+
   end
 
   describe "#save!" do
@@ -51,8 +64,8 @@ describe Mongoid::Commands do
     context "when validation passes" do
 
       it "it returns the person" do
-        Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
-        @person.save!.should == @person
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
+        @person.save!
       end
 
     end
@@ -60,7 +73,7 @@ describe Mongoid::Commands do
     context "when validation fails" do
 
       it "it raises an error" do
-        Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
         lambda { @person.save! }.should raise_error
       end
 
@@ -73,14 +86,14 @@ describe Mongoid::Commands do
       end
 
       it "delegates to the Create command" do
-        Mongoid::Commands::Create.expects(:execute).with(@person).returns(@person)
+        Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(true)
         @person.save!
       end
 
       context "when validation fails" do
 
         it "it raises an error " do
-          Mongoid::Commands::Create.expects(:execute).with(@person).returns(false)
+          Mongoid::Commands::Create.expects(:execute).with(@person, true).returns(false)
           lambda { @person.save! }.should raise_error
         end
 
@@ -93,7 +106,7 @@ describe Mongoid::Commands do
   describe "#update_attributes" do
 
     it "delegates to the Save command" do
-      Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
+      Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
       @person.update_attributes({})
     end
 
@@ -104,8 +117,8 @@ describe Mongoid::Commands do
     context "when validation passes" do
 
       it "it returns the person" do
-        Mongoid::Commands::Save.expects(:execute).with(@person).returns(@person)
-        @person.update_attributes({}).should == @person
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(true)
+        @person.update_attributes({}).should be_true
       end
 
     end
@@ -113,7 +126,7 @@ describe Mongoid::Commands do
     context "when validation fails" do
 
       it "it raises an error" do
-        Mongoid::Commands::Save.expects(:execute).with(@person).returns(false)
+        Mongoid::Commands::Save.expects(:execute).with(@person, true).returns(false)
         lambda { @person.update_attributes!({}) }.should raise_error
       end
 

data/spec/unit/mongoid/document_spec.rb

@@ -504,6 +504,40 @@ describe Mongoid::Document do
 
   end
 
+  describe "#remove" do
+
+    context "when removing an element from a has many" do
+
+      before do
+        @person = Person.new
+        @address = Address.new(:street => "Testing")
+        @person.addresses << @address
+      end
+
+      it "removes the child document attributes" do
+        @person.remove(@address)
+        @person.addresses.size.should == 0
+      end
+
+    end
+
+    context "when removing a has one" do
+
+      before do
+        @person = Person.new
+        @name = Name.new(:first_name => "Neytiri")
+        @person.name = @name
+      end
+
+      it "removes the child document attributes" do
+        @person.remove(@name)
+        @person.name.document.should be_nil
+      end
+
+    end
+
+  end
+
   describe "#root" do
 
     before do

data/spec/unit/mongoid/extensions/hash/accessors_spec.rb

@@ -2,27 +2,73 @@ require "spec_helper"
 
 describe Mongoid::Extensions::Hash::Accessors do
 
-  describe "#insert" do
+  before do
+    @hash = {
+      :_id => 1,
+      :title => "value",
+      :name => {
+        :_id => 2, :first_name => "Test", :last_name => "User"
+      },
+      :pet => {
+        :_id => 6,
+        :name => "Fido",
+        :vet_visits => [ { :date => Date.new(2007, 1, 1) } ]
+      },
+      :addresses => [
+        { :_id => 3, :street => "First Street" },
+        { :_id => 4, :street => "Second Street" }
+      ]
+    }
+  end
+
+  describe "#remove" do
+
+    context "when removing from an array" do
+
+      context "when the elements exist" do
+
+        it "removes the element from the array" do
+          @hash.remove(:addresses, { :_id => 3, :street => "First Street" })
+          @hash[:addresses].size.should == 1
+        end
+
+      end
+
+      context "when the elements do not exist" do
+
+        it "does not raise an error" do
+          @hash.remove(:aliases, { :_id => 3, :street => "First Street" })
+        end
+
+      end
 
-    before do
-      @hash = {
-        :_id => 1,
-        :title => "value",
-        :name => {
-          :_id => 2, :first_name => "Test", :last_name => "User"
-        },
-        :pet => {
-          :_id => 6,
-          :name => "Fido",
-          :vet_visits => [ { :date => Date.new(2007, 1, 1) } ]
-        },
-        :addresses => [
-          { :_id => 3, :street => "First Street" },
-          { :_id => 4, :street => "Second Street" }
-        ]
-      }
     end
 
+    context "when removing a single object" do
+
+      context "when the element exists" do
+
+        it "removes the element from the array" do
+          @hash.remove(:name, { :_id => 2, :first_name => "Test", :last_name => "User" })
+          @hash[:name].should be_nil
+        end
+
+      end
+
+      context "when the element does not exist" do
+
+        it "does not raise an error" do
+          @hash.remove(:alias, { :_id => 3, :street => "First Street" })
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "#insert" do
+
     context "when writing to a hash with a child array" do
 
       context "when child attributes not present" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Durran Jordan
@@ -113,6 +113,7 @@ files:
 - lib/mongoid/commands/create.rb
 - lib/mongoid/commands/delete.rb
 - lib/mongoid/commands/delete_all.rb
+- lib/mongoid/commands/deletion.rb
 - lib/mongoid/commands/destroy.rb
 - lib/mongoid/commands/destroy_all.rb
 - lib/mongoid/commands/save.rb