mongoid 7.0.12 → 7.3.3

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::BelongsTo::Proxy do
@@ -124,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
@@ -505,7 +525,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
@@ -545,7 +565,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
@@ -597,10 +617,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
@@ -640,7 +660,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
@@ -687,10 +707,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
@@ -729,7 +749,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
@@ -1329,4 +1349,21 @@ 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
 end

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+require_relative './has_many_models'
+
+describe Mongoid::Association::Referenced::BelongsTo do
+  context 'when projecting with #only' do
+    before do
+      school = HmmSchool.create!(district: 'foo', team: 'Bulldogs')
+      HmmStudent.create!(school: school, name: 'Dave', grade: 10)
+    end
+
+    let(:student) do
+      HmmStudent.where(name: 'Dave').only(:school_id, 'school._id', 'school.district').first
+    end
+
+    let(:school) { student.school }
+
+    it 'populates specified fields only' do
+      pending 'https://jira.mongodb.org/browse/MONGOID-4704'
+
+      expect(school.district).to eq('foo')
+      # has a default value specified in the model
+      expect do
+        school.team
+      end.to raise_error(ActiveModel::MissingAttributeError)
+      expect(student.attributes.keys).to eq(['_id', 'name'])
+    end
+
+    # Delete this test when https://jira.mongodb.org/browse/MONGOID-4704 is
+    # implemented and above test is unpended
+    it 'fetches all fields' do
+      expect(school.district).to eq('foo')
+      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,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 require_relative './has_one_models'
 

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany::Binding do
@@ -11,7 +14,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,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany::Buildable do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 require_relative '../has_and_belongs_to_many_models'
 
@@ -43,6 +46,9 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
     end
 
     context "when including the has_and_belongs_to_many association" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
 
       it "queries twice" do
         expect_query(2) do
@@ -62,6 +68,9 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
     end
 
     context "when the association is not polymorphic" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
 
       let(:eager) do
         Person.asc(:_id).includes(:preferences).last
@@ -116,6 +125,10 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
     end
 
     context "when some related documents no longer exist" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
+
       before do
         # Deleting the first one to meet Builders::Referenced::ManyToMany#query?
         House.collection.find(_id: Person.first.house_ids.first).delete_one
@@ -132,6 +145,9 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
     end
 
     context "when all the values for the has_and_belongs_to_many association are empty" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
 
       before do
         2.times { |i| HabtmmPerson.create! }

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# encoding: utf-8
 
 require "spec_helper"
 require_relative '../has_and_belongs_to_many_models'
@@ -16,15 +17,15 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
       expect(company.e_ids).to eq([456])
     end
 
-    describe 'nullify' do
+    describe '#nullify' do
       before do
         company.employees << repl_employee
         company.save!
         expect(company.employees.length).to eq(2)
-        repl_employee.habtmm_company_ids = [company.id]
+        repl_employee.c_ids = [company.c_id]
         repl_employee.save!
         repl_employee.reload
-        expect(repl_employee.habtmm_company_ids).to eq([company.id])
+        expect(repl_employee.c_ids).to eq([123])
       end
 
       context 'without replacement' do
@@ -33,7 +34,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         it 'disassociates child from parent' do
           company.employees.nullify
           repl_employee.reload
-          expect(repl_employee.habtmm_company_ids).to eq([])
+          expect(repl_employee.c_ids).to eq([])
         end
       end
 
@@ -48,9 +49,29 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         it 'keeps replacement associated with the parent' do
           company.employees.nullify([repl_employee])
           repl_employee.reload
-          expect(repl_employee.habtmm_company_ids).to eq([company.id])
+          expect(repl_employee.c_ids).to eq([123])
         end
       end
     end
   end
+
+  describe '#<<' do
+    let(:dog) { Dog.create! }
+    let(:breed) { Breed.create! }
+
+    it 'adds association on both ends' do
+      dog.breeds << breed
+      expect(breed.dogs).to eq([dog])
+    end
+
+    context 'with primary_key and foreign_key given' do
+      let(:company) { HabtmmCompany.create!(c_id: 123) }
+      let(:employee) { HabtmmEmployee.create!(e_id: 456) }
+
+      it 'adds association on both ends' do
+        company.employees << employee
+        expect(employee.companies).to eq([company])
+      end
+    end
+  end
 end

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
@@ -3017,9 +3020,13 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
       person.preferences
     end
 
-    Array.public_instance_methods.each do |method|
+    Array.public_instance_methods.sort.each do |method|
+
+      context "when checking Array##{method}" do
 
-      context "when checking #{method}" do
+        before do
+          expect([].respond_to?(method)).to be true
+        end
 
         it "returns true" do
           expect(preferences.respond_to?(method)).to be true
@@ -3027,9 +3034,9 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
       end
     end
 
-    Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy.public_instance_methods.each do |method|
+    Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy.public_instance_methods.sort.each do |method|
 
-      context "when checking #{method}" do
+      context "when checking Proxy##{method}" do
 
         it "returns true" do
           expect(preferences.respond_to?(method)).to be true
@@ -3037,9 +3044,9 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
       end
     end
 
-    Preference.scopes.keys.each do |method|
+    Preference.scopes.keys.sort.each do |method|
 
-      context "when checking #{method}" do
+      context "when checking scope #{method}" do
 
         it "returns true" do
           expect(preferences.respond_to?(method)).to be true
@@ -3050,20 +3057,36 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
 
   describe "#scoped" do
 
-    let(:person) do
-      Person.new
-    end
-
     let(:scoped) do
       person.preferences.scoped
     end
 
