mongoid 6.2.1 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c168797ecc312fa19fb9e5e411faac9d8d0386
-  data.tar.gz: d8221f9f5edf4199630a5951169150ed864830af
+  metadata.gz: 5c7e1fbb3fda280fb0e0f74c312b36b7a73dad79
+  data.tar.gz: 92dcab3023e9005560efd4209e3eecd26032b259
 SHA512:
-  metadata.gz: 8f7acb7b8783289ff4a2986353e4eeb0443643d4b957ed15752a37045a7e906bda3cb5cc5ebf3d75c222ce8926aee29176b38cab2baad80e663fc83eb0bb1b02
-  data.tar.gz: 45304b581fdcca4076ce109db08926de9e30917f9ac439f94b2bd51fbfe3939d32dce787f48236738cd015c0c0b2e90c7d68905dd5744b08ec33adb3a8ccaae2
+  metadata.gz: 44e65ba1446fc7c42e545b38223d4122e798f85d26aeb93103b85c45e7a4abc17e3b7da9f60853a7a38a24b5d4a258338111759d0b22bb4e5f99611e002eaa0f
+  data.tar.gz: 25b84f09ac4fb6366a0d9782d0865a0a1ae214234fbdbde4ce57146d8bf740823b66f15d4871e4a45b0d3fc5f0557b9f91dd743501713ae6920a430e90bab62e

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-y~z�L�|t�T��נq'��`�B~gg�%�U�&?U�Ů�;����@n�Wɞ����H����ۄ�\{6�!$u�42{�8�GC���W�Q
8����9�]�c~+,*�V{{��@=*ȴ��7�$_b���2�`���dQ7���#-g�**w�v��
��7���૏~��Q�?�A���;^IԪFN�ARm?��)7�����1��Y�
-�Ċ�;]����%D������y:<H����/�PT�u�,O%�s��1��Dۯ
+kpQ5�N�ePGlt�
+���#$[?�)
�}�	�A�����!�QV��+i�t�[=w
+�->dƩHR�uǖ{v�|��G\bS$���l��g���=�82���̵�� W��
>��BL+�Z�cS�E9�����c����Ox��)�6Ũ�Nd#��
�'ĝc,��5������h���UfO\LE*�{��'%��d�\@�Y���z�c�N��W�?���@�:�e3Ҟv-��

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�v��q�z�G�"�:�~�,X�{h�;(�!�E2�Ç����ct�W�^G�%@��Y�ª�e֚�=~m�/�(�	�"��6ɯ��%|vC$��u�����/'΃!�86���'�{n!h�6�:��טr)!Aޜk�������nw}�{*�ٰ��G�#�>�X��#ӝM�?d�1;>��"$�����p긚]�
���}k��U���9
�P����H~R���)�jHUK�HQ�0}��
-��
+��2�{&r�<`��?R��|$���L�����Yک�}NGbf�Đ���R܀6>��t�������8�I�_�^a�@:vt����ލ�}����G����`�?�;b9}
+-�.�ɮog@B���M�F�0��_e_�Bc�9yY�M-+\��

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 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/composable.rb

@@ -84,6 +84,7 @@ module Mongoid
       Validatable,
       Equality,
       Relations::Synchronization,
+      Relations::Macros,
       ActiveModel::Model,
       ActiveModel::Validations
     ]

data/lib/mongoid/contextual/atomic.rb

@@ -106,10 +106,10 @@ module Mongoid
         view.update_many("$push" => collect_operations(pushes))
       end
 
-      # Perform an atomic $pushAll operation on the matching documents.
+      # Perform an atomic $push/$each operation on the matching documents.
       #
       # @example Push the values to the matching docs.
-      #   context.push(members: [ "Alan", "Fletch" ])
+      #   context.push_all(members: [ "Alan", "Fletch" ])
       #
       # @param [ Hash ] pushes The operations.
       #
@@ -117,7 +117,10 @@ module Mongoid
       #
       # @since 3.0.0
       def push_all(pushes)
-        view.update_many("$pushAll" => collect_operations(pushes))
+        push_each_updates = collect_operations(pushes).each.inject({}) do |ops, (field, elements)|
+          ops.merge!(field => {'$each' => elements})
+        end
+        view.update_many("$push" => push_each_updates)
       end
 
       # Perform an atomic $rename of fields on the matching documents.

data/lib/mongoid/contextual/mongo.rb

@@ -486,12 +486,16 @@ module Mongoid
       #   context.update({ "$set" => { name: "Smiths" }})
       #
       # @param [ Hash ] attributes The new attributes for the document.
+      # @param [ Hash ] opts The update operation options.
+      #
+      # @option opts [ Array ] :array_filters A set of filters specifying to which array elements
+      #   an update should apply.
       #
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update(attributes = nil)
-        update_documents(attributes)
+      def update(attributes = nil, opts = {})
+        update_documents(attributes, :update_one, opts)
       end
 
       # Update all the matching documents atomically.
@@ -500,12 +504,16 @@ module Mongoid
       #   context.update_all({ "$set" => { name: "Smiths" }})
       #
       # @param [ Hash ] attributes The new attributes for each document.
+      # @param [ Hash ] opts The update operation options.
+      #
+      # @option opts [ Array ] :array_filters A set of filters specifying to which array elements
+      #   an update should apply.
       #
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update_all(attributes = nil)
-        update_documents(attributes, :update_many)
+      def update_all(attributes = nil, opts = {})
+        update_documents(attributes, :update_many, opts)
       end
 
       private
@@ -541,10 +549,10 @@ module Mongoid
       # @return [ true, false ] If the update succeeded.
       #
       # @since 3.0.4
-      def update_documents(attributes, method = :update_one)
+      def update_documents(attributes, method = :update_one, opts = {})
         return false unless attributes
         attributes = Hash[attributes.map { |k, v| [klass.database_field_name(k.to_s), v] }]
-        view.send(method, attributes.__consolidate__(klass))
+        view.send(method, attributes.__consolidate__(klass), opts)
       end
 
       # Apply the field limitations.

data/lib/mongoid/factory.rb

@@ -17,7 +17,8 @@ module Mongoid
     #
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil)
-      type = (attributes || {})[TYPE]
+      attributes ||= {}
+      type = attributes[TYPE] || attributes[TYPE.to_sym]
       if type && klass._types.include?(type)
         type.constantize.new(attributes)
       else

data/lib/mongoid/persistence_context.rb

@@ -195,10 +195,10 @@ module Mongoid
         Thread.current["[mongoid][#{object.object_id}]:context"]
       end
 
-      # Get the persistence context for a particular class or model instance.
+      # Clear the persistence context for a particular class or model instance.
       #
-      # @example Get the persistence context for a class or model instance.
-      #  PersistenceContext.get(model)
+      # @example Clear the persistence context for a class or model instance.
+      #  PersistenceContext.clear(model)
       #
       # @param [ Class, Object ] object The class or model instance.
       # @param [ Mongo::Cluster ] cluster The original cluster before this context was used.
@@ -208,8 +208,9 @@ module Mongoid
         if context = get(object)
           context.client.close unless (context.cluster.equal?(cluster) || cluster.nil?)
         end
+      ensure
         Thread.current["[mongoid][#{object.object_id}]:context"] = nil
       end
     end
   end
-end
+end

data/lib/mongoid/query_cache.rb

@@ -222,9 +222,11 @@ module Mongoid
           super
         else
           unless cursor = cached_cursor
-            server = read.select_server(cluster)
-            cursor = CachedCursor.new(view, send_initial_query(server), server)
-            QueryCache.cache_table[cache_key] = cursor
+            read_with_retry do
+              server = server_selector.select_server(cluster)
+              cursor = CachedCursor.new(view, send_initial_query(server), server)
+              QueryCache.cache_table[cache_key] = cursor
+            end
           end
           cursor.each do |doc|
             yield doc

data/lib/mongoid/relations/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.
@@ -89,7 +89,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 +116,52 @@ 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 }))
             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 } }))
+            post_process_batch_insert(docs)
+          end
+          pushes
+        end
+
         # Are we in a state to be able to batch insert?
         #
         # @api private

data/lib/mongoid/relations/synchronization.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/relations/targets/enumerable.rb

@@ -214,12 +214,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
@@ -298,13 +308,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
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "6.2.1"
+  VERSION = "6.3.0"
 end

data/spec/app/models/band.rb

@@ -20,6 +20,7 @@ class Band
 
   embeds_many :records, cascade_callbacks: true
   embeds_many :notes, as: :noteable, cascade_callbacks: true, validate: false
+  embeds_many :labels
   embeds_one :label, cascade_callbacks: true
 
   has_many :same_name, class_name: 'Agent', inverse_of: :same_name

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -211,10 +211,10 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$pushAll" =>
-              { "addresses" => [
+            { "$push" =>
+                { "addresses" => { '$each' => [
                   { "street" => "Oxford St" }
-                ]
+                ] }
               }
             }
           )
@@ -238,11 +238,11 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$pushAll" =>
-              { "addresses" => [
+            { "$push" =>
+              { "addresses" => { '$each' => [
                   { "street" => "Hobrechtstr." },
                   { "street" => "Pflugerstr." }
-                ]
+                ] }
               }
             }
           )
@@ -270,10 +270,10 @@ describe Mongoid::Atomic::Modifiers do
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
             { "$set" => { "addresses.0.street" => "Bond" },
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ] }
                 }
               }
             }
@@ -300,10 +300,10 @@ describe Mongoid::Atomic::Modifiers do
           expect(modifiers).to eq(
             { "$pullAll" => {
               "addresses" => { "street" => "Bond St" }},
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ] }
                 }
               }
             }
@@ -328,12 +328,12 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
-            { "$pushAll" => {
-              "addresses.0.locations" => [{ "street" => "Bond St" }]},
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+            { "$push" => {
+              "addresses.0.locations" => { '$each' => [{ "street" => "Bond St" }] } },
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ] }
                 }
               }
             }