mongoid 7.6.2 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b19075685074c30826364928a28ddf7ac83dd34ce316b4519a1d211a003c3e
-  data.tar.gz: b58093fe7252f378f286f4e1051ad286e1795ebedceb6d4458b89a1f02a384c7
+  metadata.gz: f4aba01720c23aaef7cb2c1ca3045e351a3499bb80758f4ddbdf2cc15baa9cd4
+  data.tar.gz: '082d09a7a072d85b8a19f884efc7805107732a32f0e90fe953785eabfae25bb7'
 SHA512:
-  metadata.gz: 587e4d3e9116f64de81e3ef8ea8db1a1971b85745ed0c8c4884b738a2357dfb8669a05f35d5ba662f433e41644ccab38912de3ef2f0bfc6fb2f886ee26834e78
-  data.tar.gz: 48433d3580da9f35b4ea0d043a169d1015ef59a993c34619a990b79acfaf2dcdd55d880f8067e714675d0c552554fbb60c5c72d029f77ce608c92524304a5b15
+  metadata.gz: 35fedeedf4ad08f7f250600101eab0af7460e2b1c727448d0e880e418b195a18c33c8b672f2472e8291d2984d13e0781f271d8b034fab0753a80a7a76e62e6fd
+  data.tar.gz: f5da886e2b77b820c4d8928edc3c9f19d090712e17fd2efc484af0e13cd1e659dbf6f19270e4c53462779536e8b924b9cc65da3aeeed65cd98a1a5fbcb1e1649

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+��q��'g�����x�o�Z�Ɏ�5�m���X|���#
+�����7�X�!��I�eo��"�.\

data/README.md

@@ -19,9 +19,9 @@ Compatibility
 
 Mongoid supports and is tested against:
 
-- MRI 2.7 - 3.1
+- MRI 2.6 - 3.1
 - JRuby 9.3
-- MongoDB server 3.6 - 8.0
+- MongoDB server 3.6 - 6.0
 
 Issues
 ------
@@ -40,7 +40,7 @@ License
 -------
 
 Copyright (c) 2009-2016 Durran Jordan
-Copyright (c) 2015-present MongoDB, Inc.
+Copyright (c) 2015-2020 MongoDB, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require "bundler"
+require "bundler/gem_tasks"
 Bundler.setup
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__)))
@@ -10,53 +10,25 @@ $: << File.join(ROOT, 'spec/shared/lib')
 
 require "rake"
 require "rspec/core/rake_task"
+require 'mrss/spec_organizer'
 
-if File.exist?('./spec/shared/lib/tasks/candidate.rake')
-  load 'spec/shared/lib/tasks/candidate.rake'
-end
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "mongoid/version"
+
+tasks = Rake.application.instance_variable_get('@tasks')
+tasks['release:do'] = tasks.delete('release')
 
-desc 'Build the gem'
+task :gem => :build
 task :build do
-  command = %w[ gem build ]
-  command << "--output=#{ENV['GEM_FILE_NAME']}" if ENV['GEM_FILE_NAME']
-  command << (ENV['GEMSPEC'] || 'mongoid.gemspec')
-  system(*command)
+  system "gem build mongoid.gemspec"
 end
 
-# `rake version` is used by the deployment system so get the release version
-# of the product beng deployed. It must do nothing more than just print the
-# product version number.
-# 
-# See the mongodb-labs/driver-github-tools/ruby/publish Github action.
-desc "Print the current value of Mongoid::VERSION"
-task :version do
-  require 'mongoid/version'
-
-  puts Mongoid::VERSION
+task :install => :build do
+  system "sudo gem install mongoid-#{Mongoid::VERSION}.gem"
 end
 
-# overrides the default Bundler-provided `release` task, which also
-# builds the gem. Our release process assumes the gem has already
-# been built (and signed via GPG), so we just need `rake release` to
-# push the gem to rubygems.
 task :release do
-  require 'mongoid/version'
-
-  if ENV['GITHUB_ACTION'].nil?
-    abort <<~WARNING
-      `rake release` must be invoked from the `Mongoid Release` GitHub action,
-      and must not be invoked locally. This ensures the gem is properly signed
-      and distributed by the appropriate user.
-
-      Note that it is the `rubygems/release-gem@v1` step in the `Mongoid Release`
-      action that invokes this task. Do not rename or remove this task, or the
-      release-gem step will fail. Reimplement this task with caution.
-
-      mongoid-#{Mongoid::VERSION}.gem was NOT pushed to RubyGems.
-    WARNING
-  end
-
-  system 'gem', 'push', "mongoid-#{Mongoid::VERSION}.gem"
+  raise "Please use ./release.sh to release"
 end
 
 RSpec::Core::RakeTask.new("spec") do |spec|
