mongoid 7.0.0.beta → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f483fd6267d4f9d7cdd88cd53e8fda43b3266d5
-  data.tar.gz: a9dc77a3e44b2e719b5bc5e74c918c0d20dc964d
+SHA256:
+  metadata.gz: 8d7943ffc77e9a6990cb063c1301476cd1d5b10cd8543f0e9861e96228ff8027
+  data.tar.gz: bc71866e339c29688dae94bdd8b4590b198ab25b503bc321802d6acea4af5c25
 SHA512:
-  metadata.gz: 5404ab3c5ee259a29c80848cdf90f5709cb4665945c41edbaab5c329a9bd28b5350dedc115e3e41d537043f730f1b90db8646a5d8b075c26f324c0a94f4e6b35
-  data.tar.gz: f14bad6291f3628cf3c767c55b7707d32f9fe0bb001e34bd466c66d483378752f0550666359a206afbd1f0bf3409b6fb4eb12f4b2fea0cc4cc0e83f737a50da6
+  metadata.gz: 51e00c706c33a552c148b768bf851042a2f5c46aecacd3aa6bed5105c8c9b002bf84f317b1d5d65ee209e153537af5fb7360560758aef34ca4cbc39ffa11b489
+  data.tar.gz: 81a21a9ee3e6aa381bb495eb098b7faba65f2fa32c304460ecb481356ab505bb1189c4850cf218680d93c269cb656360727d3ed3fd967de5525ff92bf510425d

data/lib/config/locales/en.yml

@@ -216,6 +216,20 @@ en:
             \_\_\_\_include Mongoid::Document\n
             \_\_\_\_scope :inactive, ->{ where(active: false) }\n
             \_\_end\n\n"
+        invalid_session_use:
+          message: "A session was attempted to be used with a model whose client cannot use
+            that session."
+          summary: "Sessions are started via driver clients (Model#mongo_client) and, in most cases, driver
+            clients are shared across models. When different models have their own clients, a session cannot
+            be obtained via one model and used for operations on another model."
+          resolution: "Only execute operations on the model class or instances of the model through which
+            the session was created. Otherwise, ensure that all models on which operations are executed
+            in the session block share the same driver client. For example, a model may have a different
+            client specified in its 'store_in' options.\n\n"
+        invalid_session_nesting:
+          message: "A session was started while another session was being used."
+          summary: "Sessions cannot be nested. Only one session can be used in a thread at once."
+          resolution: "Only use one session at a time; sessions cannot be nested."
         invalid_storage_options:
           message: "Invalid options passed to %{klass}.store_in: %{options}."
           summary: "The :store_in macro takes only a hash of parameters with
@@ -462,6 +476,13 @@ en:
             with the already defined method %{model_name}, or set the
             configuration option Mongoid.scope_overwrite_exception to false,
             which is its default. In this case a warning will be logged."
+        sessions_not_supported:
+          message: "Sessions are not supported by the connected server(s)."
+          summary: "A session was attempted to be used with a MongoDB server version
+            that doesn't support sessions. Sessions are supported in MongoDB
+            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:

data/lib/mongoid.rb

@@ -42,7 +42,7 @@ module Mongoid
   PLATFORM_DETAILS = "mongoid-#{VERSION}".freeze
 
   # The minimum MongoDB version supported.
-  MONGODB_VERSION = "2.4.0"
+  MONGODB_VERSION = "2.6.0"
 
   # Sets the Mongoid configuration options. Best used by passing a block.
   #

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

@@ -8,7 +8,7 @@ module Mongoid
       module Batchable
         include Positional
 
-        # Insert new documents as a batch push ($pushAll). This ensures that
+        # Insert new documents as a batch push ($push with $each). This ensures that
         # all callbacks are run at the appropriate time and only 1 request is
         # made to the database.
         #
@@ -21,7 +21,7 @@ module Mongoid
         #
         # @since 3.0.0
         def batch_insert(docs)
-          execute_batch_insert(docs, "$pushAll")
+          execute_batch_push(docs)
         end
 
         # Clear all of the docs out of the relation in a single swipe.
