mongoid 9.0.7 → 9.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72ad16d0232a1f1c1144801896ec7322b6c452100e02e9bc5c1ba6d21e015e62
-  data.tar.gz: 5ca24809ea6498805807e80e78d347a8f2d517862d2ace0c39a73fb81918e178
+  metadata.gz: '032258516f15736f4121de82ee4cdcdb625515f653f85a66b0df613665236e4d'
+  data.tar.gz: 443ec24d9a54bb10c87023cd6304081aa48bf92bf5654044cc935f79ca954b9c
 SHA512:
-  metadata.gz: 82a45afa6174672d301145d1910eb6ef4d86433f078fd6514c22d644c101637404f5c2562e497dd3c9576935ce0f267fb3993d3493c520645a85e42799d0601f
-  data.tar.gz: d01a7d34d5b01aa5b7629b4dad7735f6c86756e86e4cbe6695301f1fe1864043041ccf4beb785bb28e48b2886d85a2c7dc4d54dddbf644a24f07b9852e15ba17
+  metadata.gz: 3c875bf631d019da208fa59221a74e3468931a802664e43ce2e8ed669e990722a499d8976a8acafb8078dbeff8c02a76df96b9d76f8e33c0c979658f40748fd9
+  data.tar.gz: 46943ea7b081db4784159bacc2056b75b6511f8c8892910dc2c2bfc7ee1229a6ddf0d9141f52137a12a04eea841c24e16b4eae7fb8fc15bd26e2dec7d0273ecc

data/lib/mongoid/association/embedded/batchable.rb

@@ -313,18 +313,19 @@ module Mongoid
         #
         # @return [ Array<Hash> ] The documents as an array of hashes.
         def pre_process_batch_insert(docs)
-          docs.map do |doc|
-            next unless doc
-            append(doc)
-            if persistable? && !_assigning?
-              self.path = doc.atomic_path unless path
-              if doc.valid?(:create)
-                doc.run_before_callbacks(:save, :create)
-              else
-                self.inserts_valid = false
+          [].tap do |results|
+            append_many(docs) do |doc|
+              if persistable? && !_assigning?
+                self.path = doc.atomic_path unless path
+                if doc.valid?(:create)
+                  doc.run_before_callbacks(:save, :create)
+                else
+                  self.inserts_valid = false
+                end
               end
+
+              results << doc.send(:as_attributes)
             end
-            doc.send(:as_attributes)
           end
         end
 

data/lib/mongoid/association/embedded/embeds_many/proxy.rb

@@ -443,6 +443,67 @@ module Mongoid
             execute_callback :after_add, document
           end
 
+          # Returns a unique id for the document, which is either
+          # its _id or its object_id.
+          def id_of(doc)
+            doc._id || doc.object_id
+          end
+
+          # Optimized version of #append that handles multiple documents
+          # in a more efficient way.
+          #
+          # @param [ Array<Document> ] documents The documents to append.
+          #
+          # @return [ EmbedsMany::Proxy ] This proxy instance.
+          def append_many(documents, &block)
+            unique_set = process_incoming_docs(documents, &block)
+
+            _unscoped.concat(unique_set)
+            _target.push(*scope(unique_set))
+            update_attributes_hash
+
+            unique_set.each { |doc| execute_callback :after_add, doc }
+
+            self
+          end
+
+          # Processes the list of documents, building a list of those
+          # that are not already in the association, and preparing
+          # each unique document to be integrated into the association.
+          #
+          # The :before_add callback is executed for each unique document
+          # as part of this step.
+          #
+          # @param [ Array<Document> ] documents The incoming documents to
+          #   process.
+          #
+          # @yield [ Document ] Optional block to call for each unique
+          #   document.
+          #
+          # @return [ Array<Document> ] The list of unique documents that
+          #   do not yet exist in the association.
+          def process_incoming_docs(documents, &block)
+            visited_docs = Set.new(_target.map { |doc| id_of(doc) })
+            next_index = _unscoped.size
+
+            documents.select do |doc|
+              next unless doc
+
+              id = id_of(doc)
+              next if visited_docs.include?(id)
+
+              execute_callback :before_add, doc
+
+              visited_docs.add(id)
+              integrate(doc)
+
+              doc._index = next_index
+              next_index += 1
+
+              block&.call(doc) || true
+            end
+          end
+
           # Instantiate the binding associated with this association.
           #
           # @example Create the binding.

