mongoid 6.4.2 → 7.0.3

data/spec/mongoid/{relations/bindings/embedded/one_spec.rb → association/embedded/embeds_one/binding_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Bindings::Embedded::One do
+describe Mongoid::Association::Embedded::EmbedsOne::Binding do
 
   let(:person) do
     Person.new
@@ -10,14 +10,14 @@ describe Mongoid::Relations::Bindings::Embedded::One do
     Name.new
   end
 
-  let(:metadata) do
+  let(:association) do
     Person.relations["name"]
   end
 
   describe "#bind" do
 
     let(:binding) do
-      described_class.new(person, target, metadata)
+      described_class.new(person, target, association)
     end
 
     context "when the document is bindable" do
@@ -51,7 +51,7 @@ describe Mongoid::Relations::Bindings::Embedded::One do
   describe "#unbind" do
 
     let(:binding) do
-      described_class.new(person, target, metadata)
+      described_class.new(person, target, association)
     end
 
     context "when the document is unbindable" do

data/spec/mongoid/{relations/builders/embedded/one_spec.rb → association/embedded/embeds_one/buildable_spec.rb}

@@ -1,29 +1,29 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Builders::Embedded::One do
+describe Mongoid::Association::Embedded::EmbedsOne::Buildable do
 
   let(:base) do
     double
   end
 
-  let(:builder) do
-    described_class.new(base, metadata, object)
+  let(:options) do
+    { }
   end
 
   describe "#build" do
 
-    context "when provided nil" do
+    let(:document) do
+      association.build(base, object)
+    end
 
-      let(:metadata) do
-        double(klass: Name, name: :name)
-      end
+    let(:association) do
+      Mongoid::Association::Embedded::EmbedsOne.new(Person, :name, options)
+    end
 
-      let(:builder) do
-        described_class.new(nil, metadata, nil)
-      end
+    context "when provided nil" do
 
-      let(:document) do
-        builder.build
+      let(:object) do
+        nil
       end
 
       it "returns nil" do
@@ -33,18 +33,10 @@ describe Mongoid::Relations::Builders::Embedded::One do
 
     context "when provided a document" do
 
-      let(:metadata) do
-        double(klass: Name, name: :name)
-      end
-
       let(:object) do
         Name.new
       end
 
-      let(:document) do
-        builder.build
-      end
-
       it "returns the document" do
         expect(document).to eq(object)
       end
@@ -52,18 +44,10 @@ describe Mongoid::Relations::Builders::Embedded::One do
 
     context "when no type is in the object" do
 
-      let(:metadata) do
-        double(klass: Name, name: :name)
-      end
-
       let(:object) do
         { "first_name" => "Corbin" }
       end
 
-      let(:document) do
-        builder.build
-      end
-
       it "creates the correct type of document" do
         expect(document).to be_a_kind_of(Name)
       end
@@ -75,18 +59,14 @@ describe Mongoid::Relations::Builders::Embedded::One do
 
     context "when a type is in the object" do
 
-      let(:metadata) do
-        double(klass: Writer, name: :writer)
+      let(:association) do
+        Mongoid::Association::Embedded::EmbedsOne.new(Person, :writer, options)
       end
 
       let(:object) do
         { "_type" => PdfWriter.name, "speed" => 100 }
       end
 
-      let(:document) do
-        builder.build
-      end
-
       it "creates the correct type of document" do
         expect(document).to be_a_kind_of(PdfWriter)
       end

data/spec/mongoid/{relations/embedded/one_spec.rb → association/embedded/embeds_one/proxy_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Embedded::One do
+describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
 
   describe "#===" do
 
@@ -12,12 +12,12 @@ describe Mongoid::Relations::Embedded::One do
       Name.new
     end
 
-    let(:metadata) do
+    let(:association) do
       Person.relations["name"]
     end
 
     let(:relation) do
-      described_class.new(base, target, metadata)
+      described_class.new(base, target, association)
     end
 
     context "when the proxied document is same class" do
@@ -168,7 +168,7 @@ describe Mongoid::Relations::Embedded::One do
             expect(name).to be_persisted
           end
 
-          context "when replacing an exising document" do
+          context "when replacing an existing document" do
 
             let(:pet_owner) do
               PetOwner.create
@@ -200,6 +200,29 @@ describe Mongoid::Relations::Embedded::One do
             end
           end
         end
+        
+        context 'when the original document does not need to be unset because it will be replaced by the $set' do
+
+          let!(:pet_owner) do
+            PetOwner.create(pet: pet_one)
+          end
+
+          let(:pet_one) do
+            Pet.new(name: 'kika')
+          end
+
+          let(:pet_two) do
+            Pet.new(name: 'tiksy')
+          end
+
+          before do
+            expect(Mongo::Logger.logger).to receive(:debug?).exactly(2).times
+          end
+
+          it 'does not execute an unnecessary unset for the relation' do
+            pet_owner.pet = pet_two
+          end
+        end
 
         context "when setting via the parent attributes" do
 
@@ -644,29 +667,6 @@ describe Mongoid::Relations::Embedded::One do
     end
   end
 
-  describe ".builder" do
-
-    let(:base) do
-      Person.new
-    end
-
-    let(:target) do
-      Name.new
-    end
-
-    let(:metadata) do
-      Person.relations["name"]
-    end
-
-    let(:builder_klass) do
-      Mongoid::Relations::Builders::Embedded::One
-    end
-
-    it "returns the embedded one builder" do
-      expect(described_class.builder(base, metadata, target)).to be_a(builder_klass)
-    end
-  end
-
   describe "#create_#\{name}" do
 
     context "when the parent is a new record" do
@@ -787,6 +787,12 @@ describe Mongoid::Relations::Embedded::One do
           ShipmentAddress.new
         end
 
+        after do
+          # Note that this is necessary, otherwise all further Address objects will be
+          # saved with a "_type" attributes. See Traversable#inherited for why.
+          Address.send(:remove_defaults, "_type")
+        end
+
         before do
           courier_job.drop_address = old_child
           courier_job.update_attribute(:drop_address, new_child)
@@ -807,41 +813,6 @@ describe Mongoid::Relations::Embedded::One do
     end
   end
 
-  describe ".foreign_key_suffix" do
-
-    it "returns nil" do
-      expect(described_class.foreign_key_suffix).to be_nil
-    end
-  end
-
-  describe ".macro" do
-
-    it "returns embeds_one" do
-      expect(described_class.macro).to eq(:embeds_one)
-    end
-  end
-
-  describe ".nested_builder" do
-
-    let(:nested_builder_klass) do
-      Mongoid::Relations::Builders::NestedAttributes::One
-    end
-
-    let(:metadata) do
-      Person.relations["name"]
-    end
-
-    let(:attributes) do
-      {}
-    end
-
-    it "returns the single nested builder" do
-      expect(
-        described_class.nested_builder(metadata, attributes, {})
-      ).to be_a(nested_builder_klass)
-    end
-  end
-
   describe "#respond_to?" do
 
     let(:person) do
@@ -871,22 +842,6 @@ describe Mongoid::Relations::Embedded::One do
     end
   end
 
-  describe ".valid_options" do
-
-    it "returns the valid options" do
-      expect(described_class.valid_options).to eq(
-        [ :autobuild, :as, :cascade_callbacks, :cyclic, :store_as ]
-      )
-    end
-  end
-
-  describe ".validation_default" do
-
-    it "returns true" do
-      expect(described_class.validation_default).to be true
-    end
-  end
-
   context "when the embedded document has an array field" do
 
     let!(:person) do
@@ -895,9 +850,9 @@ describe Mongoid::Relations::Embedded::One do
 
     let!(:name) do
       person.create_name(
-        first_name: "Syd",
-        last_name: "Vicious",
-        aliases: nil
+          first_name: "Syd",
+          last_name: "Vicious",
+          aliases: nil
       )
     end
 
@@ -980,7 +935,7 @@ describe Mongoid::Relations::Embedded::One do
 
       before do
         person.collection.find(_id: person.id).update_one(
-          "$pull" => { "addresses" => { _id: address_one.id }}
+            "$pull" => { "addresses" => { _id: address_one.id }}
         )
       end
 
@@ -1013,8 +968,8 @@ describe Mongoid::Relations::Embedded::One do
 
     before do
       band.collection.
-        find(_id: band.id).
-        update_one("$set" => { label: { name: "Mute" }})
+          find(_id: band.id).
+          update_one("$set" => { label: { name: "Mute" }})
     end
 
     context "when loading the documents" do