mongoid 7.5.0 → 8.0.2

data/spec/integration/callbacks_models.rb

@@ -1,12 +1,17 @@
 class Galaxy
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   field :age, type: Integer
-
+  field :was_touched, type: Mongoid::Boolean, default: false
   before_validation :set_age
 
   embeds_many :stars
 
+  set_callback(:touch, :before) do |document|
+    self.was_touched = true
+  end
+
   private
 
   def set_age
@@ -16,15 +21,21 @@ end
 
 class Star
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embedded_in :galaxy
 
   field :age, type: Integer
+  field :was_touched_after_parent, type: Mongoid::Boolean, default: false
 
   before_validation :set_age
 
   embeds_many :planets
 
+  set_callback(:touch, :before) do |document|
+    self.was_touched_after_parent = true if galaxy.was_touched
+  end
+
   private
 
   def set_age
@@ -34,13 +45,19 @@ end
 
 class Planet
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embedded_in :star
 
   field :age, type: Integer
+  field :was_touched_after_parent, type: Mongoid::Boolean, default: false
 
   before_validation :set_age
 
+  set_callback(:touch, :before) do |document|
+    self.was_touched_after_parent = true if star.was_touched_after_parent
+  end
+
   private
 
   def set_age
@@ -59,3 +76,80 @@ class Emission
 
   attr_reader :previous
 end
+
+class Country
+  include Mongoid::Document
+
+  field :age
+
+  before_validation :set_age
+
+  embeds_one :president
+
+  private
+
+  def set_age
+    self.age ||= 245
+  end
+end
+
+class President
+  include Mongoid::Document
+
+  embedded_in :country
+
+  field :age
+
+  field :name
+
+  before_validation :set_age
+
+  embeds_one :first_spouse
+
+  private
+
+  def set_age
+    self.age ||= 79
+  end
+end
+
+class FirstSpouse
+  include Mongoid::Document
+
+  embedded_in :president
+
+  field :name
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  private
+
+  def set_age
+    self.age ||= 70
+  end
+end
+
+class Architect
+  include Mongoid::Document
+
+  has_and_belongs_to_many :buildings, after_add: :after_add_callback,
+    after_remove: :after_remove_callback, dependent: :nullify
+
+  field :after_add_num_buildings, type: Integer
+  field :after_remove_num_buildings, type: Integer
+
+  def after_add_callback(obj)
+    self.after_add_num_buildings = self.buildings.length
+  end
+
+  def after_remove_callback(obj)
+    self.after_remove_num_buildings = self.buildings.length
+  end
+end
+
+class Building
+  include Mongoid::Document
+
+  has_and_belongs_to_many :architects, dependent: :nullify
+end

data/spec/integration/callbacks_spec.rb

@@ -188,8 +188,6 @@ describe 'callbacks integration tests' do
           end
 
           it 'persists the attribute value' do
-            pending 'MONGOID-4476'
-
             Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
           end
         end
@@ -211,18 +209,242 @@ describe 'callbacks integration tests' do
         end
       end
     end
+
+    context 'when updating top-level embeds_one document via #update_attributes!' do
+      let!(:instance) do
+        Country.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.president.age.should == 79
+          end
+
+          it 'persists the attribute value' do
+            Country.find(instance.id).president.age.should == 79
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes!(president: President.new)
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes!(president: { name: "Abraham Lincoln" })
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.president.first_spouse.age.should == 70
+          end
+
+          it 'persists the attribute value' do
+            Country.find(instance.id).president.first_spouse.age.should == 70
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes!(president: President.new(first_spouse: FirstSpouse.new))
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes!(president: { first_spouse: { name: "Mary Todd Lincoln" } })
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
   end
 
   context 'attribute_was value in after_save callback' do
     let!(:obj) { Emission.create!(frequency: 1) }
 
     it 'is set to the new value' do
-      pending 'MONGOID-5104'
-
       obj.frequency = 2
       obj.save!
 
       obj.previous.should == 2
     end
   end
