mongoid 9.0.12 → 9.1.0

data/lib/mongoid/matcher/not.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $not expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/not/
     #
     # @api private
     module Not
-
       # Returns whether a value satisfies an $not expression.
       #
       # @param [ true | false ] exists Whether the value exists.

data/lib/mongoid/matcher/or.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $or expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/or/
     #
     # @api private
     module Or
-
       # Returns whether a document satisfies an $or expression.
       #
       # @param [ Mongoid::Document ] document The document.

data/lib/mongoid/matcher/regex.rb

@@ -16,23 +16,24 @@ module Mongoid
       #
       # @api private
       module_function def matches?(_exists, value, condition)
-        unless condition.is_a?(Regexp) || condition.is_a?(BSON::Regexp::Raw)
-          # Note that strings must have been converted to a regular expression
-          # instance already (with $options taken into account, if provided).
-          raise Errors::InvalidQuery, "$regex requires a regular expression argument: #{Errors::InvalidQuery.truncate_expr(condition)}"
-        end
+        condition = case condition
+                    when Regexp
+                      condition
+                    when BSON::Regexp::Raw
+                      condition.compile
+                    else
+                      # Note that strings must have been converted to a regular expression
+                      # instance already (with $options taken into account, if provided).
+                      raise Errors::InvalidQuery, "$regex requires a regular expression argument: #{Errors::InvalidQuery.truncate_expr(condition)}"
+                    end
 
-        # The condition is compiled by RegexpBudget rather than here, so that
-        # the budget's timeout can be baked into the pattern.
         case value
         when Array
-          # Object#=~ is gone as of Ruby 3.2, so an element that cannot be
-          # matched against has to be rejected rather than passed to =~.
           value.any? do |v|
-            v.respond_to?(:=~) && RegexpBudget.match?(v, condition)
+            v =~ condition
           end
         when String
-          RegexpBudget.match?(value, condition)
+          value =~ condition
         else
           false
         end

data/lib/mongoid/matcher/size.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $size expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/size/
     #
     # @api private
     module Size
-
       # Returns whether a value satisfies a $size expression.
       #
       # @param [ true | false ] exists Not used.
@@ -19,7 +16,7 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      module_function def matches?(exists, value, condition)
+      module_function def matches?(_exists, value, condition)
         case condition
         when Float
           raise Errors::InvalidQuery, "$size argument must be a non-negative integer: #{Errors::InvalidQuery.truncate_expr(condition)}"
@@ -31,7 +28,7 @@ module Mongoid
           raise Errors::InvalidQuery, "$size argument must be a non-negative integer: #{Errors::InvalidQuery.truncate_expr(condition)}"
         end
 
-        if Array === value
+        if value.is_a?(Array)
           value.length == condition
         else
           false

data/lib/mongoid/matcher/type.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $type expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/type/
     #
     # @api private
     module Type
-
       # Returns whether a value satisfies a $type expression.
       #
       # @param [ true | false ] exists Whether the value exists.
@@ -21,17 +18,15 @@ module Mongoid
       # @api private
       module_function def matches?(exists, value, condition)
         conditions = case condition
-        when Array
-          condition
-        when Integer
-          [condition]
-        else
-          raise Errors::InvalidQuery, "Unknown $type argument: #{condition}"
-        end
+                     when Array
+                       condition
+                     when Integer
+                       [ condition ]
+                     else
+                       raise Errors::InvalidQuery, "Unknown $type argument: #{condition}"
+                     end
         conditions.each do |condition|
-          if one_matches?(exists, value, condition)
-            return true
-          end
+          return true if one_matches?(exists, value, condition)
         end
         false
       end
@@ -51,70 +46,70 @@ module Mongoid
         case condition
         when 1
           # Double
-          Float === value
+          value.is_a?(Float)
         when 2
           # String
-          String === value
+          value.is_a?(String)
         when 3
           # Object
-          Hash === value
+          value.is_a?(Hash)
         when 4
           # Array
-          Array === value
+          value.is_a?(Array)
         when 5
           # Binary data
-          BSON::Binary === value
+          value.is_a?(BSON::Binary)
         when 6
           # Undefined
-          BSON::Undefined === value
+          value.is_a?(BSON::Undefined)
         when 7
           # ObjectId
-          BSON::ObjectId === value
+          value.is_a?(BSON::ObjectId)
         when 8
           # Boolean
-          TrueClass === value || FalseClass === value
+          value.is_a?(TrueClass) || value.is_a?(FalseClass)
         when 9
           # Date
-          Date === value || Time === value || DateTime === value
+          value.is_a?(Date) || value.is_a?(Time) || value.is_a?(DateTime)
         when 10
           # Null
-          exists && NilClass === value
+          exists && value.is_a?(NilClass)
         when 11
           # Regex
-          Regexp::Raw === value || ::Regexp === value
+          value.is_a?(Regexp::Raw) || value.is_a?(::Regexp)
         when 12
           # DBPointer deprecated
-          BSON::DbPointer === value
+          value.is_a?(BSON::DbPointer)
         when 13
           # JavaScript
-          BSON::Code === value
+          value.is_a?(BSON::Code)
         when 14
           # Symbol deprecated
-          Symbol === value || BSON::Symbol::Raw === value
+          value.is_a?(Symbol) || value.is_a?(BSON::Symbol::Raw)
         when 15
           # Javascript with code deprecated
-          BSON::CodeWithScope === value
+          value.is_a?(BSON::CodeWithScope)
         when 16
           # 32-bit int
-          BSON::Int32 === value || Integer === value && (-2**32..2**32-1).include?(value)
+          value.is_a?(BSON::Int32) || (value.is_a?(Integer) && (-2**32..(2**32) - 1).include?(value))
         when 17
           # Timestamp
-          BSON::Timestamp === value
+          value.is_a?(BSON::Timestamp)
         when 18
           # Long
-          BSON::Int64 === value ||
-            Integer === value &&
-              (-2**64..2**64-1).include?(value) &&
-              !(-2**32..2**32-1).include?(value)
+          value.is_a?(BSON::Int64) ||
+            (value.is_a?(Integer) &&
+              (-2**64..(2**64) - 1).include?(value) &&
+              !(-2**32..(2**32) - 1).include?(value))
         when 19
           # Decimal
-          BSON::Decimal128 === value
+          value.is_a?(BSON::Decimal128)
         when -1
           # minKey
-          BSON::MinKey === value
+          value.is_a?(BSON::MinKey)
         when 127
           # maxKey
-          BSON::MaxKey === value
+          value.is_a?(BSON::MaxKey)
         else
           raise Errors::InvalidQuery, "Unknown $type argument: #{condition}"
         end

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,7 +134,6 @@ 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'] = 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