data/lib/mongoid/association/nested/many.rb

@@ -190,6 +190,8 @@ module Mongoid
             update_document(doc, attrs)
             existing.push(doc) unless destroyable?(attrs)
           end
+
+          parent.children_may_have_changed!
         end
       end
     end

data/lib/mongoid/association/nested/one.rb

@@ -37,7 +37,7 @@ module Mongoid
             parent.send(association.setter, nil)
           else
             check_for_id_violation!
-          end
+          end.tap { parent.children_may_have_changed! }
         end
 
         # Create the new builder for nested attributes on one-to-one

data/lib/mongoid/association/referenced/has_many/proxy.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-# TODO: consider refactoring this Proxy class, to satisfy the following
-# cops...
-# rubocop:disable Metrics/ClassLength
 module Mongoid
   module Association
     module Referenced
@@ -588,4 +585,3 @@ module Mongoid
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/mongoid/changeable.rb

@@ -15,6 +15,14 @@ module Mongoid
       changed_attributes.keys.select { |attr| attribute_change(attr) }
     end
 
+    # Indicates that the children of this document may have changed, and
+    # ought to be checked when the document is validated.
+    #
+    # @api private
+    def children_may_have_changed!
+      @children_may_have_changed = true
+    end
+
     # Has the document changed?
     #
     # @example Has the document changed?
@@ -31,7 +39,7 @@ module Mongoid
     #
     # @return [ true | false ] If any children have changed.
     def children_changed?
-      _children.any?(&:changed?)
+      @children_may_have_changed || _children.any?(&:changed?)
     end
 
     # Get the attribute changes.
@@ -69,6 +77,7 @@ module Mongoid
       @previous_changes = changes
       @attributes_before_last_save = @previous_attributes
       @previous_attributes = attributes.dup
+      @children_may_have_changed = false
       reset_atomic_updates!
       changed_attributes.clear
     end

data/lib/mongoid/clients/sessions.rb

@@ -92,8 +92,7 @@ module Mongoid
             begin
               session.with_transaction(options) do
                 yield
-              end
-              run_commit_callbacks(session)
+              end.tap { run_commit_callbacks(session) }
             rescue *transactions_not_supported_exceptions
               raise Mongoid::Errors::TransactionsNotSupported
             rescue Mongoid::Errors::Rollback
@@ -213,8 +212,8 @@ module Mongoid
 
         # Transforms custom options for after_commit and after_rollback callbacks
         # into options for +set_callback+.
-        def set_options_for_callbacks!(args)
-          options = args.extract_options!
+        def set_options_for_callbacks!(args, enforced_options = {})
+          options = args.extract_options!.merge(enforced_options)
           args << options
 
           if options[:on]

data/lib/mongoid/config.rb

@@ -102,7 +102,7 @@ module Mongoid
     #
     #   - :immediate - Initializes a single +Concurrent::ImmediateExecutor+
     #   - :global_thread_pool - Initializes a single +Concurrent::ThreadPoolExecutor+
-    #      that uses the +async_query_concurrency+ for the +max_threads+ value.
+    #      that uses the +global_executor_concurrency+ for the +max_threads+ value.
     option :async_query_executor, default: :immediate
 
     # Defines how many asynchronous queries can be executed concurrently.

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -27,7 +27,12 @@ module Mongoid
         #   If no documents are found, then returned Hash will have
         #   count, sum of 0 and max, min, avg of nil.
         def aggregates(field)
-          result = collection.aggregate(pipeline(field), session: _session).to_a
+          result = collection.aggregate(
+                    pipeline(field),
+                    session: _session,
+                    hint: view.hint
+                  ).to_a
+
           if result.empty?
             Aggregable::EMPTY_RESULT.dup
           else

