mongoid 7.2.6 → 7.3.3

data/lib/mongoid/matcher/bits_all_set.rb

@@ -0,0 +1,20 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module BitsAllSet
+      include Bits
+      extend self
+
+      def array_matches?(value, condition)
+        condition.all? do |c|
+          value & (1<<c) > 0
+        end
+      end
+
+      def int_matches?(value, condition)
+        value & condition == condition
+      end
+    end
+  end
+end

data/lib/mongoid/matcher/bits_any_clear.rb

@@ -0,0 +1,20 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module BitsAnyClear
+      include Bits
+      extend self
+
+      def array_matches?(value, condition)
+        condition.any? do |c|
+          value & (1<<c) == 0
+        end
+      end
+
+      def int_matches?(value, condition)
+        value & condition < condition
+      end
+    end
+  end
+end

data/lib/mongoid/matcher/bits_any_set.rb

@@ -0,0 +1,20 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module BitsAnySet
+      include Bits
+      extend self
+
+      def array_matches?(value, condition)
+        condition.any? do |c|
+          value & (1<<c) > 0
+        end
+      end
+
+      def int_matches?(value, condition)
+        value & condition > 0
+      end
+    end
+  end
+end

data/lib/mongoid/matcher/expression.rb

@@ -12,6 +12,10 @@ module Mongoid
         end
         expr.all? do |k, expr_v|
           k = k.to_s
+          if k == "$comment"
+            # Nothing
+            return true
+          end
           if k.start_with?('$')
             ExpressionOperator.get(k).matches?(document, expr_v)
           else

data/lib/mongoid/matcher/field_operator.rb

@@ -5,6 +5,10 @@ module Mongoid
     module FieldOperator
       MAP = {
         '$all' => All,
+        '$bitsAllClear' => BitsAllClear,
+        '$bitsAllSet' => BitsAllSet,
+        '$bitsAnyClear' => BitsAnyClear,
+        '$bitsAnySet' => BitsAnySet,
         '$elemMatch' => ElemMatch,
         '$eq' => Eq,
         '$exists' => Exists,
@@ -13,11 +17,13 @@ module Mongoid
         '$in' => In,
         '$lt' => Lt,
         '$lte' => Lte,
+        '$mod' => Mod,
         '$nin' => Nin,
         '$ne' => Ne,
         '$not' => Not,
         '$regex' => Regex,
         '$size' => Size,
+        '$type' => Type,
       }.freeze
 
       module_function def get(op)

data/lib/mongoid/matcher/mod.rb

@@ -0,0 +1,17 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module Mod
+      module_function def matches?(exists, value, condition)
+        unless Array === condition
+          raise Errors::InvalidQuery, "Unknown $mod argument #{condition}"
+        end
+        if condition.length != 2
+          raise Errors::InvalidQuery, "Malformed $mod argument #{condition}, should have 2 elements"
+        end
+        condition[1] == value%condition[0]
+      end
+    end
+  end
+end

data/lib/mongoid/matcher/type.rb

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

data/lib/mongoid/matcher.rb

@@ -79,6 +79,11 @@ end
 
 require 'mongoid/matcher/all'
 require 'mongoid/matcher/and'
+require 'mongoid/matcher/bits'
+require 'mongoid/matcher/bits_all_clear'
+require 'mongoid/matcher/bits_all_set'
+require 'mongoid/matcher/bits_any_clear'
+require 'mongoid/matcher/bits_any_set'
 require 'mongoid/matcher/elem_match'
 require 'mongoid/matcher/elem_match_expression'
 require 'mongoid/matcher/eq'
@@ -92,6 +97,7 @@ require 'mongoid/matcher/gte'
 require 'mongoid/matcher/in'
 require 'mongoid/matcher/lt'
 require 'mongoid/matcher/lte'
+require 'mongoid/matcher/mod'
 require 'mongoid/matcher/ne'
 require 'mongoid/matcher/nin'
 require 'mongoid/matcher/nor'
@@ -99,5 +105,6 @@ require 'mongoid/matcher/not'
 require 'mongoid/matcher/or'
 require 'mongoid/matcher/regex'
 require 'mongoid/matcher/size'
+require 'mongoid/matcher/type'
 require 'mongoid/matcher/expression_operator'
 require 'mongoid/matcher/field_operator'

data/lib/mongoid/persistable/deletable.rb

@@ -47,7 +47,7 @@ module Mongoid
       #
       # @since 4.0.0
       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.
@@ -117,7 +117,6 @@ module Mongoid
       #
       # @since 4.0.0
       def prepare_delete
-        return false unless catch(:abort) { apply_delete_dependencies! }
         yield(self)
         freeze
         self.destroyed = true

data/lib/mongoid/persistable/destroyable.rb

@@ -23,13 +23,19 @@ module Mongoid
       def destroy(options = nil)
         raise Errors::ReadonlyDocument.new(self.class) if readonly?
         self.flagged_for_destroy = true
-        result = run_callbacks(:destroy) { delete(options || {}) }
+        result = run_callbacks(:destroy) do
+          if catch(:abort) { apply_destroy_dependencies! }
+            delete(options || {})
+          else
+            false
+          end
+        end
         self.flagged_for_destroy = false
         result
       end
 
       def destroy!(options = {})
-        destroy || raise(Errors::DocumentNotDestroyed.new(id, self.class))
+        destroy || raise(Errors::DocumentNotDestroyed.new(_id, self.class))
       end
 
       module ClassMethods

