mongoid 7.2.1 → 9.0.0

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 class HomCollege
   include Mongoid::Document
@@ -19,6 +19,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
@@ -70,3 +78,37 @@ class HomBusDriver
 
   # 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,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -24,7 +24,7 @@ describe Mongoid::Association::Referenced::HasOne do
       # has a default value specified in the model
       expect do
         accreditation.year
-      end.to raise_error(ActiveModel::MissingAttributeError)
+      end.to raise_error(Mongoid::Errors::AttributeNotLoaded)
       expect(legislator.attributes.keys).to eq(['_id', 'degree'])
     end
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './has_one_models'
@@ -487,6 +487,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

data/spec/mongoid/association/reflections_spec.rb

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

data/spec/mongoid/association/syncable_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 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 +111,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 +122,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 +143,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 +154,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 +176,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 +193,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 +225,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 +246,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 +286,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 +311,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 +343,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 +364,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 +396,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 +417,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 +458,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 +467,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 +482,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 +490,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,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/atomic/modifiers_spec.rb

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

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

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

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

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

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

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

data/spec/mongoid/atomic/paths_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -113,10 +113,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 +150,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
@@ -278,7 +330,6 @@ describe Mongoid::Atomic::Paths do
       context "assignment after saving" do
 
         it "correctly sets the association for the embedded class" do
-          pending 'MONGOID-5039'
 
           customer.home_address = CustomerAddress.new
           customer.work_address = CustomerAddress.new
@@ -295,19 +346,6 @@ describe Mongoid::Atomic::Paths do
           expect(customer.work_address.atomic_path).to eq("work_address")
         end
       end
-
-      context "inverse assignment" do
-
-        it "correctly returns the path for each embedded class" do
-          pending 'MONGOID-5039'
-
-          customer.work_address = CustomerAddress.new
-          customer.work_address.addressable = customer
-
-          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

data/spec/mongoid/atomic_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -8,15 +8,15 @@ describe Mongoid::Atomic do
   describe "#add_atomic_pull" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:address) do
-      person.addresses.create
+      person.addresses.create!
     end
 
     let(:location) do
-      address.locations.create
+      address.locations.create!
     end
 
     before do
@@ -60,7 +60,7 @@ describe Mongoid::Atomic do
     context "when the document is persisted" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when the document is modified" do
@@ -112,7 +112,7 @@ describe Mongoid::Atomic do
         context "when an existing embeds many gets modified" do
 
           let!(:address) do
-            person.addresses.create(street: "Oxford St")
+            person.addresses.create!(street: "Oxford St")
           end
 
           before do
@@ -140,7 +140,7 @@ describe Mongoid::Atomic do
           context "when an existing 2nd level embedded child gets modified" do
 
             let!(:location) do
-              address.locations.create(name: "Home")
+              address.locations.create!(name: "Home")
             end
 
             before do
@@ -387,5 +387,27 @@ describe Mongoid::Atomic do
         end
       end
     end
+
+    context "when adding embedded documents with nil ids" do
+      let(:account) { Account.create!(name: "acc") }
+
+      before do
+        account.memberships.build(id: nil, name: "m1")
+        account.memberships.build(id: nil, name: "m2")
+      end
+
+      it "has the correct updates" do
+        account.atomic_updates.should == {
+          "$push" => {
+            "memberships" => {
+              "$each" => [
+                { "_id" => nil, "name" => "m1" },
+                { "_id" => nil, "name" => "m2" }
+              ]
+            }
+          }
+        }
+      end
+    end
   end
 end

data/spec/mongoid/atomic_update_preparer_spec.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Mongoid::AtomicUpdatePreparer do
+  describe '#prepare' do
+    let(:prepared) { described_class.prepare(hash, Band) }
+
+    context 'when the hash already contains $set' do
+      context 'when the $set is first' do
+        let(:hash) do
+          { '$set' => { name: 'Tool' }, likes: 10, '$inc' => { plays: 1 } }
+        end
+
+        it 'moves the non hash values under the provided key' do
+          expect(prepared).to eq(
+            '$set' => { 'name' => 'Tool', 'likes' => 10 },
+            '$inc' => { 'plays' => 1 }
+          )
+        end
+      end
+
+      context 'when the $set is not first' do
+        let(:hash) do
+          { likes: 10, '$inc' => { plays: 1 }, '$set' => { name: 'Tool' } }
+        end
+
+        it 'moves the non hash values under the provided key' do
+          expect(prepared).to eq(
+            '$set' => { 'likes' => 10, 'name' => 'Tool' },
+            '$inc' => { 'plays' => 1 }
+          )
+        end
+      end
+    end
+
+    context 'when the hash does not contain $set' do
+      let(:hash) do
+        { likes: 10, '$inc' => { plays: 1 }, name: 'Tool' }
+      end
+
+      it 'moves the non hash values under the provided key' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10, 'name' => 'Tool' },
+          '$inc' => { 'plays' => 1 }
+        )
+      end
+    end
+
+    context 'when the hash contains $rename' do
+      let(:hash) { { likes: 10, '$rename' => { old: 'new' } } }
+
+      it 'preserves the $rename operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$rename' => { 'old' => 'new' }
+        )
+      end
+    end
+
+    context 'when the hash contains $addToSet' do
+      let(:hash) { { likes: 10, '$addToSet' => { list: 'new' } } }
+
+      it 'preserves the $addToSet operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$addToSet' => { 'list' => 'new' }
+        )
+      end
+    end
+
+    context 'when the hash contains $push' do
+      let(:hash) { { likes: 10, '$push' => { list: 14 } } }
+
+      it 'preserves the $push operator' do
+        expect(prepared).to eq(
+          '$set' => { 'likes' => 10 },
+          '$push' => { 'list' => 14 }
+        )
+      end
+    end
+  end
+end