mongoid 7.0.0.beta → 7.0.0

data/lib/mongoid/attributes/dynamic.rb

@@ -41,7 +41,7 @@ module Mongoid
         class_eval <<-READER, __FILE__, __LINE__ + 1
           def #{name}
             attribute_will_change!(#{name.inspect})
-            read_attribute(#{name.inspect})
+            read_raw_attribute(#{name.inspect})
           end
         READER
       end
@@ -147,7 +147,7 @@ module Mongoid
           getter = attr.reader
           define_dynamic_reader(getter)
           attribute_will_change!(attr.reader)
-          read_attribute(getter)
+          read_raw_attribute(getter)
         end
       end
     end

data/lib/mongoid/changeable.rb

@@ -227,7 +227,7 @@ module Mongoid
     # @since 2.3.0
     def attribute_will_change!(attr)
       unless changed_attributes.key?(attr)
-        changed_attributes[attr] = read_attribute(attr).__deep_copy__
+        changed_attributes[attr] = read_raw_attribute(attr).__deep_copy__
       end
     end
 

data/lib/mongoid/clients.rb

@@ -3,12 +3,14 @@ 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/sessions.rb

@@ -0,0 +1,113 @@
+module Mongoid
+  module Clients
+
+    # Encapsulates behavior for getting a session from the client of a model class or instance,
+    # setting the session on the current thread, and yielding to a block.
+    # The session will be closed after the block completes or raises an error.
+    #
+    # @since 6.4.0
+    module Sessions
+
+      # Execute a block within the context of a session.
+      #
+      # @example Execute some operations in the context of a session.
+      #   band.with_session(causal_consistency: true) do
+      #     band.records << Record.create
+      #     band.name = 'FKA Twigs'
+      #     band.save
+      #     band.reload
+      #   end
+      #
+      # @param [ Hash ] options The session options. Please see the driver
+      #   documentation for the available session options.
+      #
+      # @note You cannot do any operations in the block using models or objects
+      #   that use a different client; the block will execute all operations
+      #   in the context of the implicit session and operations on any models using
+      #   another client will fail. For example, if you set a client using store_in on a
+      #   particular model and execute an operation on it in the session context block,
+      #   that operation can't use the block's session and an error will be raised.
+      #   An error will also be raised if sessions are nested.
+      #
+      # @raise [ Errors::InvalidSessionUse ] If an operation is attempted on a model using another
+      #   client from which the session was started or if sessions are nested.
+      #
+      # @return [ Object ] The result of calling the block.
+      #
+      # @yieldparam [ Mongo::Session ] The session being used for the block.
+      #
+      # @since 6.4.0
+      def with_session(options = {})
+        raise Mongoid::Errors::InvalidSessionUse.new(:invalid_session_nesting) if Threaded.get_session
+        session = persistence_context.client.start_session(options)
+        Threaded.set_session(session)
+        yield(session)
+      rescue Mongo::Error::InvalidSession => ex
+        if ex.message == Mongo::Session::SESSIONS_NOT_SUPPORTED
+          raise Mongoid::Errors::InvalidSessionUse.new(:sessions_not_supported)
+        end
+        raise Mongoid::Errors::InvalidSessionUse.new(:invalid_session_use)
+      ensure
+        Threaded.clear_session
+      end
+
+      private
+
+      def session
+        Threaded.get_session
+      end
+
+      module ClassMethods
+
+        # Execute a block within the context of a session.
+        #
+        # @example Execute some operations in the context of a session.
+        #   Band.with_session(causal_consistency: true) do
+        #     band = Band.create
+        #     band.records << Record.new
+        #     band.save
+        #     band.reload.records
+        #   end
+        #
+        # @param [ Hash ] options The session options. Please see the driver
+        #   documentation for the available session options.
+        #
+        # @note You cannot do any operations in the block using models or objects
+        #   that use a different client; the block will execute all operations
+        #   in the context of the implicit session and operations on any models using
+        #   another client will fail. For example, if you set a client using store_in on a
+        #   particular model and execute an operation on it in the session context block,
+        #   that operation can't use the block's session and an error will be raised.
+        #   You also cannot nest sessions.
+        #
+        # @raise [ Errors::InvalidSessionUse ] If an operation is attempted on a model using another
+        #   client from which the session was started or if sessions are nested.
+        #
+        # @return [ Object ] The result of calling the block.
+        #
+        # @yieldparam [ Mongo::Session ] The session being used for the block.
+        #
+        # @since 6.4.0
+        def with_session(options = {})
+          raise Mongoid::Errors::InvalidSessionUse.new(:invalid_session_nesting) if Threaded.get_session
+          session = persistence_context.client.start_session(options)
+          Threaded.set_session(session)
+          yield(session)
+        rescue Mongo::Error::InvalidSession => ex
+          if ex.message == Mongo::Session::SESSIONS_NOT_SUPPORTED
+            raise Mongoid::Errors::InvalidSessionUse.new(:sessions_not_supported)
+          end
+          raise Mongoid::Errors::InvalidSessionUse.new(:invalid_session_use)
+        ensure
+          Threaded.clear_session
+        end
+
+        private
+
+        def session
+          Threaded.get_session
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/clients/storage_options.rb

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

@@ -84,6 +84,7 @@ module Mongoid
       Validatable,
       Equality,
       Association::Referenced::Syncable,
+      Association::Macros,
       ActiveModel::Model,
       ActiveModel::Validations
     ]

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)).to_a
+          result = collection.find.aggregate(pipeline(field), session: session).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 $pushAll operation on the matching documents.
+      # Perform an atomic $push/$each operation on the matching documents.
       #
       # @example Push the values to the matching docs.
