mongoid 1.2.12 → 1.2.13

data/VERSION

@@ -1 +1 @@
-1.2.12
+1.2.13

data/lib/mongoid.rb

@@ -61,6 +61,7 @@ require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"
 require "mongoid/scope"
+require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/versioning"
 require "mongoid/components"

data/lib/mongoid/commands/delete.rb

@@ -9,7 +9,7 @@ module Mongoid #:nodoc:
       #
       # doc: A new +Document+ that is going to be deleted.
       def self.execute(doc)
-        delete(doc)
+        doc.destroyed = true if delete(doc)
       end
     end
   end

data/lib/mongoid/commands/destroy.rb

@@ -11,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
-        delete(doc)
+        doc.destroyed = true if delete(doc)
         doc.run_callbacks :after_destroy
       end
     end

data/lib/mongoid/components.rb

@@ -14,6 +14,7 @@ module Mongoid #:nodoc
         include Mongoid::Indexes
         include Mongoid::Matchers
         include Mongoid::Memoization
+        include Mongoid::State
         include Observable
         include Validatable
         extend Mongoid::Finders

data/lib/mongoid/document.rb

@@ -175,23 +175,6 @@ module Mongoid #:nodoc:
         "#<#{self.class.name} _id: #{id}, #{attrs}>"
       end
 
-      # Returns true is the +Document+ has not been persisted to the database,
-      # false if it has. This is determined by the variable @new_record
-      # and NOT if the object has an id.
-      def new_record?
-        @new_record == true
-      end
-
-      # Sets the new_record boolean - used after document is saved.
-      def new_record=(saved)
-        @new_record = saved
-      end
-
-      # Checks if the document has been saved to the database.
-      def persisted?
-        !new_record?
-      end
-
       # Set the changed state of the +Document+ then notify observers that it has changed.
       #
       # Example:

data/lib/mongoid/state.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module State #:nodoc:
+    # Returns true if the +Document+ has not been persisted to the database,
+    # false if it has. This is determined by the variable @new_record
+    # and NOT if the object has an id.
+    def new_record?
+      @new_record == true
+    end
+
+    # Sets the new_record boolean - used after document is saved.
+    def new_record=(saved)
+      @new_record = saved
+    end
+
+    # Checks if the document has been saved to the database.
+    def persisted?
+      !new_record?
+    end
+
+    # Returns true if the +Document+ has been succesfully destroyed, and false if it hasn't.
+    # This is determined by the variable @destroyed and NOT by checking the database.
+    def destroyed?
+      @destroyed == true
+    end
+
+    # Sets the destroyed boolean - used after document is destroyed.
+    def destroyed=(destroyed)
+      @destroyed = destroyed && true
+    end
+  end
+end

data/mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.2.12"
+  s.version = "1.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
@@ -114,6 +114,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/memoization.rb",
      "lib/mongoid/named_scope.rb",
      "lib/mongoid/scope.rb",
+     "lib/mongoid/state.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
      "mongoid.gemspec",
@@ -232,6 +233,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
+     "spec/unit/mongoid/state_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
      "spec/unit/mongoid_spec.rb"
@@ -355,6 +357,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
      "spec/unit/mongoid/scope_spec.rb",
+     "spec/unit/mongoid/state_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
      "spec/unit/mongoid_spec.rb"

data/spec/integration/mongoid/document_spec.rb

@@ -121,6 +121,12 @@ describe Mongoid::Document do
         lambda { Person.find(@person.id) }.should raise_error
       end
 
+      it "marks the document as destroyed" do
+        @person.should_not be_destroyed
+        @person.destroy
+        @person.should be_destroyed
+      end
+
     end
 
     context "on an embedded document" do

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

@@ -14,6 +14,12 @@ 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
@@ -27,9 +33,6 @@ 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_spec.rb

@@ -23,6 +23,12 @@ describe Mongoid::Commands::Destroy do
       Mongoid::Commands::Destroy.execute(@document)
     end
 
+    it "sets the destroy flag on the document" do
+      @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
@@ -39,9 +45,6 @@ describe Mongoid::Commands::Destroy do
         Mongoid::Commands::Destroy.execute(@address)
         @parent.addresses.should be_empty
       end
-
     end