+
+  context 'atomic_selector in after_save callback' do
+    let(:name) do
+      'Alice'
+    end
+
+    let(:new_name) do
+      'Bob'
+    end
+
+    class CBIntSpecProfile
+      include Mongoid::Document
+      field :name, type: String
+      shard_key :name
+
+      attr_reader :atomic_selector_in_after_save
+
+      after_save do |document|
+        @atomic_selector_in_after_save = document.atomic_selector
+      end
+    end
+
+    it 'has updated attributes' do
+      profile = CBIntSpecProfile.create!(name: name)
+      profile.name = new_name
+      profile.save!
+      expect(
+        profile.atomic_selector_in_after_save['name']
+      ).to eq(new_name)
+    end
+  end
+
+  context "When touching an embedded document" do
+    let(:planet) { Planet.new }
+    let(:star) { Star.new }
+    let(:galaxy) { Galaxy.create! }
+
+    before do
+      star.planets << planet
+      galaxy.stars << star
+    end
+
+    it "the parent document touch callback gets called before the child" do
+      planet.touch
+      expect(galaxy.was_touched).to be true
+      expect(star.was_touched_after_parent).to be true
+      expect(planet.was_touched_after_parent).to be true
+    end
+  end
+
+  context "when reloading has_and_belongs_to_many after_save and after_remove callbacks" do
+
+    let(:architect) { Architect.create }
+
+    let(:b1) { Building.create }
+
+    let(:b2) { Building.create }
+
+    let(:b3) { Building.create }
+
+    it "counts added/removed buildings correctly" do
+      architect.buildings << b1
+      expect(architect.after_add_num_buildings).to eq(1)
+
+      architect.reload
+      architect.buildings << b2
+      expect(architect.after_add_num_buildings).to eq(2)
+
+      architect.reload
+      architect.buildings << b3
+      expect(architect.after_add_num_buildings).to eq(3)
+
+      architect.reload
+      architect.buildings.delete(b3)
+      expect(architect.after_remove_num_buildings).to eq(2)
+    end
+  end
+
+  context '_previously was methods in after_save callback' do
+    let(:title) do
+      "Title"
+    end
+
+    let(:updated_title) do
+      "Updated title"
+    end
+
+    let(:age) do
+      10
+    end
+
+    it do
+      class PreviouslyWasPerson
+        include Mongoid::Document
+
+        field :title, type: String
+        field :age, type: Integer
+
+        attr_reader :after_save_vals
+
+        set_callback :save, :after do |doc|
+          @after_save_vals ||= []
+          @after_save_vals << [doc.title_previously_was, doc.age_previously_was]
+        end
+      end
+
+      person = PreviouslyWasPerson.create!(title: title, age: age)
+      person.title = updated_title
+      person.save!
+      expect(person.after_save_vals).to eq([
+        # Field values are nil before create
+        [nil, nil],
+        [title, age]
+        ])
+    end
+  end
+
+  context 'previously_new_record? in after_save' do
+    it do
+      class PreviouslyNewRecordPerson
+        include Mongoid::Document
+
+        field :title, type: String
+        field :age, type: Integer
+
+        attr_reader :previously_new_record_value
+
+        set_callback :save, :after do |doc|
+          @previously_new_record_value = doc.previously_new_record?
+        end
+      end
+
+      person = PreviouslyNewRecordPerson.create!(title: "title", age: 55)
+      expect(person.previously_new_record_value).to be_truthy
+      person.title = "New title"
+      person.save!
+      expect(person.previously_new_record_value).to be_falsey
+    end
+  end
+
+  context 'previously_persisted? in after_destroy' do
+    it do
+      class PreviouslyPersistedPerson
+        include Mongoid::Document
+
+        field :title, type: String
+        field :age, type: Integer
+
+        attr_reader :previously_persisted_value
+
+        set_callback :destroy, :after do |doc|
+          @previously_persisted_value = doc.previously_persisted?
+        end
+      end
+
+      unsaved_person = PreviouslyPersistedPerson.new(title: "title", age: 55)
+      unsaved_person.destroy
+      expect(unsaved_person.previously_persisted_value).to be_falsey
+
+      saved_person = PreviouslyPersistedPerson.create(title: "title", age: 55)
+      saved_person.destroy
+      expect(saved_person.previously_persisted_value).to be_truthy
+    end
+  end
 end

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