mongoid 4.0.2 → 5.0.0.beta

data/spec/mongoid/relations/eager/belongs_to_spec.rb

@@ -150,5 +150,14 @@ describe Mongoid::Relations::Eager::BelongsTo do
         }.to raise_error(Mongoid::Errors::EagerLoad)
       end
     end
+
+    context "when setting the foreign key id directly" do
+
+      it "works" do
+        id = BSON::ObjectId.new
+        game = Game.new(:person_id => id)
+        expect(game.person_id).to eql(id)
+      end
+    end
   end
 end

data/spec/mongoid/relations/eager/has_and_belongs_to_many_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
 
       it "queries twice" do
         expect_query(2) do
-          Person.all.includes(:houses).each do |person|
+          Person.asc(:_id).includes(:houses).each do |person|
             expect(person.houses).to_not be_nil
 
             expect(person.houses.length).to be(3)
@@ -54,7 +54,7 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
       end
 
       it "has all items" do
-        Person.all.includes(:houses).each do |person|
+        Person.asc(:_id).includes(:houses).each do |person|
           expect(person.ivar(:houses).length).to be(3)
         end
       end
@@ -63,7 +63,7 @@ describe Mongoid::Relations::Eager::HasAndBelongsToMany do
     context "when the relation is not polymorphic" do
 
       let(:eager) do
-        Person.includes(:preferences).last
+        Person.asc(:_id).includes(:preferences).last
       end
 
       context "when the eager load has returned documents" do

data/spec/mongoid/relations/embedded/many_spec.rb

@@ -3873,7 +3873,7 @@ describe Mongoid::Relations::Embedded::Many do
     before do
       band.collection.
         find(_id: band.id).
-        update("$set" => { records: [{ name: "Moderat" }]})
+        update_one("$set" => { records: [{ name: "Moderat" }]})
     end
 
     context "when loading the documents" do
@@ -3933,4 +3933,126 @@ describe Mongoid::Relations::Embedded::Many do
       expect(loaded.extension).to eq("Testing")
     end
   end
+
+  context "deleting embedded documents" do
+
+    it "able to delete embedded documents upon condition" do
+      company = Company.new
+      4.times { |i| company.staffs << Staff.new(age: 50 + i)}
+      2.times { |i| company.staffs << Staff.new(age: 40)}
+      company.save
+      company.staffs.delete_if {|x| x.age >= 50}
+      expect(company.staffs.count).to eq(2)
+    end
+  end
+
+  context "when substituting polymorphic documents" do
+
+    before(:all) do
+      class DNS; end
+
+      class DNS::Zone
+        include Mongoid::Document
+        embeds_many :rrsets, class_name: 'DNS::RRSet',  inverse_of: :zone
+        embeds_one  :soa,    class_name: 'DNS::Record', as: :container
+      end
+
+      class DNS::RRSet
+        include Mongoid::Document
+        embedded_in :zone, class_name: 'DNS::Zone',   inverse_of: :rrsets
+        embeds_many :records, class_name: 'DNS::Record', as: :container
+      end
+
+      class DNS::Record
+        include Mongoid::Document
+        embedded_in :container, polymorphic: true
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :DNS)
+    end
+
+    context "when the parent is new" do
+
+      let(:zone) do
+        DNS::Zone.new
+      end
+
+      let(:soa_1) do
+        DNS::Record.new
+      end
+
+      context "when replacing the set document" do
+
+        let(:soa_2) do
+          DNS::Record.new
+        end
+
+        before do
+          zone.soa = soa_1
+        end
+
+        it "properly sets the metadata" do
+          expect(zone.soa = soa_2).to eq(soa_2)
+        end
+      end
+
+      context "when deleting the set document" do
+
+        let(:soa_2) do
+          DNS::Record.new
+        end
+
+        before do
+          zone.soa = soa_1
+        end
+
+        it "properly sets the metadata" do
+          expect(zone.soa.delete).to be true
+        end
+      end
+    end
+
+    context "when the parent is persisted" do
+
+      let(:zone) do
+        DNS::Zone.create
+      end
+
+      let(:soa_1) do
+        DNS::Record.new
+      end
+
+      context "when replacing the set document" do
+
+        let(:soa_2) do
+          DNS::Record.new
+        end
+
+        before do
+          zone.soa = soa_1
+        end
+
+        it "properly sets the metadata" do
+          expect(zone.soa = soa_2).to eq(soa_2)
+        end
+      end
+
+      context "when deleting the set document" do
+
+        let(:soa_2) do
+          DNS::Record.new
+        end
+
+        before do
+          zone.soa = soa_1
+        end
+
+        it "properly sets the metadata" do
+          expect(zone.soa.delete).to be true
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/relations/embedded/one_spec.rb

