mongoid 5.4.0 → 6.4.8

data/lib/mongoid/errors/invalid_session_use.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when a session is attempted to be used with a model whose client cannot use it, if
+    #   sessions are nested, or if the mongodb deployment doesn't support sessions.
+    #
+    # @since 6.4.0
+    class InvalidSessionUse < MongoidError
+
+      # Create the error.
+      #
+      # @example Create the error.
+      #   InvalidSessionUse.new(:invalid_session_use)
+      #
+      # @param [ :invalid_sesion_use, :invalid_session_nesting ] error_type The type of session misuse.
+      #
+      # @since 6.4.0
+      def initialize(error_type)
+        super(compose_message(error_type.to_s))
+      end
+    end
+  end
+end

data/lib/mongoid/errors.rb

@@ -15,7 +15,10 @@ require "mongoid/errors/invalid_includes"
 require "mongoid/errors/invalid_index"
 require "mongoid/errors/invalid_options"
 require "mongoid/errors/invalid_path"
+require "mongoid/errors/invalid_persistence_option"
+require "mongoid/errors/invalid_relation"
 require "mongoid/errors/invalid_scope"
+require "mongoid/errors/invalid_session_use"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"
 require "mongoid/errors/invalid_storage_parent"

data/lib/mongoid/evolvable.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mongoid
 
-  # Contains behaviour specific to evolving for origin queries.
+  # Contains behaviour specific to evolving for queryable queries.
   module Evolvable
 
     # Evolve the document into an object id.

data/lib/mongoid/extensions/big_decimal.rb

@@ -28,6 +28,18 @@ module Mongoid
         to_s
       end
 
+      # Is the BigDecimal a number?
+      #
+      # @example Is the object a number?.
+      #   object.numeric?
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 6.0.0
+      def numeric?
+        true
+      end
+
       module ClassMethods
 
         # Convert the object from its mongo friendly ruby type to this type.
@@ -37,28 +49,25 @@ module Mongoid
         #
         # @param [ Object ] object The object to demongoize.
         #
-        # @return [ Object ] The object.
+        # @return [ BigDecimal, nil ] A BigDecimal derived from the object or nil.
         #
         # @since 3.0.0
         def demongoize(object)
-          if object
-            object.numeric? ? ::BigDecimal.new(object.to_s) : object
-          end
+          object && object.numeric? ? BigDecimal(object.to_s) : nil
         end
 
-        # Mongoize an object of any type to how it's stored in the db as a big
-        # decimal.
+        # Mongoize an object of any type to how it's stored in the db as a String.
         #
         # @example Mongoize the object.
         #   BigDecimal.mongoize(123)
         #
         # @param [ Object ] object The object to Mongoize
         #
-        # @return [ String ] The mongoized object.
+        # @return [ String, nil ] A String representing the object or nil.
         #
         # @since 3.0.7
         def mongoize(object)
-          object ? object.to_s : object
+          object && object.numeric? ? object.to_s : nil
         end
       end
     end

data/lib/mongoid/extensions/date.rb

@@ -4,6 +4,9 @@ module Mongoid
     module Date
 
       # Constant for epoch - used when passing invalid times.
+      #
+      # @deprecated No longer used as a return value from #mongoize passed
+      #   an invalid date string.
       EPOCH = ::Date.new(1970, 1, 1)
 
       # Convert the date into a time.
@@ -64,7 +67,7 @@ module Mongoid
               time = object.__mongoize_time__
               ::Time.utc(time.year, time.month, time.day)
             rescue ArgumentError
-              EPOCH
+              nil
             end
           end
         end

data/lib/mongoid/extensions/decimal128.rb

@@ -10,7 +10,7 @@ module Mongoid
       #
       # @return [ BSON::Decimal128 ] self.
       #
-      # @since 5.2.0
+      # @since 6.1.0
       def __evolve_decimal128__
         self
       end
@@ -26,7 +26,7 @@ module Mongoid
         #
         # @return [ BSON::Decimal128 ] The decimal128.
         #
-        # @since 5.2.0
+        # @since 6.1.0
         def evolve(object)
           object.__evolve_decimal128__
         end
@@ -36,4 +36,4 @@ module Mongoid
 end
 
 BSON::Decimal128.__send__(:include, Mongoid::Extensions::Decimal128)
-BSON::Decimal128.extend(Mongoid::Extensions::Decimal128::ClassMethods)
+BSON::Decimal128.extend(Mongoid::Extensions::Decimal128::ClassMethods)

