mongoid 7.1.0.rc0 → 7.2.0.rc1

data/lib/mongoid/errors/invalid_field_operator.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mongoid
+  module Errors
+
+    # Raised when invalid field-level operator is passed to an
+    # embedded matcher.
+    class InvalidFieldOperator < InvalidQuery
+
+      # @api private
+      VALID_OPERATORS = %w(
+        all elemMatch eq exists gt gte in lt lte ne nin not regex size
+      ).freeze
+
+      # Creates the exception.
+      #
+      # @param [ String ] operator The operator that was used.
+      #
+      # @api private
+      def initialize(operator)
+        @operator = operator
+        super(compose_message("invalid_field_operator",
+          operator: operator,
+          valid_operators: VALID_OPERATORS.map { |op| "'$#{op}'" }.join(', '),
+        ))
+      end
+
+      # @return [ String ] The operator that was used.
+      attr_reader :operator
+    end
+  end
+end

data/lib/mongoid/errors/invalid_query.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mongoid
+  module Errors
+
+    # Raised when invalid query is passed to an embedded matcher, or an
+    # invalid query fragment is passed to the query builder (Criteria object).
+    class InvalidQuery < MongoidError
+
+      # Create the new invalid query error.
+      #
+      # @api private
+      def initialize(msg)
+        super
+      end
+
+      # Stringifies the argument using #inspect and truncates the result to
+      # about 100 characters.
+      #
+      # @param [ Object ] expr An expression to stringify and truncate.
+      #
+      # @api private
+      def self.truncate_expr(expr)
+        unless expr.is_a?(String)
+          expr = expr.inspect
+        end
+
+        if expr.length > 103
+          expr = if expr =~ /\A<#((?:.|\n)*)>\z/
+            "<##{expr.slice(0, 97)}...>"
+          else
+            expr.slice(0, 100) + '...'
+          end
+        end
+
+        expr
+      end
+    end
+  end
+end

data/lib/mongoid/errors/no_client_config.rb

@@ -11,9 +11,9 @@ module Mongoid
       # Create the new error.
       #
       # @example Create the error.
-      #   NoClientConfig.new(:secondary)
+      #   NoClientConfig.new(:analytics)
       #
-      # @param [ String, Symbol ] name The name of the client.
+      # @param [ String | Symbol ] name The name of the client.
       #
       # @since 3.0.0
       def initialize(name)

data/lib/mongoid/errors/no_default_client.rb

@@ -10,7 +10,7 @@ module Mongoid
       # Create the new error with the defined client names.
       #
       # @example Create the new error.
-      #   NoDefaultClient.new([ :secondary ])
+      #   NoDefaultClient.new([ :analytics ])
       #
       # @param [ Array<Symbol> ] keys The defined clients.
       #

data/lib/mongoid/extensions/hash.rb

@@ -48,9 +48,11 @@ module Mongoid
             value.each_pair do |_key, _value|
               value[_key] = (key == "$rename") ? _value.to_s : mongoize_for(key, klass, _key, _value)
             end
-            (consolidated[key] ||= {}).merge!(value)
+            consolidated[key] ||= {}
+            consolidated[key].update(value)
           else
-            (consolidated["$set"] ||= {}).merge!(key => mongoize_for(key, klass, key, value))
+            consolidated["$set"] ||= {}
+            consolidated["$set"].update(key => mongoize_for(key, klass, key, value))
           end
         end
         consolidated

data/lib/mongoid/extensions/regexp.rb

@@ -11,7 +11,7 @@ module Mongoid
         # type.
         #
         # @example Mongoize the object.
-        #   Regexp.mongoize(/^[abc]/)
+        #   Regexp.mongoize(/\A[abc]/)
         #
         # @param [ Regexp, String ] object The object to mongoize.
         #

data/lib/mongoid/factory.rb

@@ -7,10 +7,18 @@ module Mongoid
   module Factory
     extend self
 
