mongoid 7.5.4 → 8.0.1

data/spec/integration/criteria/range_spec.rb

@@ -7,11 +7,15 @@ describe 'Queries with Range criteria' do
   let(:now_in_zone) { now_utc.in_time_zone('Asia/Tokyo') }
   let(:today) { Date.new(2020, 1, 1) }
 
+  let(:labels) do
+    [ Label.new(age: 12), Label.new(age: 16) ]
+  end
+
   let!(:band1) { Band.create!(likes: 0, rating: 0.9, founded: today, updated_at: now_utc) }
   let!(:band2) { Band.create!(likes: 1, rating: 1.0, founded: today + 1.day, updated_at: now_utc + 1.days) }
   let!(:band3) { Band.create!(likes: 2, rating: 2.9, founded: today + 2.days, updated_at: now_utc + 2.days) }
   let!(:band4) { Band.create!(likes: 3, rating: 3.0, founded: today + 3.days, updated_at: now_utc + 3.days) }
-  let!(:band5) { Band.create!(likes: 4, rating: 3.1, founded: today + 4.days, updated_at: now_utc + 4.days) }
+  let!(:band5) { Band.create!(likes: 4, rating: 3.1, founded: today + 4.days, updated_at: now_utc + 4.days, labels: labels) }
 
   context 'Range<Integer> criteria vs Integer field' do
 
@@ -262,4 +266,94 @@ describe 'Queries with Range criteria' do
       end
     end
   end
+
+  context 'Range<Integer> criteria vs embedded Integer field' do
+
+    it 'returns objects within the range' do
+      expect(Band.where("labels.age" => 10..18).to_a).to eq [band5]
+      expect(Band.where("labels.age" => 13...16).to_a).to eq []
+    end
+
+    it "does not return objects out of range" do
+      expect(Band.where("labels.age" => 13..14).to_a).to eq []
+    end
+
+    context 'endless range' do
+      ruby_version_gte '2.6'
+
+      it 'returns all objects above the value' do
+        expect(Band.where("labels.age": eval('1..')).to_a).to eq [band5]
+      end
+
+      it 'does not return the objects under the value' do
+        expect(Band.where("labels.age": eval('100..')).to_a).to eq []
+      end
+    end
+
+    context 'beginless range' do
+      ruby_version_gte '2.7'
+
+      it 'returns all objects under the value' do
+        expect(Band.where("labels.age": eval('..16')).to_a).to eq [band5]
+      end
+      it 'does not return the objects above the value' do
+        expect(Band.where("labels.age": eval('...12')).to_a).to eq []
+      end
+    end
+  end
+
+  context 'Range<Integer> criteria vs Array<Integer>' do
+    let!(:band6) { Band.create!(genres: [12, 16]) }
+
+    it 'returns objects within the range' do
+      expect(Band.where("genres" => 10..18).to_a).to eq [band6]
+    end
+
+    it "does not return objects out of range" do
+      expect(Band.where("genres" => 13..14).to_a).to eq []
+    end
+  end
+
+  context 'Range<Integer> criteria vs aliased Array<Integer>' do
+    let!(:person) { Person.create!(array: [12, 16]) }
+
+    it 'returns objects within the range' do
+      expect(Person.where("array" => 10..18).to_a).to eq [person]
+    end
+
+    it "does not return objects out of range" do
+      expect(Person.where("array" => 13..14).to_a).to eq []
+    end
+  end
+
+  context 'Range<Integer> criteria vs Array<Hash<Symbol, Integer>>' do
+    let!(:band6) { Band.create!(genres: [{x: 12}, {x: 16}]) }
+
+    it 'returns objects within the range' do
+      expect(Band.where("genres.x" => 10..18).to_a).to eq [band6]
+    end
+
+    it "does not return objects out of range" do
+      expect(Band.where("genres.x" => 13..14).to_a).to eq []
+    end
+  end
+
+  context 'Range<Integer> criteria vs aliased/doubly embedded Integer' do
+    let!(:person) do
+      Person.create!(passport: Passport.new).tap do |b|
+        b.passport.passport_pages.create!(num_stamps: 12)
+        b.passport.passport_pages.create!(num_stamps: 16)
+      end
+    end
+
+    config_override :broken_alias_handling, false
+
+    it 'returns objects within the range' do
+      expect(Person.where("passport.passport_pages.num_stamps" => 10..18).to_a).to eq [person]
+    end
+
+    it "does not return objects out of range" do
+      expect(Person.where("passport.passport_pages.num_stamps" => 13..14).to_a).to eq []
+    end
+  end
 end

data/spec/integration/discriminator_key_spec.rb

@@ -2,17 +2,17 @@
 
 require 'spec_helper'
 
-describe "#discriminator_key" do 
+describe "#discriminator_key" do
 
   context "when the discriminator key is not set on a class" do
-    let(:piano) do 
+    let(:piano) do
       Piano.new
     end
 
-    let(:guitar) do 
+    let(:guitar) do
       Guitar.new
-    end  
-    
+    end
+
     it "sets the child discriminator key to _type: Piano" do
       expect(piano._type).to eq("Piano")
     end
