mongoid 6.4.8 → 7.0.0.beta

data/lib/mongoid/errors/invalid_dependent_strategy.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when an invalid strategy is defined for an association dependency.
+    class InvalidDependentStrategy < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the new error.
+      #   InvalidDependentStrategy.new(association, invalid_strategy, valid_strategies)
+      #
+      # @param [ Mongoid::Association ] association The association for which this
+      #   dependency is defined.
+      # @param [ Symbol, String ] invalid_strategy The attempted invalid strategy.
+      # @param [ Array<Symbol> ] valid_strategies The valid strategies.
+      #
+      # @since 7.0.0
+      def initialize(association, invalid_strategy, valid_strategies)
+        super(
+            compose_message(
+                "invalid_dependent_strategy",
+                { association: association,
+                  invalid_strategy: invalid_strategy,
+                  valid_strategies: valid_strategies
+                }
+            )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/invalid_relation_option.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when an option provided for a relation is invalid.
+    class InvalidRelationOption < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the new error.
+      #   InvalidRelationOption.new(Person, invalid_option: 'make_me_a_sandwich')
+      #
+      # @param [ Class ] klass The model class.
+      # @param [ String, Symbol ] name The relation name.
+      # @param [ Symbol ] option The invalid option.
+      # @param [ Array<Symbol> ] valid_options The valid option.
+      #
+      # @since 3.0.0
+      def initialize(klass, name, option, valid_options)
+        super(
+            compose_message(
+                "invalid_relation_option",
+                { klass: klass, name: name, option: option, valid_options: valid_options }
+            )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/errors/unknown_model.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when trying to instantiate a model object from the value in
+    # the '_type' field of a document and the class doesn't exist.
+    class UnknownModel < MongoidError
+
+      # Create the new error.
+      #
+      # @example Instantiate the error.
+      #   UnknownModel.new('InvalidClass', "invalid_class")
+      #
+      # @param [ String ] klass The model class.
+      # @param [ String ] value The value used to determine the (invalid) class.
+      #
+      # @since 7.0.0
+      def initialize(klass, value)
+        super(
+            compose_message("unknown_model", { klass: klass, value: value })
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/extensions/array.rb

@@ -122,22 +122,22 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the provided object to a propery array of foreign keys.
+        # Convert the provided object to a proper array of foreign keys.
         #
         # @example Mongoize the object.
         #   Array.__mongoize_fk__(constraint, object)
         #
-        # @param [ Constraint ] constraint The metadata constraint.
+        # @param [ Association ] association The association metadata.
         # @param [ Object ] object The object to convert.
         #
         # @return [ Array ] The array of ids.
         #
         # @since 3.0.0
-        def __mongoize_fk__(constraint, object)
+        def __mongoize_fk__(association, object)
           if object.resizable?
-            object.blank? ? object : constraint.convert(object)
+            object.blank? ? object : association.convert_to_foreign_key(object)
           else
-            object.blank? ? [] : constraint.convert(Array(object))
+            object.blank? ? [] : association.convert_to_foreign_key(Array(object))
           end
         end
 

data/lib/mongoid/extensions/big_decimal.rb

@@ -53,7 +53,7 @@ module Mongoid
         #
         # @since 3.0.0
         def demongoize(object)
-          object && object.numeric? ? BigDecimal(object.to_s) : nil
+          object && object.numeric? ? ::BigDecimal.new(object.to_s) : nil
         end
 
         # Mongoize an object of any type to how it's stored in the db as a String.

data/lib/mongoid/extensions/object.rb

@@ -225,17 +225,17 @@ module Mongoid
         # contstraint.
         #
         # @example Convert the object to a fk.
-        #   Object.__mongoize_fk__(constraint, object)
+        #   Object.__mongoize_fk__(association, object)
         #
-        # @param [ Constraint ] constraint The constraint.
+        # @param [ Association ] association The association metadata.
         # @param [ Object ] object The object to convert.
         #
         # @return [ Object ] The converted object.
         #
         # @since 3.0.0
-        def __mongoize_fk__(constraint, object)
+        def __mongoize_fk__(association, object)
           return nil if !object || object == ""
-          constraint.convert(object)
+          association.convert_to_foreign_key(object)
         end
 
         # Convert the object from its mongo friendly ruby type to this type.

data/lib/mongoid/extensions/range.rb

@@ -70,6 +70,7 @@ module Mongoid
         def mongoize(object)
           return nil if object.nil?
           return object if object.is_a?(::Hash)
+          return object if object.is_a?(String)
           hash = { "min" => object.first, "max" => object.last }
           if object.respond_to?(:exclude_end?) && object.exclude_end?
             hash.merge!("exclude_end" => true)

data/lib/mongoid/extensions/regexp.rb

@@ -17,7 +17,6 @@ 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

@@ -82,9 +82,7 @@ module Mongoid
       #
       # @since 3.0.0
       def numeric?
-        !!Float(self)
-      rescue ArgumentError
-        (self =~ /\A(?:NaN|-?Infinity)\z/) == 0
+        true if Float(self) rescue (self =~ /^NaN|\-?Infinity$/)
       end
 
       # Get the string as a getter string.

data/lib/mongoid/factory.rb

@@ -17,8 +17,7 @@ module Mongoid
     #
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil)
-      attributes ||= {}
-      type = attributes[TYPE] || attributes[TYPE.to_sym]
+      type = (attributes || {})[TYPE]
       if type && klass._types.include?(type)
         type.constantize.new(attributes)
       else
@@ -43,7 +42,9 @@ module Mongoid
       if type.blank?
         klass.instantiate(attributes, selected_fields)
       else
-        type.camelize.constantize.instantiate(attributes, selected_fields)
+        camelized = type.camelize
+        raise Errors::UnknownModel.new(camelized, type) unless Object.const_defined?(camelized)
+        camelized.constantize.instantiate(attributes, selected_fields)
       end
     end
   end

data/lib/mongoid/fields.rb

@@ -461,7 +461,7 @@ module Mongoid
           re_define_method("#{meth}=") do |value|
             val = write_attribute(name, value)
             if field.foreign_key?
-              remove_ivar(field.metadata.name)
+              remove_ivar(field.association.name)
             end
             val
           end

data/lib/mongoid/fields/foreign_key.rb

@@ -63,8 +63,8 @@ module Mongoid
       # @since 3.0.0
       def evolve(object)
         if object_id_field? || object.is_a?(Document)
-          if metadata.polymorphic? && constraint
-            constraint.convert(object)
+          if association.polymorphic?
+            association.convert_to_foreign_key(object)
           else
             object.__evolve_object_id__
           end
@@ -97,7 +97,7 @@ module Mongoid
       # @since 3.0.0
       def mongoize(object)
         if type.resizable? || object_id_field?
-          type.__mongoize_fk__(constraint, object)
+          type.__mongoize_fk__(association, object)
         else
           related_id_field.mongoize(object)
         end
@@ -113,7 +113,7 @@ module Mongoid
       # @since 2.2.0
       def object_id_field?
         @object_id_field ||=
-          metadata.polymorphic? ? true : metadata.klass.using_object_ids?
+            association.polymorphic? ? true : association.klass.using_object_ids?
       end
 
       # Returns true if an array, false if not.
@@ -156,7 +156,7 @@ module Mongoid
       #
       # @since 3.0.0
       def related_id_field
-        @related_id_field ||= metadata.klass.fields["_id"]
+        @related_id_field ||= association.klass.fields["_id"]
       end
 
       # This is used when default values need to be serialized. Most of the

data/lib/mongoid/fields/standard.rb

@@ -26,18 +26,6 @@ module Mongoid
         mods[key] = new
       end
 
-      # Get the constraint from the metadata once.
-      #
-      # @example Get the constraint.
-      #   field.constraint
-      #
-      # @return [ Constraint ] The relation's contraint.
-      #
-      # @since 2.1.0
-      def constraint
-        @constraint ||= metadata.constraint
-      end
-
       # Evaluate the default value and return it. Will handle the
       # serialization, proc calls, and duplication if necessary.
       #
@@ -127,8 +115,8 @@ module Mongoid
       # @return [ Metadata ] The relation metadata.
       #
       # @since 2.2.0
-      def metadata
-        @metadata ||= options[:metadata]
+      def association
+        @association ||= options[:association]
       end
 
       # Is the field a BSON::ObjectId?

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

@@ -14,7 +14,7 @@ module Mongoid
           :label,
           :localize,
           :fallbacks,
-          :metadata,
+          :association,
           :pre_processed,
           :subtype,
           :type,

data/lib/mongoid/indexable.rb

@@ -28,14 +28,17 @@ module Mongoid
       # @since 1.0.0
       def create_indexes
         return unless index_specifications
+
+        default_options = {background: Config.background_indexing}
+
         index_specifications.each do |spec|
-          key, options = spec.key, spec.options
+          key, options = spec.key, default_options.merge(spec.options)
           if database = options[:database]
             with(database: database) do |klass|
-              klass.collection.indexes(session: _session).create_one(key, options.except(:database))
+              klass.collection.indexes.create_one(key, options.except(:database))
             end
           else
-            collection.indexes(session: _session).create_one(key, options)
+            collection.indexes.create_one(key, options)
           end
         end and true
       end
@@ -53,9 +56,9 @@ module Mongoid
         indexed_database_names.each do |database|
           with(database: database) do |klass|
             begin
-              klass.collection.indexes(session: _session).each do |spec|
+              klass.collection.indexes.each do |spec|
                 unless spec["name"] == "_id_"
-                  klass.collection.indexes(session: _session).drop_one(spec["key"])
+                  klass.collection.indexes.drop_one(spec["key"])
                   logger.info(
                     "MONGOID: Removed index '#{spec["name"]}' on collection " +
                     "'#{klass.collection.name}' in database '#{database}'."

data/lib/mongoid/interceptable.rb

@@ -160,8 +160,8 @@ module Mongoid
     #
     # @since 2.3.0
     def cascadable_children(kind, children = Set.new)
-      embedded_relations.each_pair do |name, metadata|
-        next unless metadata.cascading_callbacks?
+      embedded_relations.each_pair do |name, association|
+        next unless association.cascading_callbacks?
         without_autobuild do
           delayed_pulls = delayed_atomic_pulls[name]
           delayed_unsets = delayed_atomic_unsets[name]
@@ -170,7 +170,7 @@ module Mongoid
           relation = send(name)
           Array.wrap(relation).each do |child|
             next if children.include?(child)
-            children.add(child) if cascadable_child?(kind, child, metadata)
+            children.add(child) if cascadable_child?(kind, child, association)
             child.send(:cascadable_children, kind, children)
           end
         end
@@ -189,9 +189,9 @@ module Mongoid
     # @return [ true, false ] If the child should fire the callback.
     #
     # @since 2.3.0
-    def cascadable_child?(kind, child, metadata)
+    def cascadable_child?(kind, child, association)
       return false if kind == :initialize || kind == :find || kind == :touch
-      return false if kind == :validate && metadata.validate?
+      return false if kind == :validate && association.validate?
       child.callback_executable?(kind) ? child.in_callback_state?(kind) : false
     end
 

data/lib/mongoid/matchable.rb

@@ -11,7 +11,6 @@ require "mongoid/matchable/lte"
 require "mongoid/matchable/ne"
 require "mongoid/matchable/nin"
 require "mongoid/matchable/or"
-require "mongoid/matchable/nor"
 require "mongoid/matchable/size"
 require "mongoid/matchable/elem_match"
 require "mongoid/matchable/regexp"
@@ -41,7 +40,6 @@ module Mongoid
       "$ne" => Ne,
       "$nin" => Nin,
       "$or" => Or,
-      "$nor" => Nor,
       "$size" => Size
     }.with_indifferent_access.freeze
 
@@ -126,7 +124,6 @@ module Mongoid
           case key.to_s
             when "$or" then Or.new(value, document)
             when "$and" then And.new(value, document)
-            when "$nor" then Nor.new(value, document)
             else Default.new(extract_attribute(document, key))
           end
         end

data/lib/mongoid/persistable.rb

@@ -162,10 +162,9 @@ module Mongoid
     # @since 4.0.0
     def process_atomic_operations(operations)
       operations.each do |field, value|
-        as_writable_attribute!(field, value) do |access|
-          yield(access, value)
-          remove_change(access)
-        end
+        access = database_field_name(field)
+        yield(access, value)
+        remove_change(access)
       end
     end
 
@@ -204,7 +203,7 @@ module Mongoid
     def persist_atomic_operations(operations)
       if persisted? && operations
         selector = atomic_selector
-        _root.collection.find(selector).update_one(positionally(selector, operations), session: _session)
+        _root.collection.find(selector).update_one(positionally(selector, operations))
       end
     end
   end

data/lib/mongoid/persistable/creatable.rb

@@ -61,9 +61,7 @@ module Mongoid
           _parent.insert
         else
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(
-              positionally(selector, atomic_inserts),
-              session: _session)
+          _root.collection.find(selector).update_one(positionally(selector, atomic_inserts))
         end
       end
 
@@ -78,7 +76,7 @@ module Mongoid
       #
       # @since 4.0.0
       def insert_as_root
-        collection.insert_one(as_attributes, session: _session)
+        collection.insert_one(as_attributes)
       end
 
       # Post process an insert, which sets the new record attribute to false

data/lib/mongoid/persistable/deletable.rb

@@ -21,10 +21,12 @@ module Mongoid
       def delete(options = {})
         raise Errors::ReadonlyDocument.new(self.class) if readonly?
         prepare_delete do
-          if embedded?
-            delete_as_embedded(options)
-          else
-            delete_as_root
+          unless options[:persist] == false
+            if embedded?
+              delete_as_embedded(options)
+            else
+              delete_as_root
+            end
           end
         end
       end
@@ -62,9 +64,7 @@ module Mongoid
         _parent.remove_child(self) if notifying_parent?(options)
         if _parent.persisted?
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(
-              positionally(selector, atomic_deletes),
-              session: _session)
+          _root.collection.find(selector).update_one(positionally(selector, atomic_deletes))
         end
         true
       end
@@ -80,7 +80,7 @@ module Mongoid
       #
       # @since 4.0.0
       def delete_as_root
-        collection.find(atomic_selector).delete_one(session: _session)
+        collection.find(atomic_selector).delete_one
         true
       end
 
@@ -113,11 +113,10 @@ module Mongoid
       #
       # @since 4.0.0
       def prepare_delete
-        cascade!
+        return false unless catch(:abort) { apply_delete_dependencies! }
         yield(self)
         freeze
         self.destroyed = true
-        true
       end
 
       module ClassMethods