mongoid 7.1.1 → 8.1.0

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class HomCollege
   include Mongoid::Document
 
   has_one :accreditation, class_name: 'HomAccreditation'
 
+  # The address is added with different dependency mechanisms in tests:
+  #has_one :address, class_name: 'HomAddress', dependent: :destroy
+
   field :state, type: String
 end
 
@@ -16,6 +18,14 @@ class HomAccreditation
 
   field :degree, type: String
   field :year, type: Integer, default: 2012
+
+  def format
+    'fmt'
+  end
+
+  def price
+    42
+  end
 end
 
 class HomAccreditation::Child
@@ -24,6 +34,12 @@ class HomAccreditation::Child
   belongs_to :hom_college
 end
 
+class HomAddress
+  include Mongoid::Document
+
+  belongs_to :college, class_name: 'HomCollege'
+end
+
 module HomNs
   class PrefixedParent
     include Mongoid::Document
@@ -49,3 +65,49 @@ class HomPolymorphicChild
 
   belongs_to :p_parent, polymorphic: true
 end
+
+class HomBus
+  include Mongoid::Document
+
+  has_one :driver, class_name: 'HomBusDriver'
+end
+
+class HomBusDriver
+  include Mongoid::Document
+
+  # 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
+
+class HomPost
+  include Mongoid::Document
+
+  field :title, type: String
+
+  has_one :comment, inverse_of: :post, class_name: 'HomComment'
+end
+
+class HomComment
+  include Mongoid::Document
+
+  field :content, type: String
+
+  belongs_to :post, inverse_of: :comment, optional: true, class_name: 'HomPost'
+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
@@ -748,7 +768,7 @@ describe Mongoid::Association::Referenced::HasOne do
     end
   end
 
-  describe '##inverse' do
+  describe '#inverse' do
 
     context 'when polymorphic' do
 

data/spec/mongoid/association/reflections_spec.rb

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

data/spec/mongoid/association/syncable_spec.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
 describe "Syncable Association" do
+  config_override :raise_not_found_error, true
 
   before(:all) do
-    Mongoid.raise_not_found_error = true
     Person._synced(Person.relations["preferences"])
     Person.has_and_belongs_to_many :preferences
     Preference.has_and_belongs_to_many :people
@@ -111,7 +110,7 @@ describe "Syncable Association" do
       context "and is Persisted" do
 
         it "is able to :save" do
-          expect(account.save).to be true
+          expect(account.save!).to be true
         end
       end
 
@@ -122,7 +121,7 @@ describe "Syncable Association" do
         end
 
         it "is able to :save" do
-          expect(account.save).to be true
+          expect(account.save!).to be true
         end
       end
     end
@@ -143,7 +142,7 @@ describe "Syncable Association" do
     end
 
     it "does not attempt synchronization" do
-      expect { article.save }.to_not raise_error
+      expect { article.save! }.to_not raise_error
     end
 
     it "sets the one side of the relation" do
@@ -154,11 +153,11 @@ describe "Syncable Association" do
   context "when first setting by the relation itself" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     before do
@@ -176,12 +175,12 @@ describe "Syncable Association" do
     context "when subsequently setting with keys" do
 
       let!(:two) do
-        Preference.create(name: "two")
+        Preference.create!(name: "two")
       end
 
       before do
         person.preference_ids << two.id
-        person.save
+        person.save!
       end
 
       it "sets the inverse foreign key" do
@@ -193,15 +192,15 @@ describe "Syncable Association" do
   context "when setting new ids" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     let!(:two) do
-      Preference.create(name: "two")
+      Preference.create!(name: "two")
     end
 
     before do
@@ -225,7 +224,7 @@ describe "Syncable Association" do
       context "when validation passes" do
 
         before do
-          person.save
+          person.save!
         end
 
         it "persists the foreign_key" do
@@ -246,19 +245,19 @@ describe "Syncable Association" do
   context "when replacing ids" do
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     let!(:two) do
-      Preference.create(name: "two")
+      Preference.create!(name: "two")
     end
 
     let!(:person) do
