mongoid 6.4.2 → 7.0.3

data/spec/mongoid/{relations → association}/eager_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Eager do
+describe Mongoid::Association::EagerLoadable do
 
   describe ".preload" do
 
@@ -122,12 +122,12 @@ describe Mongoid::Relations::Eager do
         Person.all.to_a
       end
 
-      let(:posts_metadata) do
+      let(:posts_association) do
         Person.reflect_on_association(:posts)
       end
 
       it "runs the has_many preload" do
-        expect(Mongoid::Relations::Eager::HasMany).to receive(:new).with([posts_metadata], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasMany::Eager).to receive(:new).with([posts_association], docs).once.and_call_original
 
         context.eager_load(docs)
       end
@@ -154,31 +154,31 @@ describe Mongoid::Relations::Eager do
         Person.all.to_a
       end
 
-      let(:posts_metadata) do
+      let(:posts_association) do
         Person.reflect_on_association(:posts)
       end
 
-      let(:houses_metadata) do
+      let(:houses_association) do
         Person.reflect_on_association(:houses)
       end
 
-      let(:cat_metadata) do
+      let(:cat_association) do
         Person.reflect_on_association(:cat)
       end
 
       it "runs the has_many preload" do
-        expect(Mongoid::Relations::Eager::HasMany).to receive(:new).with([posts_metadata], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasMany::Eager).to receive(:new).with([posts_association], docs).once.and_call_original
 
         context.eager_load(docs)
       end
 
       it "runs the has_one preload" do
-        expect(Mongoid::Relations::Eager::HasOne).to receive(:new).with([cat_metadata], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasOne::Eager).to receive(:new).with([cat_association], docs).once.and_call_original
         context.eager_load(docs)
       end
 
       it "runs the has_and_belongs_to_many preload" do
-        expect(Mongoid::Relations::Eager::HasAndBelongsToMany).to receive(:new).with([houses_metadata], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasAndBelongsToMany::Eager).to receive(:new).with([houses_association], docs).once.and_call_original
         context.eager_load(docs)
       end
 
@@ -233,16 +233,16 @@ describe Mongoid::Relations::Eager do
         Person.all.to_a
       end
 
-      let(:book_metadata) do
+      let(:book_association) do
         Person.reflect_on_association(:book)
       end
 
-      let(:cat_metadata) do
+      let(:cat_association) do
         Person.reflect_on_association(:cat)
       end
 
       it "runs the has_one preload" do
-        expect(Mongoid::Relations::Eager::HasOne).to receive(:new).with([book_metadata, cat_metadata], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasOne::Eager).to receive(:new).with([book_association, cat_association], docs).once.and_call_original
         context.eager_load(docs)
       end
     end

data/spec/mongoid/{relations → association/embedded}/cyclic_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Cyclic do
+describe Mongoid::Association::Embedded::Cyclic do
 
   describe ".recursively_embeds_many" do
 