-      #   context.push(members: [ "Alan", "Fletch" ])
+      #   context.push_all(members: [ "Alan", "Fletch" ])
       #
       # @param [ Hash ] pushes The operations.
       #
@@ -117,7 +117,10 @@ module Mongoid
       #
       # @since 3.0.0
       def push_all(pushes)
-        view.update_many("$pushAll" => collect_operations(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)
       end
 
       # Perform an atomic $rename of fields on the matching documents.

data/lib/mongoid/contextual/geo_near.rb

@@ -242,7 +242,7 @@ module Mongoid
       # @since 3.0.0
       def documents
         results["results"].map do |attributes|
-          doc = Factory.from_db(criteria.klass, attributes["obj"], criteria.options[:fields])
+          doc = Factory.from_db(criteria.klass, attributes["obj"], criteria)
           doc.attributes["geo_near_distance"] = attributes["dis"]
           doc
         end

data/lib/mongoid/contextual/map_reduce.rb

@@ -166,12 +166,12 @@ module Mongoid
         validate_out!
         cmd = command
         opts = { read: cmd.delete(:read).options } if cmd[:read]
-        @map_reduce.database.command(cmd, opts || {}).first
+        @map_reduce.database.command(cmd, (opts || {}).merge(session: session)).first
       end
       alias :results :raw
 
       # Execute the map/reduce, returning the raw output.
-      # Useful when you don't care about map/reduce's ouptut.
+      # Useful when you don't care about map/reduce's output.
       #
       # @example Run the map reduce
       #   map_reduce.execute
@@ -249,6 +249,10 @@ 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

@@ -48,7 +48,8 @@ module Mongoid
         end
         unless removed.empty?
           collection.find(selector).update_one(
-            positionally(selector, "$pullAll" => { path => removed })
+            positionally(selector, "$pullAll" => { path => removed }),
+            session: session
           )
         end
         deleted
@@ -154,6 +155,22 @@ module Mongoid
         apply_options
       end
 
+      # Increment a value on all documents.
+      #
+      # @example Perform the increment.
+      #   context.inc(likes: 10)
+      #
+      # @param [ Hash ] incs The operations.
+      #
+      # @return [ Enumerator ] The enumerator.
+      #
+      # @since 7.0.0
+      def inc(*args)
+        each do |document|
+          document.inc *args
+        end
+      end
+
       # Get the last document in the database for the criteria's selector.
       #
       # @example Get the last document.
@@ -303,7 +320,7 @@ module Mongoid
           updates["$set"].merge!(doc.atomic_updates["$set"] || {})
           doc.move_changes
         end
-        collection.find(selector).update_one(updates) unless updates["$set"].empty?
+        collection.find(selector).update_one(updates, session: session) unless updates["$set"].empty?
       end
 
       # Get the limiting value.
@@ -444,6 +461,12 @@ module Mongoid
         doc._parent.remove_child(doc)
         doc.destroyed = true
       end
+
+      private
+
+      def session
+        @criteria.send(:session)
+      end
     end
   end
 end

data/lib/mongoid/contextual/mongo.rb

@@ -95,7 +95,8 @@ module Mongoid
       def destroy
         each.inject(0) do |count, doc|
           doc.destroy
-          count += 1
+          count += 1 if acknowledged_write?
+          count
         end
       end
       alias :destroy_all :destroy
@@ -255,12 +256,12 @@ module Mongoid
         try_cache(:first) do
           if sort = view.sort || ({ _id: 1 } unless opts[:id_sort] == :none)
             if raw_doc = view.sort(sort).limit(-1).first
-              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+              doc = Factory.from_db(klass, raw_doc, criteria)
               eager_load([doc]).first
             end
           else
             if raw_doc = view.limit(-1).first
-              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+              doc = Factory.from_db(klass, raw_doc, criteria)
               eager_load([doc]).first
             end
           end
@@ -276,7 +277,7 @@ module Mongoid
       def find_first
         return documents.first if cached? && cache_loaded?
         if raw_doc = view.first
-          doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+          doc = Factory.from_db(klass, raw_doc, criteria)
           eager_load([doc]).first
         end
       end
@@ -340,7 +341,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)
+        @view = collection.find(criteria.selector, session: session)
         apply_options
       end
 
