mongoid 6.4.8 → 7.5.4

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

@@ -1,10 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional object behaviour.
+        # This module contains additional object behavior.
         module Object
 
           # Combine the two objects using the add strategy.
@@ -15,8 +16,6 @@ module Mongoid
           # @param [ Object ] object The object to add.
           #
           # @return [ Object ] The result of the add.
-          #
-          # @since 1.0.0
           def __add__(object)
             (object == self) ? self : [ self, object ].flatten.uniq
           end
@@ -29,8 +28,6 @@ module Mongoid
           # @param [ Array ] array The array to add to.
           #
           # @return [ Array ] The merged object.
-          #
-          # @since 1.0.0
           def __add_from_array__(array)
             array.concat(Array(self)).uniq
           end
@@ -43,8 +40,6 @@ module Mongoid
           # @param [ Object ] object The object to intersect.
           #
           # @return [ Array ] The result of the intersect.
-          #
-          # @since 1.0.0
           def __intersect__(object)
             object.__intersect_from_object__(self)
           end
@@ -57,8 +52,6 @@ module Mongoid
           # @param [ Array ] array The array to intersect to.
           #
           # @return [ Array ] The merged object.
-          #
-          # @since 1.0.0
           def __intersect_from_array__(array)
             array & Array(self)
           end
@@ -71,8 +64,6 @@ module Mongoid
           # @param [ Object ] object The value to intersect to.
           #
           # @return [ Array ] The merged object.
-          #
-          # @since 1.0.0
           def __intersect_from_object__(object)
             Array(object) & Array(self)
           end
@@ -85,8 +76,6 @@ module Mongoid
           # @param [ Object ] object The object to union.
           #
           # @return [ Array ] The result of the union.
-          #
-          # @since 1.0.0
           def __union__(object)
             object.__union_from_object__(self)
           end
@@ -99,8 +88,6 @@ module Mongoid
           # @param [ Object ] object The value to union to.
           #
           # @return [ Array ] The merged object.
-          #
-          # @since 1.0.0
           def __union_from_object__(object)
             (Array(object) + Array(self)).uniq
           end
@@ -112,8 +99,6 @@ module Mongoid
           #   1.__deep_copy__
           #
           # @return [ Object ] self.
-          #
-          # @since 1.0.0
           def __deep_copy__; self; end
 
           # Get the object as an array.
@@ -122,8 +107,6 @@ module Mongoid
           #   4.__array__
           #
           # @return [ Array ] The wrapped object.
-          #
-          # @since 1.0.0
           def __array__
             [ self ]
           end
@@ -134,8 +117,6 @@ module Mongoid
           #   obj.__expand_complex__
           #
           # @return [ Object ] self.
-          #
-          # @since 1.0.5
           def __expand_complex__
             self
           end
@@ -146,8 +127,6 @@ module Mongoid
           #   obj.regexp?
           #
           # @return [ false ] Always false.
-          #
-          # @since 1.0.4
           def regexp?
             false
           end
@@ -162,8 +141,6 @@ module Mongoid
             #   Object.evolve("test")
             #
             # @return [ Object ] The provided object.
-            #
-            # @since 1.0.0
             def evolve(object)
               object
             end
@@ -182,15 +159,13 @@ module Mongoid
             #   end
             #
             # @return [ Object ] The evolved object.
-            #
-            # @since 1.0.0
             def __evolve__(object)
               return nil if object.nil?
               case object
               when ::Array
                 object.map{ |obj| evolve(obj) }
               when ::Range
-                { "$gte" => evolve(object.min), "$lte" => evolve(object.max) }
+                object.__evolve_range__
               else
                 yield(object)
               end

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

@@ -1,10 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional range behaviour.
+        # This module contains additional range behavior.
         module Range
 
           # Get the range as an array.
@@ -13,39 +14,64 @@ module Mongoid
           #   1...3.__array__
           #
           # @return [ Array ] The range as an array.
