mongoid 9.0.11 → 9.1.1

data/lib/mongoid/matcher.rb

@@ -1,6 +1,4 @@
-# rubocop:todo all
 module Mongoid
-
   # Utility module containing methods which assist in performing
   # in-memory matching of documents with MQL query expressions.
   #
@@ -45,7 +43,7 @@ module Mongoid
     # @return [ Object | Array ] Field value or values.
     module_function def extract_attribute(document, key)
       # The matcher system will wind up sending atomic values to this as well,
-      # when attepting to match more complex types. If anything other than a
+      # when attempting to match more complex types. If anything other than a
       # Document or a Hash is given, we'll short-circuit the logic and just
       # return an empty array.
       return [] unless document.is_a?(Hash) || document.is_a?(Document)
@@ -65,7 +63,7 @@ module Mongoid
         document = document.send(:as_attributes)
       end
 
-      current = [document]
+      current = [ document ]
 
       key.to_s.split('.').each do |field|
         new = []
@@ -73,21 +71,15 @@ module Mongoid
           case doc
           when Hash
             actual_key = find_exact_key(doc, field)
-            if !actual_key.nil?
-              new << doc[actual_key]
-            end
+            new << doc[actual_key] unless actual_key.nil?
           when Array
-            if (index = field.to_i).to_s == field
-              if doc.length > index
-                new << doc[index]
-              end
+            if ((index = field.to_i).to_s == field) && (doc.length > index)
+              new << doc[index]
             end
             doc.each do |subdoc|
-              if Hash === subdoc
+              if subdoc.is_a?(Hash)
                 actual_key = find_exact_key(subdoc, field)
-                if !actual_key.nil?
-                  new << subdoc[actual_key]
-                end
+                new << subdoc[actual_key] unless actual_key.nil?
               end
             end
           end
@@ -142,6 +134,7 @@ require 'mongoid/matcher/nor'
 require 'mongoid/matcher/not'
 require 'mongoid/matcher/or'
 require 'mongoid/matcher/regex'
+require 'mongoid/matcher/regexp_budget'
 require 'mongoid/matcher/size'
 require 'mongoid/matcher/type'
 require 'mongoid/matcher/expression_operator'

data/lib/mongoid/model_resolver.rb

@@ -19,6 +19,7 @@ module Mongoid
 
     class << self
       extend Forwardable
+
       def_delegators :instance, :register
 
       # Returns the default instance of the ModelResolver.

data/lib/mongoid/persistable/creatable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for persistence operations that create new documents.
     module Creatable
       extend ActiveSupport::Concern
@@ -38,11 +36,17 @@ module Mongoid
       #
       # @return [ Hash ] The insert ops.
       def atomic_inserts
-        { atomic_insert_modifier => { atomic_position => as_attributes }}
+        { atomic_insert_modifier => { atomic_position => as_attributes } }
       end
 
       # Insert the embedded document.
       #
+      # When the parent association is touchable (which is the default for
+      # +embedded_in+), the touch timestamp updates are merged into the
+      # same +update_one+ call that performs the insert. This avoids a
+      # second round-trip that the +after_save+ touch callback would
+      # otherwise issue.
+      #
       # @api private
       #
       # @example Insert the document as embedded.
@@ -51,13 +55,25 @@ module Mongoid
       # @return [ Document ] The document.
       def insert_as_embedded
         raise Errors::NoParent.new(self.class.name) unless _parent
+
         if _parent.new_record?
           _parent.insert
         else
           selector = _parent.atomic_selector
+          operations = atomic_inserts
+
+          if _touchable_parent?
+            touches = _parent._gather_touch_updates(Time.current)
+            if touches.present?
+              operations['$set'] = (operations['$set'] || {}).merge(touches)
+              Threaded.begin_touch_merged(self)
+            end
+          end
+
           _root.collection.find(selector).update_one(
-              positionally(selector, atomic_inserts),
-              session: _session)
+            positionally(selector, operations),
+            session: _session
+          )
         end
       end
 
@@ -104,7 +120,8 @@ module Mongoid
       def prepare_insert(options = {})
         raise Errors::ReadonlyDocument.new(self.class) if readonly? && !Mongoid.legacy_readonly
         return self if performing_validations?(options) &&
-          invalid?(options[:context] || :create)
+                       invalid?(options[:context] || :create)
+
         ensure_client_compatibility!
         run_callbacks(:commit, with_children: true, skip_if: -> { in_transaction? }) do
           run_callbacks(:save, with_children: false) do
@@ -127,7 +144,6 @@ module Mongoid
       end
 
       module ClassMethods
-
         # Create a new document. This will instantiate a new document and
         # insert it in a single call. Will always return the document
         # whether save passed or not.

