mongoid 8.0.13 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9945b53ebb2236e5b44ef4cfead09b790b3b00881f62dba5c7007c1d99fdcba
-  data.tar.gz: f092a211395767e35a20bd2492e9c9be56c3bc53721bb6e8b437c0ef4d4c3111
+  metadata.gz: 1f5f0b81e26dba41d786804bd1213f2c05c4594ca9e05d0f62417fc15da6532e
+  data.tar.gz: c44f03a981d2fc648822718522e2ee7e8db6fa3fec01764eb09d77a4183a3559
 SHA512:
-  metadata.gz: 7fa47f5a3a012f20238d7813bc173c3a22b0f96e493bb391fc5d5d4cb5ffc37d50bd27959f2fa871f11b402ef739d43ab3ff044a7cd256ef4531b340bf1f882d
-  data.tar.gz: 8bf1abb2f757cb18b92ccfae1214a7d19c6d6331e2ed30a4a39068eab365e8cf4cd0fc017810029106a4823ddb8a8a416a63de4faa334332e012f403167b7351
+  metadata.gz: bafd2e708f204e23b0e277df74f897d19a83f059eb34bff3b636231f6e76a83176a45ea1b49586bff52c44bc3a526bd0d988cec3441bc469514035ad0acc7272
+  data.tar.gz: 59e6b77e3e03d94cb82fd2aad20c3951cbcc9f0872138ae76f6837986aad641cce339d5d51b8122047b5732266883708f847a7bd23c0ed2fe7bf8e19e834e045

data/CHANGELOG.md

@@ -63,7 +63,7 @@ For instructions on upgrading to newer versions, visit
 
 * Mongoid now uses the official Mongo Ruby Driver 2.x instead of Moped.
 
