mongoid 6.4.8 → 7.0.0.beta

data/lib/mongoid/association/touchable.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+module Mongoid
+  module Association
+    module Touchable
+
+      module InstanceMethods
+
+        # Touch the document, in effect updating its updated_at timestamp and
+        # optionally the provided field to the current time. If any belongs_to
+        # relations exist with a touch option, they will be updated as well.
+        #
+        # @example Update the updated_at timestamp.
+        #   document.touch
+        #
+        # @example Update the updated_at and provided timestamps.
+        #   document.touch(:audited)
+        #
+        # @note This will not autobuild relations if those options are set.
+        #
+        # @param [ Symbol ] field The name of an additional field to update.
+        #
+        # @return [ true/false ] false if record is new_record otherwise true.
+        #
+        # @since 3.0.0
+        def touch(field = nil)
+          return false if _root.new_record?
+          current = Time.now
+          field = database_field_name(field)
+          write_attribute(:updated_at, current) if respond_to?("updated_at=")
+          write_attribute(field, current) if field
+
+          touches = touch_atomic_updates(field)
+          unless touches["$set"].blank?
+            selector = atomic_selector
+            _root.collection.find(selector).update_one(positionally(selector, touches))
+          end
+          run_callbacks(:touch)
+          true
+        end
+      end
+
+      extend self
+
+      # Add the association to the touchable relations if the touch option was
+      # provided.
+      #
+      # @example Add the touchable.
+      #   Model.define_touchable!(assoc)
+      #
+      # @param [ Association ] association The association metadata.
+      #
+      # @return [ Class ] The model class.
+      #
+      # @since 3.0.0
+      def define_touchable!(association)
+        name = association.name
+        method_name = define_relation_touch_method(name, association)
+        association.inverse_class.tap do |klass|
+          klass.after_save method_name
+          klass.after_destroy method_name
+          klass.after_touch method_name
+        end
+      end
+
+      private
+
+      # Define the method that will get called for touching belongs_to
+      # relations.
+      #
+      # @api private
+      #
+      # @example Define the touch relation.
+      #   Model.define_relation_touch_method(:band)
+      #   Model.define_relation_touch_method(:band, :band_updated_at)
+      #
+      # @param [ Symbol ] name The name of the relation.
+      # @param [ Association ] association The association metadata.
+      #
+      # @since 3.1.0
+      #
+      # @return [ Symbol ] The method name.
+      def define_relation_touch_method(name, association)
+        association.relation_class.send(:include, InstanceMethods)
+        method_name = "touch_#{name}_after_create_or_destroy"
+        association.inverse_class.class_eval <<-TOUCH, __FILE__, __LINE__ + 1
+            def #{method_name}
+              without_autobuild do
+                relation = __send__(:#{name})
+                relation.touch #{":#{association.touch_field}" if association.touch_field} if relation
+              end
+            end
+        TOUCH
+        method_name.to_sym
+      end
+    end
+  end
+end

data/lib/mongoid/atomic.rb

@@ -36,7 +36,7 @@ module Mongoid
     # @since 2.2.0
     def add_atomic_pull(document)
       document.flagged_for_destroy = true
-      (delayed_atomic_pulls[document.metadata_name.to_s] ||= []).push(document)
+      (delayed_atomic_pulls[document.association_name.to_s] ||= []).push(document)
     end
 
     # Add an atomic unset for the document.
@@ -51,7 +51,7 @@ module Mongoid
     # @since 3.0.0
     def add_atomic_unset(document)
       document.flagged_for_destroy = true
-      (delayed_atomic_unsets[document.metadata_name.to_s] ||= []).push(document)
+      (delayed_atomic_unsets[document.association_name.to_s] ||= []).push(document)
     end
 
     # Returns path of the attribute for modification
@@ -110,10 +110,10 @@ module Mongoid
     #   performed in a single operation. Conflicting modifications are
     #   detected by the 'haveConflictingMod' function in MongoDB.
     #   Examination of the code suggests that two modifications (a $set
-    #   and a $push with $each, for example) conflict if:
+    #   and a $pushAll, for example) conflict if:
     #     (1) the key paths being modified are equal.
     #     (2) one key path is a prefix of the other.
-    #   So a $set of 'addresses.0.street' will conflict with a $push and $each
+    #   So a $set of 'addresses.0.street' will conflict with a $pushAll
     #   to 'addresses', and we will need to split our update into two
     #   pieces. We do not, however, attempt to match MongoDB's logic
     #   exactly. Instead, we assume that two updates conflict if the
@@ -189,7 +189,7 @@ module Mongoid
     #
     # @since 2.1.0
     def atomic_paths
-      @atomic_paths ||= __metadata ? __metadata.path(self) : Atomic::Paths::Root.new(self)
+      @atomic_paths ||= _association ? _association.path(self) : Atomic::Paths::Root.new(self)
     end
 
     # Get all the attributes that need to be pulled.
@@ -218,7 +218,7 @@ module Mongoid
     # @example Get the pushes.
     #   person.atomic_pushes
     #
-    # @return [ Hash ] The The $push and $each operations.
+    # @return [ Hash ] The $pushAll operations.
     #
     # @since 2.1.0
     def atomic_pushes

data/lib/mongoid/atomic/modifiers.rb

@@ -68,7 +68,7 @@ module Mongoid
         modifications.each_pair do |field, value|
           push_fields[field] = field
           mods = push_conflict?(field) ? conflicting_pushes : pushes
-          add_operation(mods, field, { '$each' => Array.wrap(value) })
+          add_operation(mods, field, Array.wrap(value))
         end
       end
 
@@ -118,12 +118,8 @@ module Mongoid
       # @since 2.2.0
       def add_operation(mods, field, value)
         if mods.has_key?(field)
-          if mods[field].is_a?(Array)
-            value.each do |val|
-              mods[field].push(val)
-            end
-          elsif mods[field]['$each']
-            mods[field]['$each'].concat(value['$each'])
+          value.each do |val|
+            mods[field].push(val)
           end
         else
           mods[field] = value
@@ -194,7 +190,7 @@ module Mongoid
       #
       # @since 2.2.0
       def conflicting_pushes
-        conflicts["$push"] ||= {}
+        conflicts["$pushAll"] ||= {}
       end
 
       # Get the conflicting set modifications.
@@ -281,16 +277,16 @@ module Mongoid
         self["$pull"] ||= {}
       end
 
-      # Get the $push/$each operations or initialize a new one.
+      # Get the $pushAll operations or intialize a new one.
       #
-      # @example Get the $push/$each operations.
+      # @example Get the $pushAll operations.
       #   modifiers.pushes
       #
-      # @return [ Hash ] The $push/$each operations.
+      # @return [ Hash ] The $pushAll operations.
       #
       # @since 2.1.0
       def pushes
-        self["$push"] ||= {}
+        self["$pushAll"] ||= {}
       end
 
       # Get the $set operations or intialize a new one.

data/lib/mongoid/atomic/paths/embedded/many.rb

@@ -35,7 +35,7 @@ module Mongoid
           def position
             pos = parent.atomic_position
             locator = document.new_record? ? "" : ".#{document._index}"
-            "#{pos}#{"." unless pos.blank?}#{document.__metadata.store_as}#{locator}"
+            "#{pos}#{"." unless pos.blank?}#{document._association.store_as}#{locator}"
           end
         end
       end

data/lib/mongoid/atomic/paths/embedded/one.rb

@@ -34,7 +34,7 @@ module Mongoid
           # @since 2.1.0
           def position
             pos = parent.atomic_position
-            "#{pos}#{"." unless pos.blank?}#{document.__metadata.store_as}"
+            "#{pos}#{"." unless pos.blank?}#{document._association.store_as}"
           end
         end
       end

data/lib/mongoid/attributes.rb

@@ -163,7 +163,8 @@ module Mongoid
     #
     # @since 1.0.0
     def write_attribute(name, value)
-      as_writable_attribute!(name) do |access|
+      access = database_field_name(name)
+      if attribute_writable?(access)
         _assigning do
           validate_attribute_value(access, value)
           localized = fields[access].try(:localized?)

data/lib/mongoid/attributes/nested.rb

@@ -48,15 +48,15 @@ module Mongoid
           args.each do |name|
             meth = "#{name}_attributes="
             self.nested_attributes["#{name}_attributes"] = meth
-            metadata = relations[name.to_s]
-            raise Errors::NestedAttributesMetadataNotFound.new(self, name) unless metadata
-            autosave_nested_attributes(metadata)
+            association = relations[name.to_s]
+            raise Errors::NestedAttributesMetadataNotFound.new(self, name) unless association
+            autosave_nested_attributes(association)
             re_define_method(meth) do |attrs|
               _assigning do
-                if metadata.polymorphic? and metadata.inverse_type
-                  options = options.merge!(:class_name => self.send(metadata.inverse_type))
+                if association.polymorphic? and association.inverse_type
+                  options = options.merge!(:class_name => self.send(association.inverse_type))
                 end
-                metadata.nested_builder(attrs, options).build(self)
+                association.nested_builder(attrs, options).build(self)
               end
             end
           end
@@ -71,12 +71,12 @@ module Mongoid
         # @example Add the autosave if appropriate.
         #   Person.autosave_nested_attributes(metadata)
         #
-        # @param [ Metadata ] metadata The existing relation metadata.
+        # @param [ Association ] association The existing association metadata.
         #
         # @since 3.1.4
-        def autosave_nested_attributes(metadata)
-          unless metadata.autosave == false
-            autosave(metadata.merge!(autosave: true))
+        def autosave_nested_attributes(association)
+          if association.autosave?
+            Association::Referenced::AutoSave.define_autosave!(association)
           end
         end
       end

data/lib/mongoid/attributes/processing.rb

@@ -133,9 +133,9 @@ module Mongoid
       # @since 2.0.0.rc.7
       def process_relations
         pending_relations.each_pair do |name, value|
-          metadata = relations[name]
+          association = relations[name]
           if value.is_a?(Hash)
-            metadata.nested_builder(value, {}).build(self)
+            association.nested_builder(value, {}).build(self)
           else
             send("#{name}=", value)
           end

data/lib/mongoid/attributes/readonly.rb

@@ -22,17 +22,15 @@ module Mongoid
       #   readonly.
       #
       # @since 3.0.0
-      #
-      # @deprecated Use #as_writable_attribute! instead.
       def attribute_writable?(name)
-        new_record? || !readonly_attributes.include?(database_field_name(name))
+        new_record? || (!readonly_attributes.include?(name) && _loaded?(name))
       end
 
       private
 
       def as_writable_attribute!(name, value = :nil)
         normalized_name = database_field_name(name)
-        if new_record? || (!readonly_attributes.include?(normalized_name) && _loaded?(normalized_name))
+        if attribute_writable?(normalized_name)
           yield(normalized_name)
         else
           raise Errors::ReadonlyAttribute.new(name, value)

data/lib/mongoid/clients.rb

@@ -3,14 +3,12 @@ require "mongoid/clients/factory"
 require "mongoid/clients/validators"
 require "mongoid/clients/storage_options"
 require "mongoid/clients/options"
-require "mongoid/clients/sessions"
 
 module Mongoid
   module Clients
     extend ActiveSupport::Concern
     include StorageOptions
     include Options
-    include Sessions
 
     class << self
 

data/lib/mongoid/clients/options.rb

@@ -38,7 +38,7 @@ module Mongoid
       def mongo_client
         persistence_context.client
       end
-      
+
       def persistence_context
         PersistenceContext.get(self) ||
             PersistenceContext.get(self.class) ||

data/lib/mongoid/clients/storage_options.rb

@@ -61,7 +61,6 @@ module Mongoid
         # @since 4.0.0
         def reset_storage_options!
           self.storage_options = storage_options_defaults.dup
-          PersistenceContext.clear(self)
         end
 
         # Get the default storage options.

data/lib/mongoid/composable.rb

@@ -43,7 +43,7 @@ module Mongoid
     include Inspectable
     include Matchable
     include Persistable
-    include Relations
+    include Association
     include Reloadable
     include Scopable
     include Selectable
@@ -70,7 +70,7 @@ module Mongoid
       Interceptable,
       Matchable,
       Persistable,
-      Relations,
+      Association,
       Reloadable,
       Scopable,
       Serializable,
@@ -83,8 +83,7 @@ module Mongoid
       Traversable,
       Validatable,
       Equality,
-      Relations::Synchronization,
-      Relations::Macros,
+      Association::Referenced::Syncable,
       ActiveModel::Model,
       ActiveModel::Validations
     ]

