mongoid 7.3.5 → 7.4.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class HmmCompany
   include Mongoid::Document
@@ -76,3 +75,21 @@ class HmmBusSeat
 
   # No belongs_to :bus
 end
+
+class HmmTrainer
+  include Mongoid::Document
+
+  field :name, type: String
+
+  has_many :animals, class_name: 'HmmAnimal', scope: :reptile
+end
+
+class HmmAnimal
+  include Mongoid::Document
+
+  field :taxonomy, type: String
+
+  scope :reptile, -> { where(taxonomy: 'reptile') }
+
+  belongs_to :trainer, class_name: 'HmmTrainer', scope: -> { where(name: 'Dave') }
+end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_many_models'

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -495,6 +494,27 @@ describe Mongoid::Association::Referenced::HasMany 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
 
     context 'when :as is specified in the options' do

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -15,14 +14,18 @@ describe Mongoid::Association::Referenced::HasOne::Buildable do
       association.build(base, object)
     end
 
+    let(:options) do
+      {}
+    end
+
     let(:association) do
-      Mongoid::Association::Referenced::HasOne.new(Person, :account)
+      Mongoid::Association::Referenced::HasOne.new(Person, :account, options)
     end
 
     context "when provided an id" do
 
       let!(:account) do
-        Account.create!(person_id: object, name: 'banking')
+        Account.create!(person_id: object, name: 'banking', balance: 200)
       end
 
       let(:object) do
@@ -30,7 +33,7 @@ describe Mongoid::Association::Referenced::HasOne::Buildable do
       end
 
       before do
-        expect(Account).to receive(:where).with(association.foreign_key => object).and_call_original
+        expect_any_instance_of(Mongoid::Criteria).to receive(:where).with(association.foreign_key => object).and_call_original
       end
 
       it "sets the document" do
@@ -38,6 +41,46 @@ describe Mongoid::Association::Referenced::HasOne::Buildable do
       end
     end
 
+    context "when scope is specified" do
+
+      let!(:account) do
+        Account.create!(person_id: object, name: 'banking', balance: 200)
+      end
+
+      let(:object) do
+        BSON::ObjectId.new
+      end
+
+      let(:options) do
+        {
+            scope: -> { gt(balance: 100) }
+        }
+      end
+
+      before do
+        expect_any_instance_of(Mongoid::Criteria).to receive(:where).with(association.foreign_key => object).and_call_original
+        expect_any_instance_of(Mongoid::Criteria).to receive(:gt).with(balance: 100).and_call_original
+      end
+
+      context "when document satisfies scope" do
+
+        it "sets the document" do
+          expect(document).to eq(account)
+        end
+      end
+
+      context "when document does not satisfy scope" do
+
+        let!(:account) do
+          Account.create!(person_id: object, name: 'banking', balance: 50)
+        end
+
+        it "returns nil" do
+          expect(document).to eq(nil)
+        end
+      end
+    end
+
     context "when provided a object" do
 
       let(:object) do
@@ -86,11 +129,11 @@ describe Mongoid::Association::Referenced::HasOne::Buildable do
     context "when the document is persisted" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:game) do
-        Game.create(person: person)
+        Game.create!(person: person)
       end
 
       it "returns the document" do
@@ -101,11 +144,11 @@ describe Mongoid::Association::Referenced::HasOne::Buildable do
     context "when the document have a non standard pk" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:cat) do
-        Cat.create(person: person)
+        Cat.create!(person: person)
       end
 
       it "returns the document" do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require_relative '../has_one_models'
 
 describe Mongoid::Association::Referenced::HasOne::Eager do
 
@@ -153,7 +153,7 @@ describe Mongoid::Association::Referenced::HasOne::Eager do
     context "when the relation is polymorphic" do
 
       let!(:book) do
-        Book.create(name: "Game of Thrones")
+        Book.create!(name: "Game of Thrones")
       end
 
       let!(:rating) do
@@ -174,5 +174,20 @@ describe Mongoid::Association::Referenced::HasOne::Eager do
         end
       end
     end