data/lib/mongoid/railties/bson_object_id_serializer.rb

@@ -33,6 +33,13 @@ module Mongoid
         def deserialize(string)
           BSON::ObjectId.from_string(string)
         end
+
+        # Returns the klass this serializer handles.
+        #
+        # @return [ BSON::ObjectId ] The class this serializer handles.
+        def klass
+          BSON::ObjectId
+        end
       end
     end
   end

data/lib/mongoid/reloadable.rb

@@ -17,6 +17,12 @@ module Mongoid
       reloaded = _reload
       check_for_deleted_document!(reloaded)
 
+      # In an instance where we create a new document, but set the ID to an existing one,
+      #   when the document is reloaded, we want to set new_record to false.
+      #   This is necessary otherwise saving will fail, as it will try to insert the document,
+      #   instead of attempting to update the existing document.
+      @new_record = false unless reloaded.nil? || reloaded.empty?
+
       reset_object!(reloaded)
 
       run_callbacks(:find) unless _find_callbacks.empty?

data/lib/mongoid/version.rb

@@ -5,5 +5,5 @@ module Mongoid
   #
   # Note that this file is automatically updated via `rake candidate:create`.
   # Manual changes to this file will be overwritten by that rake task.
-  VERSION = '9.0.7'
+  VERSION = '9.0.8'
 end

data/spec/integration/associations/embeds_many_spec.rb

@@ -3,6 +3,24 @@
 
 require 'spec_helper'
 
+module EmbedsManySpec
+  class Post
+    include Mongoid::Document
+    field :title, type: String
+    embeds_many :comments, class_name: 'EmbedsManySpec::Comment', as: :container
+    accepts_nested_attributes_for :comments
+  end
+
+  class Comment
+    include Mongoid::Document
+    field :content, type: String
+    validates :content, presence: true
+    embedded_in :container, polymorphic: true
+    embeds_many :comments, class_name: 'EmbedsManySpec::Comment', as: :container
+    accepts_nested_attributes_for :comments
+  end
+end
+
 describe 'embeds_many associations' do
 
   context 're-associating the same object' do
@@ -201,6 +219,47 @@ describe 'embeds_many associations' do
         include_examples 'persists correctly'
       end
     end
+
+    context 'including duplicates in the assignment' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      shared_examples 'persists correctly' do
+        it 'persists correctly' do
+          canvas.shapes.length.should eq 2
+          _canvas = Canvas.find(canvas.id)
+          _canvas.shapes.length.should eq 2
+        end
+      end
+
+      context 'via assignment operator' do
+        before do
+          canvas.shapes = [ canvas.shapes.first, Shape.new, canvas.shapes.first ]
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via attributes=' do
+        before do
+          canvas.attributes = { shapes: [ canvas.shapes.first, Shape.new, canvas.shapes.first ] }
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via assign_attributes' do
+        before do
+          canvas.assign_attributes(shapes: [ canvas.shapes.first, Shape.new, canvas.shapes.first ])
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+    end
   end
 
   context 'when an anonymous class defines an embeds_many association' do
@@ -217,4 +276,55 @@ describe 'embeds_many associations' do
       expect(klass.new.addresses.build).to be_a Address
     end
   end
+
+  context 'with deeply nested trees' do
+    let(:post) { EmbedsManySpec::Post.create!(title: 'Post') }
+    let(:child) { post.comments.create!(content: 'Child') }
+
+    # creating grandchild will cascade to create the other documents
+    let!(:grandchild) { child.comments.create!(content: 'Grandchild') }
+
+    let(:updated_parent_title) { 'Post Updated' }
+    let(:updated_grandchild_content) { 'Grandchild Updated' }
+
+    context 'with nested attributes' do
+      let(:attributes) do
+        {
+          title: updated_parent_title,
+          comments_attributes: [
+            {
+              # no change for comment1
+              _id: child.id,
+              comments_attributes: [
+                {
+                  _id: grandchild.id,
+                  content: updated_grandchild_content,
+                }
+              ]
+            }
+          ]
+        }
+      end
+
+      context 'when the grandchild is invalid' do
+        let(:updated_grandchild_content) { '' } # invalid value
+
+        it 'will not save the parent' do
+          expect(post.update(attributes)).to be_falsey
+          expect(post.errors).not_to be_empty
+          expect(post.reload.title).not_to eq(updated_parent_title)
+          expect(grandchild.reload.content).not_to eq(updated_grandchild_content)
+        end
+      end
+
+      context 'when the grandchild is valid' do
+        it 'will save the parent' do
+          expect(post.update(attributes)).to be_truthy
+          expect(post.errors).to be_empty
+          expect(post.reload.title).to eq(updated_parent_title)
+          expect(grandchild.reload.content).to eq(updated_grandchild_content)
+        end
+      end
+    end
+  end
 end