-
   end
-
 end

data/spec/unit/mongoid/document_spec.rb

@@ -471,45 +471,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#new_record?" do
-
-    context "when the object has been saved" do
-
-      before do
-        @person = Person.new(:_id => "1")
-      end
-
-      it "returns false" do
-        @person.new_record?.should be_false
-      end
-
-    end
-
-    context "when the object has not been saved" do
-
-      before do
-        @person = Person.new
-      end
-
-      it "returns true" do
-        @person.new_record?.should be_true
-      end
-
-    end
-
-  end
-
-  describe "#persisted?" do
-
-    before do
-      @person = Person.new
-    end
-
-    it "delegates to new_record?" do
-      @person.persisted?.should be_false
-    end
-  end
-
   describe "#_parent" do
 
     before do
@@ -600,9 +561,7 @@ describe Mongoid::Document do
         @person.remove(@name)
         @person.name.should be_nil
       end
-
     end
-
   end
 
   describe "#_root" do
@@ -620,7 +579,6 @@ describe Mongoid::Document do
       it "returns self" do
         @person._root.should == @person
       end
-
     end
 
     context "when document is embedded one level" do
@@ -628,7 +586,6 @@ describe Mongoid::Document do
       it "returns the parent" do
         @phone_number._root.should == @person
       end
-
     end
 
     context "when document is embedded multiple levels" do
@@ -636,9 +593,7 @@ describe Mongoid::Document do
       it "returns the top level parent" do
         @country_code._root.should == @person
       end
-
     end
-
   end
 
   describe ".store_in" do

data/spec/unit/mongoid/state_spec.rb

@@ -0,0 +1,83 @@
+require "spec_helper"
+
+describe Mongoid::State do
+
+  describe "#new_record?" do
+
+    context "when the object has been saved" do
+
+      before do
+        @person = Person.new(:_id => "1")
+      end
+
+      it "returns false" do
+        @person.new_record?.should be_false
+      end
+
+    end
+
+    context "when the object has not been saved" do
+
+      before do
+        @person = Person.new
+      end
+
+      it "returns true" do
+        @person.new_record?.should be_true
+      end
+
+    end
+
+  end
+
+  describe "#persisted?" do
+
+    before do
+      @person = Person.new
+    end
+
+    it "delegates to new_record?" do
+      @person.persisted?.should be_false
+    end
+  end
+
+  describe "destroyed?" do
+
+    before do
+      @person = Person.new
+    end
+
+    context "when destroyed is true" do
+
+      before do
+        @person.destroyed = true
+      end
+
+      it "returns true" do
+        @person.destroyed?.should be_true
+      end
+    end
+
+    context "when destroyed is false" do
+
+      before do
+        @person.destroyed = false
+      end
+
+      it "returns true" do
+        @person.destroyed?.should be_false
+      end
+    end
+
+    context "when destroyed is nil" do
+
+      before do
+        @person.destroyed = nil
+      end
+
+      it "returns false" do
+        @person.destroyed?.should be_false
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 12
-  version: 1.2.12
+  - 13
+  version: 1.2.13
 platform: ruby
 authors: 
 - Durran Jordan
@@ -208,6 +208,7 @@ files:
 - lib/mongoid/memoization.rb
 - lib/mongoid/named_scope.rb
 - lib/mongoid/scope.rb
+- lib/mongoid/state.rb
 - lib/mongoid/timestamps.rb
 - lib/mongoid/versioning.rb
 - mongoid.gemspec
@@ -326,6 +327,7 @@ files:
 - spec/unit/mongoid/memoization_spec.rb
 - spec/unit/mongoid/named_scope_spec.rb
 - spec/unit/mongoid/scope_spec.rb
+- spec/unit/mongoid/state_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 - spec/unit/mongoid_spec.rb
@@ -473,6 +475,7 @@ test_files:
 - spec/unit/mongoid/memoization_spec.rb
 - spec/unit/mongoid/named_scope_spec.rb
 - spec/unit/mongoid/scope_spec.rb
+- spec/unit/mongoid/state_spec.rb
 - spec/unit/mongoid/timestamps_spec.rb
 - spec/unit/mongoid/versioning_spec.rb
 - spec/unit/mongoid_spec.rb