mongoid 7.0.13 → 8.0.8

data/spec/mongoid/persistable/savable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable::Savable do
@@ -5,7 +7,7 @@ describe Mongoid::Persistable::Savable do
   describe "#save" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:contextable_item) do
@@ -13,7 +15,7 @@ describe Mongoid::Persistable::Savable do
     end
 
     let(:persisted_contextable_item) do
-      ContextableItem.create(title: 'sir')
+      ContextableItem.create!(title: 'sir')
     end
 
     context "when skipping validation" do
@@ -44,7 +46,7 @@ describe Mongoid::Persistable::Savable do
       context "when saving document that is a belongs to child" do
 
         let(:account) do
-          Account.create
+          Account.create!(name: 'Foobar')
         end
 
         let(:alert) do
@@ -146,7 +148,7 @@ describe Mongoid::Persistable::Savable do
     context "when validation fails" do
 
       let(:address) do
-        person.addresses.create(city: "London")
+        person.addresses.create!(city: "London")
       end
 
       before do
@@ -162,35 +164,35 @@ describe Mongoid::Persistable::Savable do
 
       context "when performing modification and insert ops" do
 
-        let(:person) do
-          Person.create(title: "Blah")
+        let(:owner) do
+          Owner.create!(name: "Blah")
         end
 
-        let!(:symptom) do
-          person.symptoms.build(name: "Headache")
+        let!(:birthday) do
+          owner.birthdays.build(title: "First")
         end
 
-        let!(:name) do
-          person.create_name(first_name: "Tony")
+        let!(:scribe) do
+          owner.create_scribe(name: "Josh")
         end
 
         let(:from_db) do
-          Person.find(person.id)
+          Owner.find(owner.id)
         end
 
         before do
-          person.title = "King"
-          name.first_name = "Ryan"
+          owner.name = "King"
+          scribe.name = "Tosh"
         end
 
         it "persists with proper set and push modifiers" do