data/spec/integration/associations/has_and_belongs_to_many_spec.rb

@@ -23,6 +23,38 @@ module HabtmSpec
     include Mongoid::Document
     field :file, type: String
   end
+
+  class Item
+    include Mongoid::Document
+
+    field :title, type: String
+
+    has_and_belongs_to_many :colors, class_name: 'HabtmSpec::Color', inverse_of: :items
+
+    accepts_nested_attributes_for :colors
+  end
+
+  class Beam
+    include Mongoid::Document
+
+    field :name, type: String
+    validates :name, presence: true
+
+    has_and_belongs_to_many :colors, class_name: 'HabtmSpec::Color', inverse_of: :beams
+
+    accepts_nested_attributes_for :colors
+  end
+
+  class Color
+    include Mongoid::Document
+
+    field :name, type: String
+    
+    has_and_belongs_to_many :items, class_name: 'HabtmSpec::Item', inverse_of: :colors
+    has_and_belongs_to_many :beams, class_name: 'HabtmSpec::Beam', inverse_of: :colors
+
+    accepts_nested_attributes_for :items, :beams
+  end
 end
 
 describe 'has_and_belongs_to_many associations' do
@@ -59,4 +91,53 @@ describe 'has_and_belongs_to_many associations' do
       expect { image_block.save! }.not_to raise_error
     end
   end
+
+  context 'with deeply nested trees' do
+    let(:item) { HabtmSpec::Item.create!(title: 'Item') }
+    let(:beam) { HabtmSpec::Beam.create!(name: 'Beam') }
+    let!(:color) { HabtmSpec::Color.create!(name: 'Red', items: [ item ], beams: [ beam ]) }
+
+    let(:updated_item_title) { 'Item Updated' }
+    let(:updated_beam_name) { 'Beam Updated' }
+
+    context 'with nested attributes' do
+      let(:attributes) do
+        {
+          title: updated_item_title,
+          colors_attributes: [
+            {
+              # no change for color
+              _id: color.id,
+              beams_attributes: [
+                {
+                  _id: beam.id,
+                  name: updated_beam_name,
+                }
+              ]
+            }
+          ]
+        }
+      end
+
+      context 'when the beam is invalid' do
+        let(:updated_beam_name) { '' } # invalid value
+
+        it 'will not save the parent' do
+          expect(item.update(attributes)).to be_falsey
+          expect(item.errors).not_to be_empty
+          expect(item.reload.title).not_to eq(updated_item_title)
+          expect(beam.reload.name).not_to eq(updated_beam_name)
+        end
+      end
+
+      context 'when the beam is valid' do
+        it 'will save the parent' do
+          expect(item.update(attributes)).to be_truthy
+          expect(item.errors).to be_empty
+          expect(item.reload.title).to eq(updated_item_title)
+          expect(beam.reload.name).to eq(updated_beam_name)
+        end
+      end
+    end
+  end
 end

data/spec/integration/associations/has_many_spec.rb

@@ -126,4 +126,60 @@ describe 'has_many associations' do
       end
     end
   end
