mongoid 7.0.2 → 7.0.3

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

@@ -1,4 +1,5 @@
 require "spec_helper"
+require_relative '../has_and_belongs_to_many_models'
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
 
@@ -41,7 +42,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
       Person.create!(houses: 3.times.map { House.create! })
     end
 
-    context "when including the has_and_belongs_to_many relation" do
+    context "when including the has_and_belongs_to_many association" do
 
       it "queries twice" do
         expect_query(2) do
@@ -60,7 +61,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:eager) do
         Person.asc(:_id).includes(:preferences).last
@@ -129,5 +130,23 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Eager do
         end
       end
     end
+
+    context "when all the values for the has_and_belongs_to_many association are empty" do
+
+      before do
+        2.times { |i| HabtmmPerson.create! }
+      end
+
+      it "only queries once for the parent documents" do
+        found_person = false
+        expect_query(1) do
+          HabtmmPerson.all.includes(:tickets).each do |person|
+            expect(person.tickets).to eq []
+            found_person = true
+          end
+        end
+        expect(found_person).to be true
+      end
+    end
   end
 end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require_relative '../has_and_belongs_to_many_models'
+
+describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
+  context 'with primary_key and foreign_key given' do
+    let(:company) { HabtmmCompany.create!(c_id: 123) }
+    let(:employee) { HabtmmEmployee.create!(e_id: 456) }
+
+    before do
+      company.employees << employee
+    end
+
+    it 'references correct field' do
+      expect(company.e_ids).to eq([456])
+    end
+
+    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.save!
+        repl_employee.reload
+        expect(repl_employee.habtmm_company_ids).to eq([company.id])
+      end
+
+      context 'without replacement' do
+        let(:repl_employee) { HabtmmEmployee.create!(e_id: 444) }
+
+        it 'disassociates child from parent' do
+          company.employees.nullify
+          repl_employee.reload
+          expect(repl_employee.habtmm_company_ids).to eq([])
+        end
+      end
+
+      context 'with replacement' do
+        let(:repl_employee) { HabtmmEmployee.create!(e_id: 444) }
+
+        before do
+          company.employees << repl_employee
+          expect(company.employees.length).to eq(2)
+        end
+
+        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])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+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'
+end
+
+class HabtmmEmployee
+  include Mongoid::Document
+
+  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'
+end
+
+class HabtmmTicket
+  include Mongoid::Document
+end
+
+class HabtmmPerson
+  include Mongoid::Document
+
+  has_and_belongs_to_many :tickets, class_name: 'HabtmmTicket'
+end

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

@@ -654,7 +654,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany do
     end
   end
 
-  describe '#klass' do
+  describe '#relation_class' do
 
     context 'when the :class_name option is specified' do
 
@@ -668,14 +668,14 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany do
       end
 
       it 'returns the class name option' do
-        expect(association.klass).to eq(_class)
+        expect(association.relation_class).to eq(_class)
       end
     end
 
     context 'when the class_name option is not specified' do
 
       it 'uses the name of the relation to deduce the class name' do
-        expect(association.klass).to eq(HasManyRightObject)
+        expect(association.relation_class).to eq(HasManyRightObject)
       end
     end
   end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require_relative '../has_many_models'
+
+describe Mongoid::Association::Referenced::HasMany::Proxy do
+  context 'with primary_key and foreign_key given' do
+    let(:company) { HmmCompany.create!(p: 123) }
+    let(:criteria) { company.emails }
+
+    it 'generates correct query' do
+      expect(criteria.selector).to eq('f' => 123)
+    end
+
+    context 'unscoped' do
+      let(:criteria) { company.emails.unscoped }
+
+      it 'generates correct query' do
+        expect(criteria.selector).to eq('f' => 123)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+class HmmCompany
+  include Mongoid::Document
+
+  field :p, type: Integer
+  has_many :emails, primary_key: :p, foreign_key: :f, class_name: 'HmmEmail'
+end
+
+class HmmEmail
+  include Mongoid::Document
+
+  field :f, type: Integer
+  belongs_to :company, primary_key: :p, foreign_key: :f, class_name: 'HmmCompany'
+end
+
+class HmmSchool
+  include Mongoid::Document
+
+  has_many :students, class_name: 'HmmStudent'
+
+  field :district, type: String
+  field :team, type: String
+end
+
+class HmmStudent
+  include Mongoid::Document
+
+  belongs_to :school, class_name: 'HmmSchool'
+
+  field :name, type: String
+  field :grade, type: Integer, default: 3
+end
+
+class HmmTicket
+  include Mongoid::Document
+
+  belongs_to :person
+end

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

@@ -918,7 +918,7 @@ describe Mongoid::Association::Referenced::HasMany do
     end
   end
 
-  describe '#klass' do
+  describe '#relation_class' do
 
     context 'when the :class_name option is specified' do
 
@@ -932,14 +932,14 @@ describe Mongoid::Association::Referenced::HasMany do
       end
 
       it 'returns the class name option' do
-        expect(association.klass).to eq(_class)
+        expect(association.relation_class).to eq(_class)
       end
     end
 
     context 'when the class_name option is not specified' do
 
       it 'uses the name of the relation to deduce the class name' do
-        expect(association.klass).to eq(BelongingObject)
+        expect(association.relation_class).to eq(BelongingObject)
       end
     end
   end

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