-          expect(person.atomic_updates).to eq({
+          expect(owner.atomic_updates).to eq({
             "$set" => {
-              "title" => "King",
-              "name.first_name" => "Ryan"
+              "name" => "King",
+              "scribe.name" => "Tosh"
             },
             "$push"=> {
-              "symptoms" => { '$each' => [ { "_id" => symptom.id, "name" => "Headache" } ] }
+              "birthdays" => { '$each' => [ { "_id" => birthday.id, "title" => "First" } ] }
             }
           })
         end
@@ -198,15 +200,15 @@ describe Mongoid::Persistable::Savable do
         context "when saving the document" do
 
           it "saves the root document" do
-            expect(person.title).to eq("King")
+            expect(owner.name).to eq("King")
           end
 
           it "saves embedded many relations" do
-            expect(person.symptoms.first.name).to eq("Headache")
+            expect(owner.birthdays.first.title).to eq("First")
           end
 
           it "saves embedded one relations" do
-            expect(person.name.first_name).to eq("Ryan")
+            expect(owner.scribe.name).to eq("Tosh")
           end
         end
       end
@@ -226,7 +228,7 @@ describe Mongoid::Persistable::Savable do
         end
 
         let!(:person) do
-          Person.create(
+          Person.create!(
             title: "Blah",
             addresses: [ address ]
           )
@@ -255,6 +257,162 @@ describe Mongoid::Persistable::Savable do
         end
       end
 
+      context 'when adding documents to embedded associations on multiple levels' do
+        let!(:truck) { Truck.create! }
+        let!(:crate) { truck.crates.create!(volume: 0.4) }
+
+        it 'persists the new documents' do
+          expect(truck.crates.size).to eq 1
+          expect(truck.crates[0].volume).to eq 0.4
+          expect(truck.crates[0].toys.size).to eq 0
+
+          truck.crates.first.toys.build(name: "Teddy bear")
+          truck.crates.build(volume: 0.8)
+
+          # The following is equivalent to the two lines above:
+          #
+          # truck.crates_attributes = {
+          #   '0' => {
+          #     "toys_attributes" => {
+          #       "0" => {
+          #         "name" => "Teddy bear"
+          #       }
+          #     },
+          #     "id" => crate.id.to_s
+          #   },
+          #   "1" => {
+          #     "volume" => 0.8
+          #   }
+          # }
+
+          expect(truck.crates.size).to eq 2
+          expect(truck.crates[0].volume).to eq 0.4
+          expect(truck.crates[0].toys.size).to eq 1
+          expect(truck.crates[0].toys[0].name).to eq "Teddy bear"
+          expect(truck.crates[1].volume).to eq 0.8
+          expect(truck.crates[1].toys.size).to eq 0
+
+          # TODO: MONGOID-5026: combine the updates so that there are
+          # no conflicts.
+          #expect(truck.atomic_updates[:conflicts]).to eq nil
+
+          expect { truck.save! }.not_to raise_error
+
+          _truck = Truck.find(truck.id)
+          expect(_truck.crates.size).to eq 2
+          expect(_truck.crates[0].volume).to eq 0.4
+          expect(_truck.crates[0].toys.size).to eq 1
+          expect(_truck.crates[0].toys[0].name).to eq "Teddy bear"
+          expect(_truck.crates[1].volume).to eq 0.8
+          expect(_truck.crates[1].toys.size).to eq 0
+        end
+      end
+
+      context 'when adding documents to embedded association and updating parent fields' do
+        let!(:truck) { Truck.create! }
+        let!(:crate) { truck.crates.create!(volume: 0.4) }
+
+        it 'performs all writes' do
+          truck.crates.build(volume: 1)
+          truck.crates.first.volume = 2
+
+          truck.save!
+
+          _truck = Truck.find(truck.id)
+          _truck.crates.length.should == 2
+          _truck.crates.first.volume.should == 2
+          _truck.crates.last.volume.should == 1
+        end
+      end
+
+      context 'when adding documents to nested embedded association and updating first association fields' do
+        let!(:truck) { Truck.create! }
+        let!(:seat) { truck.seats.create!(rating: 1) }
+
+        it 'performs all writes' do
+          truck.seats.first.armrests.build(side: 'left')
+          truck.seats.first.rating = 2
+
+          truck.save!
+
+          _truck = Truck.find(truck.id)
+          _truck.seats.length.should == 1
+          _truck.seats.first.armrests.length.should == 1
+          _truck.seats.first.armrests.first.side.should == 'left'
+        end
+      end
+
+      context 'when adding documents to nested embedded association and adding another top level association' do
+        let!(:truck) { Truck.create! }
+        let!(:crate) { truck.crates.create!(volume: 1) }
+
+        it 'performs all writes' do
+          truck.crates.first.toys.build(name: 'Bear')
+          truck.crates.build
+
+          truck.save!
+
+          _truck = Truck.find(truck.id)
+          _truck.crates.length.should == 2
+          _truck.crates.first.toys.length.should == 1
+          _truck.crates.first.toys.first.name.should == 'Bear'
+          _truck.crates.last.toys.length.should == 0
+        end
+
+        context 'when also updating first embedded top level association' do
+          it 'performs all writes' do
+            truck.crates.first.volume = 2
+            truck.crates.first.toys.build(name: 'Bear')
+            truck.crates.build
+
+            truck.save!
+
+            _truck = Truck.find(truck.id)
+            _truck.crates.length.should == 2
+            _truck.crates.first.toys.length.should == 1
+            _truck.crates.first.toys.first.name.should == 'Bear'
+            _truck.crates.last.toys.length.should == 0
+          end
+        end
+      end
+
+      context 'when adding documents to embedded associations with cascaded callbacks on update' do
+        let!(:truck) { Truck.create! }
+        let!(:seat) { truck.seats.create!(rating: 1) }
+
+        it 'persists the new documents' do
+          expect(truck.seats.size).to eq 1
+          expect(truck.seats[0].rating).to eq 1
+
+          truck.seats.build
+
+          expect { truck.save! }.not_to raise_error
+
+          _truck = Truck.find(truck.id)
+          expect(_truck.seats.size).to eq 2
+          expect(_truck.seats[0].rating).to eq 1
+          expect(_truck.seats[1].rating).to eq 100
+        end
+
+        context 'when embedded association embeds another association' do
+          it 'persists the new documents' do
+            expect(truck.seats.size).to eq 1
+            expect(truck.seats[0].rating).to eq 1
+
+            truck.seats.first.armrests.build
+            truck.seats.build
+
+            expect { truck.save! }.not_to raise_error
+
+            _truck = Truck.find(truck.id)
+            expect(_truck.seats.size).to eq 2
+            expect(_truck.seats[0].rating).to eq 2
+            expect(_truck.seats[0].armrests.length).to eq 1
+            expect(_truck.seats[1].rating).to eq 100
+          end
+        end
+      end
+
       context "when removing elements without using delete or destroy" do
 
         let!(:person) do
@@ -298,7 +456,7 @@ describe Mongoid::Persistable::Savable do
     context "when the changed attribute is not writable" do
 
       before do
-        Person.create(title: "sir")
+        Person.create!(title: "sir")
       end
 
       let(:person) do
@@ -315,7 +473,7 @@ describe Mongoid::Persistable::Savable do
       context 'when the changed attribute is aliased' do
 
         before do
-          Person.create(at: Time.now)
+          Person.create!(at: Time.now)
         end
 
         let(:person) do
@@ -324,7 +482,7 @@ describe Mongoid::Persistable::Savable do
 
         it "saves the document" do
           person.aliased_timestamp = Time.now
-          expect(person.save(validate: false)).to be true
+          expect(person.save!(validate: false)).to be true
         end
       end
     end
@@ -336,21 +494,26 @@ describe Mongoid::Persistable::Savable do
     end
 
     context "when validation context exists" do
+
       context "on new document" do
+
         it "returns true" do
           contextable_item.title = "sir"
           expect(contextable_item.save(context: :in_context)).to be true
         end
+
         it "returns false" do
           expect(contextable_item.save(context: :in_context)).to be false
         end
       end
 
       context "on persisted document" do
+
         it "returns true" do
           persisted_contextable_item.title = "lady"
           expect(persisted_contextable_item.save(context: :in_context)).to be true
         end
+
         it "returns false" do
           persisted_contextable_item.title = nil
           expect(persisted_contextable_item.save(context: :in_context)).to be false
@@ -468,7 +631,7 @@ describe Mongoid::Persistable::Savable do
     context "when the document has associations" do
 
       let!(:firefox) do
-        Firefox.create(name: "firefox")
+        Firefox.create!(name: "firefox")
       end
 
       let!(:writer) do

data/spec/mongoid/persistable/settable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable::Settable do
@@ -42,7 +44,7 @@ describe Mongoid::Persistable::Settable do
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:date) do
@@ -106,11 +108,11 @@ describe Mongoid::Persistable::Settable do
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "t")
+        person.addresses.create!(street: "t")
       end
 
       let(:date) do
@@ -138,7 +140,7 @@ describe Mongoid::Persistable::Settable do
       context 'when the field is a relation' do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:pet) do