+
+  context 'with deeply nested trees' do
+    let(:post) { HmmPost.create!(title: 'Post') }
+    let(:child) { post.comments.create!(title: 'Child') }
+
+    # creating grandchild will cascade to create the other documents
+    let!(:grandchild) { child.comments.create!(title: 'Grandchild') }
+
+    let(:updated_parent_title) { 'Post Updated' }
+    let(:updated_grandchild_title) { 'Grandchild Updated' }
+
+    context 'with nested attributes' do
+      let(:attributes) do
+        {
+          title: updated_parent_title,
+          comments_attributes: [
+            {
+              # no change for comment1
+              _id: child.id,
+              comments_attributes: [
+                {
+                  _id: grandchild.id,
+                  title: updated_grandchild_title,
+                  num: updated_grandchild_num,
+                }
+              ]
+            }
+          ]
+        }
+      end
+
+      context 'when the grandchild is invalid' do
+        let(:updated_grandchild_num) { -1 } # invalid value
+
+        it 'will not save the parent' do
+          expect(post.update(attributes)).to be_falsey
+          expect(post.errors).not_to be_empty
+          expect(post.reload.title).not_to eq(updated_parent_title)
+          expect(grandchild.reload.title).not_to eq(updated_grandchild_title)
+          expect(grandchild.num).not_to eq(updated_grandchild_num)
+        end
+      end
+
+      context 'when the grandchild is valid' do
+        let(:updated_grandchild_num) { 1 }
+
+        it 'will save the parent' do
+          expect(post.update(attributes)).to be_truthy
+          expect(post.errors).to be_empty
+          expect(post.reload.title).to eq(updated_parent_title)
+          expect(grandchild.reload.title).to eq(updated_grandchild_title)
+          expect(grandchild.num).to eq(updated_grandchild_num)
+        end
+      end
+    end
+  end
 end

data/spec/integration/associations/has_one_spec.rb

@@ -224,7 +224,7 @@ describe 'has_one associations' do
     end
 
     context "when explicitly setting the foreign key" do
-      let(:comment2) { HomComment.new(post_id: post.id, content: "2") }
+      let(:comment2) { HomComment.new(container_id: post.id, container_type: post.class.name, content: "2") }
 
       it "persists the new comment" do
         post.comment = comment1
@@ -264,10 +264,62 @@ describe 'has_one associations' do
 
     it "does not overwrite the original value" do
       pending "MONGOID-3999"
-      p1 = comment.post
+      p1 = comment.container
       expect(p1.title).to eq("post 1")
-      comment.post = post2
+      comment.container = post2
       expect(p1.title).to eq("post 1")
     end
   end
+
+  context 'with deeply nested trees' do
+    let(:post) { HomPost.create!(title: 'Post') }
+    let(:child) { post.create_comment(content: 'Child') }
+
+    # creating grandchild will cascade to create the other documents
+    let!(:grandchild) { child.create_comment(content: 'Grandchild') }
+
+    let(:updated_parent_title) { 'Post Updated' }
+    let(:updated_grandchild_content) { 'Grandchild Updated' }
+
+    context 'with nested attributes' do
+      let(:attributes) do
+        {
+          title: updated_parent_title,
+          comment_attributes: {
+            # no change for child
+            _id: child.id,
+            comment_attributes: {
+              _id: grandchild.id,
+              content: updated_grandchild_content,
+              num: updated_grandchild_num,
+            }
+          }
+        }
+      end
+
+      context 'when the grandchild is invalid' do
+        let(:updated_grandchild_num) { -1 } # invalid value
+
+        it 'will not save the parent' do
+          expect(post.update(attributes)).to be_falsey
+          expect(post.errors).not_to be_empty
+          expect(post.reload.title).not_to eq(updated_parent_title)
+          expect(grandchild.reload.content).not_to eq(updated_grandchild_content)
+          expect(grandchild.num).not_to eq(updated_grandchild_num)
+        end
+      end
+
+      context 'when the grandchild is valid' do
+        let(:updated_grandchild_num) { 1 }
+
+        it 'will save the parent' do
+          expect(post.update(attributes)).to be_truthy
+          expect(post.errors).to be_empty
+          expect(post.reload.title).to eq(updated_parent_title)
+          expect(grandchild.reload.content).to eq(updated_grandchild_content)
+          expect(grandchild.num).to eq(updated_grandchild_num)
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/association/referenced/has_many_models.rb