+    # @deprecated
     TYPE = "_type".freeze
 
     # Builds a new +Document+ from the supplied attributes.
     #
+    # This method either instantiats klass or a descendant of klass if the attributes include
+    # klass' discriminator key.
+    #
+    # If the attributes contain the discriminator key (which is _type by default) and the
+    # discriminator value does not correspond to a descendant of klass then this method
+    # would create an instance of klass.
+    #
     # @example Build the document.
     #   Mongoid::Factory.build(Person, { "name" => "Durran" })
     #
@@ -20,9 +28,10 @@ module Mongoid
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil)
       attributes ||= {}
-      type = attributes[TYPE] || attributes[TYPE.to_sym]
-      if type && klass._types.include?(type)
-        type.constantize.new(attributes)
+      dvalue = attributes[klass.discriminator_key] || attributes[klass.discriminator_key.to_sym]
+      type = klass.get_discriminator_mapping(dvalue)
+      if type
+        type.new(attributes)
       else
         klass.new(attributes)
       end
@@ -31,6 +40,10 @@ module Mongoid
     # Builds a new +Document+ from the supplied attributes loaded from the
     # database.
     #
+    # If the attributes contain the discriminator key (which is _type by default) and the
+    # discriminator value does not correspond to a descendant of klass then this method
+    # raises an UnknownModel error.
+    #
     # If a criteria object is given, it is used in two ways:
     # 1. If the criteria has a list of fields specified via #only,
     #    only those fields are populated in the returned document.
@@ -54,7 +67,7 @@ module Mongoid
       if criteria
         selected_fields ||= criteria.options[:fields]
       end
-      type = (attributes || {})[TYPE]
+      type = (attributes || {})[klass.discriminator_key]
       if type.blank?
         obj = klass.instantiate(attributes, selected_fields)
         if criteria && criteria.association && criteria.parent_document
@@ -62,13 +75,17 @@ module Mongoid
         end
         obj
       else
-        camelized = type.camelize
+        constantized = klass.get_discriminator_mapping(type)
 
-        # Check if the class exists
-        begin
-          constantized = camelized.constantize
-        rescue NameError
-          raise Errors::UnknownModel.new(camelized, type)
+        unless constantized
+          camelized = type.camelize
+
+          # Check if the class exists
+          begin
+            constantized = camelized.constantize
+          rescue NameError
+            raise Errors::UnknownModel.new(camelized, type)
+          end
         end
 
         # Check if the class is a Document class

data/lib/mongoid/fields.rb

@@ -500,7 +500,8 @@ module Mongoid
       def create_translations_getter(name, meth)
         generated_methods.module_eval do
           re_define_method("#{meth}_translations") do
-            (attributes[name] ||= {}).with_indifferent_access
+            attributes[name] ||= {}
+            attributes[name].with_indifferent_access
           end
           alias_method :"#{meth}_t", :"#{meth}_translations"
         end

data/lib/mongoid/fields/standard.rb

@@ -4,12 +4,13 @@
 module Mongoid
   module Fields
     class Standard
+      extend Forwardable
 
       # Defines the behavior for defined fields in the document.
       # Set readers for the instance variables.
       attr_accessor :default_val, :label, :name, :options
 
-      delegate :demongoize, :evolve, :mongoize, to: :type
+      def_delegators :type, :demongoize, :evolve, :mongoize
 
       # Adds the atomic changes for this type of resizable field.
       #

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

@@ -39,7 +39,8 @@ module Mongoid
         #
         # @since 3.0.0
         def validate(klass, name, options)
-          validate_name(klass, name, options)
+          validate_field_name(klass, name)
+          validate_name_uniqueness(klass, name, options)
           validate_options(klass, name, options)
         end
 
@@ -61,28 +62,40 @@ module Mongoid
           end
         end
 