-      Person.create(preference_ids: [ one.id, two.id ])
+      Person.create!(preference_ids: [ one.id, two.id ])
     end
 
     let!(:three) do
-      Preference.create(name: "three")
+      Preference.create!(name: "three")
     end
 
     before do
@@ -286,7 +285,7 @@ describe "Syncable Association" do
       context "when validation passes" do
 
         before do
-          person.save
+          person.save!
         end
 
         it "persists the foreign_key" do
@@ -311,15 +310,15 @@ describe "Syncable Association" do
   context "when setting ids to empty" do
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     let!(:two) do
-      Preference.create(name: "two")
+      Preference.create!(name: "two")
     end
 
     let!(:person) do
-      Person.create(preference_ids: [ one.id, two.id ])
+      Person.create!(preference_ids: [ one.id, two.id ])
     end
 
     before do
@@ -343,7 +342,7 @@ describe "Syncable Association" do
       context "when validation passes" do
 
         before do
-          person.save
+          person.save!
         end
 
         it "persists the foreign_key" do
@@ -364,15 +363,15 @@ describe "Syncable Association" do
   context "when setting ids to nil" do
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     let!(:two) do
-      Preference.create(name: "two")
+      Preference.create!(name: "two")
     end
 
     let!(:person) do
-      Person.create(preference_ids: [ one.id, two.id ])
+      Person.create!(preference_ids: [ one.id, two.id ])
     end
 
     before do
@@ -396,7 +395,7 @@ describe "Syncable Association" do
       context "when validation passes" do
 
         before do
-          person.save
+          person.save!
         end
 
         it "persists the foreign_key" do
@@ -417,15 +416,15 @@ describe "Syncable Association" do
   context "when destroying" do
 
     let!(:one) do
-      Preference.create(name: "one")
+      Preference.create!(name: "one")
     end
 
     let!(:two) do
-      Preference.create(name: "two")
+      Preference.create!(name: "two")
     end
 
     let!(:person) do
-      Person.create(preferences: [ one, two ])
+      Person.create!(preferences: [ one, two ])
     end
 
     context "when destroying the parent" do
@@ -458,7 +457,7 @@ describe "Syncable Association" do
   context "when appending an existing document to a new one" do
 
     let!(:persisted) do
-      Tag.create
+      Tag.create!
     end
 
     let(:article) do
@@ -467,7 +466,7 @@ describe "Syncable Association" do
 
     before do
       article.tags << persisted
-      article.save
+      article.save!
     end
 
     it "persists the foreign key on the inverse" do
@@ -482,7 +481,7 @@ describe "Syncable Association" do
   context "when the document has an ordering default scope" do
 
     let!(:dog) do
-      Dog.create(name: "Fido")
+      Dog.create!(name: "Fido")
     end
 
     let!(:breed) do
@@ -490,11 +489,25 @@ describe "Syncable Association" do
     end
 
     before do
-      breed.save
+      breed.save!
     end
 
     it "adds the id to the inverse relation" do
       expect(dog.reload.breed_ids).to eq([ breed.id ])
     end
   end
+
+  context "when setting one document on unpersisted HABTM association" do
+    let!(:dog) { Dog.create! }
+    let!(:breed) { Breed.new }
+
+    before do
+      breed.dogs = Dog.all
+      breed.save!
+    end
+
+    it "sets the foreign key on the other side" do
+      expect(dog.reload.breed_ids).to eq([breed._id])
+    end
+  end
 end

data/spec/mongoid/association_spec.rb

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

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -9,6 +8,26 @@ describe Mongoid::Atomic::Modifiers do
     described_class.new
   end
 
+  describe "#push_conflict?" do
+    let(:result) { modifiers.send(:push_conflict?, field) }
+
+    context 'for embeds many subdocument' do
+      context 'when another field on subdocument is being set' do
+        before do
+          modifiers.set('foo.0.a' => 1)
+        end
+
+        let(:field) { 'foo' }
+
+        it 'does not conflict' do
+          pending 'https://jira.mongodb.org/browse/MONGOID-4982'
+
+          result.should be false
+        end
+      end
+    end
+  end
+
   describe "#add_to_set" do
 
     context "when the unique adds are empty" do