data/spec/mongoid/{relations/bindings/embedded/in_spec.rb → association/embedded/embedded_in/binding_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Bindings::Embedded::In do
+describe Mongoid::Association::Embedded::EmbeddedIn::Binding do
 
   let(:person) do
     Person.new
@@ -14,15 +14,15 @@ describe Mongoid::Relations::Bindings::Embedded::In do
     Address.new
   end
 
-  let(:name_metadata) do
+  let(:name_association) do
     Name.relations["namable"]
   end
 
-  let(:address_metadata) do
+  let(:address_association) do
     Address.relations["addressable"]
   end
 
-  let(:person_metadata) do
+  let(:person_association) do
     Person.relations["addresses"]
   end
 
@@ -31,7 +31,7 @@ describe Mongoid::Relations::Bindings::Embedded::In do
     context "when the child of an embeds one" do
 
       let(:binding) do
-        described_class.new(name, person, name_metadata)
+        described_class.new(name, person, name_association)
       end
 
       context "when the document is bindable" do
@@ -65,12 +65,12 @@ describe Mongoid::Relations::Bindings::Embedded::In do
     context "when the child of an embeds many" do
 
       let(:binding) do
-        described_class.new(address, person, address_metadata)
+        described_class.new(address, person, address_association)
       end
 
       context "when the document is bindable" do
 
-        context "when the base has no metadata" do
+        context "when the base has no association" do
 
           before do
             binding.bind_one
@@ -85,14 +85,14 @@ describe Mongoid::Relations::Bindings::Embedded::In do
           end
         end
 
-        context "when the base has metadata" do
+        context "when the base has an association" do
 
           before do
-            address.__metadata = person_metadata
+            address._association = person_association
           end
 
-          it "does not overwrite the existing metadata" do
-            expect(address).to receive(:__metadata=).never
+          it "does not overwrite the existing association" do
+            expect(address).to receive(:_association=).never
             binding.bind_one
           end
         end
@@ -117,7 +117,7 @@ describe Mongoid::Relations::Bindings::Embedded::In do
     context "when the child of an embeds one" do
 
       let(:binding) do
-        described_class.new(name, person, name_metadata)
+        described_class.new(name, person, name_association)
       end
 
       context "when the document is unbindable" do
@@ -144,7 +144,7 @@ describe Mongoid::Relations::Bindings::Embedded::In do
     context "when the child of an embeds many" do
 
       let(:binding) do
-        described_class.new(address, person, address_metadata)
+        described_class.new(address, person, address_association)
       end
 
       context "when the document is unbindable" do

data/spec/mongoid/{relations/builders/embedded/in_spec.rb → association/embedded/embedded_in/buildable_spec.rb}

@@ -1,29 +1,29 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Builders::Embedded::In do
+describe Mongoid::Association::Embedded::EmbeddedIn::Buildable do
 
   describe "#build" do
 
-    let(:object) do
+    let(:base) do
       double
     end
 
-    let(:base) do
-      double
+    let(:options) do
+      { }
     end
 
-    let(:metadata) do
-      double(klass: Person, name: :person)
+    let(:association) do
+      Mongoid::Association::Embedded::EmbeddedIn.new(Person, :addresses, options)
     end
 
     context "when a document is provided" do
 
-      let(:builder) do
-        described_class.new(base, metadata, object)
+      let(:object) do
+        double
       end
 
       let(:document) do
-        builder.build
+        association.build(base, object)
       end
 
       it "returns the document" do

data/spec/mongoid/{relations/embedded/in_spec.rb → association/embedded/embedded_in/proxy_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Embedded::In do
+describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
 
   describe "#===" do
 
@@ -12,12 +12,12 @@ describe Mongoid::Relations::Embedded::In do
       Person.new
     end
 
-    let(:metadata) do
+    let(:association) do
       Name.relations["namable"]
     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
@@ -354,29 +354,6 @@ describe Mongoid::Relations::Embedded::In do
     end
   end
 
-  describe ".builder" do
-
-    let(:builder_klass) do
-      Mongoid::Relations::Builders::Embedded::In
-    end
-
-    let(:base) do
-      Name.new
-    end
-
-    let(:target) do
-      Person.new
-    end
-
-    let(:metadata) do
-      Name.relations["namable"]
-    end
-
-    it "returns the embedded one builder" do
-      expect(described_class.builder(base, metadata, target)).to be_a(builder_klass)
-    end
-  end
-
   describe ".embedded?" do
 
     it "returns true" do
@@ -384,39 +361,6 @@ describe Mongoid::Relations::Embedded::In 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(:embedded_in)
-    end
-  end
-
-  describe ".nested_builder" do
-
-    let(:nested_builder_klass) do
-      Mongoid::Relations::Builders::NestedAttributes::One
-    end
-
-    let(:metadata) do
-      Name.relations["namable"]
-    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
@@ -442,22 +386,6 @@ describe Mongoid::Relations::Embedded::In do
     end
   end
 
-  describe ".valid_options" do
-
-    it "returns the valid options" do
-      expect(described_class.valid_options).to eq(
-        [ :autobuild, :cyclic, :polymorphic, :touch ]
-      )
-    end
-  end
-
-  describe ".validation_default" do
-
-    it "returns false" do
-      expect(described_class.validation_default).to be false
-    end
-  end
-
   context "when creating the tree through initialization" do
 
     let!(:person) do
@@ -494,8 +422,8 @@ describe Mongoid::Relations::Embedded::In do
 
     it "has the locations in the association array" do
       expect(Person.last.addresses.last.locations).to eq(
-        [first_location, second_location]
-      )
+                                                          [first_location, second_location]
+                                                      )
     end
   end