-        private
-
-        # Determine if the field name is allowed, if not raise an error.
-        #
-        # @api private
+        # Determine if the field name is valid, if not raise an error.
         #
         # @example Check the field name.
-        #   Macro.validate_name(Model, :name)
+        #   Macro.validate_field_name(Model, :name)
         #
         # @param [ Class ] klass The model class.
         # @param [ Symbol ] name The field name.
         #
         # @raise [ Errors::InvalidField ] If the name is not allowed.
         #
-        # @since 3.0.0
-        def validate_name(klass, name, options)
+        # @api private
+        def validate_field_name(klass, name)
           [name, "#{name}?".to_sym, "#{name}=".to_sym].each do |n|
             if Mongoid.destructive_fields.include?(n)
               raise Errors::InvalidField.new(klass, n)
             end
           end
+        end
 
+        private
+
+        # Determine if the field name is unique, if not raise an error.
+        #
+        # @example Check the field name.
+        #   Macro.validate_name_uniqueness(Model, :name, {})
+        #
+        # @param [ Class ] klass The model class.
+        # @param [ Symbol ] name The field name.
+        # @param [ Hash ] options The provided options.
+        #
+        # @raise [ Errors::InvalidField ] If the name is not allowed.
+        #
+        # @api private
+        def validate_name_uniqueness(klass, name, options)
           if !options[:overwrite] && klass.fields.keys.include?(name.to_s)
             if Mongoid.duplicate_fields_exception
               raise Errors::InvalidField.new(klass, name)
@@ -113,7 +126,10 @@ module Mongoid
             end
 
             if option == :type && options[option] == Symbol
-              Mongoid.logger.warn(FIELD_TYPE_IS_SYMBOL)
+              @field_type_is_symbol_warned ||= begin
+                Mongoid.logger.warn(FIELD_TYPE_IS_SYMBOL)
+                true
+              end
             end
           end
         end

data/lib/mongoid/findable.rb

@@ -8,15 +8,16 @@ module Mongoid
   #
   # @since 4.0.0
   module Findable
+    extend Forwardable
 
-    delegate *(
+    def_delegators :with_default_scope, *(
       Criteria::Queryable::Selectable.forwardables +
       Criteria::Queryable::Optional.forwardables
-    ), to: :with_default_scope
+    )
 
     # These are methods defined on the criteria that should also be accessible
     # directly from the class level.
-    delegate \
+    def_delegators :with_default_scope,
       :aggregates,
       :avg,
       :create_with,
@@ -45,7 +46,7 @@ module Mongoid
       :sum,
       :text_search,
       :update,
-      :update_all, to: :with_default_scope
+      :update_all
 
     # Returns a count of records in the database.
     # If you want to specify conditions use where.
@@ -59,6 +60,16 @@ module Mongoid
       with_default_scope.count
     end
 
+    # Returns an estimated count of records in the database.
+    #
+    # @example Get the count of matching documents.
+    #   Person.estimated_count
+    #
+    # @return [ Integer ] The number of matching documents.
+    def estimated_count
+      with_default_scope.estimated_count
+    end
+
     # Returns true if count is zero
     #
     # @example Are there no saved documents for this model?
@@ -80,20 +91,46 @@ module Mongoid
       with_default_scope.exists?
     end
 