@@ -38,7 +38,8 @@ module Mongoid
           pre_process_batch_remove(docs, :delete)
           unless docs.empty?
             collection.find(selector).update_one(
-                positionally(selector, "$unset" => { path => true })
+                positionally(selector, "$unset" => { path => true }),
+                session: session
             )
             post_process_batch_remove(docs, :delete)
           end
@@ -58,7 +59,8 @@ module Mongoid
           removals = pre_process_batch_remove(docs, method)
           if !docs.empty?
             collection.find(selector).update_one(
-                positionally(selector, "$pullAll" => { path => removals })
+                positionally(selector, "$pullAll" => { path => removals }),
+                session: session
             )
             post_process_batch_remove(docs, method)
           end
@@ -89,7 +91,7 @@ module Mongoid
             _base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact
             _target.clear and _unscoped.clear
-            inserts = execute_batch_insert(docs, "$set")
+            inserts = execute_batch_set(docs)
             add_atomic_sets(inserts)
           end
         end
@@ -116,32 +118,56 @@ module Mongoid
           end
         end
 
-        # Perform a batch persist of the provided documents with the supplied
-        # operation.
+        # Perform a batch persist of the provided documents with a $set.
         #
         # @api private
         #
-        # @example Perform a batch operation.
-        #   batchable.execute_batch(docs, "$set")
+        # @example Perform a batch $set.
+        #   batchable.execute_batch_set(docs)
         #
         # @param [ Array<Document> ] docs The docs to persist.
-        # @param [ String ] operation The atomic operation.
         #
         # @return [ Array<Hash> ] The inserts.
         #
-        # @since 3.0.0
-        def execute_batch_insert(docs, operation)
+        # @since 7.0.0
+        def execute_batch_set(docs)
           self.inserts_valid = true
           inserts = pre_process_batch_insert(docs)
           if insertable?
             collection.find(selector).update_one(
-                positionally(selector, operation => { path => inserts })
+                positionally(selector, '$set' => { path => inserts }),
+                session: session
             )
             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.
+        #
+        # @return [ Array<Hash> ] The inserts.
+        #
+        # @since 7.0.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 } }),
+                session: session
+            )
+            post_process_batch_insert(docs)
+          end
+          pushes
+        end
+
         # Are we in a state to be able to batch insert?
         #
         # @api private

data/lib/mongoid/association/many.rb

@@ -189,6 +189,10 @@ module Mongoid
 
       private
 
+      def session
+        _base.send(:session)
+      end
+
       # Find the first object given the supplied attributes or create/initialize it.
       #
       # @example Find or create|initialize.

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

@@ -240,6 +240,8 @@ module Mongoid
         def query_criteria(object, base)
           crit = klass.where(foreign_key => object)
           crit = with_polymorphic_criterion(crit, base)
+          crit.association = self
+          crit.parent_document = base
           with_ordering(crit)
         end
 

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

@@ -179,12 +179,14 @@ module Mongoid
               if _loaded?
                 _loaded.each_pair do |id, doc|
                   document = _added.delete(doc._id) || doc
+                  set_base(document)
                   yield(document)
                 end
               else
                 unloaded_documents.each do |doc|
                   document = _added.delete(doc._id) || _loaded.delete(doc._id) || doc
                   _loaded[document._id] = document
+                  set_base(document)
                   yield(document)
                 end
               end
@@ -217,12 +219,22 @@ module Mongoid
             # @example Get the first document.
             #   enumerable.first
             #
+            # @note Automatically adding a sort on _id when no other sort is
+            #   defined on the criteria has the potential to cause bad performance issues.
+            #   If you experience unexpected poor performance when using #first or #last,
+            #   use the option { id_sort: :none }.
+            #   Be aware that #first/#last won't guarantee order in this case.
+            #
+            # @param [ Hash ] opts The options for the query returning the first document.
+            #
+            # @option opts [ :none ] :id_sort Don't apply a sort on _id.
+            #
             # @return [ Document ] The first document found.
             #
             # @since 2.1.0
-            def first
+            def first(opts = {})
               _loaded.try(:values).try(:first) ||
-                  _added[(ul = _unloaded.try(:first)).try(:id)] ||
+                  _added[(ul = _unloaded.try(:first, opts)).try(:id)] ||
                   ul ||
                   _added.values.try(:first)
             end