@@ -21,7 +21,7 @@ describe "#discriminator_key" do
       expect(guitar._type).to eq("Guitar")
     end
   end
-  
+
   context "when the discriminator key is changed in the parent" do
     before do
       Instrument.discriminator_key = "hello2"
@@ -31,11 +31,11 @@ describe "#discriminator_key" do
       Instrument.discriminator_key = nil
     end
 
-    let(:piano) do 
+    let(:piano) do
       Piano.new
     end
 
-    let(:guitar) do 
+    let(:guitar) do
       Guitar.new
     end
 
@@ -54,22 +54,24 @@ describe "#discriminator_key" do
         class GlobalIntDiscriminatorParent
           include Mongoid::Document
         end
-        
+
         class GlobalIntDiscriminatorChild < GlobalIntDiscriminatorParent
         end
-        
+
         Mongoid.discriminator_key = "test"
       end
 
       after do
         Mongoid.discriminator_key = "_type"
+        Object.send(:remove_const, :GlobalIntDiscriminatorParent)
+        Object.send(:remove_const, :GlobalIntDiscriminatorChild)
       end
 
-      let(:child) do 
+      let(:child) do
         GlobalIntDiscriminatorChild.new
       end
 
-      it "has a discriminator key _type" do 
+      it "has a discriminator key _type" do
         expect(child._type).to eq("GlobalIntDiscriminatorChild")
       end
 
@@ -85,30 +87,32 @@ describe "#discriminator_key" do
         class PreGlobalIntDiscriminatorParent
           include Mongoid::Document
         end
-        
+
         class PreGlobalIntDiscriminatorChild < PreGlobalIntDiscriminatorParent
         end
       end
 
       after do
         Mongoid.discriminator_key = "_type"
+        Object.send(:remove_const, :PreGlobalIntDiscriminatorParent)
+        Object.send(:remove_const, :PreGlobalIntDiscriminatorChild)
       end
 
-      let(:child) do 
+      let(:child) do
         PreGlobalIntDiscriminatorChild.new
       end
 
-      it "creates a field with new discriminator key" do 
+      it "creates a field with new discriminator key" do
         expect(child.test).to eq("PreGlobalIntDiscriminatorChild")
       end
-      
+
       it "does not have the default value as a field" do
         expect(defined?(child._type)).to be nil
       end
     end
   end
 
-  context "when the discriminator key is changed in the parent" do 
+  context "when the discriminator key is changed in the parent" do
     context "after child class creation" do
       before do
         class LocalIntDiscriminatorParent
@@ -121,15 +125,20 @@ describe "#discriminator_key" do
         LocalIntDiscriminatorParent.discriminator_key = "test2"
       end
 
-      let(:child) do 
+      after do
+        Object.send(:remove_const, :LocalIntDiscriminatorParent)
+        Object.send(:remove_const, :LocalIntDiscriminatorChild)
+      end
+
+      let(:child) do
         LocalIntDiscriminatorChild.new
       end
 
-      it "still has _type field in the child" do 
+      it "still has _type field in the child" do
         expect(child._type).to include("LocalIntDiscriminatorChild")
       end
 
-      it "has the new field in the child" do 
+      it "has the new field in the child" do
         expect(child.test2).to include("LocalIntDiscriminatorChild")
       end
     end
@@ -145,11 +154,16 @@ describe "#discriminator_key" do
         end
       end
 
-      let(:child) do 
+      after do
+        Object.send(:remove_const, :PreLocalIntDiscriminatorParent)
+        Object.send(:remove_const, :PreLocalIntDiscriminatorChild)
+      end
+
+      let(:child) do
         PreLocalIntDiscriminatorChild.new
       end
 
-      it "creates a new field in the child" do 
+      it "creates a new field in the child" do
         expect(child.test2).to include("PreLocalIntDiscriminatorChild")
       end
 
@@ -159,9 +173,9 @@ describe "#discriminator_key" do
     end
   end
 
-  context "when adding to the db" do 
+  context "when adding to the db" do
     context "when changing the discriminator_key" do
-      before do 
+      before do
         class DBDiscriminatorParent
           include Mongoid::Document
           self.discriminator_key = "dkey"
@@ -171,34 +185,44 @@ describe "#discriminator_key" do
         end
         DBDiscriminatorChild.create!
       end
-      
-      it "has the correct count" do 
+
+      after do
+        Object.send(:remove_const, :DBDiscriminatorParent)
+        Object.send(:remove_const, :DBDiscriminatorChild)
+      end
+
+      it "has the correct count" do
         expect(DBDiscriminatorChild.count).to eq(1)
       end
 
-      it "has the correct count in the parent" do 
+      it "has the correct count in the parent" do
         expect(DBDiscriminatorParent.count).to eq(1)
       end
     end
 
     context "when changing the discriminator_key after saving to the db" do
-      before do 
+      before do
         class DBDiscriminatorParent
           include Mongoid::Document
         end
-        
+
         class DBDiscriminatorChild < DBDiscriminatorParent
         end
         DBDiscriminatorChild.create!
         DBDiscriminatorParent.discriminator_key = "dkey2"
         DBDiscriminatorChild.create!
       end