-    # Find a +Document+ in several different ways.
-    #
-    # If a +String+ is provided, it will be assumed that it is a
-    # representation of a Mongo::ObjectID and will attempt to find a single
-    # +Document+ based on that id. If a +Symbol+ and +Hash+ is provided then
-    # it will attempt to find either a single +Document+ or multiples based
-    # on the conditions provided and the first parameter.
-    #
-    # @example Find a single document by an id.
-    #   Person.find(BSON::ObjectId)
-    #
-    # @param [ Array ] args An assortment of finder options.
-    #
-    # @return [ Document, nil, Criteria ] A document or matching documents.
+    # Finds a +Document+ or multiple documents by their _id values.
+    #
+    # If a single non-Array argument is given, this argument is interpreted
+    # as the _id value of a document to find. If there is a matching document
+    # in the database, this document is returned; otherwise, if the
+    # +raise_not_found_error+ Mongoid configuration option is truthy
+    # (which is the default), +Errors::DocumentNotFound+ is raised, and if
+    # +raise_not_found_error+ is falsy, +find+ returns +nil+.
+    #
+    # If multiple arguments are given, or an Array argument is given, the
+    # array is flattened and each array element is interpreted as the _id
+    # value of the document to find. Mongoid then attempts to retrieve all
+    # documents with the provided _id values. The return value is an array
+    # of found documents. Each document appears one time in the returned array,
+    # even if its _id is given multiple times in the argument to +find+.
+    # If the +raise_not_found_error+ Mongoid configuration option is truthy,
+    # +Errors::DocumentNotFound+ exception is raised if any of the specified
+    # _ids were not found in the database. If the ++raise_not_found_error+
+    # Mongoid configuration option is falsy, only those documents which are
+    # found are returned; if no documents are found, the return value is an
+    # empty array.
+    #
+    # Note that MongoDB does not allow the _id field to be an array.
+    #
+    # The argument undergoes customary Mongoid type conversions based on
+    # the type declared for the _id field. By default the _id field is a
+    # +BSON::ObjectId+; this allows strings to be passed to +find+ and the
+    # strings will be transparently converted to +BSON::ObjectId+ instances
+    # during query construction.
+    #
+    # The +find+ method takes into account the default scope defined on the
+    # model class, if any.
+    #
+    # @param [ Object | Array<Object> ] args The _id values to find or an
+    #   array thereof.
+    #
+    # @return [ Document | Array<Document> | nil ] A document or matching documents.
+    #
+    # @raise Errors::DocumentNotFound If not all documents are found and
+    #   the +raise_not_found_error+ Mongoid configuration option is truthy.
     def find(*args)
       with_default_scope.find(*args)
     end

data/lib/mongoid/indexable.rb

@@ -82,8 +82,8 @@ module Mongoid
       #
       # @since 1.0.0
       def add_indexes
-        if hereditary? && !index_keys.include?(_type: 1)
-          index({ _type: 1 }, unique: false, background: true)
+        if hereditary? && !index_keys.include?(self.discriminator_key.to_sym => 1)
+          index({ self.discriminator_key.to_sym => 1 }, unique: false, background: true)
         end
         true
       end

data/lib/mongoid/interceptable.rb

@@ -131,7 +131,11 @@ module Mongoid
           return false
         end
       end
-      callback_executable?(kind) ? super(kind, *args, &block) : true
+      if callback_executable?(kind)
+        super(kind, *args, &block)
+      else
+        true
+      end
     end
 
     private

data/lib/mongoid/matchable.rb

@@ -1,24 +1,6 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require "mongoid/matchable/default"
-require "mongoid/matchable/all"
-require "mongoid/matchable/and"
-require "mongoid/matchable/elem_match"
-require "mongoid/matchable/eq"
-require "mongoid/matchable/exists"
-require "mongoid/matchable/gt"
-require "mongoid/matchable/gte"
-require "mongoid/matchable/in"
-require "mongoid/matchable/lt"
-require "mongoid/matchable/lte"
-require "mongoid/matchable/ne"
-require "mongoid/matchable/nin"
-require "mongoid/matchable/nor"
-require "mongoid/matchable/or"
-require "mongoid/matchable/regexp"
-require "mongoid/matchable/size"
-
 module Mongoid
 
   # This module contains all the behavior for Ruby implementations of MongoDB
@@ -28,27 +10,6 @@ module Mongoid
   module Matchable
     extend ActiveSupport::Concern
 