@@ -238,7 +250,9 @@ module Mongoid
             # @param [ Criteria, Array<Document> ] target The wrapped object.
             #
             # @since 2.1.0
-            def initialize(target)
+            def initialize(target, base = nil, association = nil)
+              @_base = base
+              @_association = association
               if target.is_a?(Criteria)
                 @_added, @executed, @_loaded, @_unloaded = {}, false, {}, target
               else
@@ -291,8 +305,9 @@ module Mongoid
             # @since 2.1.0
             def in_memory
               docs = (_loaded.values + _added.values)
-              docs.each { |doc| yield(doc) } if block_given?
-              docs
+              docs.each do |doc|
+                yield(doc) if block_given?
+              end
             end
 
             # Get the last document in the enumerable. Will check the new
@@ -301,13 +316,23 @@ module Mongoid
             # @example Get the last document.
             #   enumerable.last
             #
+            # @note Automatically adding a sort on _id when no other sort is
+            #   defined on the criteria has the potential to cause bad performance issues.
+            #   If you experience unexpected poor performance when using #first or #last,
+            #   use the option { id_sort: :none }.
+            #   Be aware that #first/#last won't guarantee order in this case.
+            #
+            # @param [ Hash ] opts The options for the query returning the first document.
+            #
+            # @option opts [ :none ] :id_sort Don't apply a sort on _id.
+            #
             # @return [ Document ] The last document found.
             #
             # @since 2.1.0
-            def last
+            def last(opts = {})
               _added.values.try(:last) ||
                   _loaded.try(:values).try(:last) ||
-                  _added[(ul = _unloaded.try(:last)).try(:id)] ||
+                  _added[(ul = _unloaded.try(:last, opts)).try(:id)] ||
                   ul
             end
 
@@ -464,6 +489,12 @@ module Mongoid
 
             private
 
+            def set_base(document)
+              if @_association.is_a?(Referenced::HasMany)
+                document.set_relation(@_association.inverse, @_base) if @_association
+              end
+            end
+
             def method_missing(name, *args, &block)
               entries.send(name, *args, &block)
             end

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

@@ -210,7 +210,8 @@ module Mongoid
           #
           # @since 2.0.0.beta.1
           def initialize(base, target, association)
-            init(base, HasMany::Targets::Enumerable.new(target), association) do
+            enum = HasMany::Targets::Enumerable.new(target, base, association)
+            init(base, enum, association) do
               raise_mixed if klass.embedded? && !klass.cyclic?
             end
           end
@@ -455,7 +456,7 @@ module Mongoid
           # @since 3.0.0
           def persist_delayed(docs, inserts)
             unless docs.empty?
-              collection.insert_many(inserts)
+              collection.insert_many(inserts, session: session)
               docs.each do |doc|
                 doc.new_record = false
                 doc.run_after_callbacks(:create, :save)

data/lib/mongoid/association/referenced/syncable.rb

@@ -81,7 +81,7 @@ module Mongoid
             adds, subs = new - (old || []), (old || []) - new
 
             # If we are autosaving we don't want a duplicate to get added - the
-            # $addToSet would run previously and then the $pushAll from the
+            # $addToSet would run previously and then the $push and $each from the
             # inverse on the autosave would cause this. We delete each id from
             # what's in memory in case a mix of id addition and object addition
             # had occurred.

data/lib/mongoid/association/touchable.rb

@@ -32,7 +32,7 @@ module Mongoid
           touches = touch_atomic_updates(field)
           unless touches["$set"].blank?
             selector = atomic_selector
-            _root.collection.find(selector).update_one(positionally(selector, touches))
+            _root.collection.find(selector).update_one(positionally(selector, touches), session: session)
           end
           run_callbacks(:touch)
           true

data/lib/mongoid/atomic.rb

@@ -110,10 +110,10 @@ module Mongoid
     #   performed in a single operation. Conflicting modifications are
     #   detected by the 'haveConflictingMod' function in MongoDB.
     #   Examination of the code suggests that two modifications (a $set
-    #   and a $pushAll, for example) conflict if:
+    #   and a $push with $each, for example) conflict if:
     #     (1) the key paths being modified are equal.
     #     (2) one key path is a prefix of the other.
