mongoid 6.2.1 → 6.3.0

data/spec/mongoid/atomic_spec.rb

@@ -76,13 +76,13 @@ describe Mongoid::Atomic do
             person.addresses.build(street: "Oxford St")
           end
 
-          it "returns a $set and $pushAll for modifications" do
+          it "returns a $set and $push for modifications" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => { "title" => "Sir" },
-                "$pushAll" => { "addresses" => [
+                "$push" => { "addresses" => { '$each' => [
                     { "_id" => "oxford-st", "street" => "Oxford St" }
-                  ]}
+                  ]} }
               }
             )
           end
@@ -197,8 +197,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
+                      "$push" => {
+                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
                       }
                     }
                   }
@@ -215,8 +215,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
+                      "$push" => {
+                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
                       }
                     }
                   }
@@ -263,15 +263,15 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$pushAll" => {
-                        "addresses" => [{
+                      "$push" => {
+                        "addresses" => { '$each' => [{
                           "_id" => new_address.id,
                           "street" => "Another",
                           "locations" => [
                             "_id" => location.id,
                             "name" => "Home"
                           ]
-                        }]
+                        }] }
                       }
                     }
                   }
@@ -310,15 +310,15 @@ describe Mongoid::Atomic do
                   "$set" => {
                     "title" => "Sir"
                   },
-                  "$pushAll" => {
-                    "addresses" => [{
+                  "$push" => {
+                    "addresses" => { '$each' => [{
                       "_id" => new_address.id,
                       "street" => "Ipanema",
                       "locations" => [
                         "_id" => location.id,
                         "name" => "Home"
                       ]
-                    }]
+                    }] }
                   },
                   conflicts: {
                     "$set" => { "addresses.0.street"=>"Bond St" }
@@ -339,21 +339,21 @@ describe Mongoid::Atomic do
             address.locations.build(name: "Home")
           end
 
-          it "returns the proper $sets and $pushAlls for all levels" do
+          it "returns the proper $sets and $pushes for all levels" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => {
                   "title" => "Sir",
                 },
-                "$pushAll" => {
-                  "addresses" => [{
+                "$push" => {
+                  "addresses" => { '$each' => [{
                     "_id" => address.id,
                     "street" => "Another",
                     "locations" => [
                       "_id" => location.id,
                       "name" => "Home"
                     ]
-                  }]
+                  }] }
                 }
               }
             )

data/spec/mongoid/contextual/mongo_spec.rb

@@ -2094,6 +2094,41 @@ describe Mongoid::Contextual::Mongo do
         expect(context.update).to be false
       end
     end
+
+    context 'when provided array filters', if: array_filters_supported? do
+
+      before do
+        Band.delete_all
+        b = Band.new(name: 'Depeche Mode')
+        b.labels << Label.new(name: 'Warner')
+        b.labels << Label.new(name: 'Sony')
+        b.labels << Label.new(name: 'Cbs')
+        b.save
+
+        b = Band.new(name: 'FKA Twigs')
+        b.labels << Label.new(name: 'Warner')
+        b.labels << Label.new(name: 'Cbs')
+        b.save
+      end
+
+
+      let(:criteria) do
+        Band.where(name: 'Depeche Mode')
+      end
+
+      let!(:update) do
+        context.update({ '$set' => { 'labels.$[i].name' => 'Sony' } },
+                       array_filters: [{ 'i.name' => 'Cbs' }])
+      end
+
+      it 'applies the array filters' do
+        expect(Band.where(name: 'Depeche Mode').first.labels.collect(&:name)).to match_array(['Warner', 'Sony', 'Sony'])
+      end
+
+      it 'does not affect other documents' do
+        expect(Band.where(name: 'FKA Twigs').first.labels.collect(&:name)).to match_array(['Warner', 'Cbs'])
+      end
+    end
   end
 
   describe "#update_all" do
@@ -2231,6 +2266,41 @@ describe Mongoid::Contextual::Mongo do
         expect(context.update_all).to be false
       end
     end
+
+    context 'when provided array filters', if: array_filters_supported? do
+
+      before do
+        Band.delete_all
+        b = Band.new(name: 'Depeche Mode')
+        b.labels << Label.new(name: 'Warner')
+        b.labels << Label.new(name: 'Sony')
+        b.labels << Label.new(name: 'Cbs')
+        b.save
+
+        b = Band.new(name: 'FKA Twigs')
+        b.labels << Label.new(name: 'Warner')
+        b.labels << Label.new(name: 'Cbs')
+        b.save
+      end
+
+
+      let(:criteria) do
+        Band.all
+      end
+
+      let!(:update) do
+        context.update_all({ '$set' => { 'labels.$[i].name' => 'Sony' } },
+                           array_filters: [{ 'i.name' => 'Cbs' }])
+      end
+
+      it 'applies the array filters' do
+        expect(Band.where(name: 'Depeche Mode').first.labels.collect(&:name)).to match_array(['Warner', 'Sony', 'Sony'])
+      end
+
+      it 'updates all documents' do
+        expect(Band.where(name: 'FKA Twigs').first.labels.collect(&:name)).to match_array(['Warner', 'Sony'])
+      end
+    end
   end
 
   describe '#pipeline' do

data/spec/mongoid/factory_spec.rb

@@ -88,6 +88,17 @@ describe Mongoid::Factory do
         expect(person.title).to eq("Sir")
       end
     end
+
+    context "when the type is a symbol" do
+
+      let(:person) do
+        described_class.build(Person, {:_type => "Doctor"})
+      end
+
+      it "instantiates the subclass" do
+        expect(person.class).to eq(Doctor)
+      end
+    end
   end
 
   describe ".from_db" do

data/spec/mongoid/persistable/savable_spec.rb

@@ -189,8 +189,8 @@ describe Mongoid::Persistable::Savable do
               "title" => "King",
               "name.first_name" => "Ryan"
             },
