mongoid 6.4.8 → 7.0.0.beta

data/lib/mongoid/contextual/mongo.rb

@@ -4,7 +4,7 @@ require "mongoid/contextual/aggregable/mongo"
 require "mongoid/contextual/command"
 require "mongoid/contextual/geo_near"
 require "mongoid/contextual/map_reduce"
-require "mongoid/relations/eager"
+require "mongoid/association/eager_loadable"
 
 module Mongoid
   module Contextual
@@ -12,7 +12,7 @@ module Mongoid
       include Enumerable
       include Aggregable::Mongo
       include Atomic
-      include Relations::Eager
+      include Association::EagerLoadable
       include Queryable
 
       # Options constant.
@@ -95,8 +95,7 @@ module Mongoid
       def destroy
         each.inject(0) do |count, doc|
           doc.destroy
-          count += 1 if acknowledged_write?
-          count
+          count += 1
         end
       end
       alias :destroy_all :destroy
@@ -341,7 +340,7 @@ module Mongoid
         @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
         @collection = @klass.collection
         criteria.send(:merge_type_selection)
-        @view = collection.find(criteria.selector, session: _session)
+        @view = collection.find(criteria.selector)
         apply_options
       end
 
@@ -487,16 +486,12 @@ module Mongoid
       #   context.update({ "$set" => { name: "Smiths" }})
       #
       # @param [ Hash ] attributes The new attributes for the document.
-      # @param [ Hash ] opts The update operation options.
-      #
-      # @option opts [ Array ] :array_filters A set of filters specifying to which array elements
-      #   an update should apply.
       #
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update(attributes = nil, opts = {})
-        update_documents(attributes, :update_one, opts)
+      def update(attributes = nil)
+        update_documents(attributes)
       end
 
       # Update all the matching documents atomically.
@@ -505,16 +500,12 @@ module Mongoid
       #   context.update_all({ "$set" => { name: "Smiths" }})
       #
       # @param [ Hash ] attributes The new attributes for each document.
-      # @param [ Hash ] opts The update operation options.
-      #
-      # @option opts [ Array ] :array_filters A set of filters specifying to which array elements
-      #   an update should apply.
       #
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update_all(attributes = nil, opts = {})
-        update_documents(attributes, :update_many, opts)
+      def update_all(attributes = nil)
+        update_documents(attributes, :update_many)
       end
 
       private
@@ -550,10 +541,10 @@ module Mongoid
       # @return [ true, false ] If the update succeeded.
       #
       # @since 3.0.4
-      def update_documents(attributes, method = :update_one, opts = {})
+      def update_documents(attributes, method = :update_one)
         return false unless attributes
         attributes = Hash[attributes.map { |k, v| [klass.database_field_name(k.to_s), v] }]
-        view.send(method, attributes.__consolidate__(klass), opts)
+        view.send(method, attributes.__consolidate__(klass))
       end
 
       # Apply the field limitations.
@@ -705,14 +696,6 @@ module Mongoid
         yield(doc)
         documents.push(doc) if cacheable?
       end
-
-      def _session
-        @criteria.send(:_session)
-      end
-
-      def acknowledged_write?
-        collection.write_concern.nil? || collection.write_concern.acknowledged?
-      end
     end
   end
 end

data/lib/mongoid/copyable.rb

@@ -69,15 +69,15 @@ module Mongoid
           attrs["#{name}_translations"] = value
         end
       end
-      klass.embedded_relations.each do |_, metadata|
-        next unless attrs.present? && attrs[metadata.key].present?
+      klass.embedded_relations.each do |_, association|
+        next unless attrs.present? && attrs[association.key].present?
 
-        if metadata.macro == :embeds_many
-          attrs[metadata.key].each do |attr|
-            process_localized_attributes(metadata.klass, attr)
+        if association.is_a?(Association::Embedded::EmbedsMany)
+          attrs[association.key].each do |attr|
+            process_localized_attributes(association.klass, attr)
           end
         else
-          process_localized_attributes(metadata.klass, attrs[metadata.key])
+          process_localized_attributes(association.klass, attrs[association.key])
         end
       end
     end

data/lib/mongoid/criteria.rb

@@ -28,7 +28,6 @@ module Mongoid
     include Scopable
     include Clients::Options
     include Options
-    include Clients::Sessions
 
     # Static array used to check with method missing - we only need to ever
     # instantiate once.