+
+    context "when the association has scope" do
+      let!(:trainer1) { HomTrainer.create!(name: 'Dave') }
+      let!(:trainer2) { HomTrainer.create!(name: 'Ash') }
+      let!(:animal1) { HomAnimal.create!(taxonomy: 'reptile', trainer: trainer1) }
+      let!(:animal2) { HomAnimal.create!(taxonomy: 'bird', trainer: trainer1) }
+
+      let(:eager) do
+        HomTrainer.includes(:animal).where(_id: trainer1._id).to_a.first
+      end
+
+      it 'eager loads the included docs' do
+        expect(eager.animal).to eq animal1
+      end
+    end
   end
 end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -88,7 +87,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:game) do
@@ -143,7 +142,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when relation have a different primary_key" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:cat) do
@@ -216,7 +215,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:bar) do
-          Bar.create
+          Bar.create!
         end
 
         let(:rating) do
@@ -251,7 +250,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when replacing an existing persisted (dependent: :destroy) relation" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:game) do
@@ -324,7 +323,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when replacing an existing unpersisted (dependent: :destroy) relation" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:game) do
@@ -397,7 +396,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when replacing an existing persisted (dependent: :nullify) relation" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:cat) do
@@ -470,7 +469,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when replacing an existing unpersisted (dependent: :nullify) relation" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:cat) do
@@ -543,7 +542,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when replacing an existing relation with a new one" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         context "when dependent is destroy" do
@@ -553,7 +552,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
           end
 
           let!(:new_game) do
-            Game.create(name: "Starcraft 2")
+            Game.create!(name: "Starcraft 2")
           end
 
           before do
@@ -584,7 +583,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
           end
 
           let!(:new_account) do
-            Account.create(name: "checking")
+            Account.create!(name: "checking")
           end
 
           before do
@@ -646,7 +645,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:game) do
@@ -709,7 +708,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:bar) do
-          Bar.create
+          Bar.create!
         end
 
         let(:rating) do
@@ -760,7 +759,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when using object ids" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:game) do
@@ -787,7 +786,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when providing no attributes" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:game) do
@@ -810,7 +809,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when providing nil attributes" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:game) do
@@ -836,7 +835,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       context "when using object ids" do
 
         let(:bar) do
-          Bar.create
+          Bar.create!
         end
 
         let(:rating) do
@@ -880,7 +879,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
     context "when the relation is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:game) do
@@ -907,7 +906,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
     context "when providing no attributes" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:game) do
@@ -930,7 +929,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
     context "when providing nil attributes" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:game) do
@@ -953,7 +952,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
     context "when the relation is polymorphic" do
 
       let(:bar) do
-        Bar.create
+        Bar.create!
       end
 
       let(:rating) do
@@ -988,7 +987,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
   describe "#nullify" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:game) do
@@ -1062,15 +1061,15 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
   context "when reloading the relation" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:game_one) do
-      Game.create(name: "Warcraft 3")
+      Game.create!(name: "Warcraft 3")
     end
 
     let!(:game_two) do
-      Game.create(name: "Starcraft 2")
+      Game.create!(name: "Starcraft 2")
     end
 
     before do
@@ -1122,11 +1121,11 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
     context "when autobuild is true for child" do
 
       let(:explosion) do
-        Explosion.create
+        Explosion.create!
       end
 
       let(:bomb) do
-        bomb = Bomb.create
+        bomb = Bomb.create!
         bomb.explosion = explosion
         bomb
       end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class HomCollege
   include Mongoid::Document
@@ -78,3 +77,21 @@ class HomBusDriver
 
   # No belongs_to :bus
 end
+
+class HomTrainer
+  include Mongoid::Document
+
+  field :name, type: String
+
+  has_one :animal, class_name: 'HomAnimal', scope: :reptile
+end
+
+class HomAnimal
+  include Mongoid::Document
+
+  field :taxonomy, type: String
+
+  scope :reptile, -> { where(taxonomy: 'reptile') }
+
+  belongs_to :trainer, class_name: 'HomTrainer', scope: -> { where(name: 'Dave') }
+end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_one_models'

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -487,6 +486,27 @@ describe Mongoid::Association::Referenced::HasOne 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
 
     context 'when :as is specified in the options' do

data/spec/mongoid/association/reflections_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"