-    #   So a $set of 'addresses.0.street' will conflict with a $pushAll
+    #   So a $set of 'addresses.0.street' will conflict with a $push and $each
     #   to 'addresses', and we will need to split our update into two
     #   pieces. We do not, however, attempt to match MongoDB's logic
     #   exactly. Instead, we assume that two updates conflict if the
@@ -218,7 +218,7 @@ module Mongoid
     # @example Get the pushes.
     #   person.atomic_pushes
     #
-    # @return [ Hash ] The $pushAll operations.
+    # @return [ Hash ] The $push and $each operations.
     #
     # @since 2.1.0
     def atomic_pushes

data/lib/mongoid/atomic/modifiers.rb

@@ -68,7 +68,7 @@ module Mongoid
         modifications.each_pair do |field, value|
           push_fields[field] = field
           mods = push_conflict?(field) ? conflicting_pushes : pushes
-          add_operation(mods, field, Array.wrap(value))
+          add_operation(mods, field, { '$each' => Array.wrap(value) })
         end
       end
 
@@ -118,8 +118,12 @@ module Mongoid
       # @since 2.2.0
       def add_operation(mods, field, value)
         if mods.has_key?(field)
-          value.each do |val|
-            mods[field].push(val)
+          if mods[field].is_a?(Array)
+            value.each do |val|
+              mods[field].push(val)
+            end
+          elsif mods[field]['$each']
+            mods[field]['$each'].concat(value['$each'])
           end
         else
           mods[field] = value
@@ -190,7 +194,7 @@ module Mongoid
       #
       # @since 2.2.0
       def conflicting_pushes
-        conflicts["$pushAll"] ||= {}
+        conflicts["$push"] ||= {}
       end
 
       # Get the conflicting set modifications.
@@ -277,16 +281,16 @@ module Mongoid
         self["$pull"] ||= {}
       end
 
-      # Get the $pushAll operations or intialize a new one.
+      # Get the $push/$each operations or initialize a new one.
       #
-      # @example Get the $pushAll operations.
+      # @example Get the $push/$each operations.
       #   modifiers.pushes
       #
-      # @return [ Hash ] The $pushAll operations.
+      # @return [ Hash ] The $push/$each operations.
       #
       # @since 2.1.0
       def pushes
-        self["$pushAll"] ||= {}
+        self["$push"] ||= {}
       end
 
       # Get the $set operations or intialize a new one.

data/lib/mongoid/attributes.rb

@@ -29,7 +29,7 @@ module Mongoid
     #
     # @since 1.0.0
     def attribute_present?(name)
-      attribute = read_attribute(name)
+      attribute = read_raw_attribute(name)
       !attribute.blank? || attribute == false
     rescue ActiveModel::MissingAttributeError
       false
@@ -92,21 +92,15 @@ module Mongoid
     #
     # @since 1.0.0
     def read_attribute(name)
-      normalized = database_field_name(name.to_s)
-      if attribute_missing?(normalized)
-        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'."
-      end
-      if hash_dot_syntax?(normalized)
-        attributes.__nested__(normalized)
-      else
-        attributes[normalized]
-      end
+      field = fields[name.to_s]
+      raw = read_raw_attribute(name)
+      field ? field.demongoize(raw) : raw
     end
     alias :[] :read_attribute
 
     # Read a value from the attributes before type cast. If the value has not
     # yet been assigned then this will return the attribute's existing value
-    # using read_attribute.
+    # using read_raw_attribute.
     #
     # @example Read an attribute before type cast.
     #   person.read_attribute_before_type_cast(:price)
@@ -122,7 +116,7 @@ module Mongoid
       if attributes_before_type_cast.key?(attr)
         attributes_before_type_cast[attr]
       else
-        read_attribute(attr)
+        read_raw_attribute(attr)
       end
     end
 
@@ -293,6 +287,20 @@ module Mongoid
       fields.key?(key) ? fields[key].mongoize(value) : value.mongoize
     end
 
+    private
+
+    def read_raw_attribute(name)
+      normalized = database_field_name(name.to_s)
+      if attribute_missing?(normalized)
+        raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'."
+      end
+      if hash_dot_syntax?(normalized)
+        attributes.__nested__(normalized)
+      else
+        attributes[normalized]
+      end
+    end
+
     module ClassMethods
 
       # Alias the provided name to the original field. This will provide an