@@ -96,3 +96,27 @@ class HmmAnimal
 
   belongs_to :trainer, class_name: 'HmmTrainer', scope: -> { where(name: 'Dave') }
 end
+
+class HmmPost
+  include Mongoid::Document
+
+  field :title, type: String
+
+  has_many :comments, class_name: 'HmmComment', as: :container
+
+  accepts_nested_attributes_for :comments, allow_destroy: true
+end
+
+class HmmComment
+  include Mongoid::Document
+
+  field :title, type: String
+  field :num, type: Integer, default: 0
+
+  belongs_to :container, polymorphic: true
+  has_many :comments, class_name: 'HmmComment', as: :container
+
+  accepts_nested_attributes_for :comments, allow_destroy: true
+
+  validates :num, numericality: { greater_than_or_equal_to: 0 }
+end

data/spec/mongoid/association/referenced/has_one_models.rb

@@ -102,13 +102,21 @@ class HomPost
 
   field :title, type: String
 
-  has_one :comment, inverse_of: :post, class_name: 'HomComment'
+  has_one :comment, as: :container, class_name: 'HomComment'
+
+  accepts_nested_attributes_for :comment, allow_destroy: true
 end
 
 class HomComment
   include Mongoid::Document
 
   field :content, type: String
+  field :num, type: Integer, default: 0
+
+  validates :num, numericality: { greater_than_or_equal_to: 0 }
+
+  belongs_to :container, polymorphic: true, optional: true
+  has_one :comment, as: :container, class_name: 'HomComment'
 
-  belongs_to :post, inverse_of: :comment, optional: true, class_name: 'HomPost'
+  accepts_nested_attributes_for :comment, allow_destroy: true
 end

data/spec/mongoid/clients/transactions_spec.rb

@@ -716,7 +716,7 @@ describe Mongoid::Clients::Sessions do
       require_transaction_support
 
       context 'when no error raised' do
-        before do
+        let!(:person) do
           Mongoid.transaction do
             Person.create!
           end
@@ -727,6 +727,10 @@ describe Mongoid::Clients::Sessions do
           expect(other_events.count { |e| e.command_name == 'commitTransaction'}).to be(1)
         end
 
+        it 'returns the value from the block' do
+          expect(person).to be_a(Person)
+        end
+
         it 'executes the commands inside the transaction' do
           expect(Person.count).to be(1)
         end
@@ -787,8 +791,12 @@ describe Mongoid::Clients::Sessions do
         Mongoid::Clients.with_name(:default).database.collections.each(&:drop)
         TransactionsSpecPerson.collection.create
         TransactionsSpecPersonWithOnCreate.collection.create
+        TransactionsSpecPersonWithAfterCreateCommit.collection.create
         TransactionsSpecPersonWithOnUpdate.collection.create
+        TransactionsSpecPersonWithAfterUpdateCommit.collection.create
+        TransactionsSpecPersonWithAfterSaveCommit.collection.create
         TransactionsSpecPersonWithOnDestroy.collection.create
+        TransactionsSpecPersonWithAfterDestroyCommit.collection.create
         TransactionSpecRaisesBeforeSave.collection.create
         TransactionSpecRaisesAfterSave.collection.create
       end
@@ -818,6 +826,18 @@ describe Mongoid::Clients::Sessions do
 
             it_behaves_like 'commit callbacks are called'
           end
+
+          context 'when callback is after_create_commit' do
+            let!(:subject) do
+              person = nil
+              TransactionsSpecPersonWithAfterCreateCommit.transaction do
+                person = TransactionsSpecPersonWithAfterCreateCommit.create!(name: 'James Bond')
+              end
+              person
+            end
+
+            it_behaves_like 'commit callbacks are called'
+          end
         end
 
         context 'save' do
@@ -886,6 +906,94 @@ describe Mongoid::Clients::Sessions do
               it_behaves_like 'commit callbacks are called'
             end
           end