@@ -36,7 +35,7 @@ module Mongoid
     # @since 4.0.0
     CHECK = []
 
-    attr_accessor :embedded, :klass, :parent_document, :metadata
+    attr_accessor :embedded, :klass, :parent_document, :association
 
     # Returns true if the supplied +Enumerable+ or +Criteria+ is equal to the results
     # of this +Criteria+ or the criteria itself.

data/lib/mongoid/criteria/includable.rb

@@ -36,7 +36,7 @@ module Mongoid
       # @example Get the eager loading inclusions.
       #   Person.includes(:game).inclusions
       #
-      # @return [ Array<Metadata> ] The inclusions.
+      # @return [ Array<Association> ] The inclusions.
       #
       # @since 2.2.0
       def inclusions
@@ -46,11 +46,11 @@ module Mongoid
       # Set the inclusions for the criteria.
       #
       # @example Set the inclusions.
-      #   criteria.inclusions = [ meta ]
+      #   criteria.inclusions = [ association ]
       #
-      # @param [ Array<Metadata> ] value The inclusions.
+      # @param [ Array<Association> ] value The inclusions.
       #
-      # @return [ Array<Metadata> ] The new inclusions.
+      # @return [ Array<Association> ] The new inclusions.
       #
       # @since 3.0.0
       def inclusions=(value)
@@ -65,28 +65,28 @@ module Mongoid
       #   criteria.add_inclusion(Person, :posts)
       #
       # @param [ Class, String, Symbol ] _klass The class or string/symbol of the class name.
-      # @param [ Symbol ] metadata The relation.
+      # @param [ Symbol ] association The relation.
       #
       # @raise [ Errors::InvalidIncludes ] If no relation is found.
       #
       # @since 5.1.0
-      def add_inclusion(_klass, metadata)
-        inclusions.push(metadata) unless inclusions.include?(metadata)
+      def add_inclusion(_klass, association)
+        inclusions.push(association) unless inclusions.include?(association)
       end
 
       def extract_includes_list(_parent_class, *relations_list)
         relations_list.flatten.each do |relation_object|
           if relation_object.is_a?(Hash)
             relation_object.each do |relation, _includes|
-              metadata = _parent_class.reflect_on_association(relation)
-              raise Errors::InvalidIncludes.new(_klass, [ relation ]) unless metadata
-              add_inclusion(_parent_class, metadata)
-              extract_includes_list(metadata.klass, _includes)
+              association = _parent_class.reflect_on_association(relation)
+              raise Errors::InvalidIncludes.new(_klass, [ relation ]) unless association
+              add_inclusion(_parent_class, association)
+              extract_includes_list(association.klass, _includes)
             end
           else
-            metadata = _parent_class.reflect_on_association(relation_object)
-            raise Errors::InvalidIncludes.new(_parent_class, [ relation_object ]) unless metadata
-            add_inclusion(_parent_class, metadata)
+            association = _parent_class.reflect_on_association(relation_object)
+            raise Errors::InvalidIncludes.new(_parent_class, [ relation_object ]) unless association
+            add_inclusion(_parent_class, association)
           end
         end
       end

data/lib/mongoid/criteria/modifiable.rb

@@ -3,10 +3,6 @@ module Mongoid
   class Criteria
     module Modifiable
 
-      # @attribute [r] create_attrs Additional attributes to add to the Document upon creation.
-      # @api private
-      attr_reader :create_attrs
-
       # Build a document given the selector and return it.
       # Complex criteria, such as $in and $or operations will get ignored.
       #
@@ -61,9 +57,6 @@ module Mongoid
 
       # Define attributes with which new documents will be created.
       #
-      # Note that if `find_or_create_by` is called after this in a method chain, the attributes in
-      # the query will override those from this method.
-      #
       # @example Define attributes to be used when a new document is created.
       #   Person.create_with(job: 'Engineer').find_or_create_by(employer: 'MongoDB')
       #
@@ -71,9 +64,7 @@ module Mongoid
       #
       # @since 5.1.0
       def create_with(attrs = {})
-        tap do
-          (@create_attrs ||= {}).merge!(attrs)
-        end
+        where(selector.merge(attrs))
       end
 
       # Find the first +Document+ given the conditions, or creates a new document
@@ -181,8 +172,7 @@ module Mongoid
       #
       # @since 3.0.0
       def create_document(method, attrs = nil, &block)