@@ -68,46 +40,6 @@ RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-desc 'Build and validate the evergreen config'
-task eg: %w[ eg:build eg:validate ]
-
-# 'eg' == 'evergreen', but evergreen is too many letters for convenience
-namespace :eg do
-  desc 'Builds the .evergreen/config.yml file from the templates'
-  task :build do
-    ruby '.evergreen/update-evergreen-configs'
-  end
-
-  desc 'Validates the .evergreen/config.yml file'
-  task :validate do
-    system 'evergreen validate --project mongoid .evergreen/config.yml'
-  end
-
-  desc 'Updates the evergreen executable to the latest available version'
-  task :update do
-    system 'evergreen get-update --install'
-  end
-
-  desc 'Runs the current branch as an evergreen patch'
-  task :patch do
-    system 'evergreen patch --uncommitted --project mongoid --browse --auto-description --yes'
-  end
-end
-
-namespace :generate do
-  desc 'Generates a mongoid.yml from the template'
-  task :config do
-    require 'mongoid'
-    require 'erb'
-
-    template_path = 'lib/rails/generators/mongoid/config/templates/mongoid.yml'
-    database_name = ENV['DATABASE_NAME'] || 'my_db'
-
-    config = ERB.new(File.read(template_path), trim_mode: '-').result(binding)
-    File.write('mongoid.yml', config)
-  end
-end
-
 CLASSIFIERS = [
   [%r,^mongoid/attribute,, :attributes],
   [%r,^mongoid/association/[or],, :associations_referenced],
@@ -123,8 +55,6 @@ RUN_PRIORITY = %i(
 )
 
 def spec_organizer
-  require 'mrss/spec_organizer'
-
   Mrss::SpecOrganizer.new(
     root: ROOT,
     classifiers: CLASSIFIERS,
@@ -158,12 +88,18 @@ desc "Generate all documentation"
 task :docs => 'docs:yard'
 
 namespace :docs do
-  desc "Generate yard documentation"
+  desc "Generate yard documention"
   task :yard do
-    require "mongoid/version"
-
     out = File.join('yard-docs', Mongoid::VERSION)
     FileUtils.rm_rf(out)
     system "yardoc -o #{out} --title mongoid-#{Mongoid::VERSION}"
   end
 end
+
+namespace :release do
+  task :check_private_key do
+    unless File.exist?('gem-private_key.pem')
+      raise "No private key present, cannot release"
+    end
+  end
+end

data/lib/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  errors:
+    messages:
+      taken: "has already been taken"
+
   mongoid:
     errors:
       messages:
@@ -61,7 +65,7 @@ en:
             and the following ids were not found: %{missing}."
           resolution: "Search for an id that is in the database or set
             the Mongoid.raise_not_found_error configuration option to false,
-            which will cause a nil to be returned instead of raising this error when
+            which will cause nil to be returned instead of raising this error when
             searching for a single id, or only the matched documents when searching
             for multiples."
         document_with_attributes_not_found:
@@ -71,15 +75,17 @@ en:
             will be raised."
           resolution: "Search for attributes that are in the database or set
             the Mongoid.raise_not_found_error configuration option to false,
-            which will cause a nil to be returned instead of raising this error."
-        eager_load:
-          message: "Eager loading :%{name} is not supported since it is a
-            polymorphic belongs_to association."
-          summary: "Mongoid cannot currently determine the classes it needs to
-            eager load when the association is polymorphic. The parents reside in
-            different collections so a simple id lookup is not sufficient enough."
-          resolution: "Don't attempt to perform this action and have patience,
-            maybe this will be supported in the future."
+            which will cause nil to be returned instead of raising this error."
+        document_with_shard_key_not_found:
+          message: "Document not found for class %{klass} with id %{missing} and
+            shard key %{shard_key}."
+          summary: "When calling %{klass}.find with an id and a shard key, each
+            parameter must match a document in the database or this error will
+            be raised. The search was for the id: %{missing} with
+            shard_key: %{shard_key} and it was not found."
+          resolution: "Search for an id/shard key that is in the database or set
+            the Mongoid.raise_not_found_error configuration option to false,
+            which will cause nil to be returned instead of raising this error."
         empty_config_file:
           message: "Empty configuration file: %{path}."
           summary: "Your mongoid.yml configuration file appears to be empty."
@@ -99,32 +105,6 @@ en:
             A collation option is only supported if the query is executed on a MongoDB server
             with version >= 3.4."
           resolution: "Remove the collation option from the query."
-        in_memory_regexp_timeout:
-          message: "Evaluating this query in memory exceeded the %{limit} second
-            limit that applies to conditions containing a regular expression."
-          summary: "Mongoid evaluates some conditions in the calling thread
-            rather than sending them to the server: queries against an embedded
-            association, removing documents from an association by condition,
-            and Document#_matches?. A regular expression in such a condition
-            runs locally. Mongoid limits the total time one in-memory
-            evaluation may spend matching, because both the cost of a single
-            match and the number of matches performed grow with the condition,
-            and a pattern built from end-user input can be made to consume an
-            unbounded amount of CPU. The limit is cumulative over the whole
-            evaluation rather than per match. Where the Ruby in use offers no
-            per-Regexp timeout the limit is enforced as wall clock over the
-            whole in-memory evaluation, so there it can be exceeded by a large
-            scan even when the pattern itself is cheap."
-          resolution: "Check whether the pattern in this query comes from user
-            input; if it does, validate it before querying. If the query is
-            legitimate and simply large, raise
-            Mongoid::Config.in_memory_regexp_time_limit, or set it to nil to
-            remove the limit entirely. The limit in force is the smaller of
-            that setting and any global Regexp.timeout the application has set,
-            so check both. On JRuby, and on MRI before 3.2, there is no
-            per-Regexp timeout, so what the limit bounds there is the elapsed
-            time of the whole in-memory evaluation rather than the time spent
-            matching."
         invalid_config_file:
           message: "Invalid configuration file: %{path}."
           summary: "Your mongoid.yml configuration file does not contain the
@@ -152,6 +132,17 @@ en:
             allowed."
           resolution: "Try setting the discriminator key on %{superclass} or one of %{class_name}'s
             ancestors."
+        invalid_dot_dollar_assignment:
+          message: "Cannot set the %{attr} attribute on the %{klass} class."
+          summary: "Calling the setters for fields that start with a dollar
+            sign ($) or contain a dot/period (.) is prohibited. See the
+            Mongoid documentation on Field Names with Dots/Periods (.) and
+            Dollar Signs ($) for more information."
+          resolution: "In order to set fields that start with a dollar
+            sign ($) or contain a dot/period (.), the aggregation pipeline can
+            be used. MongoDB provides specific operators for working with these
+            fields. Refer to the MongoDB documentation here:
+            https://www.mongodb.com/docs/manual/core/dot-dollar-considerations/"
         invalid_elem_match_operator:
           message: "Invalid $elemMatch operator '%{operator}'."
           summary: "You misspelled an operator or are using an operator that
@@ -172,7 +163,7 @@ en:
           resolution: "Valid expression operators are: %{valid_operators}.
             Ensure you are using one of these operators."
         invalid_field:
-          message: "Defining a field named '%{name}' is not allowed."
+          message: "Defining a field named '%{field}' is not allowed."
           summary: "Defining this field would override the method '%{name}',
             which would cause issues with expectations around the original
             method and cause extremely hard to debug issues. The original
@@ -207,6 +198,13 @@ en:
             \_\_end\n\n
             Refer to:
             https://docs.mongodb.com/mongoid/current/reference/fields/#custom-field-options"
+        invalid_field_type:
+          message: "Invalid field type %{type_inspection} for field '%{field}' on model '%{klass}'."
+          summary: "Model '%{klass}' defines a field '%{field}' with an unknown type value
+            %{type_inspection}."
+          resolution: "Please provide a valid type value for the field.
+            Refer to:
+            https://docs.mongodb.com/mongoid/current/reference/fields/#using-symbols-or-strings-instead-of-classes"
         invalid_includes:
           message: "Invalid includes directive: %{klass}.includes(%{args})"
           summary: "Eager loading in Mongoid only supports providing arguments
@@ -222,7 +220,6 @@ en:
             Valid options are:\n
             \_\_background: true|false\n
             \_\_database: 'database_name'\n
-            \_\_drop_dups: true|false\n
             \_\_name: 'index_name'\n
             \_\_sparse: true|false\n
             \_\_unique: true|false\n
@@ -241,7 +238,7 @@ en:
             \_\_language_override\n
             \_\_default_language\n
             \_\_collation\n
-            Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack', 'text', 'hashed'\n\n
+            Valid types are: 1, -1, '2d', '2dsphere', 'geoHaystack (deprecated)', 'text', 'hashed'\n\n
             Example:\n
             \_\_class Band\n
             \_\_\_\_include Mongoid::Document\n
@@ -375,10 +372,6 @@ en:
             from the child side which association to go in."
           resolution: "Set the values from the parent, or redefine the association
             with only a single definition in the parent."
-        invalid_value:
-          message: "Value of type %{value_class} cannot be written to a field of type %{field_class}"
-          summary: "Tried to set a value of type %{value_class} to a field of type %{field_class}"
-          resolution: "Verify if the value to be set correspond to field definition"
         mixed_relations:
           message: "Referencing a(n) %{embedded} document from the %{root}
             document via a non-embedded association is not allowed since the
@@ -435,19 +428,18 @@ en:
           summary: "Mongoid attempted to find a document of the class %{klass}
             but none exist."
           resolution: "Create a document of class %{klass} or use a finder
-            method that returns nil when no documents are found instead of
-            raising an exception."
+            method that does not raise an exception when no documents are
+            found."
         no_environment:
           message: "Could not load the configuration since no environment
             was defined."
-          summary: "Mongoid attempted to find the appropriate environment
-            but no Rails.env, Sinatra::Base.environment, RACK_ENV, or
-            MONGOID_ENV could be found."
-          resolution: "Make sure some environment is set from the mentioned
-            options. Mongoid cannot load configuration from the yaml without
-            knowing which environment it is in, and we have considered
-            defaulting to development an undesirable side effect of this not
-            being defined."
+          summary: "Mongoid could not determine the environment to use because
+            it was not specified in any of the following locations:
+            Rails.env, Sinatra::Base.environment,
+            ENV[\"RACK_ENV\"], ENV[\"MONGOID_ENV\"]. Without knowing the
+            environment, Mongoid cannot load its configuration."
+          resolution: "Please ensure an environment is set in one of the
+            listed locations. The environment must be explicitly set."
         no_map_reduce_output:
           message: "No output location was specified for the map/reduce
             operation."
@@ -574,11 +566,9 @@ en:
             server versions 3.6 and higher."
           resolution: "Verify that all servers in your deployment are at least
             version 3.6 or don't attempt to use sessions with older server versions."
-        taken:
-          "is already taken"
         too_many_nested_attribute_records:
           message: "Accepting nested attributes for %{association} is limited
-            to %{limit} records."
+            to %{limit} documents."
           summary: "More documents were sent to be processed than the allowed
             limit."
           resolution: "The limit is set as an option to the macro, for example:

data/lib/mongoid/association/accessors.rb

@@ -42,8 +42,23 @@ module Mongoid
       # @return [ Proxy ] The association.
       def create_relation(object, association, selected_fields = nil)
         type = @attributes[association.inverse_type]
-        target = association.build(self, object, type, selected_fields)
-        target ? association.create_relation(self, target) : nil
+        target = if t = association.build(self, object, type, selected_fields)
+          association.create_relation(self, t)
+        else
+          nil
+        end
+
+        # Only need to do this on embedded associations. The pending callbacks
+        # are only added when materializing the documents, which only happens
+        # on embedded associations. There is no call to the database in the
+        # construction of a referenced association.
+        if association.embedded?
+          Array(target).each do |doc|
+            doc.try(:run_pending_callbacks)
+          end
+        end
+
+        target
       end
 
       # Resets the criteria inside the association proxy. Used by many-to-many
@@ -90,6 +105,19 @@ module Mongoid
       #
       # @return [ Proxy ] The association.
       def get_relation(name, association, object, reload = false)
+        field_name = database_field_name(name)
+
+        # As per the comments under MONGOID-5034, I've decided to only raise on
+        # embedded associations for a missing attribute. Rails does not raise
+        # for a missing attribute on referenced associations.
+        # We also don't want to raise if we're retrieving an association within
+        # the codebase. This is often done when retrieving the inverse association
+        # during binding or when cascading callbacks. Whenever we retrieve
+        # associations within the codebase, we use without_autobuild.
+        if !without_autobuild? && association.embedded? && attribute_missing?(field_name)
+          raise ActiveModel::MissingAttributeError, "Missing attribute: '#{field_name}'"
+        end
+
         if !reload && (value = ivar(name)) != false
           value
         else
@@ -291,7 +319,7 @@ module Mongoid
         ids_method = "#{association.name.to_s.singularize}_ids"
         association.inverse_class.tap do |klass|
           klass.re_define_method(ids_method) do
-            send(association.name).only(:_id).map(&:_id)
+            send(association.name).pluck(:_id)
           end
         end
       end
@@ -341,6 +369,7 @@ module Mongoid
       #  @return [ Class ] The class being set up.
       def self.define_ids_setter!(association)
         ids_method = "#{association.name.to_s.singularize}_ids="
+        association.inverse_class.aliased_associations[ids_method.chop] = association.name.to_s
         association.inverse_class.tap do |klass|
           klass.re_define_method(ids_method) do |ids|
             send(association.setter, association.relation_class.find(ids.reject(&:blank?)))

data/lib/mongoid/association/bindable.rb

@@ -60,6 +60,53 @@ module Mongoid
         end
       end
 
+      # Remove the associated document from the inverse's association.
+      #
+      # @param [ Document ] doc The document to remove.
+      def remove_associated(doc)
+        if inverse = _association.inverse(doc)
+          if _association.many?
+            remove_associated_many(doc, inverse)
+          elsif _association.in_to?
+            remove_associated_in_to(doc, inverse)
+          end
+        end
+      end
+
+      # Remove the associated document from the inverse's association.
+      #
+      # This method removes the associated on *_many relationships.
+      #
+      # @param [ Document ] doc The document to remove.
+      # @param [ Symbol ] inverse The name of the inverse.
+      def remove_associated_many(doc, inverse)
+        # We only want to remove the inverse association when the inverse
+        # document is in memory.
+        if inv = doc.ivar(inverse)
+          # This first condition is needed because when assigning the
+          # embeds_many association using the same embeds_many
+          # association, we delete from the array we are about to assign.
+          if _base != inv && (associated = inv.ivar(_association.name))
+            associated.delete(doc)
+          end
+        end
+      end
+
+      # Remove the associated document from the inverse's association.
+      #
+      # This method removes associated on belongs_to and embedded_in
+      # associations.
+      #
+      # @param [ Document ] doc The document to remove.
+      # @param [ Symbol ] inverse The name of the inverse.
+      def remove_associated_in_to(doc, inverse)
+        # We only want to remove the inverse association when the inverse
+        # document is in memory.
+        if associated = doc.ivar(inverse)
+          associated.send(_association.setter, nil)
+        end
+      end
+
       # Set the id of the related document in the foreign key field on the
       # keyed document.
       #
@@ -134,6 +181,7 @@ module Mongoid
       # @param [ Document ] doc The document to bind.
       def bind_from_relational_parent(doc)
         check_inverse!(doc)
+        remove_associated(doc)
         bind_foreign_key(doc, record_id(_base))
         bind_polymorphic_type(doc, _base.class.name)
         bind_inverse(doc, _base)

data/lib/mongoid/association/builders.rb

@@ -46,9 +46,10 @@ module Mongoid
         association.inverse_class.tap do |klass|
           klass.re_define_method("build_#{association.name}") do |*args|
             attributes, _options = parse_args(*args)
-            document = Factory.build(association.relation_class, attributes)
+            document = Factory.execute_build(association.relation_class, attributes, execute_callbacks: false)
             _building do
               child = send("#{association.name}=", document)
+              child.run_pending_callbacks
               child.run_callbacks(:build)
               child
             end
@@ -69,10 +70,11 @@ module Mongoid
         association.inverse_class.tap do |klass|
           klass.re_define_method("create_#{association.name}") do |*args|
             attributes, _options = parse_args(*args)
-            document = Factory.build(association.relation_class, attributes)
+            document = Factory.execute_build(association.relation_class, attributes, execute_callbacks: false)
             doc = _assigning do
               send("#{association.name}=", document)
             end
+            doc.run_pending_callbacks
             doc.save
             save if new_record? && association.stores_foreign_key?
             doc

data/lib/mongoid/association/depending.rb

@@ -11,15 +11,11 @@ module Mongoid
       included do
         class_attribute :dependents
 
-        # Note the leading underscore: without it, ActiveSupport's
-        # class_attribute would generate a helper method for this attribute
-        # that collides with one it generates for :dependents.
-        #
         # @api private
-        class_attribute :_dependents_owner
+        class_attribute :dependents_owner
 
         self.dependents = []
-        self._dependents_owner = self
+        self.dependents_owner = self
       end
 
       class_methods do
@@ -54,9 +50,9 @@ module Mongoid
       def self.define_dependency!(association)
         validate!(association)
         association.inverse_class.tap do |klass|
-          if klass._dependents_owner != klass
+          if klass.dependents_owner != klass
             klass.dependents = []
-            klass._dependents_owner = klass
+            klass.dependents_owner = klass
           end
 
           if association.dependent && !klass.dependents.include?(association)

data/lib/mongoid/association/eager_loadable.rb

@@ -20,13 +20,35 @@ module Mongoid
         end
       end
 
-      def preload(relations, docs)
-        relations.group_by(&:inverse_class_name)
-            .values
-            .each do |associations|
-          associations.group_by(&:relation)
-              .each do |relation, association|
-            relation.eager_loader(association, docs).run
+      # Load the associations for the given documents. This will be done
+      # recursively to load the associations of the given documents'
+      # subdocuments.
+      #
+      # @param [ Array<Association> ] associations The associations to load.
+      # @param [ Array<Document> ] document The documents.
+      def preload(associations, docs)
+        assoc_map = associations.group_by(&:inverse_class_name)
+        docs_map = {}
+        queue = [ klass.to_s ]
+
+        while klass = queue.shift
+          if as = assoc_map.delete(klass)
+            as.each do |assoc|
+              queue << assoc.class_name
+
+              # If this class is nested in the inclusion tree, only load documents
+              # for the association above it. If there is no parent association,
+              # we will include documents from the documents passed to this method.
+              ds = docs
+              if assoc.parent_inclusions.length > 0
+                ds = assoc.parent_inclusions.map{ |p| docs_map[p].to_a }.flatten
+              end
+
+              res = assoc.relation.eager_loader([assoc], ds).run
+
+              docs_map[assoc.name] ||= [].to_set
+              docs_map[assoc.name].merge(res)
+            end
           end
         end
       end

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

@@ -50,7 +50,7 @@ module Mongoid
           _unscoped.clear
         end
 
-        # Batch remove the provided documents as a $pullAll.
+        # Batch remove the provided documents as a $pullAll or $pull.
         #
         # @example Batch remove the documents.
         #   batchable.batch_remove([ doc_one, doc_two ])
@@ -58,13 +58,36 @@ module Mongoid
         # @param [ Array<Document> ] docs The docs to remove.
         # @param [ Symbol ] method Delete or destroy.
         def batch_remove(docs, method = :delete)
+          # If the _id is nil, we cannot use $pull and delete by searching for
+          # the id. Therefore we have to use pullAll with the documents'
+          # attributes.
           removals = pre_process_batch_remove(docs, method)
+          pulls, pull_alls = removals.partition { |o| !o["_id"].nil? }
+
+          if !_base.persisted?
+            post_process_batch_remove(docs, method) unless docs.empty?
+            return reindex
+          end
+
           if !docs.empty?
-            collection.find(selector).update_one(
-                positionally(selector, "$pullAll" => { path => removals }),
+            if !pulls.empty?
+              collection.find(selector).update_one(
+                positionally(selector, "$pull" => { path => { "_id" => { "$in" => pulls.pluck("_id") } } }),
                 session: _session
-            )
+              )
+            end
+            if !pull_alls.empty?
+              collection.find(selector).update_one(
+                positionally(selector, "$pullAll" => { path => pull_alls }),
+                session: _session
+              )
+            end
             post_process_batch_remove(docs, method)
+          else
+            collection.find(selector).update_one(
+              positionally(selector, "$set" => { path => [] }),
+              session: _session
+            )
           end
           reindex
         end
@@ -90,7 +113,7 @@ module Mongoid
               batch_remove(_target.dup)
             end
           elsif _target != docs
-            _base.delayed_atomic_sets.clear unless _assigning?
+            _base.delayed_atomic_sets.delete(path) unless _assigning?
             docs = normalize_docs(docs).compact
             _target.clear and _unscoped.clear
             _base.delayed_atomic_unsets.delete(path)