-      
-      it "only finds the documents with the new discriminator key" do 
+
+      after do
+        Object.send(:remove_const, :DBDiscriminatorParent)
+        Object.send(:remove_const, :DBDiscriminatorChild)
+      end
+
+      it "only finds the documents with the new discriminator key" do
         expect(DBDiscriminatorChild.count).to eq(1)
       end
 
-      it "has the correct count in the parent" do 
+      it "has the correct count in the parent" do
         expect(DBDiscriminatorParent.count).to eq(2)
       end
     end
@@ -213,45 +237,51 @@ describe "#discriminator_key" do
           field :x, type: Integer
           field :y, type: Integer
           embedded_in :canvas
-  
+
           self.discriminator_key = "shape_type"
         end
-  
+
         class Example1Circle < Example1Shape
           field :radius, type: Float
         end
-  
+
         class Example1Rectangle < Example1Shape
           field :width, type: Float
           field :height, type: Float
         end
       end
-  
-      let(:rectangle) do 
+
+      after do
+        Object.send(:remove_const, :Example1Shape)
+        Object.send(:remove_const, :Example1Circle)
+        Object.send(:remove_const, :Example1Rectangle)
+      end
+
+      let(:rectangle) do
         Example1Rectangle.new
       end
-  
-      let(:circle) do 
+
+      let(:circle) do
         Example1Circle.new
       end
-  
-      it "has the new discriminator key: Rectangle" do 
+
+      it "has the new discriminator key: Rectangle" do
         expect(rectangle.shape_type).to eq("Example1Rectangle")
       end
-  
+
       it "does not have the default discriminator key: Rectangle" do
         expect(defined?(rectangle._type)).to be nil
       end
-  
-      it "has the new discriminator key: Circle" do 
+
+      it "has the new discriminator key: Circle" do
         expect(circle.shape_type).to eq("Example1Circle")
       end
-  
+
       it "does not have the default discriminator key: Circle" do
         expect(defined?(circle._type)).to be nil
       end
     end
-  
+
     context "Example 2" do
       before do
         class Example2Shape
@@ -260,91 +290,100 @@ describe "#discriminator_key" do
           field :y, type: Integer
           embedded_in :canvas
         end
-  
+
         class Example2Circle < Example2Shape
           field :radius, type: Float
         end
-  
+
         class Example2Rectangle < Example2Shape
           field :width, type: Float
           field :height, type: Float
         end
-  
+
         Example2Shape.discriminator_key = "shape_type"
       end
-  
-      let(:rectangle) do 
+
+      after do
+        Example2Shape.discriminator_key = "_type"
+        Object.send(:remove_const, :Example2Shape)
+        Object.send(:remove_const, :Example2Circle)
+        Object.send(:remove_const, :Example2Rectangle)
+      end
+
+      let(:rectangle) do
         Example2Rectangle.new
       end
-  
-      let(:circle) do 
+
+      let(:circle) do
         Example2Circle.new
       end
-  
-      it "has the new discriminator key: Rectangle" do 
+
+      it "has the new discriminator key: Rectangle" do
         expect(rectangle.shape_type).to eq("Example2Rectangle")
       end
-  
+
       it "has default discriminator key: Rectangle" do
         expect(rectangle._type).to eq("Example2Rectangle")
       end
-  
-      it "has the new discriminator key: Circle" do 
+
+      it "has the new discriminator key: Circle" do
         expect(circle.shape_type).to eq("Example2Circle")
       end
-  
+
       it "has default discriminator key: Circle" do
         expect(circle._type).to eq("Example2Circle")
       end
     end
-  
+
     context "Example 3" do
       before do
-  
         Mongoid.discriminator_key = "shape_type"
-        
+
         class Example3Shape
           include Mongoid::Document
           field :x, type: Integer
           field :y, type: Integer
           embedded_in :canvas
         end
-  
+
         class Example3Circle < Example3Shape
           field :radius, type: Float
         end
-  
+
         class Example3Rectangle < Example3Shape
           field :width, type: Float
           field :height, type: Float
         end
-  
+
       end
 
-      after do 
+      after do
         Mongoid.discriminator_key = "_type"
+        Object.send(:remove_const, :Example3Shape)
+        Object.send(:remove_const, :Example3Circle)
+        Object.send(:remove_const, :Example3Rectangle)
       end
-  
-      let(:rectangle) do 
+
+      let(:rectangle) do
         Example3Rectangle.new
       end
-  
-      let(:circle) do 
+
+      let(:circle) do
         Example3Circle.new
       end
-  
-      it "has the new discriminator key: Rectangle" do 
+
+      it "has the new discriminator key: Rectangle" do
         expect(rectangle.shape_type).to eq("Example3Rectangle")
       end
-  
+
       it "does not have the default discriminator key: Rectangle" do
         expect(defined?(rectangle._type)).to be nil
       end
-  
-      it "has the new discriminator key: Circle" do 
+
+      it "has the new discriminator key: Circle" do
         expect(circle.shape_type).to eq("Example3Circle")
       end
-  
+
       it "does not have the default discriminator key: Circle" do
         expect(defined?(circle._type)).to be nil
       end