mongoid 5.4.1 → 6.1.1

data/lib/mongoid/query_cache.rb

@@ -183,7 +183,8 @@ module Mongoid
               end
             CODE
 
-          alias_method_chain method_name, :clear_cache
+          alias_method "#{method_name}_without_clear_cache", method_name
+          alias_method method_name, "#{method_name}_with_clear_cache"
         end
       end
     end
@@ -221,7 +222,7 @@ module Mongoid
           super
         else
           unless cursor = cached_cursor
-            server = read_or_server_selector.select_server(cluster)
+            server = read.select_server(cluster)
             cursor = CachedCursor.new(view, send_initial_query(server), server)
             QueryCache.cache_table[cache_key] = cursor
           end
@@ -234,10 +235,6 @@ module Mongoid
 
       private
 
-      def read_or_server_selector
-        respond_to?(:server_selector, true) ? server_selector : read
-      end
-
       def cached_cursor
         if limit
           key = [ collection.namespace, selector, nil, skip, sort, projection, collation  ]

data/lib/mongoid/relations/accessors.rb

@@ -229,6 +229,9 @@ module Mongoid
               if value = get_relation(name, metadata, object)
                 if value.respond_to?(:substitute)
                   set_relation(name, value.substitute(object.substitutable))
+                else
+                  value = __build__(name, value, metadata)
+                  set_relation(name, value.substitute(object.substitutable))
                 end
               else
                 __build__(name, object.substitutable, metadata)

data/lib/mongoid/relations/auto_save.rb

@@ -59,17 +59,25 @@ module Mongoid
           if metadata.autosave? && !metadata.embedded?
             save_method = :"autosave_documents_for_#{metadata.name}"
             define_method(save_method) do
-
               if before_callback_halted?
                 self.before_callback_halted = false
               else
                 __autosaving__ do
                   if relation = ivar(metadata.name)
-                    options = persistence_options || {}
                     if :belongs_to == metadata.macro
-                      relation.with(options).save if changed_for_autosave?(relation)
+                      if changed_for_autosave?(relation)
+                        relation.with(persistence_context) do |_relation|
+                          _relation.save
+                        end
+                      end
                     else
-                      Array(relation).each { |d| d.with(options).save if changed_for_autosave?(d) }
+                      Array(relation).each do |doc|
+                        if changed_for_autosave?(doc)
+                          doc.with(persistence_context) do |d|
+                            d.save
+                          end
+                        end
+                      end
                     end
                   end
                 end

data/lib/mongoid/relations/bindings/referenced/many_to_many.rb

@@ -26,8 +26,8 @@ module Mongoid
                 end
                 doc.reset_relation_criteria(metadata.inverse)
               end
-              base.synced[metadata.foreign_key] = true
-              doc.synced[metadata.inverse_foreign_key] = true
+              base._synced[metadata.foreign_key] = true
+              doc._synced[metadata.inverse_foreign_key] = true
             end
           end
 
@@ -45,8 +45,8 @@ module Mongoid
                 inverse_keys.delete_one(inverse_record_id(doc))
                 doc.reset_relation_criteria(metadata.inverse)
               end
-              base.synced[metadata.foreign_key] = true
-              doc.synced[metadata.inverse_foreign_key] = true
+              base._synced[metadata.foreign_key] = true
+              doc._synced[metadata.inverse_foreign_key] = true
             end
           end
 

data/lib/mongoid/relations/counter_cache.rb

@@ -15,7 +15,9 @@ module Mongoid
       #
       # @since 4.0.0
       def reset_counters(*counters)
-        self.class.reset_counters(self, *counters)
+        self.class.with(persistence_context) do |_class|
+          _class.reset_counters(self, *counters)
+        end
       end
 
       module ClassMethods
@@ -111,12 +113,16 @@ module Mongoid
                 original, current = attribute_change(foreign_key)
 
                 unless original.nil?
-                  record.class.decrement_counter(cache_column, original)
+                  record.class.with(persistence_context) do |_class|
+                    _class.decrement_counter(cache_column, original)
+                  end
                 end
 
                 unless current.nil?
                   record[cache_column] = (record[cache_column] || 0) + 1
-                  record.class.increment_counter(cache_column, current) if record.persisted?
+                  record.class.with(record.persistence_context) do |_class|
+                    _class.increment_counter(cache_column, current) if record.persisted?
+                  end
                 end
               end
             end
@@ -127,7 +133,9 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) + 1
 
               if record.persisted?
-                record.class.increment_counter(cache_column, record._id)
+                record.class.with(record.persistence_context) do |_class|
+                  _class.increment_counter(cache_column, record._id)
+                end
                 record.remove_change(cache_column)
               end
             end
@@ -138,7 +146,9 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) - 1 unless record.frozen?
 
               if record.persisted?