-        attrs = (create_attrs || {}).merge(attrs || {})
-        attributes = selector.reduce(attrs) do |hash, (key, value)|
+        attributes = selector.reduce(attrs ? attrs.dup : {}) do |hash, (key, value)|
           unless invalid_key?(hash, key) || invalid_embedded_doc?(value)
             hash[key] = value
           end
@@ -190,9 +180,13 @@ module Mongoid
         end
         if embedded?
           attributes[:_parent] = parent_document
-          attributes[:__metadata] = metadata
+          attributes[:_association] = association
+        end
+        if polymorphic? && @criterion
+          klass.__send__(method, attributes.merge(@criterion), &block)
+        else
+          klass.__send__(method, attributes, &block)
         end
-        klass.__send__(method, attributes, &block)
       end
 
       # Find the first object or create/initialize it.

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

@@ -259,9 +259,7 @@ module Mongoid
         def prepare(field, operator, value)
           unless operator =~ /exists|type|size/
             value = value.__expand_complex__
-            field = field.to_s
-            name = aliases[field] || field
-            serializer = serializers[name]
+            serializer = serializers[field]
             value = serializer ? serializer.evolve(value) : value
           end
           selection = { operator => value }

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

@@ -72,16 +72,21 @@ module Mongoid
         #
         # @example Add the unwind.
         #   pipeline.unwind(:field)
+        #   pipeline.unwind(document)
         #
-        # @param [ String, Symbol ] field The name of the field.
+        # @param [ String, Symbol, Hash ] field_or_doc The name of the field or a document.
         #
         # @return [ Pipeline ] The pipeline.
         #
         # @since 2.0.0
-        def unwind(field)
-          normalized = field.to_s
-          name = aliases[normalized] || normalized
-          push("$unwind" => name.__mongo_expression__)
+        def unwind(field_or_doc)
+          unless field_or_doc.respond_to? :keys
+            normalized = field_or_doc.to_s
+            name = aliases[normalized] || normalized
+            push("$unwind" => name.__mongo_expression__)
+          else
+            push("$unwind" => field_or_doc)
+          end
         end
 
         private

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

@@ -24,7 +24,7 @@ module Mongoid
         # @since 2.0.0
         POLYGON = "Polygon"
 
-        # @attribute [rw] negating If the next expression is negated.
+        # @attribute [rw] negating If the next spression is negated.
         # @attribute [rw] selector The query selector.
         attr_accessor :negating, :selector
 
@@ -134,21 +134,13 @@ module Mongoid
           ::Boolean.evolve(value)
         end
 
-        # Add a $geoIntersects or $geoWithin selection. Symbol operators must
-        # be used as shown in the examples to expand the criteria.
+        # Add a $geoIntersects or $geoWithin selection. Symbol operators must be used as shown in
+        # the examples to expand the criteria.
         #
         # @note The only valid geometry shapes for a $geoIntersects are:
         #   :intersects_line, :intersects_point, and :intersects_polygon.
         #
-        # @note The only valid options for a $geoWithin query are the geometry
-        #   shape :within_polygon and the operator :within_box.
-        #
-        # @note The :within_box operator for the $geoWithin query expects the
-        #   lower left (south west) coordinate pair as the first argument and
-        #   the upper right (north east) as the second argument.
-        #   Important: When latitude and longitude are passed, longitude is
-        #   expected as the first element of the coordinate pair.
-        #   Source: https://docs.mongodb.com/manual/reference/operator/query/box/
+        # @note The only valid geometry shape for a $geoWithin is :within_polygon
         #
         # @example Add a geo intersect criterion for a line.
         #   query.geo_spacial(:location.intersects_line => [[ 1, 10 ], [ 2, 10 ]])
@@ -162,9 +154,6 @@ module Mongoid
         # @example Add a geo within criterion for a polygon.
         #   query.geo_spacial(:location.within_polygon => [[ 1, 10 ], [ 2, 10 ], [ 1, 10 ]])
         #
-        # @example Add a geo within criterion for a box.
-        #   query.geo_spacial(:location.within_box => [[ 1, 10 ], [ 2, 10 ])
-        #
         # @param [ Hash ] criterion The criterion.
         #
         # @return [ Selectable ] The cloned selectable.
@@ -185,7 +174,6 @@ module Mongoid
         key :within_polygon, :override, "$geoWithin", "$geometry" do |value|
           { "type" => POLYGON, "coordinates" => value }
         end