data/lib/mongoid/persistable/deletable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for persistence operations that delete documents.
     module Deletable
       extend ActiveSupport::Concern
@@ -31,7 +29,7 @@ module Mongoid
           end
         end
       end
-      alias :remove :delete
+      alias remove delete
 
       private
 
@@ -44,7 +42,7 @@ module Mongoid
       #
       # @return [ Hash ] The atomic deletes.
       def atomic_deletes
-        { atomic_delete_modifier => { atomic_path => _index ? { "_id" => _id } : true }}
+        { atomic_delete_modifier => { atomic_path => _index ? { '_id' => _id } : true } }
       end
 
       # Delete the embedded document.
@@ -62,8 +60,9 @@ module Mongoid
         if _parent.persisted?
           selector = _parent.atomic_selector
           _root.collection.find(selector).update_one(
-              positionally(selector, atomic_deletes),
-              session: _session)
+            positionally(selector, atomic_deletes),
+            session: _session
+          )
         end
         true
       end
@@ -107,13 +106,13 @@ module Mongoid
       # @return [ true ] If the object was deleted successfully.
       def prepare_delete
         raise Errors::ReadonlyDocument.new(self.class) if readonly?
+
         yield(self)
         freeze
         self.destroyed = true
       end
 
       module ClassMethods
-
         # Delete all documents given the supplied conditions. If no conditions
         # are passed, the entire collection will be dropped for performance
         # benefits. Does not fire any callbacks.

data/lib/mongoid/persistable/destroyable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for persistence operations that destroy documents.
     module Destroyable
       extend ActiveSupport::Concern
@@ -22,14 +20,13 @@ module Mongoid
       # @return [ true | false ] True if successful, false if not.
       def destroy(options = nil)
         raise Errors::ReadonlyDocument.new(self.class) if readonly?
+
         self.flagged_for_destroy = true
         result = run_callbacks(:commit, skip_if: -> { in_transaction? }) do
           run_callbacks(:destroy) do
             if catch(:abort) { apply_destroy_dependencies! }
               delete(options || {}).tap do |res|
-                if res && in_transaction?
-                  Threaded.add_modified_document(_session, self)
-                end
+                Threaded.add_modified_document(_session, self) if res && in_transaction?
               end
             else
               false
@@ -61,7 +58,6 @@ module Mongoid
       end
 
       module ClassMethods
-
         # Delete all documents given the supplied conditions. If no conditions
         # are passed, the entire collection will be dropped for performance
         # benefits. Fires the destroy callbacks if conditions were passed.

data/lib/mongoid/persistable/incrementable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $inc operations.
     module Incrementable
       extend ActiveSupport::Concern
@@ -28,7 +26,7 @@ module Mongoid
             attributes[field] = new_value
             ops[atomic_attribute_name(field)] = increment
           end
