mongoid 9.0.12 → 9.1.0

data/lib/mongoid/matcher/bits.rb

@@ -1,12 +1,9 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # Mixin module included in bitwise expression matchers.
     #
     # @api private
     module Bits
-
       # Returns whether a value satisfies a bitwise expression.
       #
       # @param [ true | false ] exists Not used.
@@ -17,7 +14,7 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      def matches?(exists, value, condition)
+      def matches?(_exists, value, condition)
         case value
         when BSON::Binary
           value = value.data.split('').map { |n| '%02x' % n.ord }.join.to_i(16)
@@ -30,17 +27,25 @@ module Mongoid
           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}"
+            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
+          # Allow floats that are whole numbers (e.g. 50.0), but reject those
+          # with a fractional part (e.g. 50.1) since bitwise ops require integers.
+          int_cond = condition.to_i
+          if int_cond == condition
             if int_cond < 0
-              raise Errors::InvalidQuery, "Invalid value for $#{operator_name} argument: negative numbers are not allowed: #{condition}"
+              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}"
+            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}"

data/lib/mongoid/matcher/bits_all_clear.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $bitsAllClear expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/bitsAllClear/
@@ -21,7 +19,7 @@ module Mongoid
       # @api private
       def array_matches?(value, condition)
         condition.all? do |c|
-          value & (1<<c) == 0
+          value & (1 << c) == 0
         end
       end
 

data/lib/mongoid/matcher/bits_all_set.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $bitsAllSet expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/bitsAllSet/
@@ -21,7 +19,7 @@ module Mongoid
       # @api private
       def array_matches?(value, condition)
         condition.all? do |c|
-          value & (1<<c) > 0
+          value & (1 << c) > 0
         end
       end
 

data/lib/mongoid/matcher/bits_any_clear.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $bitsAnyClear expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/bitsAnyClear/
@@ -21,7 +19,7 @@ module Mongoid
       # @api private
       def array_matches?(value, condition)
         condition.any? do |c|
-          value & (1<<c) == 0
+          value & (1 << c) == 0
         end
       end
 

data/lib/mongoid/matcher/bits_any_set.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $bitsAnySet expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/bitsAnySet/
@@ -21,7 +19,7 @@ module Mongoid
       # @api private
       def array_matches?(value, condition)
         condition.any? do |c|
-          value & (1<<c) > 0
+          value & (1 << c) > 0
         end
       end
 

data/lib/mongoid/matcher/elem_match.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $elemMatch expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/elemMatch/
     #
     # @api private
     module ElemMatch
-
       # Returns whether a value satisfies an $elemMatch expression.
       #
       # @param [ true | false ] exists Not used.
@@ -18,28 +15,29 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      module_function def matches?(exists, value, condition)
-        unless Hash === condition
+      module_function def matches?(_exists, value, condition)
+        unless condition.is_a?(Hash)
           raise Errors::InvalidQuery, "$elemMatch requires a Hash operand: #{Errors::InvalidQuery.truncate_expr(condition)}"
         end
-        if Array === value && !value.empty?
+
+        if value.is_a?(Array) && !value.empty?
           value.any? do |v|
             ElemMatchExpression.matches?(v, condition)
           end
         else
           # Validate the condition is valid, even though we will never attempt
           # matching it.
-          condition.each do |k, v|
+          condition.each do |k, _v|
             k = k.to_s
-            if k.start_with?('$')
+            next unless k.start_with?('$')
+
+            begin
+              ExpressionOperator.get(k)
+            rescue Mongoid::Errors::InvalidExpressionOperator
               begin
-                ExpressionOperator.get(k)
-              rescue Mongoid::Errors::InvalidExpressionOperator
-                begin
-                  FieldOperator.get(k)
-                rescue Mongoid::Errors::InvalidFieldOperator => exc
-                  raise Mongoid::Errors::InvalidElemMatchOperator.new(exc.operator)
-                end
+                FieldOperator.get(k)
+              rescue Mongoid::Errors::InvalidFieldOperator => exc
+                raise Mongoid::Errors::InvalidElemMatchOperator.new(exc.operator)
               end
             end
           end

data/lib/mongoid/matcher/elem_match_expression.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher used to evaluate whether an $elemMatch predicate
     # matches and individual document. The $elemMatch predicate can be a
     # logical expressions including $and, $or, $nor, and $not. $not can
@@ -9,7 +7,6 @@ module Mongoid
     #
     # @api private
     module ElemMatchExpression
-
       # Returns whether a document satisfies an $elemMatch expression.
       #
       # @param [ Mongoid::Document ] document The document.

data/lib/mongoid/matcher/eq.rb

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

data/lib/mongoid/matcher/eq_impl.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # This module is used by $eq and other operators that need to perform
     # the matching that $eq performs (for example, $ne which negates the result
     # of $eq). Unlike $eq this module takes an original operator as an
@@ -10,7 +8,6 @@ module Mongoid
     #
     # @api private
     module EqImpl
-
       # Returns whether a value satisfies an $eq (or similar) expression.
       #
       # @param [ true | false ] exists Not used.
@@ -21,26 +18,24 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      module_function def matches?(exists, value, condition, original_operator)
+      module_function def matches?(_exists, value, condition, original_operator)
         case condition
         when Range
           # Since $ne invokes $eq, the exception message needs to handle
           # both operators.
           raise Errors::InvalidQuery, "Range is not supported as an argument to '#{original_operator}'"
-=begin
-          if value.is_a?(Array)
-            value.any? { |elt| condition.include?(elt) }
-          else
-            condition.include?(value)
-          end
-=end
+        #           if value.is_a?(Array)
+        #             value.any? { |elt| condition.include?(elt) }
+        #           else
+        #             condition.include?(value)
+        #           end
         else
           # When doing a comparison with Time objects, compare using millisecond precision
-          if value.kind_of?(Time) && condition.kind_of?(Time)
+          if value.is_a?(Time) && condition.is_a?(Time)
             time_eq?(value, condition)
-          elsif value.is_a?(Array) && condition.kind_of?(Time)
+          elsif value.is_a?(Array) && condition.is_a?(Time)
             value.map do |v|
-              if v.kind_of?(Time)
+              if v.is_a?(Time)
                 time_rounded_to_millis(v)
               else
                 v
@@ -48,12 +43,12 @@ module Mongoid
             end.include?(time_rounded_to_millis(condition))
           else
             value == condition ||
-            value.is_a?(Array) && value.include?(condition)
+              (value.is_a?(Array) && value.include?(condition))
           end
         end
       end
 
-      # Per https://www.mongodb.com/docs/ruby-driver/current/tutorials/bson-v4/#time-instances,
+      # Per https://www.mongodb.com/docs/ruby-driver/upcoming/data-formats/bson/#time-instances,
       # > Times in BSON (and MongoDB) can only have millisecond precision. When Ruby Time instances
       # are serialized to BSON or Extended JSON, the times are floored to the nearest millisecond.
       #
@@ -77,7 +72,7 @@ module Mongoid
       #
       # @return [ true | false ] The time rounded to the millisecond.
       module_function def time_rounded_to_millis(time)
-        return time._bson_to_i * 1000 + time.usec.divmod(1000).first
+        (time._bson_to_i * 1000) + time.usec.divmod(1000).first
       end
     end
   end

data/lib/mongoid/matcher/eq_impl_with_regexp.rb

@@ -18,8 +18,10 @@ module Mongoid
       # @api private
       module_function def matches?(_original_operator, value, condition)
         case condition
-        when Regexp, ::BSON::Regexp::Raw
-          value.respond_to?(:=~) && RegexpBudget.match?(value, condition)
+        when Regexp
+          value.respond_to?(:=~) && value =~ condition
+        when ::BSON::Regexp::Raw
+          value.respond_to?(:=~) && value =~ condition.compile
         else
           if value.is_a?(Time) && condition.is_a?(Time)
             EqImpl.time_eq?(value, condition)

data/lib/mongoid/matcher/exists.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $exists expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/exists/
     #
     # @api private
     module Exists
-
       # Returns whether an $exists expression is satisfied.
       #
       # @param [ true | false ] exists Whether the value exists.
@@ -18,7 +15,7 @@ module Mongoid
       # @return [ true | false ] Whether the existence condition is met.
       #
       # @api private
-      module_function def matches?(exists, value, condition)
+      module_function def matches?(exists, _value, condition)
         case condition
         when Range
           raise Errors::InvalidQuery, "$exists argument cannot be a Range: #{Errors::InvalidQuery.truncate_expr(condition)}"

data/lib/mongoid/matcher/expression.rb

@@ -1,13 +1,10 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # Base singleton module used for evaluating whether a given
     # document in-memory matches an MSQL query expression.
     #
     # @api private
     module Expression
-
       # Returns whether a document satisfies a query expression.
       #
       # @param [ Mongoid::Document ] document The document.
@@ -17,18 +14,16 @@ module Mongoid
       #
       # @api private
       module_function def matches?(document, expr)
-        if expr.nil?
-          raise Errors::InvalidQuery, "Nil condition in expression context"
-        end
-        unless Hash === expr
-          raise Errors::InvalidQuery, "MQL query must be provided as a Hash"
-        end
+        raise Errors::InvalidQuery, 'Nil condition in expression context' if expr.nil?
+        raise Errors::InvalidQuery, 'MQL query must be provided as a Hash' unless expr.is_a?(Hash)
+
         expr.all? do |k, expr_v|
           k = k.to_s
-          if k == "$comment"
+          if k == '$comment'
             # Nothing
             return true
           end
+
           if k.start_with?('$')
             ExpressionOperator.get(k).matches?(document, expr_v)
           else

data/lib/mongoid/matcher/expression_operator.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # Singleton module provides lookup of logical query operator
     # matchers.
     #
@@ -10,7 +8,7 @@ module Mongoid
       MAP = {
         '$and' => And,
         '$nor' => Nor,
-        '$or' => Or,
+        '$or' => Or
       }.freeze
 
       # Returns the matcher module for a given operator.

data/lib/mongoid/matcher/field_expression.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # Singleton module used for evaluating whether a given
     # value in-memory matches an MSQL query expression related
     # to a specific field.
     #
     # @api private
     module FieldExpression
-
       # Returns whether a value satisfies a condition.
       #
       # @param [ true | false ] exists Whether the value exists.
@@ -23,7 +20,7 @@ module Mongoid
           condition.all? do |k, cond_v|
             k = k.to_s
             if k.start_with?('$')
-              if %w($regex $options).include?(k)
+              if %w[$regex $options].include?(k)
                 unless condition.key?('$regex')
                   raise Errors::InvalidQuery, "$regex is required if $options is given: #{Errors::InvalidQuery.truncate_expr(condition)}"
                 end
@@ -31,14 +28,14 @@ module Mongoid
                 if k == '$regex'
                   if options = condition['$options']
                     cond_v = case cond_v
-                    when Regexp
-                      BSON::Regexp::Raw.new(cond_v.source, options)
-                    when BSON::Regexp::Raw
-                      BSON::Regexp::Raw.new(cond_v.pattern, options)
-                    else
-                      BSON::Regexp::Raw.new(cond_v, options)
-                    end
-                  elsif String === cond_v
+                             when Regexp
+                               BSON::Regexp::Raw.new(cond_v.source, options)
+                             when BSON::Regexp::Raw
+                               BSON::Regexp::Raw.new(cond_v.pattern, options)
+                             else
+                               BSON::Regexp::Raw.new(cond_v, options)
+                             end
+                  elsif cond_v.is_a?(String)
                     cond_v = BSON::Regexp::Raw.new(cond_v)
                   end
 
@@ -50,7 +47,7 @@ module Mongoid
               else
                 FieldOperator.get(k).matches?(exists, value, cond_v)
               end
-            elsif Hash === value
+            elsif value.is_a?(Hash)
               sub_values = Matcher.extract_attribute(value, k)
               if sub_values.length > 0
                 sub_values.any? do |sub_v|

data/lib/mongoid/matcher/field_operator.rb

@@ -1,7 +1,5 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # Singleton module provides lookup of query operator matchers
     # related to field values.
     #
@@ -27,7 +25,7 @@ module Mongoid
         '$not' => Not,
         '$regex' => Regex,
         '$size' => Size,
-        '$type' => Type,
+        '$type' => Type
       }.freeze
 
       # Returns the matcher module for a given operator.
@@ -51,9 +49,9 @@ module Mongoid
       # @todo Refactor this as it is only relevant to $lt, $lte, $gt, $gte.
       #
       # @api private
-      module_function def apply_array_field_operator(exists, value, condition)
-        if Array === value
-          value.any? { |v| yield v }
+      module_function def apply_array_field_operator(_exists, value, _condition, &block)
+        if value.is_a?(Array)
+          value.any?(&block)
         else
           yield value
         end

data/lib/mongoid/matcher/gt.rb

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

data/lib/mongoid/matcher/gte.rb

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

data/lib/mongoid/matcher/in.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $in expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/in/
     #
     # @api private
     module In
-
       # Returns whether a value satisfies an $in expression.
       #
       # @param [ true | false ] exists Not used.
@@ -18,19 +15,19 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      module_function def matches?(exists, value, condition)
-        unless Array === condition
+      module_function def matches?(_exists, value, condition)
+        unless condition.is_a?(Array)
           raise Errors::InvalidQuery, "$in argument must be an array: #{Errors::InvalidQuery.truncate_expr(condition)}"
         end
-        if Array === value
-          if value.any? { |v|
-            condition.any? do |c|
-              EqImplWithRegexp.matches?('$in', v, c)
-            end
-          } then
-            return true
+
+        if value.is_a?(Array) && value.any? do |v|
+          condition.any? do |c|
+            EqImplWithRegexp.matches?('$in', v, c)
           end
         end
+          return true
+        end
+
         condition.any? do |c|
           EqImplWithRegexp.matches?('$in', value, c)
         end

data/lib/mongoid/matcher/lt.rb

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

data/lib/mongoid/matcher/lte.rb

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

data/lib/mongoid/matcher/mod.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $mod expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/mod/
     #
     # @api private
     module Mod
-
       # Returns whether a value satisfies a $mod expression.
       #
       # @param [ true | false ] exists Not used.
@@ -19,14 +16,13 @@ module Mongoid
       # @return [ true | false ] Whether the value matches.
       #
       # @api private
-      module_function def matches?(exists, value, condition)
-        unless Array === condition
-          raise Errors::InvalidQuery, "Unknown $mod argument #{condition}"
-        end
+      module_function def matches?(_exists, value, condition)
+        raise Errors::InvalidQuery, "Unknown $mod argument #{condition}" unless condition.is_a?(Array)
         if condition.length != 2
           raise Errors::InvalidQuery, "Malformed $mod argument #{condition}, should have 2 elements"
         end
-        condition[1] == value%condition[0]
+
+        condition[1] == value % condition[0]
       end
     end
   end

data/lib/mongoid/matcher/ne.rb

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

data/lib/mongoid/matcher/nin.rb

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

data/lib/mongoid/matcher/nor.rb

@@ -1,14 +1,11 @@
-# rubocop:todo all
 module Mongoid
   module Matcher
-
     # In-memory matcher for $nor expression.
     #
     # @see https://www.mongodb.com/docs/manual/reference/operator/query/nor/
     #
     # @api private
     module Nor
-
       # Returns whether a document satisfies a $nor expression.
       #
       # @param [ Mongoid::Document ] document The document.
@@ -27,9 +24,7 @@ module Mongoid
         end
 
         expr.each do |sub_expr|
-          if Expression.matches?(document, sub_expr)
-            return false
-          end
+          return false if Expression.matches?(document, sub_expr)
         end
 
         expr.any?