mongoid 7.0.0.beta → 7.0.0

data/spec/app/models/band.rb

@@ -20,6 +20,7 @@ class Band
 
   embeds_many :records, cascade_callbacks: true
   embeds_many :notes, as: :noteable, cascade_callbacks: true, validate: false
+  embeds_many :labels
   embeds_one :label, cascade_callbacks: true
 
   has_many :same_name, class_name: 'Agent', inverse_of: :same_name

data/spec/app/models/shipment_address.rb

@@ -1,2 +1,3 @@
 class ShipmentAddress < Address
+  field :shipping_name, localize: true
 end

data/spec/mongoid/association/macros_spec.rb

@@ -20,6 +20,26 @@ describe Mongoid::Association::Macros do
     klass.validators.clear
   end
 
+  describe 'Model loading' do
+
+    let(:model_associations) do
+      class TestModel
+        include Mongoid::Document
+        field :associations
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :TestModel)
+    end
+
+    it 'prohibits the use of :associations as an attribute' do
+      expect {
+        model_associations
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+  end
+
   describe ".embedded_in" do
 
     it "defines the macro" do

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

@@ -91,6 +91,15 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
           end
         end
       end
+
+      it "does not query when accessing the base on each document" do
+        persons = Person.all.includes(:drugs).to_a
+        expect_query(0) do
+          persons.each do |person|
+            person.drugs.collect(&:person)
+          end
+        end
+      end
     end
 
     context "when the relation is not polymorphic" do
@@ -120,6 +129,12 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
             eager.posts.first.title = "New title"
           end
         end
+
+        it "does not query when accessing the base on each document" do
+          expect_query(0) do
+            eager.posts.collect(&:person)
+          end
+        end
       end
 
       context "when the eager load has not returned documents" do

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

@@ -189,6 +189,12 @@ describe Mongoid::Association::Referenced::HasMany::Targets::Enumerable do
       it "returns the added documents" do
         expect(added).to eq([ post ])
       end
+
+      it "sets the base on the new document" do
+        expect_query(0) do
+          added.collect(&:person)
+        end
+      end
     end
   end
 
@@ -622,6 +628,22 @@ describe Mongoid::Association::Referenced::HasMany::Targets::Enumerable do
       it "becomes loaded" do
         expect(enumerable).to be__loaded
       end
+
+      context 'when the base relation is accessed from each document' do
+
+        let(:persons) do
+          described_class.new(criteria).collect(&:person)
+        end
+
+        before do
+          Post.create(person_id: person.id)
+          Post.create(person_id: person.id)
+        end
+
+        it 'sets the base relation from the criteria' do
+          expect(persons.uniq.size).to eq(1)
+        end
+      end
     end
 
     context "when only an array target exists" do
@@ -928,6 +950,60 @@ describe Mongoid::Association::Referenced::HasMany::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
@@ -1344,6 +1420,60 @@ describe Mongoid::Association::Referenced::HasMany::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
@@ -1714,4 +1844,103 @@ describe Mongoid::Association::Referenced::HasMany::Targets::Enumerable do
       expect(enumerable).to be__loaded
     end
   end
+
+  describe 'setting the same parent object on enumerated children objects' do
+
+    let(:person) do
+      Person.create
+    end
+
+    context 'when a single child is fetched' do
+
+      let!(:post) do
+        person.posts << Post.new
+        person.posts.first
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(post.person).to eq(person)
+        end
+      end
+    end
+
+    context 'when a single child is fetched with a scope' do
+
+      let!(:post) do
+        person.posts << Post.new(title: 'open')
+        person.posts.open.first
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(post.person).to eq(person)
+        end
+      end
+    end
+
+    context 'when multiple children are fetched' do
+
+      let!(:posts) do
+        person.posts << Post.new
+        person.posts << Post.new
+        person.posts << Post.new
+        person.posts.to_a
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(posts.all? { |post| post.person == person }).to be(true)
+        end
+      end
+    end
+
+    context 'when multiple children are fetched with query criteria' do
+
+      let!(:posts) do
+        person.posts << Post.new(title: 'open')
+        person.posts << Post.new(title: 'open')
+        person.posts << Post.new(title: 'not-a-test')
+        person.posts.where(title: 'open').to_a
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(posts.all? { |post| post.person == person }).to be(true)
+        end
+      end
+    end
+
+    context 'when multiple children are fetched with a scope' do
+
+      let!(:posts) do
+        person.posts << Post.new(title: 'open')
+        person.posts << Post.new(title: 'open')
+        person.posts << Post.new(title: 'not-a-test')
+        person.posts.open.to_a
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(posts.all? { |post| post.person == person }).to be(true)
+        end
+      end
+    end
+
+    context 'when the parent is updated in memory' do
+
+      let!(:posts) do
+        person.posts << Post.new
+        person.posts << Post.new
+        person.username = 'emily'
+        person.posts.to_a
+      end
+
+      it 'does not query the database to access the parent' do
+        expect_query(0) do
+          expect(posts.all? { |post| post.person.username == 'emily' }).to be(true)
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -211,10 +211,10 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$pushAll" =>
-              { "addresses" => [
+            { "$push" =>
+              { "addresses" => { '$each' => [
                   { "street" => "Oxford St" }
-                ]
+                ] }
               }
             }
           )
@@ -238,11 +238,11 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$pushAll" =>
-              { "addresses" => [
+            { "$push" =>
+              { "addresses" => { '$each' => [
                   { "street" => "Hobrechtstr." },
                   { "street" => "Pflugerstr." }
-                ]
+                ] }
               }
             }
           )
@@ -270,10 +270,10 @@ describe Mongoid::Atomic::Modifiers do
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
             { "$set" => { "addresses.0.street" => "Bond" },
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ] }
                 }
               }
             }