@@ -947,7 +947,7 @@ describe Mongoid::Relations::Embedded::One do
     context "when a parent was removed outside of mongoid" do
 
       before do
-        person.collection.where(_id: person.id).update(
+        person.collection.find(_id: person.id).update_one(
           "$pull" => { "addresses" => { _id: address_one.id }}
         )
       end
@@ -963,7 +963,7 @@ describe Mongoid::Relations::Embedded::One do
         end
 
         before do
-          address_two.code = code
+          person.reload.addresses.first.code = code
         end
 
         it "reloads the correct number" do
@@ -982,7 +982,7 @@ describe Mongoid::Relations::Embedded::One do
     before do
       band.collection.
         find(_id: band.id).
-        update("$set" => { label: { name: "Mute" }})
+        update_one("$set" => { label: { name: "Mute" }})
     end
 
     context "when loading the documents" do

data/spec/mongoid/relations/proxy_spec.rb

@@ -2,6 +2,34 @@ require "spec_helper"
 
 describe Mongoid::Relations::Proxy do
 
+  describe "#find" do
+    let(:person) do
+      Person.create
+    end
+
+    let(:messages) do
+      person.messages
+    end
+
+    let(:msg1) do
+      messages.create(body: 'msg1')
+    end
+
+    it "returns nil with no arguments" do
+      expect(messages.find).to be_nil
+      expect(messages.send(:find)).to be_nil
+      expect(messages.__send__(:find)).to be_nil
+      expect(messages.public_send(:find)).to be_nil
+    end
+
+    it "returns the object corresponding to the id" do
+      expect(messages.find(msg1.id)).to eq(msg1)
+      expect(messages.send(:find, msg1.id)).to eq(msg1)
+      expect(messages.__send__(:find, msg1.id)).to eq(msg1)
+      expect(messages.public_send(:find, msg1.id)).to eq(msg1)
+    end
+  end
+
   describe "#extend" do
 
     before(:all) do

data/spec/mongoid/relations/referenced/in_spec.rb

@@ -1240,7 +1240,7 @@ describe Mongoid::Relations::Referenced::In do
 
       before do
         Person.collection.find({ _id: person_one.id }).
-          update({ "$set" => { title: "Madam" }})
+          update_one({ "$set" => { title: "Madam" }})
       end
 
       let(:reloaded) do

data/spec/mongoid/relations/referenced/many_spec.rb

@@ -292,7 +292,7 @@ describe Mongoid::Relations::Referenced::Many do
           it "raises an error" do
             expect {
               person.posts.send(method, post)
-            }.to raise_error(Moped::Errors::OperationFailure)
+            }.to raise_error(Mongo::Error::OperationFailure)
           end
         end
       end
@@ -1536,7 +1536,7 @@ describe Mongoid::Relations::Referenced::Many do
               person.posts.create do |doc|
                 doc._id = existing.id
               end
-            }.to raise_error(Moped::Errors::OperationFailure)
+            }.to raise_error(Mongo::Error::OperationFailure)
           end
         end
       end
@@ -2164,30 +2164,24 @@ describe Mongoid::Relations::Referenced::Many do
 
   describe "#find" do
 
-    context "when the identity map is enabled" do
+    context "when iterating after the find" do
 
-      context "when the document is in the map" do
-
-        let(:person) do
-          Person.create
-        end
-
-        before do
-          person.posts.create(title: "Test")
-        end
+      let(:person) do
+        Person.create!
+      end
 
-        context "when the document does not belong to the relation" do
+      let(:post_id) do
+        person.posts.first.id
+      end
 
-          let!(:post) do
-            Post.create(title: "testing")
-          end
+      before do
+        5.times { person.posts.create! }
+      end
 
