Prevent child double push when after_create callbacks save again. [ fix…

… #2331 ]

CHANGELOG.md

@@ -110,6 +110,9 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#2331 Don't double push child documents when extra saves are called in an
+  after_create callback.
+
 ## 3.0.6
 
 ### Resolved Issues

lib/mongoid/hierarchy.rb

@@ -44,6 +44,20 @@ def collect_children
       children
     end
 
+    # Marks all children as being persisted.
+    #
+    # @example Flag all the children.
+    #   document.flag_children_persisted
+    #
+    # @return [ Array<Document> ] The flagged children.
+    #
+    # @since 3.0.7
+    def flag_children_persisted
+      _children.each do |child|
+        child.new_record = false
+      end
+    end
+
     # Determines if the document is a subclass of another document.
     #
     # @example Check if the document is a subclass

lib/mongoid/persistence/insertion.rb

@@ -24,6 +24,7 @@ def prepare(&block)
             document.run_callbacks(:create) do
               yield(document)
               document.new_record = false
+              document.flag_children_persisted
               true
             end
           end

spec/app/models/server.rb

@@ -1,8 +1,13 @@
 class Server
   include Mongoid::Document
   field :name, type: String
+  field :after, type: Boolean, default: false
   belongs_to :node
   embeds_many :filesystems, validate: false
   accepts_nested_attributes_for :filesystems
   validates :name, presence: { allow_blank: false }
+
+  after_create do |server|
+    server.update_attribute(:after, !after)
+  end
 end

spec/mongoid/relations/embedded/many_spec.rb

@@ -3677,4 +3677,26 @@ class TrackingIdValidationHistory
       end
     end
   end
+
+  context "when saving at the parent level" do
+
+    let!(:server) do
+      Server.new(name: "staging")
+    end
+
+    let!(:filesystem) do
+      server.filesystems.build
+    end
+
+    context "when the parent has an after create callback" do
+
+      before do
+        server.save
+      end
+
+      it "does not push the embedded documents twice" do
+        server.reload.filesystems.count.should eq(1)
+      end
+    end
+  end
 end