-          #
-          # @since 1.0.0
           def __array__
             to_a
           end
 
-          # Convert the range to a min/max mongo friendly query for dates.
+          # Convert the range to a $gte/$lte mongo friendly query for dates.
           #
           # @example Evolve the range.
           #   (11231312..213123131).__evolve_date__
           #
-          # @return [ Hash ] The min/max range query with times at midnight.
-          #
-          # @since 1.0.0
+          # @return [ Hash ] The $gte/$lte range query with times at UTC midnight.
           def __evolve_date__
-            { "$gte" => min.__evolve_date__, "$lte" => max.__evolve_date__ }
+            __evolve_range_naive__.transform_values! {|v| v&.__evolve_date__ }
           end
 
-          # Convert the range to a min/max mongo friendly query for times.
+          # Convert the range to a $gte/$lte mongo friendly query for times.
           #
           # @example Evolve the range.
           #   (11231312..213123131).__evolve_date__
           #
-          # @return [ Hash ] The min/max range query with times.
-          #
-          # @since 1.0.0
+          # @return [ Hash ] The $gte/$lte range query with times in UTC.
           def __evolve_time__
-            { "$gte" => min.__evolve_time__, "$lte" => max.__evolve_time__ }
+            __evolve_range_naive__.transform_values! {|v| v&.__evolve_time__ }
+          end
+
+          # Convert the range to a $gte/$lte mongo friendly query.
+          #
+          # @example Evolve the range.
+          #   (11231312..213123131).__evolve_range__
+          #
+          # @return [ Hash ] The $gte/$lte range query.
+          def __evolve_range__
+            __evolve_range_naive__.transform_values! do |value|
+              case value
+              when Time, DateTime then value.__evolve_time__
+              when Date then value.__evolve_date__
+              else value
+              end
+            end
+          end
+
+          private
+
+          # @note This method's return value will be mutated by the __evolve_*__
+          #   methods, therefore it must always return new objects.
+          #
+          # @api private
+          def __evolve_range_naive__
+            hash = {}
+            hash['$gte'] = self.begin if self.begin
+            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.
             #
             # @example Evolve the range.
             #   Range.evolve(1..3)
@@ -53,11 +79,9 @@ module Mongoid
             # @param [ Range ] object The range to evolve.
             #
             # @return [ Hash ] The range as a gte/lte criteria.
-            #
-            # @since 1.0.0
             def evolve(object)
               return object unless object.is_a?(::Range)
-              { "$gte" => object.min, "$lte" => object.max }
+              object.__evolve_range__
             end
           end
         end

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

@@ -1,20 +1,19 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional regex behaviour.
+        # This module contains additional regex behavior.
         module Regexp
 
           # Is the object a regexp?
           #
           # @example Is the object a regex?
-          #   /^[123]/.regexp?
+          #   /\A[123]/.regexp?
           #
           # @return [ true ] Always true.
-          #
-          # @since 1.0.0
           def regexp?; true; end
 
           module ClassMethods
@@ -22,13 +21,11 @@ module Mongoid
             # Evolve the object into a regex.
             #
             # @example Evolve the object to a regex.
-            #   Regexp.evolve("^[123]")
+            #   Regexp.evolve("\A[123]")
             #
             # @param [ Regexp, String ] object The object to evolve.
             #
             # @return [ Regexp ] The evolved regex.
-            #
-            # @since 1.0.0
             def evolve(object)
               __evolve__(object) do |obj|
                 ::Regexp.new(obj)
@@ -36,7 +33,7 @@ module Mongoid
             end
           end
 
-          module Raw
+          module Raw_
 
             # Is the object a regexp?
             #
@@ -44,8 +41,6 @@ module Mongoid
             #   bson_raw_regexp.regexp?
             #
             # @return [ true ] Always true.
-            #
-            # @since 5.2.1
             def regexp?; true; end
 
             module ClassMethods
