mongoid 7.3.5 → 7.4.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class HabtmmCompany
   include Mongoid::Document
@@ -48,3 +47,21 @@ class HabtmmPerson
 
   has_and_belongs_to_many :tickets, class_name: 'HabtmmTicket'
 end
+
+class HabtmmTrainer
+  include Mongoid::Document
+
+  field :name, type: String
+
+  has_and_belongs_to_many :animals, inverse_of: :trainers, class_name: 'HabtmmAnimal', scope: :reptile
+end
+
+class HabtmmAnimal
+  include Mongoid::Document
+
+  field :taxonomy, type: String
+
+  scope :reptile, -> { where(taxonomy: 'reptile') }
+
+  has_and_belongs_to_many :trainers, inverse_of: :animals, class_name: 'HabtmmTrainer', scope: -> { where(name: 'Dave') }
+end

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

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

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -494,6 +493,27 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany 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

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

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

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -59,6 +58,27 @@ describe Mongoid::Association::Referenced::HasMany::Buildable do
       end
     end
 
+    context "when scope is specified" do
+
+      let(:options) do
+        {
+          scope: -> { where(rating: 3) },
+        }
+      end
+
+      let(:object) do
+        BSON::ObjectId.new
+      end
+
+      let(:criteria) do
+        Post.where(association.foreign_key => object, rating: 3)
+      end
+
+      it "adds the ordering to the criteria" do
+        expect(documents).to eq(criteria)
+      end
+    end
+
     context "when the relation is polymorphic" do
 
       let(:options) do

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require_relative '../has_many_models'
 
 describe Mongoid::Association::Referenced::HasMany::Eager do
 
@@ -122,7 +122,7 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
       context "when the eager load has returned documents" do
 
         let!(:post) do
-          person.posts.create(title: "testing")
+          person.posts.create!(title: "testing")
         end
 
         let!(:eager) do
@@ -176,7 +176,7 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
 
         it "returns the proxy" do
           expect do
-            eager.posts.create(title: "testing")
+            eager.posts.create!(title: "testing")
           end.to_not raise_error
         end
       end
@@ -188,11 +188,11 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
         end
 
         let!(:person_two) do
-          Person.create(username: "durran")
+          Person.create!(username: "durran")
         end
 
         let!(:post) do
-          person_one.posts.create(title: "testing")
+          person_one.posts.create!(title: "testing")
         end
 
         let!(:eager) do
@@ -249,11 +249,11 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
     context "when the relation is polymorphic" do
 
       let!(:movie) do
-        Movie.create(name: "Bladerunner")
+        Movie.create!(name: "Bladerunner")
       end
 
       let!(:rating) do
-        movie.ratings.create(value: 10)
+        movie.ratings.create!(value: 10)
       end
 
       let!(:eager) do
@@ -270,5 +270,21 @@ describe Mongoid::Association::Referenced::HasMany::Eager do
         end
       end
     end
+
+    context "when the association has scope" do
+      let!(:trainer1) { HmmTrainer.create!(name: 'Dave') }
+      let!(:trainer2) { HmmTrainer.create!(name: 'Ash') }
+      let!(:animal1) { HmmAnimal.create!(taxonomy: 'reptile', trainer: trainer1) }
+      let!(:animal2) { HmmAnimal.create!(taxonomy: 'bird', trainer: trainer1) }
+
+      let(:eager) do
+        HmmTrainer.includes(:animals).where(_id: trainer1._id).to_a.first
+      end
+
+      it 'eager loads the included docs' do
+        expect(eager.animals._loaded).to eq(animal1._id => animal1)
+        expect(eager.animals).to eq [animal1]
+      end
+    end
   end
 end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -114,55 +113,86 @@ describe Mongoid::Association::Referenced::HasMany::Enumerable do
 
   describe "#===" do
 
-    let(:enumerable) do
-      described_class.new([])
-    end
+    let(:data) { [] }
 
-    context "when compared to an array class" do
+    shared_examples 'standard library-compatible enumerable' do
+      context "when compared to an array class" do
 
-      it "returns true" do
-        expect(enumerable === Array).to be true
+        it "returns false" do
+          expect(enumerable === Array).to be false
+        end
       end
-    end
 
-    context "when compared to an enumerable class" do
+      context "when compared to an enumerable class" do
 
-      it "returns true" do
-        expect(enumerable === described_class).to be true
+        it "returns false" do
+          expect(enumerable === described_class).to be false
+        end
       end
-    end
 
-    context "when compared to a different class" do
+      context "when compared to a different class" do
 
-      it "returns false" do
-        expect(enumerable === Mongoid::Document).to be false
+        it "returns false" do
+          expect(enumerable === Mongoid::Document).to be false
+        end
       end
-    end
 
-    context "when compared to an array instance" do
+      context "when compared to an array instance" do
 
-      context "when the entries are equal" do
+        context "when the entries are equal" do
 
-        let(:other) do
-          described_class.new([])
-        end
+          let(:data) do
+            [Post.new(id: 2)]
+          end
 
-        it "returns true" do
-          expect(enumerable === other).to be true
+          let(:other) do
+            described_class.new([Post.new(id: 2)])
+          end
+
+          it "returns true" do
+            expect(enumerable === other).to be true
+          end
         end
-      end
 
-      context "when the entries are not equal" do
+        context "when the entries are both empty" do
 
-        let(:other) do
-          described_class.new([ Band.new ])
+          let(:other) do
+            described_class.new([])
+          end
+
+          it "returns true" do
+            expect(enumerable === other).to be true
+          end
         end
 
-        it "returns false" do
-          expect(enumerable === other).to be false
+        context "when the entries are not equal" do
+
+          let(:other) do
+            described_class.new([ Band.new ])
+          end
+
+          it "returns false" do
+            expect(enumerable === other).to be false
+          end
         end
       end
     end
+
+    context 'enumerable' do
+      let(:enumerable) do
+        described_class.new(data)
+      end
+
+      include_examples 'standard library-compatible enumerable'
+    end
+
+    context 'Array instance' do
+      let(:enumerable) do
+        data
+      end
+
+      include_examples 'standard library-compatible enumerable'
+    end
   end
 
   describe "#<<" do
@@ -420,7 +450,6 @@ describe Mongoid::Association::Referenced::HasMany::Enumerable do
       end
 
       context "when an argument is given" do
-        ruby_version_gte '2.5'
 
         it "returns true when the argument is true" do
           expect(enumerable.any?(Post)).to be true
@@ -432,7 +461,6 @@ describe Mongoid::Association::Referenced::HasMany::Enumerable do
       end
 
       context "when both an argument and a block are given" do
-        ruby_version_gte '2.5'
 
         it "gives precedence to the pattern" do
           expect(
@@ -492,7 +520,6 @@ describe Mongoid::Association::Referenced::HasMany::Enumerable do
       end
 
       context "when an argument is given" do
-        ruby_version_gte '2.5'
 
         it "returns true when the argument is true" do
           expect(enumerable.any?(Post)).to be true
@@ -504,7 +531,6 @@ describe Mongoid::Association::Referenced::HasMany::Enumerable do
       end
 
       context "when both an argument and a block are given" do
-        ruby_version_gte '2.5'
 
         it "gives precedence to the pattern" do
           expect(

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

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