@@ -300,10 +300,10 @@ describe Mongoid::Atomic::Modifiers do
           expect(modifiers).to eq(
             { "$pullAll" => {
               "addresses" => { "street" => "Bond St" }},
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ]}
                 }
               }
             }
@@ -328,12 +328,12 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
-            { "$pushAll" => {
-              "addresses.0.locations" => [{ "street" => "Bond St" }]},
-              conflicts: { "$pushAll" =>
-                { "addresses" => [
+            { "$push" => {
+              "addresses.0.locations" => { '$each' => [{ "street" => "Bond St" }] } },
+              conflicts: { "$push" =>
+                { "addresses" => { '$each' => [
                     { "street" => "Oxford St" }
-                  ]
+                  ] }
                 }
               }
             }

data/spec/mongoid/atomic_spec.rb

@@ -76,13 +76,13 @@ describe Mongoid::Atomic do
             person.addresses.build(street: "Oxford St")
           end
 
-          it "returns a $set and $pushAll for modifications" do
+          it "returns a $set and $push with $each for modifications" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => { "title" => "Sir" },
-                "$pushAll" => { "addresses" => [
+                "$push" => { "addresses" => { "$each" => [
                     { "_id" => "oxford-st", "street" => "Oxford St" }
-                  ]}
+                  ] } }
               }
             )
           end
@@ -197,8 +197,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
+                      "$push" => {
+                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
                       }
                     }
                   }
@@ -215,8 +215,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
+                      "$push" => {
+                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
                       }
                     }
                   }
@@ -263,15 +263,15 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses" => [{
+                      "$push" => {
+                        "addresses" => { '$each' => [{
                           "_id" => new_address.id,
                           "street" => "Another",
                           "locations" => [
                             "_id" => location.id,
                             "name" => "Home"
                           ]
-                        }]
+                        }]}
                       }
                     }
                   }
@@ -310,15 +310,15 @@ describe Mongoid::Atomic do
                   "$set" => {
                     "title" => "Sir"
                   },
-                  "$pushAll" => {
-                    "addresses" => [{
+                  "$push" => {
+                    "addresses" => { '$each' => [{
                       "_id" => new_address.id,
                       "street" => "Ipanema",
                       "locations" => [
                         "_id" => location.id,
                         "name" => "Home"
                       ]
-                    }]
+                    }] }
                   },
                   conflicts: {
                     "$set" => { "addresses.0.street"=>"Bond St" }
@@ -339,21 +339,21 @@ describe Mongoid::Atomic do
             address.locations.build(name: "Home")
           end
 
-          it "returns the proper $sets and $pushAlls for all levels" do
+          it "returns the proper $sets and $pushes for all levels" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => {
                   "title" => "Sir",
                 },
-                "$pushAll" => {
-                  "addresses" => [{
+                "$push" => {
+                  "addresses" => { '$each' => [{
                     "_id" => address.id,
                     "street" => "Another",
                     "locations" => [
                       "_id" => location.id,
                       "name" => "Home"
                     ]
-                  }]
+                  }] }
                 }
               }
             )