@@ -53,13 +48,11 @@ module Mongoid
               # Evolve the object into a raw bson regex.
               #
               # @example Evolve the object to a regex.
-              #   BSON::Regexp::Raw.evolve("^[123]")
+              #   BSON::Regexp::Raw.evolve("\\A[123]")
               #
               # @param [ BSON::Regexp::Raw, String ] object The object to evolve.
               #
               # @return [ BSON::Regexp::Raw ] The evolved raw regex.
-              #
-              # @since 5.2.1
               def evolve(object)
                 __evolve__(object) do |obj|
                   obj.is_a?(String) ? BSON::Regexp::Raw.new(obj) : obj
@@ -75,5 +68,5 @@ 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)
+BSON::Regexp::Raw.__send__(:include,Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_)
+BSON::Regexp::Raw.__send__(:extend, Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_::ClassMethods)

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

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "set"
 
 module Mongoid
@@ -6,7 +7,7 @@ module Mongoid
     module Queryable
       module Extensions
 
-        # This module contains additional object behaviour.
+        # This module contains additional object behavior.
         module Set
           module ClassMethods
 
@@ -18,8 +19,6 @@ module Mongoid
             # @param [ Set, Object ] object The object to evolve.
             #
             # @return [ Array ] The evolved set.
-            #
-            # @since 1.0.0
             def evolve(object)
               return object if !object || !object.respond_to?(:map)
               object.map{ |obj| obj.class.evolve(obj) }

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

@@ -1,10 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional object behaviour.
+        # This module contains additional object behavior.
         module String
 
           # Evolve the string into a mongodb friendly date.
@@ -13,8 +14,6 @@ module Mongoid
           #   "2012-1-1".__evolve_date__
           #
           # @return [ Time ] The time at UTC midnight.
-          #
-          # @since 1.0.0
           def __evolve_date__
             time = ::Time.parse(self)
             ::Time.utc(time.year, time.month, time.day, 0, 0, 0, 0)
@@ -26,10 +25,8 @@ module Mongoid
           #   "2012-1-1".__evolve_time__
           #
           # @return [ Time ] The string as a time.
-          #
-          # @since 1.0.0
           def __evolve_time__
-            ::Time.parse(self).utc
+            __mongoize_time__.utc
           end
 
           # Get the string as a mongo expression, adding $ to the front.
@@ -38,8 +35,6 @@ module Mongoid
           #   "test".__mongo_expression__
           #
           # @return [ String ] The string with $ at the front.
-          #
-          # @since 2.0.0
           def __mongo_expression__
             start_with?("$") ? self : "$#{self}"
           end
@@ -50,8 +45,6 @@ module Mongoid
           #   "field ASC".__sort_option__
           #
           # @return [ Hash ] The string as a sort option hash.
-          #
-          # @since 1.0.0
           def __sort_option__
             split(/,/).inject({}) do |hash, spec|
               hash.tap do |_hash|
@@ -70,8 +63,6 @@ module Mongoid
           # @param [ true, false ] negating If the selection should be negated.
           #
           # @return [ Hash ] The selection.
-          #
-          # @since 1.0.0
           def __expr_part__(value, negating = false)
             ::String.__expr_part__(self, value, negating)
           end
@@ -82,8 +73,6 @@ module Mongoid
           #   "1".to_direction
           #
           # @return [ Integer ] The direction.
-          #
-          # @since 1.0.0
           def to_direction
             self =~ /desc/i ? -1 : 1
           end
@@ -100,8 +89,6 @@ module Mongoid
             # @param [ true, false ] negating If the selection should be negated.
             #
             # @return [ Hash ] The selection.
-            #
-            # @since 2.0.0
             def __expr_part__(key, value, negating = false)
               if negating
                 { key => { "$#{value.regexp? ? "not" : "ne"}" => value }}
@@ -119,8 +106,6 @@ module Mongoid
             # @param [ Object ] object The object to convert.
             #
             # @return [ String ] The value as a string.
