mongoid 7.2.0.rc1 → 7.3.0

data/lib/mongoid/inspectable.rb

@@ -20,7 +20,7 @@ module Mongoid
     def inspect
       inspection = []
       inspection.concat(inspect_fields).concat(inspect_dynamic_fields)
-      "#<#{self.class.name} _id: #{id}, #{inspection * ', '}>"
+      "#<#{self.class.name} _id: #{_id}, #{inspection * ', '}>"
     end
 
     private

data/lib/mongoid/interceptable.rb

@@ -234,9 +234,11 @@ module Mongoid
     #   document.halted_callback_hook(filter)
     #
     # @param [ Symbol ] filter The callback that halted.
+    # @param [ Symbol ] name The name of the callback that was halted
+    #   (requires Rails 6.1+)
     #
     # @since 3.0.3
-    def halted_callback_hook(filter)
+    def halted_callback_hook(filter, name = nil)
       @before_callback_halted = true
     end
 

data/lib/mongoid/matcher.rb

@@ -43,66 +43,47 @@ module Mongoid
         document = BSON::Document.new(document.send(:as_attributes))
       end
 
-      src = document
-      expanded = false
-      exists = true
+      current = [document]
 
       key.to_s.split('.').each do |field|
-        if (index = field.to_i).to_s == field
-          # Array indexing
-          if Array === src
-            exists = index < src.length
-            src = src[index]
-          else
-            # Trying to index something that is not an array
-            exists = false
-            src = nil
-          end
-        else
-          case src
-          when nil
-            exists = false
+        new = []
+        current.each do |doc|
+          case doc
           when Hash
-            exists = src.key?(field)
-            src = src[field]
+            if doc.key?(field)
+              new << doc[field]
+            end
           when Array
-            expanded = true
-            exists = false
-            new = []
-            src.each do |doc|
-              case doc
-              when Hash
-                if doc.key?(field)
-                  v = doc[field]
-                  case v
-                  when Array
-                    new += v
-                  else
-                    new += [v]
-                  end
-                  exists = true
+            if (index = field.to_i).to_s == field
+              if doc.length > index
+                new << doc[index]
+              end
+            end
+            doc.each do |subdoc|
+              if Hash === subdoc
+                if subdoc.key?(field)
+                  new << subdoc[field]
                 end
-              else
-                # Trying to hash index into a value that is not a hash
               end
             end
-            src = new
-          else
-            # Trying to descend into a field that is not a hash using
-            # dot notation.
-            exists = false
-            src = nil
           end
         end
+        current = new
+        break if current.empty?
       end
 
-      [exists, src, expanded]
+      current
     end
   end
 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'
@@ -116,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'
@@ -123,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/matcher/bits.rb

@@ -0,0 +1,41 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module Bits
+      def matches?(exists, value, condition)
+        case value
+        when BSON::Binary
+          value = value.data.split('').map { |n| '%02x' % n.ord }.join.to_i(16)
+        end
+        case condition
+        when Array
+          array_matches?(value, condition)
+        when BSON::Binary
+          int_cond = condition.data.split('').map { |n| '%02x' % n.ord }.join.to_i(16)
+          int_matches?(value, int_cond)
+        when Integer
+          if condition < 0
+            raise Errors::InvalidQuery, "Invalid value for $#{operator_name} argument: negative integers are not allowed: #{condition}"
+          end
+          int_matches?(value, condition)
+        when Float
+          if (int_cond = condition.to_i).to_f == condition
+            if int_cond < 0
+              raise Errors::InvalidQuery, "Invalid value for $#{operator_name} argument: negative numbers are not allowed: #{condition}"
+            end
+            int_matches?(value, int_cond)
+          else
+            raise Errors::InvalidQuery, "Invalid type for $#{operator_name} argument: not representable as an integer: #{condition}"
+          end
+        else
+          raise Errors::InvalidQuery, "Invalid type for $#{operator_name} argument: #{condition}"
+        end
+      end
+
+      module_function def operator_name
+        name.sub(/.*::/, '').sub(/\A(.)/) { |l| l.downcase }
+      end
+    end
+  end
+end

data/lib/mongoid/matcher/bits_all_clear.rb

@@ -0,0 +1,20 @@
+module Mongoid
+  module Matcher
+
+    # @api private
+    module BitsAllClear
+      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 == 0
+      end
+    end
+  end
+end

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

@@ -15,7 +15,8 @@ module Mongoid
           # Validate the condition is valid, even though we will never attempt
           # matching it.
           condition.each do |k, v|
-            if k.to_s.start_with?('$')
+            k = k.to_s
+            if k.start_with?('$')
               begin
                 ExpressionOperator.get(k)
               rescue Mongoid::Errors::InvalidExpressionOperator

data/lib/mongoid/matcher/expression.rb

@@ -12,25 +12,20 @@ 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
-            exists, value, expanded = Matcher.extract_attribute(document, k)
-            # The value may have been expanded into an array, but then
-            # array may have been shrunk back to a scalar (or hash) when
-            # path contained a numeric position.
-            # Do not treat a hash as an array here (both are iterable).
-            if expanded && Array === value
-              if value == []
-                # Empty array is technically equivalent to exists: false.
-                FieldExpression.matches?(false, nil, expr_v)
-              else
-                value.any? do |v|
-                  FieldExpression.matches?(true, v, expr_v)
-                end
+            values = Matcher.extract_attribute(document, k)
+            if values.length > 0
+              values.any? do |v|
+                FieldExpression.matches?(true, v, expr_v)
               end
             else
-              FieldExpression.matches?(exists, value, expr_v)
+              FieldExpression.matches?(false, nil, expr_v)
             end
           end
         end

data/lib/mongoid/matcher/field_expression.rb

@@ -36,14 +36,13 @@ module Mongoid
                 FieldOperator.get(k).matches?(exists, value, cond_v)
               end
             elsif Hash === value
-              sub_exists, sub_value, expanded =
-                Matcher.extract_attribute(value, k)
-              if expanded
-                sub_value.any? do |sub_v|
+              sub_values = Matcher.extract_attribute(value, k)
+              if sub_values.length > 0
+                sub_values.any? do |sub_v|
                   Eq.matches?(true, sub_v, cond_v)
                 end
               else
-                Eq.matches?(sub_exists, sub_value, cond_v)
+                Eq.matches?(false, nil, cond_v)
               end
             else
               false

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)
@@ -35,17 +41,13 @@ module Mongoid
       end
 
       module_function def apply_comparison_operator(operator, left, right)
-        case left
-        when Numeric
-          case right
-          when Numeric
-            left.send(operator, right)
-          else
-            false
-          end
-        else
-          false
-        end
+        left.send(operator, right)
+      rescue ArgumentError, NoMethodError, TypeError
+        # We silence bogus comparison attempts, e.g. number to string
+        # comparisons.
+        # Several different exceptions may be produced depending on the types
+        # involved.
+        false
       end
     end
   end

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