-        key :within_box, :override, "$geoWithin", "$box"
 
         # Add the $gt criterion to the selector.
         #
@@ -513,11 +501,6 @@ module Mongoid
         # @example Construct a text search selector with options.
         #   selectable.text_search("testing", :$language => "fr")
         #
-        # @note Per https://docs.mongodb.com/manual/reference/operator/query/text/
-        #   it is not currently possible to supply multiple text search
-        #   conditions in a query. Mongoid will build such a query but the
-        #   server will return an error when trying to execute it.
-        #
         # @param [ String, Symbol ] terms A string of terms that MongoDB parses
         #   and uses to query the text index.
         # @param [ Hash ] opts Text search options. See MongoDB documentation
@@ -529,19 +512,9 @@ module Mongoid
         def text_search(terms, opts = nil)
           clone.tap do |query|
             if terms
-              criterion = {'$text' => { '$search' => terms }}
-              criterion['$text'].merge!(opts) if opts
-              if query.selector['$text']
-                # Per https://docs.mongodb.com/manual/reference/operator/query/text/
-                # multiple $text expressions are not currently supported by
-                # MongoDB server, but build the query correctly instead of
-                # overwriting previous text search condition with the currently
-                # given one.
-                Mongoid.logger.warn('Multiple $text expressions per query are not currently supported by the server')
-                query.selector = {'$and' => [query.selector]}.merge(criterion)
-              else
-                query.selector = query.selector.merge(criterion)
-              end
+              criterion = { :$text => { :$search => terms } }
+              criterion[:$text].merge!(opts) if opts
+              query.selector = criterion
             end
           end
         end
@@ -562,6 +535,9 @@ module Mongoid
         #
         # @since 1.0.0
         def where(criterion = nil)
+          # We need to save the criterion in an instance variable so Modifiable methods
+          # know how to create a polymorphic object.
+          @criterion = criterion
           criterion.is_a?(String) ? js_query(criterion) : expr_query(criterion)
         end
 

data/lib/mongoid/document.rb

@@ -4,7 +4,6 @@ require "mongoid/evolvable"
 require "mongoid/extensions"
 require "mongoid/errors"
 require "mongoid/threaded"
-require "mongoid/relations"
 require "mongoid/atomic"
 require "mongoid/attributes"
 require "mongoid/contextual"
@@ -14,6 +13,7 @@ require "mongoid/criteria"
 require "mongoid/factory"
 require "mongoid/fields"
 require "mongoid/timestamps"
+require "mongoid/association"
 require "mongoid/composable"
 
 module Mongoid
@@ -190,11 +190,11 @@ module Mongoid
     #
     # @since 5.1.0
     def as_json(options = nil)
-      rv = super
-      if options && options[:compact]
-        rv = rv.compact
+      if options && (options[:compact] == true)
+        super(options).reject! { |k,v| v.nil? }
+      else
+        super(options)
       end
-      rv
     end
 
     # Returns an instance of the specified class with the attributes,
@@ -281,7 +281,7 @@ module Mongoid
         without_autobuild do
           relation, stored = send(name), meta.store_as
           if attributes.key?(stored) || !relation.blank?
-            if relation
+            if !relation.nil?
               attributes[stored] = relation.send(:as_attributes)
             else
               attributes.delete(stored)

data/lib/mongoid/errors.rb

@@ -8,6 +8,7 @@ require "mongoid/errors/eager_load"
 require "mongoid/errors/in_memory_collation_not_supported"
 require "mongoid/errors/invalid_collection"
 require "mongoid/errors/invalid_config_option"
+require "mongoid/errors/invalid_dependent_strategy"
 require "mongoid/errors/invalid_field"
 require "mongoid/errors/invalid_field_option"
 require "mongoid/errors/invalid_find"
@@ -17,8 +18,8 @@ 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_relation_option"
 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"
@@ -42,6 +43,7 @@ require "mongoid/errors/readonly_document"
 require "mongoid/errors/scope_overwrite"
 require "mongoid/errors/too_many_nested_attribute_records"
 require "mongoid/errors/unknown_attribute"
+require "mongoid/errors/unknown_model"
 require "mongoid/errors/unsaved_document"
 require "mongoid/errors/unsupported_javascript"
 require "mongoid/errors/validations"