-          it "raises an error" do
-            expect {
-              person.posts.find(post.id)
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
-          end
-        end
+      it "does not change the in memory size" do
+        expect {
+          person.posts.find(post_id)
+        }.not_to change { person.posts.to_a.size }
       end
     end
 
@@ -2807,6 +2801,35 @@ describe Mongoid::Relations::Referenced::Many do
     end
   end
 
+  describe "#last" do
+
+    let(:person) do
+      Person.create!
+    end
+
+    let!(:persisted_post) do
+      person.posts.create!
+    end
+
+    context "when a new document is added" do
+
+      let!(:new_post) do
+        person.posts.new
+      end
+
+      context "when the target is subsequently loaded" do
+
+        before do
+          person.posts.entries
+        end
+
+        it "returns the expected last document" do
+          expect(person.posts.last).to eq(new_post)
+        end
+      end
+    end
+  end
+
   describe ".macro" do
 
     it "returns has_many" do
@@ -3344,7 +3367,7 @@ describe Mongoid::Relations::Referenced::Many do
 
       before do
         Post.collection.find({ _id: post_one.id }).
-          update({ "$set" => { title: "reloaded" }})
+          update_one({ "$set" => { title: "reloaded" }})
       end
 
       let(:reloaded) do
@@ -3687,6 +3710,7 @@ describe Mongoid::Relations::Referenced::Many do
   end
 
   context "when accessing a relation named parent" do
+
     let!(:parent) do
       Odd.create(name: "odd parent")
     end

data/spec/mongoid/relations/referenced/many_to_many_spec.rb

@@ -3274,7 +3274,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
       before do
         Preference.collection.find({ _id: preference_one.id }).
-          update({ "$set" => { name: "reloaded" }})
+          update_one({ "$set" => { name: "reloaded" }})
       end
 
       let(:reloaded) do

data/spec/mongoid/relations/referenced/one_spec.rb

@@ -1178,7 +1178,7 @@ describe Mongoid::Relations::Referenced::One do
 
       before do
         Game.collection.find({ _id: game_one.id }).
-          update({ "$set" => { name: "Diablo 2" }})
+          update_one({ "$set" => { name: "Diablo 2" }})
       end
 
       let(:reloaded) do

data/spec/mongoid/relations/targets/enumerable_spec.rb

@@ -122,6 +122,13 @@ describe Mongoid::Relations::Targets::Enumerable do
       end
     end
 
+    context "when compared to an enumerable class" do
+
+      it "returns true" do
+        expect(enumerable === described_class).to be true
+      end
+    end
+
     context "when compared to a different class" do
 
       it "returns false" do
@@ -1186,7 +1193,7 @@ describe Mongoid::Relations::Targets::Enumerable do
     context "when the enumerable is not loaded" do
 
       let(:criteria) do
-        Post.where(person_id: person.id)
+        Post.asc(:_id).where(person_id: person.id)
       end
 
       let(:enumerable) do
@@ -1272,7 +1279,7 @@ describe Mongoid::Relations::Targets::Enumerable do
         context "when accessing from a reloaded child" do
 
           it "returns the last document" do
-            expect(post_one.reload.person.posts.last).to eq(post_two)
+            expect(post_one.reload.person.posts.asc(:_id).last).to eq(post_two)
           end
         end
       end

data/spec/mongoid/reloadable_spec.rb

@@ -115,7 +115,7 @@ describe Mongoid::Reloadable do
           before do
             Person.collection.find(
               { "_id" => person.id }
-            ).update({ "$set" => { "addresses.0.number" => 3 }})
+            ).update_one({ "$set" => { "addresses.0.number" => 3 }})
           end
 
           let!(:reloaded) do
@@ -143,7 +143,7 @@ describe Mongoid::Reloadable do
 
           before do
             Person.collection.find({ "_id" => person.id }).
-              update({ "$set" => { "name.last_name" => "Vicious" }})
+              update_one({ "$set" => { "name.last_name" => "Vicious" }})
           end
 
           let!(:reloaded) do
@@ -176,7 +176,7 @@ describe Mongoid::Reloadable do
 
         before do
           Person.collection.find({ "_id" => person.id }).
-            update({ "$set" => { "addresses.0.locations.0.name" => "work" }})
+            update_one({ "$set" => { "addresses.0.locations.0.name" => "work" }})
         end
 
         let!(:reloaded) do
@@ -209,7 +209,7 @@ describe Mongoid::Reloadable do
 
       before do
         Person.collection.find({ "_id" => person.id }).
-          update({ "$set" => { "addresses" => [] }})
+          update_one({ "$set" => { "addresses" => [] }})
         person.reload
       end
 
@@ -232,7 +232,7 @@ describe Mongoid::Reloadable do
 
         before do
           Game.collection.find({ "_id" => game.id }).
-            update({ "$set" => { "score" => 75 }})
+            update_one({ "$set" => { "score" => 75 }})
           person.reload
         end
 
@@ -251,7 +251,7 @@ describe Mongoid::Reloadable do
 
           before do
             Person.collection.find({ "_id" => person.id }).
-              update({ "$set" => { "title" => "Mam" }})
+              update_one({ "$set" => { "title" => "Mam" }})
             game.reload
           end