mongoid 7.3.5 → 7.4.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -16,8 +15,6 @@ module Mongoid
           #   125214512412.1123.__evolve_date__
           #
           # @return [ Time ] The time representation at UTC midnight.
-          #
-          # @since 1.0.0
           def __evolve_date__
             time = ::Time.at(self).utc
             ::Time.utc(time.year, time.month, time.day, 0, 0, 0, 0)
@@ -29,8 +26,6 @@ module Mongoid
           #   125214512412.1123.__evolve_time__
           #
           # @return [ Time ] The time representation.
-          #
-          # @since 1.0.0
           def __evolve_time__
             ::Time.at(self).utc
           end
@@ -41,8 +36,6 @@ module Mongoid
           #   1.to_direction
           #
           # @return [ Integer ] self.
-          #
-          # @since 1.0.0
           def to_direction; self; end
 
           module ClassMethods
@@ -57,8 +50,6 @@ module Mongoid
             # @param [ Object ] object The object to convert.
             #
             # @return [ Object ] The converted number.
-            #
-            # @since 1.0.0
             def __numeric__(object)
               object.to_s =~ /(\A[-+]?[0-9]+\z)|(\.0+\z)|(\.\z)/ ? object.to_i : Float(object)
             end
@@ -71,8 +62,6 @@ module Mongoid
             # @param [ Object ] object The object to evolve.
             #
             # @return [ Integer ] The evolved object.
-            #
-            # @since 1.0.0
             def evolve(object)
               __evolve__(object) do |obj|
                 __numeric__(obj) rescue obj

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -17,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
@@ -31,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
@@ -45,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
@@ -59,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
@@ -73,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
@@ -87,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
@@ -101,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
@@ -114,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.
@@ -124,8 +107,6 @@ module Mongoid
           #   4.__array__
           #
           # @return [ Array ] The wrapped object.
-          #
-          # @since 1.0.0
           def __array__
             [ self ]
           end
@@ -136,8 +117,6 @@ module Mongoid
           #   obj.__expand_complex__
           #
           # @return [ Object ] self.
-          #
-          # @since 1.0.5
           def __expand_complex__
             self
           end
@@ -148,8 +127,6 @@ module Mongoid
           #   obj.regexp?
           #
           # @return [ false ] Always false.
-          #
-          # @since 1.0.4
           def regexp?
             false
           end
@@ -164,8 +141,6 @@ module Mongoid
             #   Object.evolve("test")
             #
             # @return [ Object ] The provided object.
-            #
-            # @since 1.0.0
             def evolve(object)
               object
             end
@@ -184,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -15,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)
@@ -55,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -15,8 +14,6 @@ module Mongoid
           #   /\A[123]/.regexp?
           #
           # @return [ true ] Always true.
-          #
-          # @since 1.0.0
           def regexp?; true; end
 
           module ClassMethods
@@ -29,8 +26,6 @@ module Mongoid
             # @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)
@@ -46,8 +41,6 @@ module Mongoid
             #   bson_raw_regexp.regexp?
             #
             # @return [ true ] Always true.
-            #
-            # @since 5.2.1
             def regexp?; true; end
 
             module ClassMethods
@@ -60,8 +53,6 @@ module Mongoid
               # @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

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "set"
 
@@ -20,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -15,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)
@@ -28,8 +25,6 @@ module Mongoid
           #   "2012-1-1".__evolve_time__
           #
           # @return [ Time ] The string as a time.
-          #
-          # @since 1.0.0
           def __evolve_time__
             __mongoize_time__.utc
           end
@@ -40,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
@@ -52,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|
@@ -72,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
@@ -84,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
@@ -102,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 }}
@@ -121,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -18,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
@@ -30,8 +27,6 @@ module Mongoid
           #   "1".to_direction
           #
           # @return [ Integer ] The direction.
-          #
-          # @since 1.0.0
           def to_direction
             to_s.to_direction
           end
@@ -47,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
@@ -65,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -15,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
@@ -27,8 +24,6 @@ module Mongoid
           #   time.__evolve_time__
           #
           # @return [ Time ] The time in UTC.
-          #
-          # @since 1.0.0
           def __evolve_time__
             getutc
           end
@@ -46,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -15,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
@@ -27,8 +24,6 @@ module Mongoid
           #   time.__evolve_time__
           #
           # @return [ Time ] The time in UTC.
-          #
-          # @since 1.0.0
           def __evolve_time__
             utc
           end
@@ -46,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,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 if defined?(ActiveSupport)
   unless defined?(ActiveSupport::TimeWithZone)

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -22,7 +21,7 @@ module Mongoid
       #
       #   Foo.where(:price.gt => 1)
       #
-      # ... causes a Key instance to be created thusly:
+      # ... causes a Key instance to be created as follows:
       #
       #   Key.new(:price, :__override__, '$gt')
       #
@@ -84,8 +83,6 @@ module Mongoid
         # @param [ Object ] other The object to compare to.
         #
         # @return [ true, false ] If the objects are equal.
-        #
-        # @since 1.0.0
         def ==(other)
           return false unless other.is_a?(Key)
           name == other.name && operator == other.operator && expanded == other.expanded
@@ -95,8 +92,6 @@ module Mongoid
         # Calculate the hash code for a key.
         #
         # @return [ Fixnum ] The hash code for the key.
-        #
-        # @since 1.1.0
         def hash
           [name, operator, expanded].hash
         end
@@ -114,8 +109,6 @@ module Mongoid
         # @param [ String | Integer ] operator The MongoDB operator,
         #   or sort direction (1 or -1).
         # @param [ String ] expanded The Mongo expanded operator.
-        #
-        # @since 1.0.0
         def initialize(name, strategy, operator, expanded = nil, &block)
           unless operator.is_a?(String) || operator.is_a?(Integer)
             raise ArgumentError, "Operator must be a string or an integer: #{operator.inspect}"
@@ -134,8 +127,6 @@ module Mongoid
         # @param [ true, false ] negating If the selection should be negated.
         #
         # @return [ Hash ] The raw MongoDB selector.
-        #
-        # @since 1.0.0
         def __expr_part__(object, negating = false)
           { name.to_s => transform_value(object, negating) }
         end
@@ -166,8 +157,6 @@ module Mongoid
         #   key.__sort_option__
         #
         # @return [ Hash ] The field/direction pair.
-        #
-        # @since 1.0.0
         def __sort_option__
           { name => operator }
         end
@@ -179,8 +168,6 @@ module Mongoid
         #   key.to_s
         #
         # @return [ String ] The key as a string.
-        #
-        # @since 1.1.0
         def to_s
           @name.to_s
         end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 module Mongoid
   class Criteria
@@ -18,8 +17,6 @@ module Mongoid
         # @param [ Symbol ] strategy The merge strategy.
         # @param [ String ] operator The MongoDB operator.
         # @param [ String ] additional The additional MongoDB operator.
-        #
-        # @since 1.0.0
         def key(name, strategy, operator, additional = nil, &block)
           ::Symbol.add_key(name, strategy, operator, additional, &block)
         end