@@ -164,11 +166,25 @@ describe Mongoid::Persistable::Settable do
         end
       end
     end
+
+    context "when executing atomically" do
+
+      let(:person) do
+        Person.create!(title: "sir", age: 30)
+      end
+
+      it "marks a dirty change for the set fields" do
+        person.atomically do
+          person.set title: "miss", age: 21
+          expect(person.changes).to eq({"title" => ["sir", "miss"], "age" => [30, 21]})
+        end
+      end
+    end
   end
 
   context "when dynamic attributes are not enabled" do
     let(:account) do
-      Account.create
+      Account.create!(name: 'Foobar')
     end
 
     it "raises exception for an unknown attribute " do
@@ -180,7 +196,7 @@ describe Mongoid::Persistable::Settable do
 
   context "when dynamic attributes enabled" do
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     it "updates non existing attribute" do
@@ -191,7 +207,7 @@ describe Mongoid::Persistable::Settable do
 
   context "with an attribute with private setter" do
     let(:agent) do
-      Agent.create
+      Agent.create!
     end
 
     let(:title) do
@@ -445,7 +461,7 @@ describe Mongoid::Persistable::Settable do
   context 'when the field is not already set locally' do
 
     let(:church) do
-      Church.create
+      Church.create!
     end
 
     context 'when the field is a Hash type' do

data/spec/mongoid/persistable/unsettable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable::Unsettable do
@@ -38,7 +40,7 @@ describe Mongoid::Persistable::Unsettable do
       end
 
       let(:person) do
-        Person.create(title: "test", age: 30, dob: date)
+        Person.create!(title: "test", age: 30, dob: date)
       end
 
       context "when provided a splat of symbols" do
@@ -108,11 +110,11 @@ describe Mongoid::Persistable::Unsettable do
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "kreuzberg", number: 40, city: "Berlin")
+        person.addresses.create!(street: "kreuzberg", number: 40, city: "Berlin")
       end
 
       context "when provided a splat of symbols" do
@@ -151,5 +153,19 @@ describe Mongoid::Persistable::Unsettable do
         it_behaves_like "an unsettable embedded document"
       end
     end
+
+    context "when executing atomically" do
+
+      let(:person) do
+        Person.create!(title: "sir", age: 30)
+      end
+
+      it "marks a dirty change for the unset fields" do
+        person.atomically do
+          person.unset :title
+          expect(person.changes).to eq({"title" => ["sir", nil]})
+        end
+      end
+    end
   end
 end

data/spec/mongoid/persistable/updatable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Persistable::Updatable do
@@ -7,7 +9,7 @@ describe Mongoid::Persistable::Updatable do
     context "when the field is aliased" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when the setter is overridden" do
@@ -67,7 +69,7 @@ describe Mongoid::Persistable::Updatable do
     context "when setting an array field" do
 
       let(:person) do