data/lib/mongoid/extensions/hash.rb

@@ -105,6 +105,7 @@ module Mongoid
         keys = string.split(".")
         value = self
         keys.each do |key|
+          return nil if value.nil?
           nested = value[key] || value[key.to_i]
           value = nested
         end

data/lib/mongoid/extensions/regexp.rb

@@ -17,6 +17,7 @@ module Mongoid
         #
         # @since 3.0.0
         def mongoize(object)
+          return nil if object.nil?
           ::Regexp.new(object)
         end
       end

data/lib/mongoid/extensions/string.rb

@@ -72,7 +72,8 @@ module Mongoid
         self =~ /\A(|_)id$/
       end
 
-      # Is the string a number?
+      # Is the string a number? The literals "NaN", "Infinity", and "-Infinity"
+      # are counted as numbers.
       #
       # @example Is the string a number.
       #   "1234.23".numeric?
@@ -81,7 +82,9 @@ module Mongoid
       #
       # @since 3.0.0
       def numeric?
-        true if Float(self) rescue (self == "NaN")
+        !!Float(self)
+      rescue ArgumentError
+        (self =~ /\A(?:NaN|-?Infinity)\z/) == 0
       end
 
       # Get the string as a getter string.
@@ -117,7 +120,7 @@ module Mongoid
       #
       # @since 3.0.15
       def valid_method_name?
-        /[@$"]/ !~ self
+        /[@$"-]/ !~ self
       end
 
       # Does the string end with _before_type_cast?

data/lib/mongoid/extensions/time.rb

@@ -4,6 +4,9 @@ module Mongoid
     module Time
 
       # Constant for epoch - used when passing invalid times.
+      #
+      # @deprecated No longer used as a return value from #mongoize passed
+      #   an invalid time string.
       EPOCH = ::Time.utc(1970, 1, 1, 0, 0, 0)
 
       # Turn the object from the ruby type we deal with to a Mongo friendly
@@ -76,7 +79,7 @@ module Mongoid
               ::Time.at(time.to_i, time.usec).utc
             end
           rescue ArgumentError
-            EPOCH
+            nil
           end
         end
       end

data/lib/mongoid/extensions.rb

@@ -3,9 +3,6 @@ class BSON::ObjectId
   def as_json(options = nil)
     { "$oid" => to_s }
   end
-  def to_xml(options = nil)
-    ActiveSupport::XmlMini.to_tag(options[:root], self.to_s, options)
-  end
 end
 
 class Symbol
@@ -39,7 +36,6 @@ require "mongoid/extensions/module"
 require "mongoid/extensions/nil_class"
 require "mongoid/extensions/object"
 require "mongoid/extensions/object_id"
-require "mongoid/extensions/origin/regexp_raw"
 require "mongoid/extensions/range"
 require "mongoid/extensions/regexp"
 require "mongoid/extensions/set"

data/lib/mongoid/factory.rb

@@ -17,7 +17,8 @@ module Mongoid
     #
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil)
-      type = (attributes || {})[TYPE]
+      attributes ||= {}
+      type = attributes[TYPE] || attributes[TYPE.to_sym]
       if type && klass._types.include?(type)
         type.constantize.new(attributes)
       else

data/lib/mongoid/fields/validators/macro.rb

@@ -36,6 +36,24 @@ module Mongoid
           validate_options(klass, name, options)
         end
 
+        # Validate the relation definition.
+        #
+        # @example Validate the relation definition.
+        #   Macro.validate(Model, :name)
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Symbol ] name The field name.
+        # @param [ Hash ] options The provided options.
+        #
+        # @since 6.0.0
+        def validate_relation(klass, name, options = {})
+          [name, "#{name}?".to_sym, "#{name}=".to_sym].each do |n|
+            if Mongoid.destructive_fields.include?(n)
+              raise Errors::InvalidRelation.new(klass, n)
+            end
+          end
+        end
+
         private
 
         # Determine if the field name is allowed, if not raise an error.

data/lib/mongoid/findable.rb

@@ -6,12 +6,12 @@ module Mongoid
   #
   # @since 4.0.0
   module Findable
-    extend Origin::Forwardable
+    extend Mongoid::Criteria::Queryable::Forwardable
 
     select_with :with_default_scope
 
     # These are methods defined on the criteria that should also be accessible
-    # directly from the the class level.
+    # directly from the class level.
     delegate \
       :aggregates,
       :avg,

data/lib/mongoid/indexable.rb

