mongoid 7.1.1 → 8.1.0

data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require_relative '../belongs_to_models.rb'
 
 describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
@@ -10,7 +10,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   end
 
   let(:person) do
-    Person.create
+    Person.create!
   end
 
   describe "#=" do
@@ -62,15 +62,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when referencing a document from an embedded document" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "Wienerstr")
+        person.addresses.create!(street: "Wienerstr")
       end
 
       let(:account) do
-        Account.create(name: "1", number: 1000000)
+        Account.create!(name: "1", number: 1000000)
       end
 
       before do
@@ -86,7 +86,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
       end
 
       it "allows saving of the embedded document" do
-        expect(address.save).to be true
+        expect(address.save!).to be true
       end
     end
 
@@ -127,6 +127,23 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           it "does not save the target" do
             expect(person).to_not be_persisted
           end
+
+          it "drops private visibility from private methods" do
+            # This is unfortunate but it appears that Ruby does not
+            # have a way to distinguish how method_missing was invoked
+            # (i.e. via an explicit send or method call).
+            # See https://jira.mongodb.org/browse/MONGOID-5009
+            game.person.secret_name.should == 'secret'
+          end
+
+          it "allows private methods to be invoked" do
+            game.person.send(:secret_name).should == 'secret'
+          end
+
+          it "properly exposes delegated methods visibility" do
+            expect(defined?(game.person.id)).to eq("method")
+            expect(defined?(game.person.secret_name)).to be_nil
+          end
         end
 
         context "when the child is not a new record" do
@@ -136,7 +153,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:game) do
-            Game.create
+            Game.create!
           end
 
           before do
@@ -170,16 +187,16 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
         context "when the parent is a subclass" do
 
           let(:canvas) do
-            Canvas::Test.create
+            Canvas::Test.create!
           end
 
           let(:comment) do
-            Comment.create(title: "test")
+            Comment.create!(title: "test")
           end
 
           before do
             comment.commentable = canvas
-            comment.save
+            comment.save!
           end
 
           it "sets the correct value in the type field" do
@@ -233,7 +250,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:rating) do
-            Rating.create
+            Rating.create!
           end
 
           before do
@@ -269,6 +286,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
         context 'when the child has persistence options set' do
 
+          before do
+            Person.collection.client['other-posts'].delete_many
+            Person.collection.client['other-people'].delete_many
+          end
+
           let(:person) do
             Person.new
           end
@@ -278,11 +300,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           before do
-            post.with(collection: 'other-posts') do |p|
-              person.with(collection: 'other-people') do |per|
-                p.person = person
-                per.save
-                p.save
+            post.with(collection: 'other-posts') do |post|
+              person.with(collection: 'other-people') do |person|
+                post.person = person
+                person.save!
+                post.save!
               end
             end
           end
@@ -339,7 +361,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:post) do
-            Post.create
+            Post.create!
           end
 
           before do
@@ -431,7 +453,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
             end
 
             let(:rating) do
-              Rating.create
+              Rating.create!
             end
 
             before do
@@ -484,7 +506,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :destroy
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         after :all do
@@ -508,7 +530,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -535,7 +557,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :destroy
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         after :all do
@@ -548,7 +570,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do
@@ -566,15 +588,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when dependent is delete" do
 
       let(:account) do
-        Account.create
+        Account.create!(name: 'Foobar')
       end
 
       let(:drug) do
-        Drug.create
+        Drug.create!
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when relation is has_one" do
@@ -590,7 +612,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :delete_all
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         after :all do
@@ -600,10 +622,10 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
         context "when parent is persisted" do
 
-          context "when child is deleted" do
+          context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -630,7 +652,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :delete_all
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         after :all do
@@ -643,7 +665,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do
@@ -661,15 +683,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when dependent is nullify" do
 
       let(:account) do
-        Account.create
+        Account.create!(name: 'Foobar')
       end
 
       let(:drug) do
-        Drug.create
+        Drug.create!
       end
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when relation is has_one" do
@@ -685,15 +707,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Account.belongs_to :person, dependent: :nullify
           Person.has_one :account
           person.account = account
-          person.save
+          person.save!
         end
 
         context "when parent is persisted" do
 
-          context "when child is deleted" do
+          context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -724,7 +746,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           Drug.belongs_to :person, dependent: :nullify
           Person.has_many :drugs
           person.drugs = [drug]
-          person.save
+          person.save!
         end
 
         context "when parent exists" do
@@ -732,7 +754,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do
@@ -810,11 +832,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
         context "when the parent is not a new record" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let(:game) do
-            Game.create
+            Game.create!
           end
 
           before do
@@ -879,7 +901,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
             end
 
             let(:rating) do
-              Rating.create
+              Rating.create!
             end
 
             before do
@@ -942,7 +964,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:post) do
-            Post.create
+            Post.create!
           end
 
           before do
@@ -1001,7 +1023,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           end
 
           let(:rating) do
-            Rating.create
+            Rating.create!
           end
 
           before do
@@ -1143,11 +1165,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when replacing the relation with another" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post) do
-      Post.create(title: "test")
+      Post.create!(title: "test")
     end
 
     let!(:game) do
@@ -1156,7 +1178,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
     before do
       post.person = game.person
-      post.save
+      post.save!
     end
 
     it "clones the relation" do
@@ -1203,17 +1225,17 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when the document belongs to a has one and has many" do
 
     let(:movie) do
-      Movie.create(name: "Infernal Affairs")
+      Movie.create!(name: "Infernal Affairs")
     end
 
     let(:account) do
-      Account.create(name: "Leung")
+      Account.create!(name: "Leung")
     end
 
     context "when creating the document" do
 
       let(:comment) do
-        Comment.create(movie: movie, account: account)
+        Comment.create!(title: 'My Title', movie: movie, account: account)
       end
 
       it "sets the correct has one" do
@@ -1229,20 +1251,20 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when reloading the relation" do
 
     let!(:person_one) do
-      Person.create
+      Person.create!
     end
 
     let!(:person_two) do
-      Person.create(title: "Sir")
+      Person.create!(title: "Sir")
     end
 
     let!(:game) do
-      Game.create(name: "Starcraft 2")
+      Game.create!(name: "Starcraft 2")
     end
 
     before do
       game.person = person_one
-      game.save
+      game.save!
     end
 
     context "when the relation references the same document" do
@@ -1269,7 +1291,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
       before do
         game.person_id = person_two.id
-        game.save
+        game.save!
       end
 
       let(:reloaded) do
@@ -1289,13 +1311,13 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
   context "when creating with a reference to an integer id parent" do
 
     let!(:jar) do
-      Jar.create do |doc|
+      Jar.create! do |doc|
         doc._id = 1
       end
     end
 
     let(:cookie) do
-      Cookie.create(jar_id: "1")
+      Cookie.create!(jar_id: "1")
     end
 
     it "allows strings to be passed as the id" do
@@ -1312,15 +1334,15 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
     context "when the relation exists" do
 
       let!(:person_one) do
-        Person.create
+        Person.create!
       end
 
       let!(:person_two) do
-        Person.create
+        Person.create!
       end
 
       let!(:game) do
-        Game.create(person: person_one)
+        Game.create!(person: person_one)
       end
 
       before do
@@ -1332,4 +1354,35 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
       end
     end
   end
+
+  describe "#method_missing" do
+      let!(:person) do
+        Person.create!
+      end
+
+      let!(:game) do
+        Game.create!(person: person)
+      end
+
+    it 'handles keyword args' do
+      expect do
+        game.person.set_personal_data(ssn: '123', age: 25)
+      end.not_to raise_error
+    end
+  end
+
+  # This is a very specific case, see MONGOID-5089 for more details.
+  context "when required is false, child is an orphan, and parent has explicit _id" do
+    let(:comment) { BTMComment.create! }
+    let(:article) do
+      BTMArticle.new(
+        comment_ids: [comment.id],
+        id: 1
+      )
+    end
+
+    it "uses the correct explicit id" do
+      expect(article.comments.first.article_id).to eq(1)
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to_models.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class BTMArticle
+  include Mongoid::Document
+  has_many :comments, class_name: "BTMComment"
+end
+
+class BTMComment
+  include Mongoid::Document
+  belongs_to :article, class_name: "BTMArticle", required: false
+end

data/spec/mongoid/association/referenced/belongs_to_query_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_many_models'
@@ -35,4 +34,24 @@ describe Mongoid::Association::Referenced::BelongsTo do
       expect(school.team).to eq('Bulldogs')
     end
   end
+
+  context 'when projecting with #only while having similar inverse_of candidates' do
+    before do
+      alice = HmmOwner.create!(name: 'Alice')
+      bob = HmmOwner.create!(name: 'Bob')
+
+      HmmPet.create!(name: 'Rex', current_owner: bob, previous_owner: alice)
+    end
+
+    let(:pet) { HmmPet.where(name: 'Rex').only(:name, :previous_owner_id, 'previous_owner.name').first }
+
+    it 'populates specified fields' do
+      expect(pet.name).to eq('Rex')
+      expect(pet.previous_owner.name).to eq('Alice')
+    end
+
+    it 'does not try to load the inverse for an association that explicitly prevents it' do
+      expect { pet.previous_owner.name }.not_to raise_error
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -547,17 +546,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is true' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = true
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
-
-        let!(:original_required_config) do
-          Mongoid.belongs_to_required_by_default
-        end
+        config_override :belongs_to_required_by_default, true
 
         context 'when the required option is true' do
 
@@ -685,13 +674,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is false' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = false
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
+        config_override :belongs_to_required_by_default, false
 
         context 'when the required option is true' do
 
@@ -1050,6 +1033,27 @@ describe Mongoid::Association::Referenced::BelongsTo do
     end
   end
 
+  describe '#scope' do
+
+    context 'when scope is specified in the options' do
+
+      let(:options) do
+        { scope: -> { unscoped.where(foo: :bar) } }
+      end
+
+      it 'returns a Criteria Queryable Key' do
+        expect(association.scope).to be_a(Proc)
+      end
+    end
+
+    context 'when scope is not specified in the options' do
+
+      it 'returns nil' do
+        expect(association.scope).to be_nil
+      end
+    end
+  end
+
   describe '#as' do
 
     it 'returns nil' do
@@ -1900,7 +1904,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
 
   describe '#foreign_key_setter' do
 
-    it 'returns the foriegn key field followed by "="' do
+    it 'returns the foreign key field followed by "="' do
       expect(association.foreign_key_setter).to eq("owner_object_id=")
     end
   end
@@ -1999,8 +2003,8 @@ describe Mongoid::Association::Referenced::BelongsTo do
 
   describe '#foreign_key_check' do
 
-    it 'returns the foreign_key followed by "_changed?"' do
-      expect(association.foreign_key_check).to eq('owner_object_id_changed?')
+    it 'returns the foreign_key followed by "_previously_changed?"' do
+      expect(association.foreign_key_check).to eq('owner_object_id_previously_changed?')
     end
   end
 

data/spec/mongoid/association/referenced/has_and_belongs_to_many/binding_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -14,7 +13,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Binding do
   end
 
   let(:target) do
-    Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ preference ])
+    Mongoid::Association::Referenced::HasMany::Enumerable.new([ preference ])
   end
 
   let(:association) do

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -67,6 +66,31 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Buildable do
       end
     end
 
+    context "when scope is specified" do
+
+      let(:object_id) do
+        BSON::ObjectId.new
+      end
+
+      let(:options) do
+        {
+          scope: -> { where(rating: 3) }
+        }
+      end
+
+      let(:object) do
+        [ object_id ]
+      end
+
+      let(:criteria) do
+        Preference.all_of("_id" => { "$in" => object }).where(rating: 3)
+      end
+
+      it "returns the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
     context "when provided a object" do
 
       context "when the object is not nil" do
@@ -108,7 +132,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Buildable do
       context "when the ids are incorrect" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         before do