@@ -367,7 +368,7 @@ module Mongoid
         try_cache(:last) do
           with_inverse_sorting(opts) do
             if raw_doc = view.limit(-1).first
-              doc = Factory.from_db(klass, raw_doc, criteria.options[:fields])
+              doc = Factory.from_db(klass, raw_doc, criteria)
               eager_load([doc]).first
             end
           end
@@ -486,12 +487,16 @@ 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)
-        update_documents(attributes)
+      def update(attributes = nil, opts = {})
+        update_documents(attributes, :update_one, opts)
       end
 
       # Update all the matching documents atomically.
@@ -500,12 +505,16 @@ 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)
-        update_documents(attributes, :update_many)
+      def update_all(attributes = nil, opts = {})
+        update_documents(attributes, :update_many, opts)
       end
 
       private
@@ -541,10 +550,10 @@ module Mongoid
       # @return [ true, false ] If the update succeeded.
       #
       # @since 3.0.4
-      def update_documents(attributes, method = :update_one)
+      def update_documents(attributes, method = :update_one, opts = {})
         return false unless attributes
         attributes = Hash[attributes.map { |k, v| [klass.database_field_name(k.to_s), v] }]
-        view.send(method, attributes.__consolidate__(klass))
+        view.send(method, attributes.__consolidate__(klass), opts)
       end
 
       # Apply the field limitations.
@@ -674,7 +683,7 @@ module Mongoid
       def documents_for_iteration
         return documents if cached? && !documents.empty?
         return view unless eager_loadable?
-        docs = view.map{ |doc| Factory.from_db(klass, doc, criteria.options[:fields]) }
+        docs = view.map{ |doc| Factory.from_db(klass, doc, criteria) }
         eager_load(docs)
       end
 
@@ -692,10 +701,20 @@ module Mongoid
       # @since 3.0.0
       def yield_document(document, &block)
         doc = document.respond_to?(:_id) ?
-            document : Factory.from_db(klass, document, criteria.options[:fields])
+            document : Factory.from_db(klass, document, criteria)
         yield(doc)
         documents.push(doc) if cacheable?
       end
+
+      private
+
+      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

@@ -73,8 +73,8 @@ module Mongoid
         next unless attrs.present? && attrs[association.key].present?
 
         if association.is_a?(Association::Embedded::EmbedsMany)
-          attrs[association.key].each do |attr|
-            process_localized_attributes(association.klass, attr)
+          attrs[association.name.to_s].each_with_index do |attr, index|
+            process_localized_attributes(send(association.name)[index].class, attr)
           end
         else
           process_localized_attributes(association.klass, attrs[association.key])

data/lib/mongoid/criteria.rb

@@ -27,6 +27,7 @@ module Mongoid
     include Modifiable
     include Scopable
     include Clients::Options
+    include Clients::Sessions
     include Options
 
     # Static array used to check with method missing - we only need to ever