@@ -31,10 +31,11 @@ module Mongoid
         index_specifications.each do |spec|
           key, options = spec.key, spec.options
           if database = options[:database]
-            with(database: database).
-              collection.indexes.create_one(key, options.except(:database))
+            with(database: database) do |klass|
+              klass.collection.indexes(session: _session).create_one(key, options.except(:database))
+            end
           else
-            collection.indexes.create_one(key, options)
+            collection.indexes(session: _session).create_one(key, options)
           end
         end and true
       end
@@ -50,18 +51,19 @@ module Mongoid
       # @since 3.0.0
       def remove_indexes
         indexed_database_names.each do |database|
-          collection = with(database: database).collection
-          begin
-            collection.indexes.each do |spec|
-              unless spec["name"] == "_id_"
-                collection.indexes.drop_one(spec["key"])
-                logger.info(
-                  "MONGOID: Removed index '#{spec["name"]}' on collection " +
-                  "'#{collection.name}' in database '#{database}'."
-                )
+          with(database: database) do |klass|
+            begin
+              klass.collection.indexes(session: _session).each do |spec|
+                unless spec["name"] == "_id_"
+                  klass.collection.indexes(session: _session).drop_one(spec["key"])
+                  logger.info(
+                    "MONGOID: Removed index '#{spec["name"]}' on collection " +
+                    "'#{klass.collection.name}' in database '#{database}'."
+                  )
+                end
               end
-            end
-          rescue Mongo::Error::OperationFailure; end
+            rescue Mongo::Error::OperationFailure; end
+          end
         end and true
       end
 

data/lib/mongoid/interceptable.rb

@@ -125,12 +125,6 @@ module Mongoid
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
       cascadable_children(kind).each do |child|
-        # This is returning false for some destroy tests on 4.1.0.beta1,
-        # causing them to fail since 4.1.0 expects a block to be passed if the
-        # callbacks for the type are empty. If no block is passed then the nil
-        # return value gets interpreted as false and halts the chain.
-        #
-        # @see https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L79
         if child.run_callbacks(child_callback_type(kind, child), *args) == false
           return false
         end
@@ -196,7 +190,7 @@ module Mongoid
     #
     # @since 2.3.0
     def cascadable_child?(kind, child, metadata)
-      return false if kind == :initialize || kind == :find
+      return false if kind == :initialize || kind == :find || kind == :touch
       return false if kind == :validate && metadata.validate?
       child.callback_executable?(kind) ? child.in_callback_state?(kind) : false
     end
@@ -259,22 +253,15 @@ module Mongoid
         send("_#{kind}_callbacks").each do |callback|
           chain.append(callback) if callback.kind == place
         end
-
-        if Gem::Version.new("4.1.0") <= Gem::Version.new(ActiveSupport::VERSION::STRING)
-          self.class.send :define_method, name do
-            runner = ActiveSupport::Callbacks::Filters::Environment.new(self, false, nil)
-            chain.compile.call(runner).value
-          end
-          self.class.send :protected, name
-        else
-          class_eval <<-EOM
-            def #{name}()
-              #{chain.compile}
-            end
-            protected :#{name}
-          EOM
+        self.class.send :define_method, name do
+          env = ActiveSupport::Callbacks::Filters::Environment.new(self, false, nil)
+          sequence = chain.compile
+          sequence.invoke_before(env)
+          env.value = !env.halted
+          sequence.invoke_after(env)
+          env.value
         end
-
+        self.class.send :protected, name
       end
       send(name)
     end

data/lib/mongoid/matchable/all.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute and first value in the hash are equal.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If the values match.
-      def matches?(value)
+      def _matches?(value)
         first = first(value)
         return false if first.is_a?(Array) && first.empty?
 

data/lib/mongoid/matchable/and.rb

@@ -8,19 +8,19 @@ module Mongoid
       # Does the supplied query match the attribute?
       #
       # @example Does this match?
-      #   matcher.matches?([ { field => value } ])
+      #   matcher._matches?([ { field => value } ])
       #
       # @param [ Array ] conditions The or expression.
       #
       # @return [ true, false ] True if matches, false if not.
       #
       # @since 2.3.0
-      def matches?(conditions)
+      def _matches?(conditions)
         conditions.each do |condition|
           condition.keys.each do |k|
             key = k
             value = condition[k]
-            return false unless document.matches?(key => value)
+            return false unless document._matches?(key => value)
           end
         end
         true

data/lib/mongoid/matchable/default.rb

@@ -24,14 +24,14 @@ module Mongoid
       # if the value is included.
       #
       # @example Does this value match?