+
+          context 'with after_update_commit callback' do
+            let(:subject) do
+              TransactionsSpecPersonWithAfterUpdateCommit.create!(name: 'James Bond').tap do |subject|
+                subject.after_commit_counter.reset
+                subject.after_rollback_counter.reset
+              end
+            end
+
+            context 'when modified once' do
+              before do
+                subject.transaction do
+                  subject.name = 'Austin Powers'
+                  subject.save!
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+
+            context 'when modified multiple times' do
+              before do
+                subject.transaction do
+                  subject.name = 'Austin Powers'
+                  subject.save!
+                  subject.name = 'Jason Bourne'
+                  subject.save!
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+          end
+
+          context 'with after_save_commit callback' do
+            let(:subject) do
+              TransactionsSpecPersonWithAfterSaveCommit.create!(name: 'James Bond').tap do |subject|
+                subject.after_commit_counter.reset
+                subject.after_rollback_counter.reset
+              end
+            end
+
+            context 'when modified once' do
+              before do
+                subject.transaction do
+                  subject.name = 'Austin Powers'
+                  subject.save!
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+
+            context 'when created' do
+              before do
+                TransactionsSpecPersonWithAfterSaveCommit.transaction do
+                  subject
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+
+            context 'when modified multiple times' do
+              before do
+                subject.transaction do
+                  subject.name = 'Austin Powers'
+                  subject.save!
+                  subject.name = 'Jason Bourne'
+                  subject.save!
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+
+            context 'when created and modified' do
+              before do
+                TransactionsSpecPersonWithAfterSaveCommit.transaction do
+                  subject
+                  subject.name = 'Jason Bourne'
+                  subject.save!
+                end
+              end
+
+              it_behaves_like 'commit callbacks are called'
+            end
+          end
         end
 
         context 'update_attributes' do
@@ -919,6 +1027,34 @@ describe Mongoid::Clients::Sessions do
 
             it_behaves_like 'commit callbacks are called'
           end
+
+          context 'when callback is after_update_commit' do
+            let(:subject) do
+              TransactionsSpecPersonWithAfterUpdateCommit.create!(name: 'Jason Bourne')
+            end
+
+            before do
+              TransactionsSpecPersonWithAfterUpdateCommit.transaction do
+                subject.update_attributes!(name: 'Foma Kiniaev')
+              end
+            end
+
+            it_behaves_like 'commit callbacks are called'
+          end
+
+          context 'when callback is after_save_commit' do
+            let(:subject) do
+              TransactionsSpecPersonWithAfterSaveCommit.create!(name: 'Jason Bourne')
+            end
+
+            before do
+              TransactionsSpecPersonWithAfterSaveCommit.transaction do
+                subject.update_attributes!(name: 'Foma Kiniaev')
+              end
+            end
+
+            it_behaves_like 'commit callbacks are called'
+          end
         end
 
         context 'destroy' do
@@ -971,6 +1107,31 @@ describe Mongoid::Clients::Sessions do
 
             it_behaves_like 'commit callbacks are called'
           end
+
+          context 'with after_destroy_commit' do
+            let(:after_commit_counter) do
+              TransactionsSpecCounter.new
+            end
+
+            let(:after_rollback_counter) do
+              TransactionsSpecCounter.new
+            end
+
+            let(:subject) do
+              TransactionsSpecPersonWithAfterDestroyCommit.create!(name: 'James Bond').tap do |p|
+                p.after_commit_counter = after_commit_counter
+                p.after_rollback_counter = after_rollback_counter
+              end
+            end
+
+            before do
+              subject.transaction do
+                subject.destroy
+              end
+            end
+
+            it_behaves_like 'commit callbacks are called'
+          end
         end
       end
 

data/spec/mongoid/clients/transactions_spec_models.rb

@@ -33,6 +33,38 @@ module TransactionsSpecCountable
   def after_rollback_counter=(new_counter)
     @after_rollback_counter = new_counter
   end