data/lib/mongoid/config.rb

@@ -27,6 +27,7 @@ module Mongoid
     option :log_level, default: :info
     option :belongs_to_required_by_default, default: true
     option :app_name, default: nil
+    option :background_indexing, default: false
 
     # Has Mongoid been configured? This is checking that at least a valid
     # client config exists.

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -23,7 +23,7 @@ module Mongoid
         #
         # @since 3.0.0
         def aggregates(field)
-          result = collection.find.aggregate(pipeline(field), session: _session).to_a
+          result = collection.find.aggregate(pipeline(field)).to_a
           if result.empty?
             { "count" => 0, "sum" => nil, "avg" => nil, "min" => nil, "max" => nil }
           else

data/lib/mongoid/contextual/atomic.rb

@@ -106,10 +106,10 @@ module Mongoid
         view.update_many("$push" => collect_operations(pushes))
       end
 
-      # Perform an atomic $push/$each operation on the matching documents.
+      # Perform an atomic $pushAll operation on the matching documents.
       #
       # @example Push the values to the matching docs.
-      #   context.push_all(members: [ "Alan", "Fletch" ])
+      #   context.push(members: [ "Alan", "Fletch" ])
       #
       # @param [ Hash ] pushes The operations.
       #
@@ -117,10 +117,7 @@ module Mongoid
       #
       # @since 3.0.0
       def push_all(pushes)