-      #   default.matches?("value")
+      #   default._matches?("value")
       #
       # @param [ Object ] value The value to check if it matches.
       #
       # @return [ true, false ] True if matches, false if not.
       #
       # @since 1.0.0
-      def matches?(value)
+      def _matches?(value)
         attribute.is_a?(Array) && !value.is_a?(Array) ? attribute.any? { |_attribute| value === _attribute } : value === attribute
       end
 

data/lib/mongoid/matchable/elem_match.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+module Mongoid
+  module Matchable
+
+    class ElemMatch < Default
+
+      # Return true if a given predicate matches a sub document entirely
+      #
+      # @example Do the values match?
+      #   matcher._matches?({"$elemMatch" => {"a" => 1, "b" => 2}})
+      #
+      # @param [ Hash ] value The values to check.
+      #
+      # @return [ true, false ] If the values match.
+      def _matches?(value)
+        if !@attribute.is_a?(Array) || !value.kind_of?(Hash) || !value["$elemMatch"].kind_of?(Hash)
+          return false
+        end
+
+        return @attribute.any? do |sub_document|
+          value["$elemMatch"].all? do |k, v|
+            Matchable.matcher(sub_document, k, v)._matches?(v)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/matchable/exists.rb

@@ -10,12 +10,12 @@ module Mongoid
       # non-existence.
       #
       # @example Does anything exist?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         @attribute.nil? != value.values.first
       end
     end

data/lib/mongoid/matchable/gt.rb

@@ -8,13 +8,15 @@ module Mongoid
       # Return true if the attribute is greater than the value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         determine(value, :>)
+      rescue ArgumentError
+        false
       end
     end
   end

data/lib/mongoid/matchable/gte.rb

@@ -8,13 +8,15 @@ module Mongoid
       # Return true if the attribute is greater than or equal to the value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         determine(value, :>=)
+      rescue ArgumentError
+        false
       end
     end
   end

data/lib/mongoid/matchable/in.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute is in the values.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         attribute_array = @attribute.nil? ? [nil] : Array.wrap(@attribute)
         value.values.first.any? do |e|
           attribute_array.any? { |_attribute| e === _attribute }

data/lib/mongoid/matchable/lt.rb

@@ -8,13 +8,15 @@ module Mongoid
       # Return true if the attribute is less than the value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         determine(value, :<)
+      rescue ArgumentError
+        false
       end
     end
   end

data/lib/mongoid/matchable/lte.rb

@@ -8,13 +8,15 @@ module Mongoid
       # Return true if the attribute is less than or equal to the value.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         determine(value, :<=)
+      rescue ArgumentError
+        false
       end
     end
   end

data/lib/mongoid/matchable/ne.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute and first value are not equal.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         !super(value.values.first)
       end
     end

data/lib/mongoid/matchable/nin.rb

@@ -8,12 +8,12 @@ module Mongoid
       # Return true if the attribute is not in the value list.
       #
       # @example Do the values match?
-      #   matcher.matches?({ :key => 10 })
+      #   matcher._matches?({ :key => 10 })
       #
       # @param [ Hash ] value The values to check.
       #
       # @return [ true, false ] If a value exists.
-      def matches?(value)
+      def _matches?(value)
         attribute_array = @attribute.nil? ? [nil] : Array.wrap(@attribute)
         attribute_array.none? { |e| value.values.first.include?(e) }
       end

data/lib/mongoid/matchable/nor.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+# encoding: utf-8
+module Mongoid
+  module Matchable
+
+    # Defines behavior for handling $nor expressions in embedded documents.
+    class Nor < Default
+
+      # Does the supplied query match the attribute?
+      #
+      # Note: an empty array as an argument to $nor is prohibited by
+      # MongoDB server. Mongoid does allow this and returns false in this case.
+      #
+      # @example Does this match?
+      #   matcher._matches?("$nor" => [ { field => value } ])
+      #
+      # @param [ Array ] conditions The or expression.
+      #
+      # @return [ true, false ] True if matches, false if not.
+      #
+      # @since 6.4.2/7.0.2/7.1.0
+      def _matches?(conditions)
+        if conditions.length == 0
+          # MongoDB does not allow $nor array to be empty, but
+          # Mongoid accepts an empty array for $or which MongoDB also
+          # prohibits
+          return false
+        end
+        conditions.none? do |condition|
+          condition.all? do |key, value|
+            document._matches?(key => value)
+          end
+        end
+      end
+    end
+  end
+end