mongoid 7.1.1 → 8.1.0

data/spec/mongoid/association/embedded/embeds_many_models.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class EmmCongress
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embeds_many :legislators, class_name: 'EmmLegislator'
 
@@ -18,6 +18,25 @@ class EmmLegislator
   field :b, type: Integer, default: 0
 end
 
+# Models with associations with :class_name as a :: prefixed string
+
+class EmmCcCongress
+  include Mongoid::Document
+
+  embeds_many :legislators, class_name: '::EmmCcLegislator'
+
+  field :name, type: String
+end
+
+class EmmCcLegislator
+  include Mongoid::Document
+
+  embedded_in :congress, class_name: '::EmmCcCongress'
+
+  field :a, type: Integer, default: 0
+  field :b, type: Integer, default: 0
+end
+
 class EmmManufactory
   include Mongoid::Document
 
@@ -32,3 +51,177 @@ class EmmProduct
 
   field :name, type: String
 end
+
+class EmmInner
+  include Mongoid::Document
+
+  embeds_many :friends, :class_name => self.name, :cyclic => true
+  embedded_in :parent, :class_name => self.name, :cyclic => true
+
+  field :level, :type => Integer
+end
+
+class EmmOuter
+  include Mongoid::Document
+  embeds_many :inners, class_name: 'EmmInner'
+
+  field :level, :type => Integer
+end
+
+class EmmCustomerAddress
+  include Mongoid::Document
+
+  embedded_in :addressable, polymorphic: true, inverse_of: :work_address
+end
+
+class EmmFriend
+  include Mongoid::Document
+
+  embedded_in :befriendable, polymorphic: true
+end
+
+class EmmCustomer
+  include Mongoid::Document
+
+  embeds_one :home_address, class_name: 'EmmCustomerAddress', as: :addressable
+  embeds_one :work_address, class_name: 'EmmCustomerAddress', as: :addressable
+
+  embeds_many :close_friends, class_name: 'EmmFriend', as: :befriendable
+  embeds_many :acquaintances, class_name: 'EmmFriend', as: :befriendable
+end
+
+class EmmUser
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  embeds_many :orders, class_name: 'EmmOrder'
+end
+
+class EmmOrder
+  include Mongoid::Document
+
+  field :sku
+  field :amount, type: Integer
+
+  embedded_in :user, class_name: 'EmmUser'
+end
+
+module EmmSpec
+  # There is also a top-level Car class defined.
+  class Car
+    include Mongoid::Document
+
+    embeds_many :doors
+  end
+
+  class Door
+    include Mongoid::Document
+
+    embedded_in :car
+  end
+
+  class Tank
+    include Mongoid::Document
+
+    embeds_many :guns
+    embeds_many :emm_turrets
+    # This association references a model that is not in our module,
+    # and it does not define class_name hence Mongoid will not be able to
+    # figure out the inverse for this association.
+    embeds_many :emm_hatches
+
+    # class_name is intentionally unqualified, references a class in the
+    # same module. Rails permits class_name to be unqualified like this.
+    embeds_many :launchers, class_name: 'Launcher'
+  end
+
+  class Gun
+    include Mongoid::Document
+
+    embedded_in :tank
+  end
+
+  class Launcher
+    include Mongoid::Document
+
+    # class_name is intentionally unqualified.
+    embedded_in :tank, class_name: 'Tank'
+  end
+end
+
+# This is intentionally on top level.
+class EmmTurret
+  include Mongoid::Document
+
+  embedded_in :tank, class_name: 'EmmSpec::Tank'
+end
+
+# This is intentionally on top level.
+class EmmHatch
+  include Mongoid::Document
+
+  # No :class_name option on this association intentionally.
+  embedded_in :tank
+end
+
+class EmmPost
+  include Mongoid::Document
+
+  embeds_many :company_tags, class_name: "EmmCompanyTag"
+  embeds_many :user_tags, class_name: "EmmUserTag"
+end
+
+
+class EmmCompanyTag
+  include Mongoid::Document
+
+  field :title, type: String
+
+  embedded_in :post, class_name: "EmmPost"
+end
+
+
+class EmmUserTag
+  include Mongoid::Document
+
+  field :title, type: String
+
+  embedded_in :post, class_name: "EmmPost"
+end
+
+class EmmSchool
+  include Mongoid::Document
+
+  embeds_many :students, class_name: "EmmStudent"
+
+  field :name, type: :string
+
+  validates :name, presence: true
+end
+
+class EmmStudent
+  include Mongoid::Document
+
+  embedded_in :school, class_name: "EmmSchool"
+end
+
+class EmmParent
+  include Mongoid::Document
+  embeds_many :blocks, class_name: "EmmBlock"
+end
+
+class EmmBlock
+  include Mongoid::Document
+  field :name, type: String
+  embeds_many :children, class_name: "EmmChild"
+end
+
+class EmmChild
+  include Mongoid::Document
+  embedded_in :block, class_name: "EmmBlock"
+
+  field :size, type: Integer
+  field :order, type: Integer
+  field :t
+end
+