@@ -0,0 +1,48 @@
+class HomCollege
+  include Mongoid::Document
+
+  has_one :accreditation, class_name: 'HomAccreditation'
+
+  field :state, type: String
+end
+
+class HomAccreditation
+  include Mongoid::Document
+
+  belongs_to :college, class_name: 'HomCollege'
+
+  field :degree, type: String
+  field :year, type: Integer, default: 2012
+end
+
+class HomAccreditation::Child
+  include Mongoid::Document
+
+  belongs_to :hom_college
+end
+
+module HomNs
+  class PrefixedParent
+    include Mongoid::Document
+
+    has_one :child, class_name: 'PrefixedChild'
+  end
+
+  class PrefixedChild
+    include Mongoid::Document
+
+    belongs_to :parent, class_name: 'PrefixedParent'
+  end
+end
+
+class HomPolymorphicParent
+  include Mongoid::Document
+
+  has_one :p_child, as: :parent
+end
+
+class HomPolymorphicChild
+  include Mongoid::Document
+
+  belongs_to :p_parent, polymorphic: true
+end

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

@@ -1,4 +1,5 @@
 require "spec_helper"
+require_relative './has_one_models'
 
 describe Mongoid::Association::Referenced::HasOne do
 
@@ -926,6 +927,16 @@ describe Mongoid::Association::Referenced::HasOne do
       it 'returns the class name option' do
         expect(association.relation_class_name).to eq('OtherBelongingObject')
       end
+
+      context 'when the class is namespaced' do
+        let(:association) do
+          HomNs::PrefixedParent.relations['child']
+        end
+
+        it 'returns unqualified class name as given in the :class_name option' do
+          expect(association.relation_class_name).to eq('PrefixedChild')
+        end
+      end
     end
 
     context 'when the class_name option is not specified' do
@@ -936,7 +947,7 @@ describe Mongoid::Association::Referenced::HasOne do
     end
   end
 
-  describe '#klass' do
+  describe '#relation_class' do
 
     context 'when the :class_name option is specified' do
 
@@ -950,22 +961,48 @@ describe Mongoid::Association::Referenced::HasOne do
       end
 
       it 'returns the class name option' do
-        expect(association.klass).to eq(_class)
+        expect(association.relation_class).to eq(_class)
+      end
+
+      context 'when the class is namespaced' do
+        let(:association) do
+          HomNs::PrefixedParent.relations['child']
+        end
+
+        it 'returns resolved class instance' do
+          expect(association.relation_class).to eq(HomNs::PrefixedChild)
+        end
       end
     end
 
     context 'when the class_name option is not specified' do
 
       it 'uses the name of the relation to deduce the class name' do
-        expect(association.klass).to eq(BelongingObject)
+        expect(association.relation_class).to eq(BelongingObject)
       end
     end
   end
 
+  describe '#klass' do
+    it 'is the target class' do
+      expect(association.klass).to eq(BelongingObject)
+    end
+  end
+
   describe '#inverse_class_name' do
 
     it 'returns the name of the owner class' do
-      expect(association.inverse_class_name).to eq(OwnerObject.name)
+      expect(association.inverse_class_name).to eq('OwnerObject')
+    end
+
+    context 'polymorphic association' do
+      let(:association) do
+        has_one_class.has_one :belonging_object, as: :bar
+      end
+
+      it 'returns the name of the owner class' do
+        expect(association.inverse_class_name).to eq(OwnerObject.name)
+      end
     end
   end
 
@@ -974,6 +1011,16 @@ describe Mongoid::Association::Referenced::HasOne do
     it 'returns the owner class' do
       expect(association.inverse_class).to be(OwnerObject)
     end
+
+    context 'polymorphic association' do
+      let(:association) do
+        has_one_class.has_one :belonging_object, as: :bar
+      end
+
+      it 'returns the owner class' do
+        expect(association.inverse_class).to be(OwnerObject)
+      end
+    end
   end
 
   describe '#inverse_of' do

data/spec/mongoid/clients/factory_spec.rb

@@ -12,8 +12,8 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -38,7 +38,7 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(cluster.addresses.first.to_s).to eq(SpecConfig.instance.addresses.first)
           end
 
           it "sets the platform to Mongoid's platform constant" do
@@ -80,11 +80,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
 
           it "sets ips with no ports to 27017" do
-            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
         end
 
@@ -120,7 +120,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
             end
 
             it "sets the database" do
@@ -181,7 +181,7 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
       end
 
       before do
@@ -200,7 +200,7 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:seeds) do
+      let(:cluster_addresses) do
         cluster.addresses.map{ |address| address.to_s }
       end
 
@@ -208,8 +208,10 @@ describe Mongoid::Clients::Factory do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's seeds" do
-        expect(seeds).to eq([ "127.0.0.1:27017" ])
+      it "sets the cluster's addresses" do
+        SpecConfig.instance.addresses.each do |address|
+          expect(cluster_addresses).to include(address)
+        end
       end
     end
 
@@ -230,7 +232,7 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
     end
 
     before do
@@ -249,7 +251,7 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
+    let(:cluster_addresses) do
       cluster.addresses.map{ |address| address.to_s }
     end
 
@@ -257,8 +259,10 @@ describe Mongoid::Clients::Factory do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    it "sets the cluster's addresses" do
+      SpecConfig.instance.addresses.each do |address|
+        expect(cluster_addresses).to include(address)
+      end
     end
   end
 
@@ -267,7 +271,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: [ "127.0.0.1:27017" ],
+          hosts: SpecConfig.instance.addresses,
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -293,7 +297,7 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
+    let(:cluster_addresses) do
       cluster.addresses.map{ |address| address.to_s }
     end
 
@@ -301,8 +305,10 @@ describe Mongoid::Clients::Factory do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    it "sets the cluster's addresses" do
+      SpecConfig.instance.addresses.each do |address|
+        expect(cluster_addresses).to include(address)
+      end
     end
 
     it "sets the server selection timeout" do