-        Person.create(aliases: [])
+        Person.create!(aliases: [])
       end
 
       before do
@@ -115,7 +117,7 @@ describe Mongoid::Persistable::Updatable do
     context "when dynamic attributes are not enabled" do
 
       it "raises exception for an unknown attribute " do
-        account = Account.create
+        account = Account.create!(name: 'Foobar')
 
         expect {
           account.update_attribute(:somethingnew, "somethingnew")
@@ -123,7 +125,7 @@ describe Mongoid::Persistable::Updatable do
       end
 
       it "will update value of aliased field" do
-        person = Person.create
+        person = Person.create!
         person.update_attribute(:t, "test_value")
         expect(person.reload.t).to eq "test_value"
         expect(person.test).to eq "test_value"
@@ -231,7 +233,7 @@ describe Mongoid::Persistable::Updatable do
     context "when persisting a localized field" do
 
       let!(:product) do
-        Product.create(description: "The bomb")
+        Product.create!(description: "The bomb")
       end
 
       before do
@@ -260,15 +262,15 @@ describe Mongoid::Persistable::Updatable do
     context "when updating a deeply embedded document" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
-        person.addresses.create(street: "Winterfeldtstr")
+        person.addresses.create!(street: "Winterfeldtstr")
       end
 
       let!(:location) do
-        address.locations.create(name: "work")
+        address.locations.create!(name: "work")
       end
 
       let(:from_db) do
@@ -299,7 +301,7 @@ describe Mongoid::Persistable::Updatable do
       end
 
       let(:person) do
-        Person.create(species: :human)
+        Person.create!(species: :human)
       end
 
       it 'raises an error when trying to set the attribute' do
@@ -344,7 +346,7 @@ describe Mongoid::Persistable::Updatable do
     context 'when the field is loaded explicitly' do
 
       before do
-        Person.create(title: 'Captain')
+        Person.create!(title: 'Captain')
       end
 
       context 'when the loaded attribute is updated' do
@@ -398,7 +400,7 @@ describe Mongoid::Persistable::Updatable do
     context 'when fields are explicitly not loaded' do
 
       before do
-        Person.create(title: 'Captain')
+        Person.create!(title: 'Captain')
       end
 
       context 'when the loaded attribute is updated' do
@@ -455,14 +457,15 @@ describe Mongoid::Persistable::Updatable do
     describe "##{method}" do
 
       context "when saving with a hash field with invalid keys" do
+        max_server_version '4.9'
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         it "raises an error" do
           expect {
-            person.update_attributes(map: { "$bad.key" => "value" })
+            person.update_attributes!(map: { "$bad.key" => "value" })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -470,11 +473,11 @@ describe Mongoid::Persistable::Updatable do
       context "when validation passes" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:saved) do
-          person.update_attributes(pets: false)
+          person.update_attributes!(pets: false)
         end
 
         let(:from_db) do
@@ -491,9 +494,10 @@ describe Mongoid::Persistable::Updatable do
       end
 
       context "when the document has been destroyed" do
+        max_server_version '4.9'
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         it "raises an error" do
@@ -506,7 +510,7 @@ describe Mongoid::Persistable::Updatable do
       context "when validation passes" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:saved) do
@@ -529,7 +533,7 @@ describe Mongoid::Persistable::Updatable do
       context "when the document has been destroyed" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         before do
@@ -550,7 +554,7 @@ describe Mongoid::Persistable::Updatable do
         end
 
         let(:game) do
-          Game.create(person: person)
+          Game.create!(person: person)
         end
 
         before do
@@ -587,7 +591,7 @@ describe Mongoid::Persistable::Updatable do
         context "when providing an embedded child" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:name) do
@@ -614,11 +618,11 @@ describe Mongoid::Persistable::Updatable do
         context "when providing a parent to a referenced in" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:post) do
-            Post.create(title: "Testing")
+            Post.create!(title: "Testing")
           end
 
           context "when the relation has not yet been touched" do
@@ -679,7 +683,7 @@ describe Mongoid::Persistable::Updatable do
         before do
           phone_number.country_code = country_code
           person.phone_numbers << phone_number
-          person.save
+          person.save!
         end
 
         it "sets the first level document" do
@@ -735,4 +739,22 @@ describe Mongoid::Persistable::Updatable do
       end
     end
   end
+
+  describe "#update_attributes!" do
+
+    let(:person) do
+      Person.create!
+    end
+
+    let(:attributes) do
+      { security_code: 'secret' }
+    end
+
+    it 'calls update_attributes' do
+      person.should receive(:update_attributes).with(attributes).and_call_original
+      lambda do
+        person.update_attributes!(attributes)
+      end.should_not raise_error
+    end
+  end
 end