+
+  def after_save_commit_counter
+    @after_save_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_save_commit_counter=(new_counter)
+    @after_save_commit_counter = new_counter
+  end
+
+  def after_create_commit_counter
+    @after_create_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_create_commit_counter=(new_counter)
+    @after_create_commit_counter = new_counter
+  end
+
+  def after_update_commit_counter
+    @after_update_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_update_commit_counter=(new_counter)
+    @after_update_commit_counter = new_counter
+  end
+
+  def after_destroy_commit_counter
+    @after_destroy_commit_counter ||= TransactionsSpecCounter.new
+  end
+
+  def after_destroy_commit_counter=(new_counter)
+    @after_destroy_commit_counter = new_counter
+  end
 end
 
 class TransactionsSpecPerson
@@ -65,6 +97,21 @@ class TransactionsSpecPersonWithOnCreate
   end
 end
 
+class TransactionsSpecPersonWithAfterCreateCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_create_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionsSpecPersonWithOnUpdate
   include Mongoid::Document
   include TransactionsSpecCountable
@@ -80,6 +127,36 @@ class TransactionsSpecPersonWithOnUpdate
   end
 end
 
+class TransactionsSpecPersonWithAfterUpdateCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_update_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
+class TransactionsSpecPersonWithAfterSaveCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_save_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionsSpecPersonWithOnDestroy
   include Mongoid::Document
   include TransactionsSpecCountable
@@ -94,6 +171,22 @@ class TransactionsSpecPersonWithOnDestroy
     after_rollback_counter.inc
   end
 end
+
+class TransactionsSpecPersonWithAfterDestroyCommit
+  include Mongoid::Document
+  include TransactionsSpecCountable
+
+  field :name, type: String
+
+  after_destroy_commit do
+    after_commit_counter.inc
+  end
+
+  after_rollback on: :create do
+    after_rollback_counter.inc
+  end
+end
+
 class TransactionSpecRaisesBeforeSave
   include Mongoid::Document
   include TransactionsSpecCountable

data/spec/mongoid/contextual/aggregable/mongo_spec.rb

@@ -244,6 +244,39 @@ describe Mongoid::Contextual::Aggregable::Mongo do
         end
       end
     end
+
+    context 'regarding hints' do
+      let(:client) { Person.collection.client }
+      let(:subscriber) { Mrss::EventSubscriber.new }
+
+      before do
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        maybe_hint.aggregates(:age)
+      end
+
+      after do
+        client.unsubscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+
+      let(:event) { subscriber.single_command_started_event('aggregate') }
+      let(:command) { event.command }
+
+      context 'when no hint is provided' do
+        let(:maybe_hint) { Person }
+
+        it 'does not include the hint in the command' do
+          expect(command['hint']).to be_nil
+        end
+      end
+
+      context 'when a hint is provided' do
+        let(:maybe_hint) { Person.hint(age: 1) }
+
+        it 'includes the hint with the command' do
+          expect(command['hint']).to eq({ 'age' => 1 })
+        end
+      end
+    end
   end
 
   describe "#avg" do

data/spec/mongoid/reloadable_spec.rb

@@ -134,6 +134,16 @@ describe Mongoid::Reloadable do
 
           agent.title.should == '007'
         end
+
+        it 'sets new_record to false' do
+          expect(agent.new_record?).to be true
+
+          lambda do
+            agent.reload
+          end.should_not raise_error
+
+          expect(agent.new_record?).to be false
+        end
       end
     end
 
@@ -596,6 +606,20 @@ describe Mongoid::Reloadable do
           band.id.should_not == original_id
         end
       end
+
+      context 'when there is no document matching our id' do
+        let(:agent) { Agent.new(id: BSON::ObjectId.new) }
+
+        it 'does not set new_record to false' do
+          expect(agent.new_record?).to be true
+
+          lambda do
+            agent.reload
+          end.should_not raise_error
+
+          expect(agent.new_record?).to be true
+        end
+      end
     end
 
     context 'when document has referenced associations' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 9.0.7
+  version: 9.0.8
 platform: ruby
 authors:
 - The MongoDB Ruby Team
@@ -1229,7 +1229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
 test_files: