mongoid 9.0.11 → 9.1.0

data/lib/mongoid/criteria/queryable/extensions/numeric.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Numeric module and its children.
         module Numeric
-
           # Evolve the numeric value into a mongo friendly date, aka UTC time at
           # midnight.
           #
@@ -32,7 +29,6 @@ module Mongoid
           end
 
           module ClassMethods
-
             # Get the object as a numeric.
             #
             # @api private
@@ -55,10 +51,14 @@ module Mongoid
               str = str.chop if str.end_with?('.')
               return 0 if str.empty?
 
-              result = Integer(str) rescue Float(object)
+              result = begin
+                Integer(str)
+              rescue StandardError
+                Float(object)
+              end
 
               integer = result.to_i
-              integer == result ? integer : result
+              (integer == result) ? integer : result
             end
 
             # Evolve the object to an integer.
@@ -71,7 +71,9 @@ module Mongoid
             # @return [ Integer ] The evolved object.
             def evolve(object)
               __evolve__(object) do |obj|
-                __numeric__(obj) rescue obj
+                __numeric__(obj)
+              rescue StandardError
+                obj
               end
             end
           end
@@ -81,8 +83,10 @@ module Mongoid
   end
 end
 
-::Integer.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Numeric)
-::Integer.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Numeric::ClassMethods)
+Integer.include Mongoid::Criteria::Queryable::Extensions::Numeric
+Integer.extend Mongoid::Criteria::Queryable::Extensions::Numeric::ClassMethods
+
+Float.include Mongoid::Criteria::Queryable::Extensions::Numeric
+Float.extend Mongoid::Criteria::Queryable::Extensions::Numeric::ClassMethods
 
-::Float.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Numeric)
-::Float.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Numeric::ClassMethods)
+BigDecimal.include Mongoid::Criteria::Queryable::Extensions::Numeric

data/lib/mongoid/criteria/queryable/extensions/object.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Object class.
         module Object
-
           # Combine the two objects using the add strategy.
           #
           # @example Add the object to the array.
@@ -100,7 +97,9 @@ module Mongoid
           #   1.__deep_copy__
           #
           # @return [ Object ] self.
-          def __deep_copy__; self; end
+          def __deep_copy__
+            self
+          end
 
           # Get the object as an array.
           #
@@ -135,7 +134,6 @@ module Mongoid
           Mongoid.deprecate(self, :regexp?)
 
           module ClassMethods
-
             # Evolve the object.
             #
             # @note This is here for API compatibility.
@@ -164,9 +162,10 @@ module Mongoid
             # @return [ Object ] The evolved object.
             def __evolve__(object)
               return nil if object.nil?
+
               case object
               when ::Array
-                object.map{ |obj| evolve(obj) }
+                object.map { |obj| evolve(obj) }
               when ::Range
                 object.__evolve_range__
               else
@@ -181,5 +180,5 @@ module Mongoid
   end
 end
 
-::Object.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Object)
-::Object.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Object::ClassMethods)
+Object.include Mongoid::Criteria::Queryable::Extensions::Object
+Object.extend Mongoid::Criteria::Queryable::Extensions::Object::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/range.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Range class.
         module Range
-
           # Get the range as an array.
           #
           # @example Get the range as an array.
@@ -26,7 +23,7 @@ module Mongoid
           #
           # @return [ Hash ] The $gte/$lte range query with times at UTC midnight.
           def __evolve_date__
-            __evolve_range_naive__.transform_values! {|v| v&.__evolve_date__ }
+            __evolve_range_naive__.transform_values! { |v| v&.__evolve_date__ }
           end
 
           # Convert the range to a $gte/$lte mongo friendly query for times.
@@ -36,7 +33,7 @@ module Mongoid
           #
           # @return [ Hash ] The $gte/$lte range query with times in UTC.
           def __evolve_time__
-            __evolve_range_naive__.transform_values! {|v| v&.__evolve_time__ }
+            __evolve_range_naive__.transform_values! { |v| v&.__evolve_time__ }
           end
 
           # Convert the range to a $gte/$lte mongo friendly query.
@@ -72,12 +69,11 @@ module Mongoid
           def __evolve_range_naive__
             hash = {}
             hash['$gte'] = self.begin if self.begin
-            hash[exclude_end? ? "$lt" : "$lte"] = self.end if self.end
+            hash[exclude_end? ? '$lt' : '$lte'] = self.end if self.end
             hash
           end
 
           module ClassMethods
-
             # Evolve the range. This will transform it into a $gte/$lte selection.
             # Endless and beginning-less ranges will use only $gte or $lte respectively.
             # End-excluded ranges (...) will use $lt selector instead of $lte.
@@ -90,6 +86,7 @@ module Mongoid
             # @return [ Hash ] The range as a gte/lte criteria.
             def evolve(object)
               return object unless object.is_a?(::Range)
+
               object.__evolve_range__
             end
           end
@@ -99,5 +96,5 @@ module Mongoid
   end
 end
 
-::Range.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Range)
-::Range.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Range::ClassMethods)
+Range.include Mongoid::Criteria::Queryable::Extensions::Range
+Range.extend Mongoid::Criteria::Queryable::Extensions::Range::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/regexp.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Regexp class.
         module Regexp
-
           # Is the object a regexp?
           #
           # @example Is the object a regex?
@@ -16,11 +13,12 @@ module Mongoid
           #
           # @return [ true ] Always true.
           # @deprecated
-          def regexp?; true; end
+          def regexp?
+            true
+          end
           Mongoid.deprecate(self, :regexp?)
 
           module ClassMethods
-
             # Evolve the object into a regex.
             #
             # @example Evolve the object to a regex.
@@ -38,7 +36,6 @@ module Mongoid
 
           # Adds query type-casting behavior to BSON::Regexp::Raw class.
           module Raw_
-
             # Is the object a regexp?
             #
             # @example Is the object a regex?
@@ -46,11 +43,12 @@ module Mongoid
             #
             # @return [ true ] Always true.
             # @deprecated
-            def regexp?; true; end
+            def regexp?
+              true
+            end
             Mongoid.deprecate(self, :regexp?)
 
             module ClassMethods
-
               # Evolve the object into a raw bson regex.
               #
               # @example Evolve the object to a regex.
@@ -72,7 +70,7 @@ module Mongoid
   end
 end
 
-::Regexp.__send__(:include,Mongoid::Criteria::Queryable::Extensions::Regexp)
-::Regexp.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Regexp::ClassMethods)
-BSON::Regexp::Raw.__send__(:include,Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_)
-BSON::Regexp::Raw.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_::ClassMethods)
+Regexp.include Mongoid::Criteria::Queryable::Extensions::Regexp
+Regexp.extend Mongoid::Criteria::Queryable::Extensions::Regexp::ClassMethods
+BSON::Regexp::Raw.include Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_
+BSON::Regexp::Raw.extend Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/set.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "set"
+require 'set'
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Set class.
         module Set
           module ClassMethods
-
             # Evolve the set, casting all its elements.
             #
             # @example Evolve the set.
@@ -22,7 +19,8 @@ module Mongoid
             # @return [ Array ] The evolved set.
             def evolve(object)
               return object if !object || !object.respond_to?(:map)
-              object.map{ |obj| obj.class.evolve(obj) }
+
+              object.map { |obj| obj.class.evolve(obj) }
             end
           end
         end
@@ -31,4 +29,4 @@ module Mongoid
   end
 end
 
-::Set.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Set::ClassMethods)
+Set.extend Mongoid::Criteria::Queryable::Extensions::Set::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/string.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to String class.
         module String
-
           # Evolve the string into a mongodb friendly date.
           #
           # @example Evolve the string.
@@ -37,7 +34,7 @@ module Mongoid
           #
           # @return [ String ] The string with $ at the front.
           def __mongo_expression__
-            start_with?("$") ? self : "$#{self}"
+            start_with?('$') ? self : "$#{self}"
           end
 
           # Get the string as a sort option.
@@ -47,7 +44,7 @@ module Mongoid
           #
           # @return [ Hash ] The string as a sort option hash.
           def __sort_option__
-            split(/,/).inject({}) do |hash, spec|
+            split(',').inject({}) do |hash, spec|
               hash.tap do |_hash|
                 field, direction = spec.strip.split(/\s/)
                 _hash[field.to_sym] = Mongoid::Criteria::Translator.to_direction(direction)
@@ -69,7 +66,6 @@ module Mongoid
           end
 
           module ClassMethods
-
             # Get the value as a expression.
             #
             # @example Get the value as an expression.
@@ -82,7 +78,7 @@ module Mongoid
             # @return [ Hash ] The selection.
             def __expr_part__(key, value, negating = false)
               if negating
-                { key => { "$#{__regexp?(value) ? "not" : "ne"}" => value }}
+                { key => { "$#{__regexp?(value) ? 'not' : 'ne'}" => value } }
               else
                 { key => value }
               end
@@ -120,5 +116,5 @@ module Mongoid
   end
 end
 
-::String.__send__(:include, Mongoid::Criteria::Queryable::Extensions::String)
-::String.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::String::ClassMethods)
+String.include Mongoid::Criteria::Queryable::Extensions::String
+String.extend Mongoid::Criteria::Queryable::Extensions::String::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/symbol.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Symbol class.
         module Symbol
-
           # Get the symbol as a specification.
           #
           # @example Get the symbol as a criteria.
@@ -23,7 +20,6 @@ module Mongoid
           end
 
           module ClassMethods
-
             # Adds a method on symbol as a convenience for the MongoDB operator.
             #
             # @example Add the $in method.
@@ -35,7 +31,7 @@ module Mongoid
             # @param [ String ] additional The additional MongoDB operator.
             def add_key(name, strategy, operator, additional = nil, &block)
               define_method(name) do
-                method = "__#{strategy}__".to_sym
+                method = :"__#{strategy}__"
                 Key.new(self, method, operator, additional, &block)
               end
             end
@@ -61,5 +57,5 @@ module Mongoid
   end
 end
 
-::Symbol.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Symbol)
-::Symbol.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Symbol::ClassMethods)
+Symbol.include Mongoid::Criteria::Queryable::Extensions::Symbol
+Symbol.extend Mongoid::Criteria::Queryable::Extensions::Symbol::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/time.rb

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to Time class.
         module Time
-
           # Evolve the time as a date, UTC midnight.
           #
           # @example Evolve the time to a date query format.
@@ -30,7 +27,6 @@ module Mongoid
           end
 
           module ClassMethods
-
             # Evolve the object to an date.
             #
             # @example Evolve dates.
@@ -57,5 +53,5 @@ module Mongoid
   end
 end
 
-::Time.__send__(:include, Mongoid::Criteria::Queryable::Extensions::Time)
-::Time.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Time::ClassMethods)
+Time.include Mongoid::Criteria::Queryable::Extensions::Time
+Time.extend Mongoid::Criteria::Queryable::Extensions::Time::ClassMethods

data/lib/mongoid/criteria/queryable/extensions/time_with_zone.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
-
         # Adds query type-casting behavior to
         # ActiveSupport::TimeWithZone class.
         module TimeWithZone
-
           # Evolve the time as a date, UTC midnight.
           #
           # @example Evolve the time to a date query format.
@@ -31,7 +28,6 @@ module Mongoid
           end
 
           module ClassMethods
-
             # Evolve the object to an date.
             #
             # @example Evolve dates.
@@ -58,11 +54,5 @@ module Mongoid
   end
 end
 
-::ActiveSupport::TimeWithZone.__send__(
-  :include,
-  Mongoid::Criteria::Queryable::Extensions::TimeWithZone
-)
-::ActiveSupport::TimeWithZone.__send__(
-  :extend,
-  Mongoid::Criteria::Queryable::Extensions::TimeWithZone::ClassMethods
-)
+ActiveSupport::TimeWithZone.include Mongoid::Criteria::Queryable::Extensions::TimeWithZone
+ActiveSupport::TimeWithZone.extend Mongoid::Criteria::Queryable::Extensions::TimeWithZone::ClassMethods

data/lib/mongoid/criteria/queryable/extensions.rb

@@ -1,26 +1,23 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 if defined?(ActiveSupport)
-  unless defined?(ActiveSupport::TimeWithZone)
-    require "active_support/time_with_zone"
-  end
-  require "mongoid/criteria/queryable/extensions/time_with_zone"
+  require 'active_support/time_with_zone' unless defined?(ActiveSupport::TimeWithZone)
+  require 'mongoid/criteria/queryable/extensions/time_with_zone'
 end
 
-require "time"
-require "mongoid/criteria/queryable/extensions/object"
-require "mongoid/criteria/queryable/extensions/array"
-require "mongoid/criteria/queryable/extensions/big_decimal"
-require "mongoid/criteria/queryable/extensions/boolean"
-require "mongoid/criteria/queryable/extensions/date"
-require "mongoid/criteria/queryable/extensions/date_time"
-require "mongoid/criteria/queryable/extensions/hash"
-require "mongoid/criteria/queryable/extensions/nil_class"
-require "mongoid/criteria/queryable/extensions/numeric"
-require "mongoid/criteria/queryable/extensions/range"
-require "mongoid/criteria/queryable/extensions/regexp"
-require "mongoid/criteria/queryable/extensions/set"
-require "mongoid/criteria/queryable/extensions/string"
-require "mongoid/criteria/queryable/extensions/symbol"
-require "mongoid/criteria/queryable/extensions/time"
+require 'time'
+require 'mongoid/criteria/queryable/extensions/object'
+require 'mongoid/criteria/queryable/extensions/array'
+require 'mongoid/criteria/queryable/extensions/big_decimal'
+require 'mongoid/criteria/queryable/extensions/boolean'
+require 'mongoid/criteria/queryable/extensions/date'
+require 'mongoid/criteria/queryable/extensions/date_time'
+require 'mongoid/criteria/queryable/extensions/hash'
+require 'mongoid/criteria/queryable/extensions/nil_class'
+require 'mongoid/criteria/queryable/extensions/numeric'
+require 'mongoid/criteria/queryable/extensions/range'
+require 'mongoid/criteria/queryable/extensions/regexp'
+require 'mongoid/criteria/queryable/extensions/set'
+require 'mongoid/criteria/queryable/extensions/string'
+require 'mongoid/criteria/queryable/extensions/symbol'
+require 'mongoid/criteria/queryable/extensions/time'

data/lib/mongoid/criteria/queryable/key.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
-
       # Key objects represent specifications for building query expressions
       # utilizing MongoDB selectors.
       #
@@ -59,7 +57,6 @@ module Mongoid
       # MongoDB query expression required to obtain the key's condition,
       # given the value.
       class Key
-
         # @return [ String | Symbol ] The name of the field.
         attr_reader :name
 
@@ -86,15 +83,16 @@ module Mongoid
         # @return [ true | false ] If the objects are equal.
         def ==(other)
           return false unless other.is_a?(Key)
+
           name == other.name && operator == other.operator && expanded == other.expanded
         end
-        alias :eql? :==
+        alias eql? ==
 
         # Calculate the hash code for a key.
         #
         # @return [ Integer ] The hash code for the key.
         def hash
-          [name, operator, expanded].hash
+          [ name, operator, expanded ].hash
         end
 
         # Instantiate the new key.
@@ -142,21 +140,17 @@ module Mongoid
         #
         # @return [ Hash ] The raw MongoDB selector.
         def transform_value(value, negating = false)
-          if block
-            expr = block[value]
-          else
-            expr = value
-          end
+          expr = if block
+                   block[value]
+                 else
+                   value
+                 end
 
-          if expanded
-            expr = {expanded => expr}
-          end
+          expr = { expanded => expr } if expanded
 
-          expr = {operator => expr}
+          expr = { operator => expr }
 
-          if negating && operator != '$not'
-            expr = {'$not' => expr}
-          end
+          expr = { '$not' => expr } if negating && operator != '$not'
 
           expr
         end
@@ -170,7 +164,7 @@ module Mongoid
         def __sort_option__
           { name => operator }
         end
-        alias :__sort_pair__ :__sort_option__
+        alias __sort_pair__ __sort_option__
 
         # Convert the key to a string.
         #

data/lib/mongoid/criteria/queryable/macroable.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module Mongoid
   class Criteria
     module Queryable
-
       # Adds macro behavior for adding symbol methods.
       module Macroable
-
         # Adds a method on Symbol for convenience in where queries for the
         # provided operators.
         #