-                record.class.decrement_counter(cache_column, record._id)
+                record.class.with(record.persistence_context) do |_class|
+                  _class.decrement_counter(cache_column, record._id)
+                end
                 record.remove_change(cache_column)
               end
             end

data/lib/mongoid/relations/eager.rb

@@ -22,19 +22,14 @@ module Mongoid
       end
 
       def preload(relations, docs)
-        grouped_relations = relations.group_by do |metadata|
-          metadata.inverse_class_name
-        end
-        grouped_relations.keys.each do |_klass|
-          grouped_relations[_klass] = grouped_relations[_klass].group_by do |metadata|
-            metadata.relation
+        relations.group_by(&:inverse_class_name)
+                 .values
+                 .each do |associations|
+          associations.group_by(&:relation)
+                      .each do |relation, association|
+            relation.eager_load_klass.new(association, docs).run
           end
         end
-        grouped_relations.each do |_klass, associations|
-          docs = associations.collect do |_relation, association|
-            _relation.eager_load_klass.new(association, docs).run
-          end.flatten
-        end
       end
     end
   end

data/lib/mongoid/relations/eager/base.rb

@@ -48,7 +48,7 @@ module Mongoid
           @loaded = []
           while shift_metadata
             preload
-            @loaded << @docs.collect { |d| d.send(@metadata.name) }
+            @loaded << @docs.collect { |d| d.send(@metadata.name) if d.respond_to?(@metadata.name) }
           end
           @loaded.flatten
         end
@@ -99,12 +99,12 @@ module Mongoid
         # @example Return a hash with the current documents grouped by key.
         #   loader.grouped_docs
         #
-        # @return [ Hash ] hash with groupd documents.
+        # @return [ Hash ] hash with grouped documents.
         #
         # @since 4.0.0
         def grouped_docs
           @grouped_docs[@metadata.name] ||= @docs.group_by do |doc|
-            doc.send(group_by_key)
+            doc.send(group_by_key) if doc.respond_to?(group_by_key)
           end
         end
 

data/lib/mongoid/relations/eager/has_and_belongs_to_many.rb

@@ -17,7 +17,7 @@ module Mongoid
 
           @docs.each do |d|
             keys = d.send(group_by_key)
-            docs = entries.values_at(*keys)
+            docs = entries.values_at(*keys).compact
             set_relation(d, docs)
           end
         end
@@ -31,7 +31,7 @@ module Mongoid
         end
 
         def set_relation(doc, element)
-          doc.__build__(@metadata.name, element, @metadata)
+          doc.__build__(@metadata.name, element, @metadata) unless doc.blank?
         end
 
         def group_by_key

data/lib/mongoid/relations/eager/has_many.rb

@@ -22,7 +22,7 @@ module Mongoid
         end
 
         def set_relation(doc, element)
-          doc.__build__(@metadata.name, element, @metadata)
+          doc.__build__(@metadata.name, element, @metadata) unless doc.blank?
         end
 
         def group_by_key

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

@@ -13,15 +13,15 @@ module Mongoid
         # made to the database.
         #
         # @example Execute the batch push.
-        #   batchable.batch_push([ doc_one, doc_two ])
+        #   batchable.batch_insert([ doc_one, doc_two ])
         #
         # @param [ Array<Document> ] docs The docs to add.
         #
         # @return [ Array<Hash> ] The inserts.
         #
-        # @since 5.4.0
-        def batch_push(docs)
-          execute_batch_push(docs)
+        # @since 3.0.0
+        def batch_insert(docs)
+          execute_batch_insert(docs, "$pushAll")
         end
 
         # Clear all of the docs out of the relation in a single swipe.
@@ -85,11 +85,11 @@ module Mongoid
             else
               batch_remove(target.dup)
             end
-          else
+          elsif target != docs
             base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact
             target.clear and _unscoped.clear
-            inserts = execute_batch_set(docs)
+            inserts = execute_batch_insert(docs, "$set")
             add_atomic_sets(inserts)
           end
         end
@@ -122,50 +122,26 @@ module Mongoid
         # @api private
         #
         # @example Perform a batch operation.
-        #   batchable.execute_batch_set(docs)
+        #   batchable.execute_batch(docs, "$set")
         #
         # @param [ Array<Document> ] docs The docs to persist.
         # @param [ String ] operation The atomic operation.
         #
         # @return [ Array<Hash> ] The inserts.
         #
-        # @since 5.4.0
-        def execute_batch_set(docs)
+        # @since 3.0.0
+        def execute_batch_insert(docs, operation)
           self.inserts_valid = true
           inserts = pre_process_batch_insert(docs)
           if insertable?
             collection.find(selector).update_one(
-              positionally(selector, '$set' => { path => inserts })
+              positionally(selector, operation => { path => inserts })
             )
             post_process_batch_insert(docs)
           end
           inserts
         end
 