-* Most driver specific configuration options have changed, please see [here](http://docs.mongodb.org/ecosystem/tutorial/ruby-driver-tutorial/#ruby-options) for the new options.
+* Most driver specific configuration options have changed, please see [here](https://www.mongodb.com/docs/ecosystem/tutorial/ruby-driver-tutorial/#ruby-options) for the new options.
 
 * All references to `session` are now replaced with `client`. This includes the mongoid.yml configuration, `store_in` options, and all exceptions and modules with `Session` in the name.
 
@@ -872,8 +872,8 @@ child elements.
   handling of validations. (Gerad Suyderhoud)
 
 * \#2443 `expire_after_seconds` is now a valid index option
-  (http://docs.mongodb.org/manual/core/indexes/#ttl-indexes,
-   http://docs.mongodb.org/manual/tutorial/expire-data/).
+  (https://www.mongodb.com/docs/manual/core/indexes/#ttl-indexes,
+   https://www.mongodb.com/docs/manual/tutorial/expire-data/).
 
         class Event
           include Mongoid::Document

data/README.md

@@ -8,11 +8,11 @@ Mongoid is an ODM (Object-Document Mapper) framework for MongoDB in Ruby.
 Documentation
 -------------
 
-Mongoid has [extensive user documentation](https://docs.mongodb.com/mongoid/current/).
-[API documentation](https://docs.mongodb.com/mongoid/current/api/) is also available.
+Mongoid has [extensive user documentation](https://www.mongodb.com/docs/mongoid/current/).
+[API documentation](https://www.mongodb.com/docs/mongoid/current/api/) is also available.
 
 Mongoid is built on top of the MongoDB Ruby driver which has
-[its own user documentation](https://docs.mongodb.com/ruby-driver/current/).
+[its own user documentation](https://www.mongodb.com/docs/ruby-driver/current/).
 
 Compatibility
 -------------

data/Rakefile

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler"
+require "bundler/gem_tasks"
 Bundler.setup
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__)))
@@ -9,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|
@@ -82,8 +55,6 @@ RUN_PRIORITY = %i(
 )
 
 def spec_organizer
-  require 'mrss/spec_organizer'
-
   Mrss::SpecOrganizer.new(
     root: ROOT,
     classifiers: CLASSIFIERS,
@@ -119,36 +90,16 @@ task :docs => 'docs:yard'
 namespace :docs do
   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
 
-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'
+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

@@ -31,6 +31,17 @@ en:
             since the document did not actually get saved."
           resolution: "Double check all before callbacks to make sure they are
             not unintentionally returning false."
+        create_collection_failure:
+          message: "Cannot create collection %{collection_name}
+            with options %{collection_options}. The following error was raised:
+            %{error}."
+          summary: "The server rejected createCollection command with given collection
+            options. This may happen when some of the options are invalid, or not
+            supported by your version of the server."
+          resolution: "Double check that collection options for the collection
+            %{collection_name} are valid. Consult with Ruby driver documentation
+            and MongoDB documentation if the desired options are supported by
+            your version of the server."
         criteria_argument_required:
           message: "Calling Criteria methods with nil arguments is not allowed."
           summary: "Arguments to Criteria methods cannot be nil, and most
@@ -86,11 +97,24 @@ en:
           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."
+        drop_collection_failure:
+          message: "Cannot drop collection %{collection_name}."
+          summary: "Mongoid tried to drop collection %{collection_name}, but the
+            collection still exists in the database."
+          resolution: "Try to drop the collection manually using Ruby driver or
+            mongo shell."
         empty_config_file:
           message: "Empty configuration file: %{path}."
           summary: "Your mongoid.yml configuration file appears to be empty."
           resolution: "Ensure your configuration file contains the correct contents.
-            Refer to: https://docs.mongodb.com/mongoid/current/reference/configuration/"
+            Refer to: https://www.mongodb.com/docs/mongoid/current/reference/configuration/"
+        immutable_attribute:
+          message: "Attempted to change the immutable attribute '%{name}' with
+            the value: %{value}."
+          summary: "Immutable attributes can only have values set when the
+            document is a new record."
+          resolution: "Do not attempt to update the value of '%{name}' after
+            the document is persisted."
         invalid_collection:
           message: "Access to the collection for %{klass} is not allowed."
           summary: "%{klass}.collection was called, and %{klass} is an embedded
@@ -105,38 +129,20 @@ 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_async_query_executor:
+          message: "Invalid async_query_executor option: %{executor}."
+          summary: "A invalid async query executor was specified.
+            The valid options are: %{options}."
+          resolution: "Pick an allowed option or fix the typo. If you were
+            expecting the option to be there, please consult the following page
+            with respect to Mongoid's configuration:\n\n
+            \_\_https://www.mongodb.com/docs/mongoid/current/reference/configuration/#mongoid-configuration-options"
         invalid_config_file:
           message: "Invalid configuration file: %{path}."
           summary: "Your mongoid.yml configuration file does not contain the
             correct file structure."
           resolution: "Ensure your configuration file contains the correct contents.
-            Refer to: https://docs.mongodb.com/mongoid/current/reference/configuration/"
+            Refer to: https://www.mongodb.com/docs/mongoid/current/reference/configuration/"
         invalid_config_option:
           message: "Invalid configuration option: %{name}."
           summary: "A invalid configuration option was provided in your
@@ -223,14 +229,21 @@ en:
             \_\_\_\_field :%{name}, %{option}: true\n
             \_\_end\n\n
             Refer to:
-            https://docs.mongodb.com/mongoid/current/reference/fields/#custom-field-options"
+            https://www.mongodb.com/docs/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"
+            https://www.mongodb.com/docs/mongoid/current/reference/fields/#using-symbols-or-strings-instead-of-classes"
+        invalid_global_executor_concurrency:
+          message: "Invalid global_executor_concurrency option."
+          summary: "You set global_executor_concurrency while async_query_executor
+            option is not set to :global_thread_pool. The global_executor_concurrency is
+            allowed only for the global thread pool executor."
+          resolution: "Set global_executor_concurrency option to :global_thread_pool
+            or remove global_executor_concurrency option."
         invalid_includes:
           message: "Invalid includes directive: %{klass}.includes(%{args})"
           summary: "Eager loading in Mongoid only supports providing arguments
@@ -341,7 +354,7 @@ en:
         invalid_storage_options:
           message: "Invalid options passed to %{klass}.store_in: %{options}."
           summary: "The :store_in macro takes only a hash of parameters with
-            the keys :database, :collection, or :client."
+            the keys :database, :collection, :collection_options, or :client."
           resolution: "Change the options passed to store_in to match the
             documented API, and ensure all keys in the options hash are
             symbols.\n\n
@@ -350,12 +363,6 @@ en:
             \_\_\_\_include Mongoid::Document\n
             \_\_\_\_store_in collection: 'artists', database: 'music'\n
             \_\_end\n\n"
-        invalid_storage_parent:
-          message: "Invalid store_in call on class %{klass}."
-          summary: "The :store_in macro can only be called on a base Mongoid Document"
-          resolution: "Remove the store_in call on class %{klass}, as it will use its
-            parent store configuration. Or remove the hierarchy extension for this
-            class."
         invalid_time:
           message: "'%{value}' is not a valid Time."
           summary: "Mongoid tries to serialize the values for Date, DateTime, and
@@ -571,9 +578,8 @@ en:
           resolution: "Don't define '%{name}' as readonly, or do not attempt
             to update its value after the document is persisted."
         readonly_document:
-          message: "Attempted to persist the readonly document '%{klass}'."
-          summary: "Documents loaded from the database using #only
-            cannot be persisted."
+          message: "Attempted to persist a readonly document of class '%{klass}'."
+          summary: "Documents that are marked readonly cannot be persisted."
           resolution: "Don't attempt to persist documents that are flagged as
             readonly."
         scope_overwrite:

data/lib/mongoid/association/accessors.rb

@@ -115,11 +115,7 @@ module Mongoid
         # 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)
-          # We always allow accessing the parent document of an embedded one.
-          try_get_parent = association.is_a?(
-                             Mongoid::Association::Embedded::EmbeddedIn
-                           ) && field_name == association.key
-          raise ActiveModel::MissingAttributeError, "Missing attribute: '#{field_name}'" unless try_get_parent
+          raise ActiveModel::MissingAttributeError, "Missing attribute: '#{field_name}'"
         end
 
         if !reload && (value = ivar(name)) != false
@@ -210,7 +206,7 @@ module Mongoid
 
         # Positional projection is specified as "foo.$". In this case the
         # document that the $ is referring to should be retrieved with all
-        # fields. See https://docs.mongodb.com/manual/reference/operator/projection/positional/
+        # fields. See https://www.mongodb.com/docs/manual/reference/operator/projection/positional/
         # and https://jira.mongodb.org/browse/MONGOID-4769.
         if filtered.keys == %w($)
           filtered = nil
@@ -255,7 +251,7 @@ module Mongoid
       # @example Parse the args.
       #   doc.parse_args(:name => "Joe")
       #
-      # @param [ Array ] args The arguments.
+      # @param [ Hash... ] *args The arguments.
       #
       # @return [ Array<Hash> ] The attributes and options.
       def parse_args(*args)

data/lib/mongoid/association/builders.rb

@@ -27,7 +27,7 @@ module Mongoid
       # @example Parse the args.
       #   doc.parse_args(:name => "Joe")
       #
-      # @param [ Array ] args The arguments.
+      # @param [ Hash... ] *args The arguments.
       #
       # @return [ Array<Hash> ] The attributes and options.
       def parse_args(*args)

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

@@ -31,9 +31,6 @@ module Mongoid
         docs_map = {}
         queue = [ klass.to_s ]
 
-        # account for single-collection inheritance
-        queue.push(klass.root_class.to_s) if klass != klass.root_class
-
         while klass = queue.shift
           if as = assoc_map.delete(klass)
             as.each do |assoc|

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

@@ -97,7 +97,7 @@ module Mongoid
         # @example Batch replace the documents.
         #   batchable.batch_replace([ doc_one, doc_two ])
         #
-        # @param [ Array<Document> ] docs The docs to replace with.
+        # @param [ Array<Document> | Array<Hash> ] docs The docs to replace with.
         #
         # @return [ Array<Hash> ] The inserts.
         def batch_replace(docs)
@@ -235,7 +235,7 @@ module Mongoid
         # @example Normalize the docs.
         #   batchable.normalize_docs(docs)
         #
-        # @param [ Array<Hash | Document> ] docs The docs to normalize.
+        # @param [ Array<Document> | Array<Hash> ] docs The docs to normalize.
         #
         # @return [ Array<Document> ] The docs.
         def normalize_docs(docs)

data/lib/mongoid/association/embedded/embedded_in/buildable.rb

@@ -15,8 +15,8 @@ module Mongoid
           # @example Build the document.
           #   Builder.new(meta, attrs).build
           #
-          # @param [ Object ] base The object.
-          # @param [ Object ] object The parent hash or document.
+          # @param [ Document ] base The object.
+          # @param [ Document | Hash ] object The parent hash or document.
           # @param [ String ] type Not used in this context.
           # @param [ Hash ] selected_fields Fields which were retrieved via
           #   #only. If selected_fields are specified, fields not listed in it

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

@@ -30,7 +30,7 @@ module Mongoid
           # @example Substitute the new document.
           #   person.name.substitute(new_name)
           #
-          # @param [ Document ] replacement A document to replace the target.
+          # @param [ Document | Hash ] replacement A document to replace the target.
           #
           # @return [ Document | nil ] The association or nil.
           def substitute(replacement)
@@ -40,6 +40,7 @@ module Mongoid
               return nil
             end
             _base.new_record = true
+            replacement = Factory.build(klass, replacement) if replacement.is_a?(::Hash)
             self._target = replacement
             bind_one
             self

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

@@ -17,8 +17,9 @@ module Mongoid
           # @example Build the documents.
           #   Builder.new(meta, attrs).build
           #
-          # @param [ Object ] base The base object.
-          # @param [ Object ] object The object to use to build the association.
+          # @param [ Document ] base The base object.
+          # @param [ Array<Document> | Array<Hash> ] object The object to use
+          #   to build the association.
           # @param [ String ] type Not used in this context.
           # @param [ Hash ] selected_fields Fields which were retrieved via
           #   #only. If selected_fields are specified, fields not listed in it

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

@@ -19,7 +19,7 @@ module Mongoid
           # @example Push a document.
           #   person.addresses.push(address)
           #
-          # @param [ Document | Array<Document> ] args Any number of documents.
+          # @param [ Document... ] *args Any number of documents.
           def <<(*args)
             docs = args.flatten
             return concat(docs) if docs.size > 1
@@ -117,7 +117,7 @@ module Mongoid
           # @example Use #persisted? inside block to count persisted documents.
           #   person.addresses.count { |a| a.persisted? && a.country == "FR" }
           #
-          # @param [ Object | Array<Object> ] args Args to delegate to the target.
+          # @param [ Object... ] *args Args to delegate to the target.
           #
           # @return [ Integer ] The total number of persisted embedded docs, as
           #   flagged by the #persisted? method.
@@ -252,7 +252,7 @@ module Mongoid
           # @example Finds the first matching document using a block.
           #   person.addresses.find { |addr| addr.state == 'CA' }
           #
-          # @param [ Array<Object> ] args Various arguments.
+          # @param [ Object... ] *args Various arguments.
           # @param [ Proc ] block Optional block to pass.
           #
           # @return [ Document | Array<Document> | nil ] A document or matching documents.
@@ -348,7 +348,7 @@ module Mongoid
           # @example Substitute the association's target.
           #   person.addresses.substitute([ address ])
           #
-          # @param [ Array<Document> ] docs The replacement docs.
+          # @param [ Array<Document> | Array<Hash> ] docs The replacement docs.
           #
           # @return [ Many ] The proxied association.
           def substitute(docs)
@@ -432,10 +432,10 @@ module Mongoid
           # If the method exists on the array, use the default proxy behavior.
           #
           # @param [ Symbol | String ] name The name of the method.
-          # @param [ Array ] args The method args
+          # @param [ Object... ] *args The method args.
           # @param [ Proc ] block Optional block to pass.
           #
-          # @return [ Criteria, Object ] A Criteria or return value from the target.
+          # @return [ Criteria | Object ] A Criteria or return value from the target.
           ruby2_keywords def method_missing(name, *args, &block)
             return super if _target.respond_to?(name)
             klass.send(:with_scope, criteria) do

data/lib/mongoid/association/embedded/embeds_one/buildable.rb

@@ -17,7 +17,7 @@ module Mongoid
           #   Builder.new(meta, attrs).build
           #
           # @param [ Document ] base The document this association hangs off of.
-          # @param [ Document ] object The related document.
+          # @param [ Document | Hash ] object The related document.
           # @param [ String ] _type Not used in this context.
           # @param [ Hash ] selected_fields Fields which were retrieved via
           #   #only. If selected_fields are specified, fields not listed in it

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

@@ -32,8 +32,8 @@ module Mongoid
               bind_one
               characterize_one(_target)
               update_attributes_hash(_target)
-              _target.save if persistable?
               _base._reset_memoized_descendants!
+              _target.save if persistable?
             end
           end
 
@@ -43,7 +43,7 @@ module Mongoid
           # @example Substitute the new document.
           #   person.name.substitute(new_name)
           #
-          # @param [ Document ] replacement A document to replace the target.
+          # @param [ Document | Hash ] replacement A document to replace the target.
           #
           # @return [ Document | nil ] The association or nil.
           def substitute(replacement)

data/lib/mongoid/association/macros.rb

@@ -35,15 +35,10 @@ module Mongoid
         # @api private
         class_attribute :aliased_associations
 
-        # @return [ Set<String> ] The set of associations that are configured 
-        #   with :store_as parameter.
-        class_attribute :stored_as_associations
-
         self.embedded = false
         self.embedded_relations = BSON::Document.new
         self.relations = BSON::Document.new
         self.aliased_associations = {}
-        self.stored_as_associations = Set.new
       end
 
       # This is convenience for libraries still on the old API.
@@ -224,7 +219,6 @@ module Mongoid
             self.relations = self.relations.merge(name => assoc)
             if assoc.embedded? && assoc.respond_to?(:store_as) && assoc.store_as != name
               self.aliased_associations[assoc.store_as] = name
-              self.stored_as_associations << assoc.store_as
             end
           end
         end

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

@@ -169,7 +169,7 @@ module Mongoid
         # @param [ Hash ] attrs The single document attributes to process.
         def update_nested_relation(parent, id, attrs)
           first = existing.first
-          converted = convert_id(first ? first.class : association.klass, id)
+          converted = first ? convert_id(first.class, id) : id
 
           if existing.where(_id: converted).exists?
             # document exists in association
@@ -179,46 +179,11 @@ module Mongoid
             else
               update_document(doc, attrs)
             end
-          elsif association.embedded?
-            raise Errors::DocumentNotFound.new(association.klass, id)
-          elsif destroyable?(attrs)
-            # A destroy of a document that is not in the association is
-            # ignored, rather than reaching for it outside the association.
-            nil
-          elsif Mongoid.allow_reparenting_via_nested_attributes?
-            Mongoid::Warnings.warn_reparenting_via_nested_attributes
-
+          else
             # push existing document to association
             doc = association.klass.unscoped.find(converted)
-            # find returns nil instead of raising when
-            # Mongoid.raise_not_found_error is false; a missing document
-            # must still be an error here, consistent with the other
-            # not-found branches.
-            raise Errors::DocumentNotFound.new(association.klass, id) if doc.nil?
-
             update_document(doc, attrs)
-            existing.push(doc)
-          else
-            raise Errors::DocumentNotFound.new(association.klass, not_found_params(parent, id))
-          end
-        end
-
-        # The params to report when an id in the nested attributes could not
-        # be resolved within the association.
-        #
-        # @api private
-        #
-        # @param [ Document ] parent The parent document.
-        # @param [ String | BSON::ObjectId ] id of the related document.
-        #
-        # @return [ Hash | Object ] The params for the not found error.
-        def not_found_params(parent, id)
-          if association.is_a?(Association::Referenced::HasAndBelongsToMany)
-            # A many-to-many association has no foreign key on the child, so
-            # the id is only ever resolved within the association itself.
-            id
-          else
-            { _id: id, association.foreign_key => parent.id }
+            existing.push(doc) unless destroyable?(attrs)
           end
         end
       end