mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/{relations/bindings/referenced/many_spec.rb → association/referenced/has_many/binding_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Bindings::Referenced::Many do
+describe Mongoid::Association::Referenced::HasMany::Binding do
 
   let(:person) do
     Person.new
@@ -11,17 +11,17 @@ describe Mongoid::Relations::Bindings::Referenced::Many do
   end
 
   let(:target) do
-    Mongoid::Relations::Targets::Enumerable.new([ post ])
+    Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ post ])
   end
 
-  let(:metadata) do
+  let(:association) do
     Person.relations["posts"]
   end
 
   describe "#bind_one" do
 
     let(:binding) do
-      described_class.new(person, target, metadata)
+      described_class.new(person, target, association)
     end
 
     context "when the document is bindable" do
@@ -55,7 +55,7 @@ describe Mongoid::Relations::Bindings::Referenced::Many do
   describe "#unbind_one" do
 
     let(:binding) do
-      described_class.new(person, target, metadata)
+      described_class.new(person, target, association)
     end
 
     context "when the documents are unbindable" do

data/spec/mongoid/association/referenced/has_many/buildable_spec.rb

@@ -0,0 +1,119 @@
+require "spec_helper"
+
+describe Mongoid::Association::Referenced::HasMany::Buildable do
+
+  let(:base) do
+    double
+  end
+
+  describe "#build" do
+
+    let(:documents) do
+      association.build(base, object)
+    end
+
+    let(:options) do
+      {}
+    end
+
+    let(:association) do
+      Mongoid::Association::Referenced::HasMany.new(Person, :posts, options)
+    end
+
+    context "when provided an id" do
+
+      let(:object) do
+        BSON::ObjectId.new
+      end
+
+      let(:criteria) do
+        Post.where(association.foreign_key => object)
+      end
+
+      it "returns the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
+    context "when order is specified" do
+
+      let(:options) do
+        {
+          order: :rating.asc,
+        }
+      end
+
+      let(:object) do
+        BSON::ObjectId.new
+      end
+
+      let(:criteria) do
+        Post.where(association.foreign_key => object).order_by(options[:order])
+      end
+
+      it "adds the ordering to the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
+    context "when the relation is polymorphic" do
+
+      let(:options) do
+        {
+          as: :ratable
+        }
+      end
+
+      let(:object) do
+        BSON::ObjectId.new
+      end
+
+      let(:base) do
+        Rating.new
+      end
+
+      let(:criteria) do
+        Post.where(association.foreign_key => object, 'ratable_type' => 'Rating')
+      end
+
+      it "adds the type to the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
+    context "when provided a object" do
+
+      let(:object) do
+        [ Person.new ]
+      end
+
+      it "returns the object" do
+        expect(documents).to eq(object)
+      end
+    end
+
+    context "when no documents found in the database" do
+
+      context "when the ids are empty" do
+
+        let(:object) do
+          [ nil ]
+        end
+
+        it "returns an empty array" do
+          expect(documents).to be_empty
+        end
+
+        context "during initialization" do
+
+          it "returns an empty array" do
+            Person.new do |p|
+              expect(p.posts).to be_empty
+              expect(p.posts._association).to_not be_nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/mongoid/{relations/eager/has_many_spec.rb → association/referenced/has_many/eager_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Eager::HasMany do
+describe Mongoid::Association::Referenced::HasMany::Eager do
 
   describe ".grouped_docs" do
 
@@ -12,13 +12,13 @@ describe Mongoid::Relations::Eager::HasMany do
       Person.create!
     end
 
-    let(:metadata) do
+    let(:association) do
       Person.reflect_on_association(:posts)
     end
 
     let(:eager) do
-      described_class.new([metadata], docs).tap do |b|
-        b.shift_metadata
+      described_class.new([association], docs).tap do |b|
+        b.send(:shift_association)
       end
     end
 
@@ -27,7 +27,7 @@ describe Mongoid::Relations::Eager::HasMany do
     end
 
     it "aggregates by the parent primary key" do
-      expect(eager.grouped_docs.keys).to eq([person.id])
+      expect(eager.send(:grouped_docs).keys).to eq([person.id])
     end
   end
 
@@ -41,13 +41,13 @@ describe Mongoid::Relations::Eager::HasMany do
       Person.create!
     end
 
-    let(:metadata) do
+    let(:association) do
       Person.reflect_on_association(:posts)
     end
 
     let(:eager) do
-      described_class.new([metadata], docs).tap do |b|
-        b.shift_metadata
+      described_class.new([association], docs).tap do |b|
+        b.send(:shift_association)
       end
     end
 
@@ -58,14 +58,14 @@ describe Mongoid::Relations::Eager::HasMany do
 
     it "sets the relation into the parent" do
       docs.each do |doc|
-        expect(doc).to receive(:__build__).once.with(:posts, :foo, metadata)
+        expect(doc).to receive(:__build__).once.with(:posts, :foo, association)
       end
-      eager.set_on_parent(person.id, :foo)
+      eager.send(:set_on_parent, person.id, :foo)
     end
 
     it "doesnt call an extra query" do
       expect_query(0) do
-        eager.set_on_parent(person.id, :foo)
+        eager.send(:set_on_parent, person.id, :foo)
       end
     end
   end

data/spec/mongoid/{relations/targets → association/referenced/has_many}/enumerable_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Targets::Enumerable do
+describe Mongoid::Association::Referenced::HasMany::Targets::Enumerable do
 
   describe "#==" do
 
@@ -928,60 +928,6 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
-
-    context 'when the id_sort option is none' do
-
-      let(:person) do
-        Person.create
-      end
-
-      let(:criteria) do
-        Post.where(person_id: person.id)
-      end
-
-      let(:enumerable) do
-        described_class.new(criteria)
-      end
-
-      let!(:first_post) do
-        person.posts.create(title: "One")
-      end
-
-      let!(:second_post) do
-        person.posts.create(title: "Two")
-      end
-
-      it 'does not use the sort on id' do
-        expect(enumerable.first(id_sort: :none)).to eq(first_post)
-      end
-    end
-
-    context 'when the id_sort option is not provided' do
-
-      let(:person) do
-        Person.create
-      end
-
-      let(:criteria) do
-        Post.where(person_id: person.id)
-      end
-
-      let(:enumerable) do
-        described_class.new(criteria)
-      end
-
-      let!(:first_post) do
-        person.posts.create(title: "One")
-      end
-
-      let!(:second_post) do
-        person.posts.create(title: "Two")
-      end
-
-      it 'uses the sort on id' do
-        expect(enumerable.first).to eq(first_post)
-      end
-    end
   end
 
   describe "#include?" do
@@ -1398,60 +1344,6 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
-
-    context 'when the id_sort option is none' do
-
-      let(:person) do
-        Person.create
-      end
-
-      let(:criteria) do
-        Post.where(person_id: person.id)
-      end
-
-      let(:enumerable) do
-        described_class.new(criteria)
-      end
-
-      let!(:first_post) do
-        person.posts.create(title: "One")
-      end
-
-      let!(:second_post) do
-        person.posts.create(title: "Two")
-      end
-
-      it 'does not use the sort on id' do
-        expect(enumerable.last(id_sort: :none)).to eq(first_post)
-      end
-    end
-
-    context 'when the id_sort option is not provided' do
-
-      let(:person) do
-        Person.create
-      end
-
-      let(:criteria) do
-        Post.where(person_id: person.id)
-      end
-
-      let(:enumerable) do
-        described_class.new(criteria)
-      end
-
-      let!(:first_post) do
-        person.posts.create(title: "One")
-      end
-
-      let!(:second_post) do
-        person.posts.create(title: "Two")
-      end
-
-      it 'uses the sort on id' do
-        expect(enumerable.last).to eq(second_post)
-      end
-    end
   end
 
   describe "#kind_of?" do

data/spec/mongoid/{relations/referenced/many_spec.rb → association/referenced/has_many/proxy_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Referenced::Many do
+describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   before :all do
     Mongoid.raise_not_found_error = true
@@ -401,7 +401,7 @@ describe Mongoid::Relations::Referenced::Many do
         end
 
         it "sets the target of the relation" do
-          expect(person.posts.target).to eq([ post ])
+          expect(person.posts._target).to eq([ post ])
         end
 
         it "sets the foreign key on the relation" do
@@ -432,7 +432,7 @@ describe Mongoid::Relations::Referenced::Many do
         end
 
         it "sets the target of the relation" do
-          expect(person.posts.target).to eq([ post ])
+          expect(person.posts._target).to eq([ post ])
         end
 
         it "sets the foreign key of the relation" do
@@ -593,7 +593,7 @@ describe Mongoid::Relations::Referenced::Many do
         end
 
         it "sets the target of the relation" do
-          expect(movie.ratings.target).to eq([ rating ])
+          expect(movie.ratings._target).to eq([ rating ])
         end
 
         it "sets the foreign key on the relation" do
@@ -624,7 +624,7 @@ describe Mongoid::Relations::Referenced::Many do
         end
 
         it "sets the target of the relation" do
-          expect(movie.ratings.target).to eq([ rating ])
+          expect(movie.ratings._target).to eq([ rating ])
         end
 
         it "sets the foreign key of the relation" do
@@ -1039,27 +1039,6 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".builder" do
-
-    let(:builder_klass) do
-      Mongoid::Relations::Builders::Referenced::Many
-    end
-
-    let(:document) do
-      double
-    end
-
-    let(:metadata) do
-      double(extension?: false)
-    end
-
-    it "returns the embedded in builder" do
-      expect(
-        described_class.builder(nil, metadata, document)
-      ).to be_a_kind_of(builder_klass)
-    end
-  end
-
   describe "#clear" do
 
     context "when the relation is not polymorphic" do
@@ -1835,44 +1814,48 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".criteria" do
+  describe "#criteria" do
 
-    let(:id) do
-      BSON::ObjectId.new
+    let(:base) do
+      Movie.new
     end
 
     context "when the relation is polymorphic" do
 
-      let(:metadata) do
+      let(:association) do
         Movie.relations["ratings"]
       end
 
       let(:criteria) do
-        described_class.criteria(metadata, id, Movie)
+        association.criteria(base)
       end
 
       it "includes the type in the criteria" do
         expect(criteria.selector).to eq(
-          {
-            "ratable_id"    => id,
-            "ratable_type"  => "Movie"
-          }
-        )
+                                         {
+                                             "ratable_id"    => base.id,
+                                             "ratable_type"  => "Movie"
+                                         }
+                                     )
       end
     end
 
     context "when the relation is not polymorphic" do
 
-      let(:metadata) do
+      let(:association) do
         Person.relations["posts"]
       end
 
+      let(:base) do
+        Person.new
+      end
+
       let(:criteria) do
-        described_class.criteria(metadata, id, Person)
+        association.criteria(base)
       end
 
       it "does not include the type in the criteria" do
-        expect(criteria.selector).to eq({ "person_id" => id })
+        expect(criteria.selector).to eq({ "person_id" => base.id })
       end
     end
   end
@@ -2785,13 +2768,6 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".foreign_key_suffix" do
-
-    it "returns _id" do
-      expect(described_class.foreign_key_suffix).to eq("_id")
-    end
-  end
-
   describe "#initialize" do
 
     context "when an illegal mixed relation exists" do
@@ -2848,13 +2824,6 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".macro" do
-
-    it "returns has_many" do
-      expect(described_class.macro).to eq(:has_many)
-    end
-  end
-
   describe "#max" do
 
     let(:person) do
@@ -3178,7 +3147,7 @@ describe Mongoid::Relations::Referenced::Many do
       end
     end
 
-    Mongoid::Relations::Referenced::Many.public_instance_methods.each do |method|
+    Mongoid::Association::Referenced::HasMany::Proxy.public_instance_methods.each do |method|
 
       context "when checking #{method}" do
 
@@ -3199,13 +3168,6 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".stores_foreign_key?" do
-
-    it "returns false" do
-      expect(described_class.stores_foreign_key?).to be false
-    end
-  end
-
   describe "#scoped" do
 
     let(:person) do
@@ -3311,33 +3273,6 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
-  describe ".valid_options" do
-
-    it "returns the valid options" do
-      expect(described_class.valid_options).to eq(
-        [
-          :after_add,
-          :after_remove,
-          :as,
-          :autosave,
-          :before_add,
-          :before_remove,
-          :dependent,
-          :foreign_key,
-          :order,
-          :primary_key
-        ]
-      )
-    end
-  end
-
-  describe ".validation_default" do
-
-    it "returns true" do
-      expect(described_class.validation_default).to be true
-    end
-  end
-
   context "when the association has an order defined" do
 
     let(:person) do
@@ -3363,14 +3298,14 @@ describe Mongoid::Relations::Referenced::Many do
 
     it "order documents" do
       expect(person.ordered_posts(true)).to eq(
-        [post_two, post_three, post_one]
-      )
+                                                [post_two, post_three, post_one]
+                                            )
     end
 
     it "chaining order criterias" do
       expect(person.ordered_posts.order_by(:title.desc).to_a).to eq(
-        [post_three, post_two, post_one]
-      )
+                                                                     [post_three, post_two, post_one]
+                                                                 )
     end
   end
 
@@ -3396,7 +3331,7 @@ describe Mongoid::Relations::Referenced::Many do
 
       before do
         Post.collection.find({ _id: post_one.id }).
-          update_one({ "$set" => { title: "reloaded" }})
+            update_one({ "$set" => { title: "reloaded" }})
       end
 
       let(:reloaded) do