-        # Perform a batch persist of the provided documents with $push and $each.
-        #
-        # @api private
-        #
-        # @example Perform a batch push.
-        #   batchable.execute_batch_push(docs)
-        #
-        # @param [ Array<Document> ] docs The docs to persist.
-        # @param [ String ] operation The atomic operation.
-        #
-        # @return [ Array<Hash> ] The inserts.
-        #
-        # @since 5.4.0
-        def execute_batch_push(docs)
-          self.inserts_valid = true
-          pushes = pre_process_batch_insert(docs)
-          if insertable?
-            collection.find(selector).update_one(
-                positionally(selector, '$push' => { path => { '$each' => pushes } }))
-            post_process_batch_insert(docs)
-          end
-          pushes
-        end
-
         # Are we in a state to be able to batch insert?
         #
         # @api private
@@ -303,7 +279,7 @@ module Mongoid
                 self.inserts_valid = false
               end
             end
-            doc.as_document
+            doc.send(:as_attributes)
           end
         end
 
@@ -332,7 +308,7 @@ module Mongoid
             _unscoped.delete_one(doc)
             unbind_one(doc)
             execute_callback :after_remove, doc
-            doc.as_document
+            doc.send(:as_attributes)
           end
         end
 

data/lib/mongoid/relations/embedded/in.rb

@@ -8,6 +8,18 @@ module Mongoid
       # multiple documents.
       class In < Relations::One
 
+        # The allowed options when defining this relation.
+        #
+        # @return [ Array<Symbol> ] The allowed options when defining this relation.
+        #
+        # @since 6.0.0
+        VALID_OPTIONS = [
+          :autobuild,
+          :cyclic,
+          :polymorphic,
+          :touch
+         ].freeze
+
         # Instantiate a new embedded_in relation.
         #
         # @example Create the new relation.
@@ -207,7 +219,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [ :autobuild, :cyclic, :polymorphic, :touch ]
+            VALID_OPTIONS
           end
 
           # Get the default validation setting for the relation. Determines if

data/lib/mongoid/relations/embedded/many.rb

@@ -10,6 +10,23 @@ module Mongoid
       class Many < Relations::Many
         include Batchable
 
+        # The allowed options when defining this relation.
+        #
+        # @return [ Array<Symbol> ] The allowed options when defining this relation.
+        #
+        # @since 6.0.0
+        VALID_OPTIONS = [
+          :as,
+          :cascade_callbacks,
+          :cyclic,
+          :order,
+          :store_as,
+          :before_add,
+          :after_add,
+          :before_remove,
+          :after_remove
+         ].freeze
+
         # Appends a document or array of documents to the relation. Will set
         # the parent and update the index in the process.
         #
@@ -41,11 +58,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def as_document
-          attributes = []
-          _unscoped.each do |doc|
-            attributes.push(doc.as_document)
-          end
-          attributes
+          as_attributes.collect { |attrs| BSON::Document.new(attrs) }
         end
 
         # Appends an array of documents to the relation. Performs a batch
@@ -60,7 +73,7 @@ module Mongoid
         #
         # @since 2.4.0
         def concat(docs)
-          batch_push(docs) unless docs.empty?
+          batch_insert(docs) unless docs.empty?
           self
         end
 
@@ -496,6 +509,14 @@ module Mongoid
           @_unscoped = docs
         end
 
+        def as_attributes
+          attributes = []
+          _unscoped.each do |doc|
+            attributes.push(doc.as_document)
+          end
+          attributes
+        end
+
         class << self
 
           # Return the builder that is responsible for generating the documents
@@ -617,10 +638,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [
-              :as, :cascade_callbacks, :cyclic, :order, :store_as,
-              :before_add, :after_add, :before_remove, :after_remove
-            ]
+            VALID_OPTIONS
           end
 
           # Get the default validation setting for the relation. Determines if

data/lib/mongoid/relations/embedded/one.rb

@@ -7,6 +7,19 @@ module Mongoid
       # relations.
       class One < Relations::One
 
+        # The allowed options when defining this relation.
+        #
+        # @return [ Array<Symbol> ] The allowed options when defining this relation.
+        #
+        # @since 6.0.0
+        VALID_OPTIONS = [
+          :autobuild,
+          :as,
+          :cascade_callbacks,
+          :cyclic,
+          :store_as
+        ].freeze
+
         # Instantiate a new embeds_one relation.
         #
         # @example Create the new proxy.
@@ -200,7 +213,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [ :autobuild, :as, :cascade_callbacks, :cyclic, :store_as ]
+            VALID_OPTIONS
           end
 
           # Get the default validation setting for the relation. Determines if