mongoid 7.0.10 → 7.4.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require_relative './has_one_models'
 
@@ -484,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
@@ -745,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Association::Reflections do

data/spec/mongoid/association/syncable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe "Syncable Association" do
@@ -108,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
 
@@ -119,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
@@ -140,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
@@ -151,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
@@ -173,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
@@ -190,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
@@ -222,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
@@ -243,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
@@ -283,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
@@ -308,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
@@ -340,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
@@ -361,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
@@ -393,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
@@ -414,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
@@ -455,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
@@ -464,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
@@ -479,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
@@ -487,7 +489,7 @@ describe "Syncable Association" do
     end
 
     before do
-      breed.save
+      breed.save!
     end
 
     it "adds the id to the inverse relation" do

data/spec/mongoid/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Association do

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic::Modifiers do
@@ -6,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
@@ -341,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic::Paths::Embedded::Many do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic::Paths::Embedded::One do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic::Paths::Root do

data/spec/mongoid/atomic/paths_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic::Paths do
@@ -110,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
 
@@ -124,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
@@ -265,5 +319,46 @@ 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
+          pending 'MONGOID-5039'
+
+          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
+
+      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,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Atomic do
@@ -5,15 +7,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
@@ -57,7 +59,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
@@ -109,7 +111,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
@@ -137,7 +139,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
@@ -359,6 +361,29 @@ describe Mongoid::Atomic do
             )
           end
         end
+
+        context 'when adding nested embedded docs and updating top level embedded doc' do
+          let!(:truck) { Truck.create! }
+          let!(:crate) { truck.crates.create!(volume: 1) }
+
+          before do
+            truck.crates.first.volume = 2
+            truck.crates.first.toys.build(name: 'Bear')
+            truck.crates.build
+          end
+
+          it 'correctly distributes the operations' do
+            pending 'https://jira.mongodb.org/browse/MONGOID-4982'
+
+            truck.atomic_updates.should == {
+              '$set' => {'crates.0.volume' => 2},
+              '$push' => {'crates.0.toys' => {'$each' => [crate.toys.first.attributes]}},
+              conflicts: {
+                '$push' => {'crates' => {'$each' => [truck.crates.last.attributes]}},
+              },
+            }
+          end
+        end
       end
     end
   end

data/spec/mongoid/attributes/dynamic_spec.rb

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