data/lib/mongoid/persistable/updatable.rb

@@ -137,8 +137,33 @@ module Mongoid
             coll = collection(_root)
             selector = atomic_selector
             coll.find(selector).update_one(positionally(selector, updates), session: _session)
-            conflicts.each_pair do |key, value|
-              coll.find(selector).update_one(positionally(selector, { key => value }), session: _session)
+
+            # The following code applies updates which would cause
+            # path conflicts in MongoDB, for example when changing attributes
+            # of foo.0.bars while adding another foo. Each conflicting update
+            # is applied using its own write.
+            #
+            # TODO: MONGOID-5026: reduce the number of writes performed by
+            # more intelligently combining the writes such that there are
+            # fewer conflicts.
+            conflicts.each_pair do |modifier, changes|
+
+              # Group the changes according to their root key which is
+              # the top-level association name.
+              # This handles at least the cases described in MONGOID-4982.
+              conflicting_change_groups = changes.group_by do |key, _|
+                key.split(".", 2).first
+              end.values
+
+              # Apply changes in batches. Pop one change from each
+              # field-conflict group round-robin until all changes
+              # have been applied.
+              while batched_changes = conflicting_change_groups.map(&:pop).compact.to_h.presence
+                coll.find(selector).update_one(
+                  positionally(selector, modifier => batched_changes),
+                  session: _session,
+                )
+              end
             end
           end
         end

data/lib/mongoid/query_cache.rb

@@ -127,38 +127,44 @@ module Mongoid
       end
     end
 
-    # The middleware to be added to a rack application in order to activate the
-    # query cache.
-    #
-    # @since 4.0.0
-    class Middleware
-
-      # Instantiate the middleware.
-      #
-      # @example Create the new middleware.
-      #   Middleware.new(app)
-      #
-      # @param [ Object ] app The rack applciation stack.
+    if defined?(Mongo::QueryCache::Middleware)
+      Middleware = Mongo::QueryCache::Middleware
+    else
+      # The middleware to be added to a rack application in order to activate the
+      # query cache.
       #
       # @since 4.0.0
-      def initialize(app)
-        @app = app
-      end
+      class Middleware
 
-      # Execute the request, wrapping in a query cache.
-      #
-      # @example Execute the request.
-      #   middleware.call(env)
-      #
-      # @param [ Object ] env The environment.
-      #
-      # @return [ Object ] The result of the call.
-      #
-      # @since 4.0.0
-      def call(env)
-        QueryCache.cache { @app.call(env) }
-      ensure
-        QueryCache.clear_cache
+        # Instantiate the middleware.
+        #
+        # @example Create the new middleware.
+        #   Middleware.new(app)
+        #
+        # @param [ Object ] app The rack application stack.
+        #
+        # @since 4.0.0
+        def initialize(app)
+          @app = app
+        end
+
+        # Execute the request, wrapping in a query cache.
+        #
+        # @example Execute the request.
+        #   middleware.call(env)
+        #
+        # @param [ Object ] env The environment.
+        #
+        # @return [ Object ] The result of the call.
+        #
+        # @since 4.0.0
+        def call(env)
+          QueryCache.cache do
+            @app.call(env)
+          end
+        ensure
+          QueryCache.clear_cache
+        end
       end
     end
 

data/lib/mongoid/selectable.rb

@@ -21,7 +21,7 @@ module Mongoid
     # @since 1.0.0
     def atomic_selector
       @atomic_selector ||=
-        (embedded? ? embedded_atomic_selector : root_atomic_selector)
+        (embedded? ? embedded_atomic_selector : root_atomic_selector_in_db)
     end
 
     private
@@ -44,18 +44,16 @@ module Mongoid
       end
     end
 
-    # Get the atomic selector for a root document.
+    # Get the atomic selector that would match the existing version of the
+    # root document.
     #
     # @api private
     #
-    # @example Get the root atomic selector.
-    #   document.root_atomic_selector
-    #
     # @return [ Hash ] The root document selector.
     #
     # @since 4.0.0
-    def root_atomic_selector
-      { "_id" => _id }.merge!(shard_key_selector)
+    def root_atomic_selector_in_db
+      { "_id" => _id }.merge!(shard_key_selector_in_db)
     end
   end
 end

data/lib/mongoid/shardable.rb

@@ -52,15 +52,31 @@ module Mongoid
       self.class.shard_key_fields
     end
 
-    # Get the document selector with the defined shard keys.
-    #
-    # @example Get the selector for the shard keys.
-    #   person.shard_key_selector
+    # Returns the selector that would match the current version of this
+    # document.
     #
     # @return [ Hash ] The shard key selector.
     #
-    # @since 2.0.0
+    # @api private
     def shard_key_selector
+      selector = {}
+      shard_key_fields.each do |field|
+        selector[field.to_s] = send(field)
+      end
+      selector
+    end
+
+    # Returns the selector that would match the existing version of this
+    # document in the database.
+    #
+    # If the document is not persisted, this method uses the current values
+    # of the shard key fields. If the document is persisted, this method
+    # uses the values retrieved from the database.
+    #
+    # @return [ Hash ] The shard key selector.
+    #
+    # @api private
+    def shard_key_selector_in_db
       selector = {}
       shard_key_fields.each do |field|
         selector[field.to_s] = new_record? ? send(field) : attribute_was(field)