mongoid 7.3.3 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7cd241503d485cd393a4d0885629b2916aa5542083a281ff8883111938044e
-  data.tar.gz: f10cbf0946bd1b4a6f93deebe42fc2f9a728704d0565e1ea392df3007e5d6cc7
+  metadata.gz: 8bbeda0aba58b991964f1d6c687a8120cdeac497c9fbeef7b376386470519b6d
+  data.tar.gz: 4d3d62eef06a3d4502e5b846a6d38905f8bdca608598a1fb3e04945d364589d8
 SHA512:
-  metadata.gz: 7e2a3edf8051a2ad27202288f73dc7d284effe7c766ab5d7a7274c0901e793eb124fd178d5b366ffb3b3c196e9e69cded899b66dab8f15044a9981e4b12f5c55
-  data.tar.gz: 3c990c42772c0b2f61eccf88bdb8ad5f26779fe62c8ad119f5717d9da48c558a85deaf56aa8ff088f97c2aee2e41c2a29cfec67018142a59c79e3ea13f8e415c
+  metadata.gz: f8e5502f46048cd2f726aad05b44de638e6c3af5d3de59c33625fa0c5de6b4f8099155e643273afe17f2678239c52f2ffd3412587a6c23067ce1804eb2849c89
+  data.tar.gz: c84fd0380200bcb1c13fb49e3baa6c095670657fdcf6cfbd60f422448327faf37bdc43f9ac5334fcf96a883ed70bb9be9c42430b06f357a98e393ef2cec77efc

data/lib/mongoid/association/embedded/batchable.rb

@@ -82,6 +82,7 @@ module Mongoid
         def batch_replace(docs)
           if docs.blank?
             if _assigning? && !empty?
+              _base.delayed_atomic_sets.clear
               _base.add_atomic_unset(first)
               target_duplicate = _target.dup
               pre_process_batch_remove(target_duplicate, :delete)
@@ -93,6 +94,7 @@ module Mongoid
             _base.delayed_atomic_sets.clear unless _assigning?
             docs = normalize_docs(docs).compact
             _target.clear and _unscoped.clear
+            _base.delayed_atomic_unsets.clear
             inserts = execute_batch_set(docs)
             add_atomic_sets(inserts)
           end

data/lib/mongoid/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Mongoid
-  VERSION = "7.3.3"
+  VERSION = "7.3.4"
 end

data/spec/integration/associations/embeds_many_spec.rb

@@ -65,4 +65,143 @@ describe 'embeds_many associations' do
       include_examples 'does not delete the target from the database'
     end
   end
+
+  context 'assigning attributes to the same association' do
+    context 'setting then clearing' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      shared_examples 'persists correctly' do
+        it 'persists correctly' do
+          canvas.shapes.should be_empty
+          _canvas = Canvas.find(canvas.id)
+          _canvas.shapes.should be_empty
+        end
+      end
+
+      context 'via assignment operator' do
+        before do
+          canvas.shapes = [Shape.new, Shape.new]
+          canvas.shapes = []
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via attributes=' do
+        before do
+          canvas.attributes = {shapes: [Shape.new, Shape.new]}
+          canvas.attributes = {shapes: []}
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via assign_attributes' do
+        before do
+          canvas.assign_attributes(shapes: [Shape.new, Shape.new])
+          canvas.assign_attributes(shapes: [])
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+    end
+
+    context 'clearing then setting' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      shared_examples 'persists correctly' do
+        it 'persists correctly' do
+          canvas.shapes.length.should eq 2
+          _canvas = Canvas.find(canvas.id)
+          _canvas.shapes.length.should eq 2
+        end
+      end
+
+      context 'via assignment operator' do
+        before do
+          canvas.shapes = []
+          canvas.shapes = [Shape.new, Shape.new]
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via attributes=' do
+        before do
+          canvas.attributes = {shapes: []}
+          canvas.attributes = {shapes: [Shape.new, Shape.new]}
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via assign_attributes' do
+        before do
+          canvas.assign_attributes(shapes: [])
+          canvas.assign_attributes(shapes: [Shape.new, Shape.new])
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+    end
+
+    context 'updating a child then clearing' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      shared_examples 'persists correctly' do
+        it 'persists correctly' do
+          canvas.shapes.should be_empty
+          _canvas = Canvas.find(canvas.id)
+          _canvas.shapes.should be_empty
+        end
+      end
+
+      context 'via assignment operator' do
+        before do
+          # Mongoid uses the new value of `x` in the $pullAll query,
+          # which doesn't match the document that is in the database,
+          # resulting in the empty array assignment not taking effect.
+          pending 'MONGOID-5037'
+
+          canvas.shapes.first.x = 1
+          canvas.shapes = []
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via attributes=' do
+        before do
+          canvas.shapes.first.x = 1
+          canvas.attributes = {shapes: []}
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via assign_attributes' do
+        before do
+          canvas.shapes.first.x = 1
+          canvas.assign_attributes(shapes: [])
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+    end
+  end
 end

data/spec/mongoid/copyable_spec.rb

@@ -91,7 +91,7 @@ describe Mongoid::Copyable do
           end
 
           it 'calls constructor with explicitly declared attributes only' do
-            expect(cls).to receive(:new).with('name' => 'test').and_call_original
+            expect(cls).to receive(:new).with({'name' => 'test'}).and_call_original
             cloned
           end
         end