data/spec/mongoid/association/embedded/embeds_many_query_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './embeds_many_models'
@@ -48,5 +47,17 @@ describe Mongoid::Association::Embedded::EmbedsMany do
         expect(patient.addresses.first.number).to eq(123)
       end
     end
+
+    context "when excluding the relation" do
+      let(:congress) do
+        EmmCongress.where(name: 'foo').only(:_id).first
+      end
+
+      it 'raises a MissingAttributeError' do
+        expect do
+          congress.legislators
+        end.to raise_error(ActiveModel::MissingAttributeError)
+      end
+    end
   end
 end

data/spec/mongoid/association/embedded/embeds_many_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require_relative 'embeds_many_models'
 
 describe Mongoid::Association::Embedded::EmbedsMany do
 
@@ -649,6 +649,16 @@ describe Mongoid::Association::Embedded::EmbedsMany do
       it 'returns the class name option' do
         expect(association.klass).to eq(_class)
       end
+
+      context 'when the class name is prefixed with ::' do
+        let(:options) do
+          { class_name: '::OtherEmbeddedObject' }
+        end
+
+        it 'returns the class name option' do
+          expect(association.klass).to eq(_class)
+        end
+      end
     end
 
     context 'when the class_name option is not specified' do
@@ -852,4 +862,71 @@ describe Mongoid::Association::Embedded::EmbedsMany do
       expect(association.path(double( :_parent => true))).to be_a(Mongoid::Atomic::Paths::Embedded::Many)
     end
   end
+
+  context "when the document and embedded document's klass is in a submodule" do
+
+    let(:tank) { EmmSpec::Tank.create! }
+    let(:gun) { tank.guns.create! }
+
+    let(:inverse_assoc) { gun._association.inverse_association }
+
+    it "has the correct inverses" do
+      pending 'MONGOID-5080'
+
+      inverse_assoc.should be_a(Mongoid::Association::Embedded::EmbeddedIn)
+      inverse_assoc.name.should == :tank
+    end
+
+    context "when embedded association is not namespaced but has class_name" do
+
+      let(:turret) { tank.emm_turrets.create! }
+
+      let(:inverse_assoc) { turret._association.inverse_association }
+
+      it "has the correct inverses" do
+        inverse_assoc.should be_a(Mongoid::Association::Embedded::EmbeddedIn)
+        inverse_assoc.name.should == :tank
+      end
+    end
+
+    context "when embedded association is not namespaced and lacks class_name" do
+
+      let(:hatch) { tank.emm_hatches.create! }
+
+      let(:inverse_assoc) { hatch._association.inverse_association }
+
+      it "does not find the inverse" do
+        inverse_assoc.should be nil
+      end
+    end
+
+    context "when the class names exist on top level and namespaced" do
+
+      let(:car) { EmmSpec::Car.create! }
+      let(:door) { car.doors.create! }
+
+      let(:inverse_assoc) { door._association.inverse_association }
+
+      it "has the correct inverses" do
+        pending 'MONGOID-5080'
+
+        inverse_assoc.should be_a(Mongoid::Association::Embedded::EmbeddedIn)
+        inverse_assoc.name.should == :car
+      end
+    end
+
+    context "when the association has an unqualified class_name in same module" do
+
+      let(:launcher) { tank.launchers.create! }
+
+      let(:inverse_assoc) { launcher._association.inverse_association }
+
+      it "has the correct inverses" do
+        pending 'unqualified class_name arguments do not work per MONGOID-5080'
+
+        inverse_assoc.should be_a(Mongoid::Association::Embedded::EmbeddedIn)
+        inverse_assoc.name.should == :tank
+      end
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_one/binding_spec.rb

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

data/spec/mongoid/association/embedded/embeds_one/buildable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -79,4 +78,29 @@ describe Mongoid::Association::Embedded::EmbedsOne::Buildable do
       end
     end
   end
+
+  context 'when the object is already associated with another object' do
+
+    let(:owner1) do
+      Owner.create!
+    end
+
+    let(:owner2) do
+      Owner.create!
+    end
+
+    let(:scribe) do
+      Scribe.new
+    end
+
+    before do
+      owner1.scribe = scribe
+      owner2.scribe = scribe
+    end
+
+    it 'clears the object of its previous association' do
+      expect(owner1.scribe).to be_nil
+      expect(owner2.scribe).to eq(scribe)
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_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::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:name) do
@@ -174,7 +173,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
           context "when replacing an existing document" do
 
             let(:pet_owner) do
-              PetOwner.create
+              PetOwner.create!
             end
 
             let(:pet_one) do
@@ -203,11 +202,11 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
             end
           end
         end
-        
+
         context 'when the original document does not need to be unset because it will be replaced by the $set' do
 
           let!(:pet_owner) do
-            PetOwner.create(pet: pet_one)
+            PetOwner.create!(pet: pet_one)
           end
 
           let(:pet_one) do
@@ -280,7 +279,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let(:child_shelf) do
@@ -312,7 +311,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
     context "when setting a new document multiple times in a row" do
 
       let(:parent) do