-            "$pushAll"=> {
-              "addresses" => [ { "_id" => address.id, "street" => "Bond St" } ]
+            "$push"=> {
+              "addresses" =>  { '$each' => [ { "_id" => address.id, "street" => "Bond St" } ] }
             }
           })
         end

data/spec/mongoid/persistable/updatable_spec.rb

@@ -462,7 +462,7 @@ describe Mongoid::Persistable::Updatable do
 
         it "raises an error" do
           expect {
-            person.update_attributes(map: { "bad.key" => "value" })
+            person.update_attributes(map: { "$bad.key" => "value" })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -498,7 +498,7 @@ describe Mongoid::Persistable::Updatable do
 
         it "raises an error" do
           expect {
-            person.send(method, map: { "bad.key" => "value" })
+            person.send(method, map: { "$bad.key" => "value" })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end

data/spec/mongoid/persistence_context_spec.rb

@@ -70,6 +70,20 @@ describe Mongoid::PersistenceContext do
       { collection: :other }
     end
 
+    context 'when the method throws an error' do
+
+      let!(:persistence_context) do
+        described_class.set(object, options).tap do |cxt|
+          allow(cxt).to receive(:client).and_raise(Mongoid::Errors::NoClientConfig.new('default'))
+        end
+      end
+
+      it 'clears the context anyway' do
+        begin; described_class.clear(object); rescue; end
+        expect(described_class.get(object)).to be(nil)
+      end
+    end
+
     context 'when there has been a persistence context set on the current thread' do
 
       let!(:persistence_context) do

data/spec/mongoid/positional_spec.rb

@@ -17,8 +17,8 @@ describe Mongoid::Positional do
           "children.0.field" => "value",
           "children.0.children.1.children.3.field" => "value"
         },
-        "$pushAll" => {
-          "children.0.children.1.children.3.fields" => [ "value", "value" ]
+        "$push" => {
+          "children.0.children.1.children.3.fields" => { '$each' => [ "value", "value" ] }
         }
       }
     end
@@ -113,8 +113,8 @@ describe Mongoid::Positional do
               "children.$.field" => "value",
               "children.0.children.1.children.3.field" => "value"
             },
-            "$pushAll" => {
-              "children.0.children.1.children.3.fields" => [ "value", "value" ]
+            "$push" => {
+              "children.0.children.1.children.3.fields" => { '$each' => [ "value", "value" ] }
             }
           }
         end
@@ -141,8 +141,8 @@ describe Mongoid::Positional do
               "children.0.field" => "value",
               "children.0.children.1.children.3.field" => "value"
             },
-            "$pushAll" => {
-              "children.0.children.1.children.3.fields" => [ "value", "value" ]
+            "$push" => {
+              "children.0.children.1.children.3.fields" => { '$each' => [ "value", "value" ] }
             }
           }
         end
@@ -170,8 +170,8 @@ describe Mongoid::Positional do
             "children.$.field" => "value",
             "children.0.children.1.children.3.field" => "value"
           },
-          "$pushAll" => {
-            "children.0.children.1.children.3.fields" => [ "value", "value" ]
+          "$push" => {
+            "children.0.children.1.children.3.fields" => { '$each' => [ "value", "value" ] }
           }
         }
       end
@@ -203,8 +203,8 @@ describe Mongoid::Positional do
             "children.$.field" => "value",
             "children.0.children.1.children.3.field" => "value"
           },
-          "$pushAll" => {
-            "children.0.children.1.children.3.fields" => [ "value", "value" ]
+          "$push" => {
+            "children.0.children.1.children.3.fields" => { '$each' => [ "value", "value" ] }
           }
         }
       end

data/spec/mongoid/relations/macros_spec.rb

@@ -20,6 +20,26 @@ describe Mongoid::Relations::Macros do
     klass.validators.clear
   end
 
+  describe 'Model loading' do
+
+    let(:model_associations) do
+      class TestModel
+        include Mongoid::Document
+        field :associations
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :TestModel)
+    end
+
+    it 'prohibits the use of :associations as an attribute' do
+      expect {
+        model_associations
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+  end
+
   describe ".embedded_in" do
 
     it "defines the macro" do

data/spec/mongoid/relations/targets/enumerable_spec.rb

@@ -928,6 +928,60 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
+
+    context 'when the id_sort option is none' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'does not use the sort on id' do
+        expect(enumerable.first(id_sort: :none)).to eq(first_post)
+      end
+    end
+
+    context 'when the id_sort option is not provided' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'uses the sort on id' do
+        expect(enumerable.first).to eq(first_post)
+      end
+    end
   end
 
   describe "#include?" do
@@ -1344,6 +1398,60 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
+
+    context 'when the id_sort option is none' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'does not use the sort on id' do
+        expect(enumerable.last(id_sort: :none)).to eq(first_post)
+      end
+    end
+
+    context 'when the id_sort option is not provided' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'uses the sort on id' do
+        expect(enumerable.last).to eq(second_post)
+      end
+    end
   end
 
   describe "#kind_of?" do