-          { "$inc" => ops } unless ops.empty?
+          { '$inc' => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/logical.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for logical bitwise operations.
     module Logical
       extend ActiveSupport::Concern
@@ -22,14 +20,14 @@ module Mongoid
           process_atomic_operations(operations) do |field, values|
             value = attributes[field]
             values.each do |op, val|
-              value = value & val if op.to_s == "and"
-              value = value | val if op.to_s == "or"
+              value &= val if op.to_s == 'and'
+              value |= val if op.to_s == 'or'
             end
             process_attribute field, value if executing_atomically?
             attributes[field] = value
             ops[atomic_attribute_name(field)] = values
           end
-          { "$bit" => ops } unless ops.empty?
+          { '$bit' => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/maxable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for setting a field (or fields) to the larger of
     # either it's current value, or a given value.
     module Maxable
@@ -28,10 +26,10 @@ module Mongoid
               ops[atomic_attribute_name(field)] = value
             end
           end
-          { "$max" => ops } unless ops.empty?
+          { '$max' => ops } unless ops.empty?
         end
       end
-      alias :clamp_lower_bound :set_max
+      alias clamp_lower_bound set_max
     end
   end
 end

data/lib/mongoid/persistable/minable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for setting a field (or fields) to the smaller of
     # either it's current value, or a given value.
     module Minable
@@ -28,10 +26,10 @@ module Mongoid
               ops[atomic_attribute_name(field)] = value
             end
           end
-          { "$min" => ops } unless ops.empty?
+          { '$min' => ops } unless ops.empty?
         end
       end
-      alias :clamp_upper_bound :set_min
+      alias clamp_upper_bound set_min
     end
   end
 end

data/lib/mongoid/persistable/multipliable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $mul operations.
     module Multipliable
       extend ActiveSupport::Concern
@@ -28,7 +26,7 @@ module Mongoid
             attributes[field] = new_value
             ops[atomic_attribute_name(field)] = factor
           end
-          { "$mul" => ops } unless ops.empty?
+          { '$mul' => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/poppable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $pop operations.
     module Poppable
       extend ActiveSupport::Concern
@@ -26,10 +24,10 @@ module Mongoid
         prepare_atomic_operation do |ops|
           process_atomic_operations(pops) do |field, value|
             values = send(field)
-            value > 0 ? values.pop : values.shift
+            (value > 0) ? values.pop : values.shift
             ops[atomic_attribute_name(field)] = value
           end
-          { "$pop" => ops }
+          { '$pop' => ops }
         end
       end
     end

data/lib/mongoid/persistable/pullable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $pull and $pullAll operations.
     module Pullable
       extend ActiveSupport::Concern
@@ -24,7 +22,7 @@ module Mongoid
             (send(field) || []).delete(value)
             ops[atomic_attribute_name(field)] = value
           end
-          { "$pull" => ops }
+          { '$pull' => ops }
         end
       end
 
@@ -40,10 +38,10 @@ module Mongoid
         prepare_atomic_operation do |ops|
           process_atomic_operations(pulls) do |field, value|
             existing = send(field) || []
-            value.each{ |val| existing.delete(val) }
+            value.each { |val| existing.delete(val) }
             ops[atomic_attribute_name(field)] = value
           end
-          { "$pullAll" => ops }
+          { '$pullAll' => ops }
         end
       end
     end

data/lib/mongoid/persistable/pushable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $push and $addToSet operations.
     module Pushable
       extend ActiveSupport::Concern
@@ -31,9 +29,9 @@ module Mongoid
             values.each do |val|
               existing.push(val) unless existing.include?(val)
             end
-            ops[atomic_attribute_name(field)] = { "$each" => values }
+            ops[atomic_attribute_name(field)] = { '$each' => values }
           end
-          { "$addToSet" => ops }
+          { '$addToSet' => ops }
         end
       end
 
@@ -56,10 +54,10 @@ module Mongoid
               attributes[field]
             end
             values = [ value ].flatten(1)
-            values.each{ |val| existing.push(val) }
-            ops[atomic_attribute_name(field)] = { "$each" => values }
+            values.each { |val| existing.push(val) }
+            ops[atomic_attribute_name(field)] = { '$each' => values }
           end
-          { "$push" => ops }
+          { '$push' => ops }
         end
       end
     end

data/lib/mongoid/persistable/renamable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $rename operations.
     module Renamable
       extend ActiveSupport::Concern
@@ -30,7 +28,7 @@ module Mongoid
             end
             ops[atomic_attribute_name(old_field)] = atomic_attribute_name(new_name)
           end
-          { "$rename" => ops }
+          { '$rename' => ops }
         end
       end
     end

data/lib/mongoid/persistable/savable.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for persistence operations that save documents.
     module Savable
-
       # Save the document - will perform an insert if the document is new, and
       # update if not.
       #

data/lib/mongoid/persistable/settable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $set operations.
     module Settable
       extend ActiveSupport::Concern
@@ -48,7 +46,6 @@ module Mongoid
       def set(setters)
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
-
             field_seq = field.to_s.split('.')
             field = field_seq.shift
             if field_seq.length > 0
@@ -56,18 +53,14 @@ module Mongoid
               old_value = attributes[field]
 
               # if the old value is not a hash, clobber it
-              unless Hash === old_value
-                old_value = {}
-              end
+              old_value = {} unless old_value.is_a?(Hash)
 
               # descend into the hash, creating intermediate keys as needed
               cur_value = old_value
               while field_seq.length > 1
                 cur_key = field_seq.shift
                 # clobber on each level if type is not a hash
-                unless Hash === cur_value[cur_key]
-                  cur_value[cur_key] = {}
-                end
+                cur_value[cur_key] = {} unless cur_value[cur_key].is_a?(Hash)
                 cur_value = cur_value[cur_key]
               end
 
@@ -82,11 +75,9 @@ module Mongoid
 
             process_attribute(field, value)
 
-            unless relations.include?(field.to_s)
-              ops[atomic_attribute_name(field)] = attributes[field]
-            end
+            ops[atomic_attribute_name(field)] = attributes[field] unless relations.include?(field.to_s)
           end
-          { "$set" => ops } unless ops.empty?
+          { '$set' => ops } unless ops.empty?
         end
       end
     end

data/lib/mongoid/persistable/unsettable.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   module Persistable
-
     # Defines behavior for $unset operations.
     module Unsettable
       extend ActiveSupport::Concern
@@ -29,7 +27,7 @@ module Mongoid
             end
             ops[atomic_attribute_name(normalized)] = true
           end
-          { "$unset" => ops }
+          { '$unset' => ops }
         end
       end
     end