-        Parent.create
+        Parent.create!
       end
 
       before do
@@ -373,7 +372,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is persisted" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:name) do
@@ -462,7 +461,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the documents are not new records" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let(:child_shelf) do
@@ -611,7 +610,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:name) do
@@ -656,7 +655,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let!(:child_shelf) do
@@ -758,7 +757,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:name) do
@@ -779,7 +778,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the embedded document inherits its relationship" do
 
         let(:courier_job) do
-          CourierJob.create
+          CourierJob.create!
         end
 
         let(:old_child) do
@@ -848,7 +847,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when the embedded document has an array field" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:name) do
@@ -867,7 +866,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
 
       before do
         from_db.aliases = [ "Syd", "Sydney" ]
-        from_db.save
+        from_db.save!
       end
 
       it "sets the values of the array" do
@@ -883,7 +882,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedding a many under a one" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     before do
@@ -909,7 +908,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
         context "when saving the root" do
 
           before do
-            from_db.save
+            from_db.save!
           end
 
           it "persists the new document on the first save" do
@@ -923,15 +922,15 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedding a one under a many" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:address_one) do
-      person.addresses.create(street: "hobrecht")
+      person.addresses.create!(street: "hobrecht")
     end
 
     let!(:address_two) do
-      person.addresses.create(street: "kreuzberg")
+      person.addresses.create!(street: "kreuzberg")
     end
 
     context "when a parent was removed outside of mongoid" do
@@ -966,13 +965,13 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedded documents are stored without ids" do
 
     let!(:band) do
-      Band.create(name: "Moderat")
+      Band.create!(name: "Moderat")
     end
 
     before do
       band.collection.
           find(_id: band.id).
-          update_one("$set" => { label: { name: "Mute" }})
+          update_one("$set" => { label: { _id: BSON::ObjectId.new, name: "Mute" }})
     end
 
     context "when loading the documents" do
@@ -1013,9 +1012,9 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when parent validation of child is set to false" do
 
     let(:building) do
-      building = Building.create
+      building = Building.create!
       building.building_address = BuildingAddress.new
-      building.save
+      building.save!
       building.reload
     end
 
@@ -1023,4 +1022,17 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       expect(building.building_address).to be_a(BuildingAddress)
     end
   end
+
+  context "when assigning a hash" do
+    let(:building) { Building.create! }
+
+    before do
+      building.building_address = { city: "NYC" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building.building_address).to be_a(BuildingAddress)
+      expect(building.building_address.city).to eq("NYC")
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_one_dnl_models.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 # This file is added as an autoload target, but should never be actually
 # processed.

data/spec/mongoid/association/embedded/embeds_one_models.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class EomParent
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embeds_one :child, class_name: 'EomChild'
 
@@ -52,3 +52,22 @@ class EomDnlChild
   embedded_in :parent, class_name: 'EomDnlParent'
   embedded_in :missing_parent, class_name: 'EomDnlMissingParent'
 end
+
+class EomAddress
+  include Mongoid::Document
+
+  field :city, type: String
+
+  embedded_in :addressable, polymorphic: true
+end
+
+# app/models/company.rb
+class EomCompany
+  include Mongoid::Document
+
+  embeds_one :address, class_name: 'EomAddress', as: :addressable
+  accepts_nested_attributes_for :address
+
+  embeds_one :delivery_address, class_name: 'EomAddress', as: :addressable
+  accepts_nested_attributes_for :delivery_address
+end

data/spec/mongoid/association/embedded/embeds_one_query_spec.rb

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

data/spec/mongoid/association/embedded/embeds_one_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './embeds_one_models'
@@ -456,8 +455,6 @@ describe Mongoid::Association::Embedded::EmbedsOne do
             end
 
             it 'returns the inverse in an array' do
-              pending 'MONGOID-4751'
-
               inverses = association.inverses
               expect(inverses).to eq([:parent])
             end
@@ -956,4 +953,32 @@ describe Mongoid::Association::Embedded::EmbedsOne do
       expect(association.create_relation(owner, target)).to be_a(EmbeddedObject)
     end
   end
+
+  context "when multiple embeds_one associations reference the same class" do
+    let(:acme) { EomCompany.create(address: { city: 'Gotham' }, delivery_address: { city: 'Parcelville' }) }
+
+    context "when the first assignment is modified" do
+      before do
+        acme.update(address: EomAddress.new(city: 'Bigville'))
+        acme.reload
+      end
+
+      it "updates the correct association" do
+        expect(acme.address.city).to eq("Bigville")
+        expect(acme.delivery_address.city).to eq("Parcelville")
+      end
+    end
+
+    context "when the second assignment is modified" do
+      before do
+        acme.update(delivery_address: EomAddress.new(city: 'Bigville'))
+        acme.reload
+      end
+
+      it "updates the correct association" do
+        expect(acme.address.city).to eq("Gotham")
+        expect(acme.delivery_address.city).to eq("Bigville")
+      end
+    end
+  end
 end