-    # Hash lookup for the matcher for a specific operation.
-    #
-    # @since 1.0.0
-    MATCHERS = {
-      "$all" => All,
-      "$and" => And,
-      "$elemMatch" => ElemMatch,
-      "$eq" => Eq,
-      "$exists" => Exists,
-      "$gt" => Gt,
-      "$gte" => Gte,
-      "$in" => In,
-      "$lt" => Lt,
-      "$lte" => Lte,
-      "$ne" => Ne,
-      "$nin" => Nin,
-      "$nor" => Nor,
-      "$or" => Or,
-      "$size" => Size,
-    }.with_indifferent_access.freeze
-
     # Determines if this document has the attributes to match the supplied
     # MongoDB selector. Used for matching on embedded associations.
     #
@@ -61,116 +22,7 @@ module Mongoid
     #
     # @since 1.0.0
     def _matches?(selector)
-      selector.each_pair do |key, value|
-        if value.is_a?(Hash)
-          value.each do |item|
-            if item[0].to_s == "$not".freeze
-              item = item[1]
-              return false if matcher(key, item)._matches?(item)
-            else
-              return false unless matcher(key, Hash[*item])._matches?(Hash[*item])
-            end
-          end
-        else
-          return false unless matcher(key, value)._matches?(value)
-        end
-      end
-      true
-    end
-
-    private
-
-    # Get the matcher for the supplied key and value. Will determine the class
-    # name from the key.
-    #
-    # @example Get the matcher.
-    #   document.matcher(:title, { "$in" => [ "test" ] })
-    #
-    # @param [ Symbol, String ] key The field name.
-    # @param [ Object, Hash ] value The value or selector.
-    #
-    # @return [ Matcher ] The matcher.
-    #
-    # @since 2.0.0.rc.7
-    # @api private
-    def matcher(key, value)
-      Matchable.matcher(self, key, value)
-    end
-
-    class << self
-
-      # Get the matcher for the supplied key and value. Will determine the class
-      # name from the key.
-      #
-      # @api private
-      #
-      # @example Get the matcher.
-      #   Matchable.matcher(document, :title, { "$in" => [ "test" ] })
-      #
-      # @param [ Document ] document The document to check.
-      # @param [ Symbol, String ] key The field name.
-      # @param [ Object, Hash ] value The value or selector.
-      #
-      # @return [ Matcher ] The matcher.
-      #
-      # @since 2.0.0.rc.7
-      def matcher(document, key, value)
-        if value.is_a?(Hash)
-          matcher = MATCHERS[value.keys.first]
-          if matcher
-            matcher.new(extract_attribute(document, key))
-          else
-            Default.new(extract_attribute(document, key))
-          end
-        elsif value.regexp?
-          Regexp.new(extract_attribute(document, key))
-        else
-          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
-      end
-
-      private
-
-      # Extract the attribute from the key, being smarter about dot notation.
-      #
-      # @api private
-      #
-      # @example Extract the attribute.
-      #   strategy.extract_attribute(doc, "info.field")
-      #
-      # @param [ Document ] document The document.
-      # @param [ String ] key The key.
-      #
-      # @return [ Object ] The value of the attribute.
-      #
-      # @since 2.2.1
-      # @api private
-      def extract_attribute(document, key)
-        if (key_string = key.to_s) =~ /.+\..+/
-          key_string.split('.').inject(document.send(:as_attributes)) do |_attribs, _key|
-            if _attribs.is_a?(::Array)
-              if _key =~ /\A\d+\z/ && _attribs.none? {|doc| doc.is_a?(Hash)}
-                _attribs.try(:[], _key.to_i)
-              else
-                _attribs.map { |doc| doc.try(:[], _key) }
-              end
-            else
-              _attribs.try(:[], _key)
-            end
-          end
-        else
-          if document.is_a?(Hash)
-            document[key_string]
-          else
-            document.attributes[key_string]
-          end
-        end
-      end
+      Matcher::Expression.matches?(self, selector)
     end
   end
 end