-    it "returns the relation criteria" do
-      expect(scoped).to be_a(Mongoid::Criteria)
+    context 'when association is empty' do
+
+      let(:person) do
+        Person.new
+      end
+
+      it "returns the relation criteria" do
+        expect(scoped).to be_a(Mongoid::Criteria)
+      end
+
+      it "returns with an empty selector" do
+        expect(scoped.selector).to eq("_id" => { "$in" => [] })
+      end
     end
 
-    it "returns with an empty selector" do
-      expect(scoped.selector).to eq({ "$and" => [{ "_id" => { "$in" => [] }}]})
+    context 'when association is not empty' do
+
+      let(:person) do
+        Person.create!(preferences: [
+          Preference.new(id: 123),
+        ])
+      end
+
+      it "returns with a selector including association element ids" do
+        expect(scoped.selector).to eq("_id" => { "$in" => [123] })
+      end
     end
   end
 

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

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 class HabtmmCompany
   include Mongoid::Document
 
   field :c_id, type: Integer
   field :e_ids, type: Array
-  has_and_belongs_to_many :employees, primary_key: :e_id, foreign_key: :e_ids, class_name: 'HabtmmEmployee'
+  has_and_belongs_to_many :employees, class_name: 'HabtmmEmployee',
+    primary_key: :e_id, foreign_key: :e_ids,
+    inverse_primary_key: :c_id, inverse_foreign_key: :c_ids
 end
 
 class HabtmmEmployee
@@ -12,7 +17,26 @@ class HabtmmEmployee
   field :e_id, type: Integer
   field :c_ids, type: Array
   field :habtmm_company_ids, type: Array
-  has_and_belongs_to_many :companies, primary_key: :c_id, foreign_key: :c_ids, class_name: 'HabtmmCompany'
+  has_and_belongs_to_many :companies, class_name: 'HabtmmCompany',
+    primary_key: :c_id, foreign_key: :c_ids,
+    inverse_primary_key: :e_id, inverse_foreign_key: :e_ids
+end
+
+class HabtmmContract
+  include Mongoid::Document
+
+  has_and_belongs_to_many :signatures, class_name: 'HabtmmSignature'
+
+  field :item, type: String
+end
+
+class HabtmmSignature
+  include Mongoid::Document
+
+  has_and_belongs_to_many :contracts, class_name: 'HabtmmContract'
+
+  field :name, type: String
+  field :year, type: Integer
 end
 
 class HabtmmTicket

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+require_relative './has_and_belongs_to_many_models'
+
+describe Mongoid::Association::Referenced::HasAndBelongsToMany do
+  context 'when projecting with #only' do
+    before do
+      contract = HabtmmContract.create!(item: 'foo')
+      contract.signatures << HabtmmSignature.create!(contracts: [contract], name: 'Dave', year: 2019)
+      contract.save!
+    end
+
+    let(:contract) do
+      HabtmmContract.where(item: 'foo').only(:signature_ids,
+        'signatures._id', 'signatures.name').first
+    end
+
+    let(:signature) { contract.signatures.first }
+
+    it 'populates specified fields only' do
+      pending 'https://jira.mongodb.org/browse/MONGOID-4704'
+
+      expect(signature.name).to eq('Dave')
+      # has a default value specified in the model
+      expect do
+        signature.year
+      end.to raise_error(ActiveModel::MissingAttributeError)
+      expect(signature.attributes.keys).to eq(['_id', 'name'])
+    end
+
+    # Delete this test when https://jira.mongodb.org/browse/MONGOID-4704 is
+    # implemented and above test is unpended
+    it 'fetches all fields' do
+      expect(signature.name).to eq('Dave')
+      expect(signature.year).to eq(2019)
+    end
+  end
+end

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany do
@@ -1013,14 +1016,35 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany do
 
   describe '#inverse_foreign_key' do
 
-    it 'returns nil' do
+    it 'returns generated key' do
       expect(association.inverse_foreign_key).to eq('has_many_left_object_ids')
     end
+
+    context 'with inverse given' do
+      let(:options) do
+        { inverse_of: 'foo' }
+      end
+
+      it 'returns configured key' do
+        expect(association.inverse_foreign_key).to eq('foo_ids')
+      end
+    end
+
+    context 'with primary_key and foreign_key given' do
+      let(:options) do
+        { primary_key: 'foo', foreign_key: 'foo_ref',
+          inverse_primary_key: 'bar', inverse_foreign_key: 'bar_ref' }
+      end
+
+      it 'returns configured key' do
+        expect(association.inverse_foreign_key).to eq('bar_ref')
+      end
+    end
   end
 
   describe '#inverse_foreign_key_setter' do
 
-    it 'returns nil' do
+    it 'returns generated method name' do
       expect(association.inverse_foreign_key_setter).to eq('has_many_left_object_ids=')
     end
   end

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

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

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasMany::Buildable do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Association::Referenced::HasMany::Eager do
@@ -63,9 +66,15 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
       eager.send(:set_on_parent, person.id, :foo)
     end
 
-    it "doesnt call an extra query" do
-      expect_query(0) do
-        eager.send(:set_on_parent, person.id, :foo)
+    context 'when able to make query count assertions' do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
+
+      it "doesnt call an extra query" do
+        expect_query(0) do
+          eager.send(:set_on_parent, person.id, :foo)
+        end
       end
     end
   end
@@ -77,6 +86,9 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
     end
 
     context "when including the has_many relation" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
 
       before do
         3.times { Drug.create!(person: person) }
@@ -103,6 +115,9 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
     end
 
     context "when the relation is not polymorphic" do
+      # Query count assertions require that all queries are sent using the
+      # same connection object.
+      require_no_multi_shard
 
       context "when the eager load has returned documents" do