@@ -344,6 +363,33 @@ describe Mongoid::Atomic::Modifiers do
         end
       end
     end
+
+    context 'when there is another operation on a sibling of a key which is nested' do
+
+      let(:first_op) do
+        { "addresses.0.name" => 'test' }
+      end
+
+      let(:push_op) do
+        { "addresses.0.locations" => { "street" => "Oxford St" } }
+      end
+
+      before do
+        modifiers.set(first_op)
+        modifiers.push(push_op)
+      end
+
+      it "does not conflict and adds push to top level" do
+        pending 'https://jira.mongodb.org/browse/MONGOID-4982'
+
+        modifiers.should == {
+          '$set' => { "addresses.0.name" => 'test' },
+          '$push' => {"addresses.0.locations" => {'$each' => [
+            { "street" => "Oxford St" },
+          ]}},
+        }
+      end
+    end
   end
 
   describe "#set" do

data/spec/mongoid/atomic/paths/embedded/many_spec.rb

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

data/spec/mongoid/atomic/paths/embedded/one_spec.rb

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

data/spec/mongoid/atomic/paths/root_spec.rb

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

data/spec/mongoid/atomic/paths_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -113,10 +112,33 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the association with id.atomic_selector" do
-        expect(address.atomic_selector).to eq(
-          { "_id" => person.id, "addresses._id" => address.id }
-        )
+      context 'when the parent is persisted' do
+
+        let(:person) do
+          Person.create!
+        end
+
+        before do
+          person.should be_persisted
+        end
+
+        it "returns the association with id.atomic_selector" do
+          expect(address.atomic_selector).to eq(
+            { "_id" => person.id, "addresses._id" => address.id }
+          )
+        end
+      end
+
+      context 'when the parent is not persisted' do
+        before do
+          person.should be_new_record
+        end
+
+        it "returns the association with id.atomic_selector" do
+          expect(address.atomic_selector).to eq(
+            { "_id" => person.id, "addresses._id" => address.id }
+          )
+        end
       end
     end
 
@@ -127,14 +149,43 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the JSON notation to the document with ids" do
-        expect(location.atomic_selector).to eq(
-          {
-            "_id" => person.id,
-            "addresses._id" => address.id,
-            "addresses.locations._id" => location.id
-          }
-        )
+      context 'when the parent is persisted' do
+
+        let(:person) do
+          Person.create!
+        end
+
+        before do
+          person.should be_persisted
+        end
+
+        it "returns the JSON notation to the document with ids" do
+          expect(location.atomic_selector).to eq(
+            {
+              "_id" => person.id,
+              "addresses._id" => address.id,
+              "addresses.0.locations._id" => location.id
+            }
+          )
+        end
+      end
+
+      context 'when the parent is not persisted' do
+        before do
+          person.should be_new_record
+        end
+
+        it "returns the JSON notation to the document with ids" do
+          expect(location.atomic_selector).to eq(
+            {
+              "_id" => person.id,
+              "addresses._id" => address.id,
+              # This condition is technically acceptable for finds
+              # but probably won't work for modifications of 'locations'.
+              "addresses.locations._id" => location.id
+            }
+          )
+        end
       end
     end
   end
@@ -268,5 +319,32 @@ describe Mongoid::Atomic::Paths do
         end
       end
     end
+
+    context "when the same class is embedded in multiple associations" do
+
+      let(:customer) do
+        Customer.new
+      end
+
+      context "assignment after saving" do
+
+        it "correctly sets the association for the embedded class" do
+
+          customer.home_address = CustomerAddress.new
+          customer.work_address = CustomerAddress.new
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+
+          customer.save!
+
+          customer.home_address = CustomerAddress.new
+          customer.work_address = CustomerAddress.new
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+        end
+      end
+    end
   end
 end