-        push_each_updates = collect_operations(pushes).each.inject({}) do |ops, (field, elements)|
-          ops.merge!(field => {'$each' => elements})
-        end
-        view.update_many("$push" => push_each_updates)
+        view.update_many("$pushAll" => collect_operations(pushes))
       end
 
       # Perform an atomic $rename of fields on the matching documents.

data/lib/mongoid/contextual/map_reduce.rb

@@ -165,13 +165,13 @@ module Mongoid
       def raw
         validate_out!
         cmd = command
-        opts = { read: cmd.delete(:read) } if cmd[:read]
-        @map_reduce.database.command(cmd, (opts || {}).merge(session: _session)).first
+        opts = { read: cmd.delete(:read).options } if cmd[:read]
+        @map_reduce.database.command(cmd, opts || {}).first
       end
       alias :results :raw
 
       # Execute the map/reduce, returning the raw output.
-      # Useful when you don't care about map/reduce's output.
+      # Useful when you don't care about map/reduce's ouptut.
       #
       # @example Run the map reduce
       #   map_reduce.execute
@@ -249,10 +249,6 @@ module Mongoid
       def validate_out!
         raise Errors::NoMapReduceOutput.new({}) unless @map_reduce.out
       end
-
-      def _session
-        criteria.send(:_session)
-      end
     end
   end
 end