-            #
-            # @since 1.0.0
             def evolve(object)
               __evolve__(object) do |obj|
                 obj.regexp? ? obj : obj.to_s

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

@@ -1,10 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional symbol behaviour.
+        # This module contains additional symbol behavior.
         module Symbol
 
           # Get the symbol as a specification.
@@ -16,8 +17,6 @@ module Mongoid
           # @param [ true, false ] negating If the selection should be negated.
           #
           # @return [ Hash ] The selection.
-          #
-          # @since 1.0.0
           def __expr_part__(value, negating = false)
             ::String.__expr_part__(self, value, negating)
           end
@@ -28,8 +27,6 @@ module Mongoid
           #   "1".to_direction
           #
           # @return [ Integer ] The direction.
-          #
-          # @since 1.0.0
           def to_direction
             to_s.to_direction
           end
@@ -45,8 +42,6 @@ module Mongoid
             # @param [ Symbol ] strategy The name of the merge strategy.
             # @param [ String ] operator The MongoDB operator.
             # @param [ String ] additional The additional MongoDB operator.
-            #
-            # @since 1.0.0
             def add_key(name, strategy, operator, additional = nil, &block)
               define_method(name) do
                 method = "__#{strategy}__".to_sym
@@ -63,8 +58,6 @@ module Mongoid
             # @param [ Object ] object The object to convert.
             #
             # @return [ Symbol ] The value as a symbol.
-            #
-            # @since 1.0.0
             def evolve(object)
               __evolve__(object) { |obj| obj.to_sym }
             end

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

@@ -1,10 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional time behaviour.
+        # This module contains additional time behavior.
         module Time
 
           # Evolve the time as a date, UTC midnight.
@@ -13,8 +14,6 @@ module Mongoid
           #   time.__evolve_date__
           #
           # @return [ Time ] The date at midnight UTC.
-          #
-          # @since 1.0.0
           def __evolve_date__
             ::Time.utc(year, month, day, 0, 0, 0, 0)
           end
@@ -25,10 +24,8 @@ module Mongoid
           #   time.__evolve_time__
           #
           # @return [ Time ] The time in UTC.
-          #
-          # @since 1.0.0
           def __evolve_time__
-            utc
+            getutc
           end
 
           module ClassMethods
@@ -44,8 +41,6 @@ module Mongoid
             # @param [ Object ] object The object to evolve.
             #
             # @return [ Time ] The evolved date time.
-            #
-            # @since 1.0.0
             def evolve(object)
               object.__evolve_time__
             end

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

@@ -1,20 +1,29 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Mongoid
   class Criteria
     module Queryable
       module Extensions
 
-        # This module contains additional time with zone behaviour.
+        # This module contains additional time with zone behavior.
         module TimeWithZone
 
+          # Evolve the time as a date, UTC midnight.
+          #
+          # @example Evolve the time to a date query format.
+          #   time.__evolve_date__
+          #
+          # @return [ Time ] The date at midnight UTC.
+          def __evolve_date__
+            ::Time.utc(year, month, day, 0, 0, 0, 0)
+          end
+
           # Evolve the time into a utc time.
           #
           # @example Evolve the time.
           #   time.__evolve_time__
           #
           # @return [ Time ] The time in UTC.
-          #
-          # @since 1.0.0
           def __evolve_time__
             utc
           end
@@ -32,8 +41,6 @@ module Mongoid
             # @param [ Object ] object The object to evolve.
             #
             # @return [ Time ] The evolved date time.
-            #
-            # @since 1.0.0
             def evolve(object)
               object.__evolve_time__
             end

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

@@ -1,7 +1,4 @@
-# encoding: utf-8
-unless defined?(Boolean)
-  class Boolean; end
-end
+# frozen_string_literal: true
 
 if defined?(ActiveSupport)
   unless defined?(ActiveSupport::TimeWithZone)