data/lib/mongoid/contextual/memory.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 require "mongoid/contextual/aggregable/memory"
-require "mongoid/relations/eager"
+require "mongoid/association/eager_loadable"
 
 module Mongoid
   module Contextual
     class Memory
       include Enumerable
       include Aggregable::Memory
-      include Relations::Eager
+      include Association::EagerLoadable
       include Queryable
       include Positional
 
@@ -48,8 +48,7 @@ module Mongoid
         end
         unless removed.empty?
           collection.find(selector).update_one(
-            positionally(selector, "$pullAll" => { path => removed }),
-            session: _session
+            positionally(selector, "$pullAll" => { path => removed })
           )
         end
         deleted
@@ -130,7 +129,7 @@ module Mongoid
       # @return [ Document ] The first document.
       #
       # @since 3.0.0
-      def first
+      def first(*args)
         eager_load([documents.first]).first
       end
       alias :one :first
@@ -304,7 +303,7 @@ module Mongoid
           updates["$set"].merge!(doc.atomic_updates["$set"] || {})
           doc.move_changes
         end
-        collection.find(selector).update_one(updates, session: _session) unless updates["$set"].empty?
+        collection.find(selector).update_one(updates) unless updates["$set"].empty?
       end
 
       # Get the limiting value.
@@ -445,10 +444,6 @@ module Mongoid
         doc._parent.remove_child(doc)
         doc.destroyed = true
       end
-
-      def _session
-        @criteria.send(:_session)
-      end
     end
   end
 end