mongoid 5.4.1 → 6.0.0.beta

data/spec/app/models/record.rb

@@ -1,6 +1,7 @@
 class Record
   include Mongoid::Document
   field :name, type: String
+  field :producers, type: Array
 
   field :before_create_called, type: Mongoid::Boolean, default: false
   field :before_save_called, type: Mongoid::Boolean, default: false

data/spec/app/models/thing.rb

@@ -4,6 +4,6 @@ class Thing
   embedded_in :actor
 
   def dont_do_it
-    false
+    throw(:abort)
   end
 end

data/spec/config/mongoid.yml

@@ -13,10 +13,6 @@ test:
           tag_sets:
             - use: web
         max_pool_size: 1
-    reports:
-      database: reports
-      hosts:
-        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
   options:
     include_root_in_json: false
     include_type_for_serialization: false
@@ -26,4 +22,4 @@ test:
     use_activesupport_time_zone: true
     use_utc: false
     log_level: :warn
-    app_name: 'testing'
+    belongs_to_required_by_default: false

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -211,10 +211,10 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$push" =>
-              { "addresses" => { '$each' => [
+            { "$pushAll" =>
+              { "addresses" => [
                   { "street" => "Oxford St" }
-                ] }
+                ]
               }
             }
           )
@@ -238,11 +238,11 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$push" =>
-              { "addresses" => { '$each' => [
+            { "$pushAll" =>
+              { "addresses" => [
                   { "street" => "Hobrechtstr." },
                   { "street" => "Pflugerstr." }
-                ] }
+                ]
               }
             }
           )
@@ -270,10 +270,10 @@ describe Mongoid::Atomic::Modifiers do
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
             { "$set" => { "addresses.0.street" => "Bond" },
-              conflicts: { "$push" =>
-                { "addresses" => { '$each' => [
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }
@@ -300,10 +300,10 @@ describe Mongoid::Atomic::Modifiers do
           expect(modifiers).to eq(
             { "$pullAll" => {
               "addresses" => { "street" => "Bond St" }},
-              conflicts: { "$push" => 
-                { "addresses" => { '$each' => [
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }
@@ -328,12 +328,12 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
-            { "$push" => {
-              "addresses.0.locations" => {'$each' => [{ "street" => "Bond St" }]}},
-              conflicts: { "$push" =>
-                { "addresses" => { '$each' => [
+            { "$pushAll" => {
+              "addresses.0.locations" => [{ "street" => "Bond St" }]},
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }

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

data/spec/mongoid/attributes/nested_spec.rb

@@ -1335,7 +1335,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.addresses_attributes =
                     { "foo" => { "id" => "test", "street" => "Test" } }
-                }.to raise_error
+                }.to raise_error(Mongoid::Errors::DocumentNotFound)
               end
             end
           end
@@ -1434,7 +1434,7 @@ describe Mongoid::Attributes::Nested do
                       Person.create(age: 42)
                     end
 
-                    context "when the child returns false in a before callback" do
+                    context "when the child halts the callback chain in a before callback" do
 
                       context "when the child is not paranoid" do
 
@@ -1970,7 +1970,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "ignores the the marked document" do
+                  it "ignores the marked document" do
                     expect(person.addresses.size).to eq(1)
                   end
 
@@ -2031,7 +2031,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
@@ -2091,7 +2091,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
@@ -3028,7 +3028,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.posts_attributes =
                     { "foo" => { "id" => "test", "title" => "Test" } }
-                }.to raise_error
+                }.to raise_error(Mongoid::Errors::DocumentNotFound)
               end
             end
           end
@@ -3431,7 +3431,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "ignores the the marked document" do
+                  it "ignores the marked document" do
                     expect(person.posts.size).to eq(1)
                   end
 
@@ -3492,7 +3492,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.posts.first.title).to eq("New Blog")
                   end
 
@@ -3552,7 +3552,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.posts.first.title).to eq("New Blog")
                   end
 
@@ -3745,7 +3745,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.preferences_attributes =
                     { "foo" => { "id" => "test", "name" => "Test" } }
-                }.to raise_error
+                }.to raise_error(Mongoid::Errors::DocumentNotFound)
               end
             end
           end
@@ -4097,7 +4097,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "ignores the the marked document" do
+                  it "ignores the marked document" do
                     expect(person.preferences.size).to eq(1)
                   end
 
@@ -4158,7 +4158,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.preferences.first.name).to eq("New Blog")
                   end
 
@@ -4218,7 +4218,7 @@ describe Mongoid::Attributes::Nested do
                       }
                   end
 
-                  it "adds the the marked document" do
+                  it "adds the marked document" do
                     expect(person.preferences.first.name).to eq("New Blog")
                   end
 
@@ -4852,7 +4852,7 @@ describe Mongoid::Attributes::Nested do
           end
 
           it "the update raises an error" do
-            expect{ error_raising_update }.to raise_error
+            expect{ error_raising_update }.to raise_error(Mongoid::Errors::Validations)
           end
 
           it "the update does not occur" do

data/spec/mongoid/attributes/readonly_spec.rb

@@ -2,49 +2,56 @@ require "spec_helper"
 
 describe Mongoid::Attributes::Readonly do
 
-  describe ".attr_readonly" do
+  before do
+    Person.attr_readonly(*attributes)
+  end
 
-    after do
-      Person.readonly_attributes.clear
+  after do
+    Person.readonly_attributes.reject! do |a|
+      [ attributes ].flatten.include?(a.to_sym) ||
+        [ attributes ].flatten.include?(Person.aliased_fields.key(a).to_sym)
     end
+  end
+
+  describe ".attr_readonly" do
 
     context "when providing a single field" do
 
-      before do
-        Person.attr_readonly :title
+      let(:attributes) do
+        :title
       end
 
       it "adds the field to readonly attributes" do
-        expect(Person.readonly_attributes.to_a).to eq([ "title" ])
+        expect(Person.readonly_attributes.to_a).to include("title")
       end
     end
 
     context "when providing a field alias" do
 
-      before do
-        Person.attr_readonly :aliased_timestamp
+      let(:attributes) do
+        :aliased_timestamp
       end
 
       it "adds the database field name to readonly attributes" do
-        expect(Person.readonly_attributes.to_a).to eq([ "at" ])
+        expect(Person.readonly_attributes.to_a).to include("at")
       end
     end
 
     context "when providing multiple fields" do
 
-      before do
-        Person.attr_readonly :title, :terms
+      let(:attributes) do
+        [ :title, :terms ]
       end
 
       it "adds the fields to readonly attributes" do
-        expect(Person.readonly_attributes.to_a).to eq([ "title", "terms" ])
+        expect(Person.readonly_attributes.to_a).to include("title", "terms")
       end
     end
 
     context "when creating a new document with a readonly field" do
 
-      before do
-        Person.attr_readonly :title, :terms, :aliased_timestamp
+      let(:attributes) do
+        [ :title, :terms, :aliased_timestamp ]
       end
 
       let(:person) do
@@ -78,8 +85,8 @@ describe Mongoid::Attributes::Readonly do
 
     context "when updating an existing readonly field" do
 
-      before do
-        Person.attr_readonly :title, :terms, :score, :aliased_timestamp
+      let(:attributes) do
+        [ :title, :terms, :score, :aliased_timestamp ]
       end
 
       let(:person) do
@@ -88,25 +95,31 @@ describe Mongoid::Attributes::Readonly do
 
       context "when updating via the setter" do
 
-        before do
-          person.title = "mr"
-          person.aliased_timestamp = Time.at(43)
-          person.save
-        end
-
         it "does not update the first field" do
+          expect {
+            person.title = 'mr'
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.title).to eq("sir")
         end
 
         it "does not update the second field" do
+          expect {
+            person.aliased_timestamp = Time.at(43)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.aliased_timestamp).to eq(Time.at(42))
         end
 
         it "does not persist the first field" do
+          expect {
+            person.title = 'mr'
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.title).to eq("sir")
         end
 
         it "does not persist the second field" do
+          expect {
+            person.aliased_timestamp = Time.at(43)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -114,6 +127,7 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via inc" do
 
         context 'with single field operation' do
+
           it "raises an error " do
             expect {
               person.inc(score: 1)
@@ -122,6 +136,7 @@ describe Mongoid::Attributes::Readonly do
         end
 
         context 'with multiple fields operation' do
+
           it "raises an error " do
             expect {
               person.inc(score: 1, age: 1)
@@ -133,6 +148,7 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via bit" do
 
         context 'with single field operation' do
+
           it "raises an error " do
             expect {
               person.bit(score: { or: 13 })
@@ -141,6 +157,7 @@ describe Mongoid::Attributes::Readonly do
         end
 
         context 'with multiple fields operation' do
+
           it "raises an error " do
             expect {
               person.bit(
@@ -153,98 +170,124 @@ describe Mongoid::Attributes::Readonly do
 
       context "when updating via []=" do
 
-        before do
-          person[:title] = "mr"
-          person[:aliased_timestamp] = Time.at(43)
-          person.save
-        end
-
         it "does not update the first field" do
+          expect {
+            person[:title] = "mr"
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.title).to eq("sir")
         end
 
         it "does not update the second field" do
+          expect {
+            person[:aliased_timestamp] = Time.at(43)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.aliased_timestamp).to eq(Time.at(42))
         end
 
         it "does not persist the first field" do
+          expect {
+            person[:title] = "mr"
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.title).to eq("sir")
         end
 
         it "does not persist the second field" do
+          expect {
+            person[:aliased_timestamp] = Time.at(43)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
 
       context "when updating via write_attribute" do
 
-        before do
-          person.write_attribute(:title, "mr")
-          person.write_attribute(:aliased_timestamp, Time.at(43))
-          person.save
-        end
-
         it "does not update the first field" do
+          expect {
+            person.write_attribute(:title, "mr")
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.title).to eq("sir")
         end
 
         it "does not update the second field" do
+          expect {
+            person.write_attribute(:aliased_timestamp, Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.aliased_timestamp).to eq(Time.at(42))
         end
 
         it "does not persist the first field" do
+          expect {
+            person.write_attribute(:title, "mr")
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.title).to eq("sir")
         end
 
         it "does not persist the second field" do
+          expect {
+            person.write_attribute(:aliased_timestamp, Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
 
       context "when updating via update_attributes" do
 
-        before do
-          person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
-          person.save
-        end
-
         it "does not update the first field" do
+          expect {
+            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.title).to eq("sir")
         end
 
         it "does not update the second field" do
+          expect {
+            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.aliased_timestamp).to eq(Time.at(42))
         end
 
         it "does not persist the first field" do
+          expect {
+            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.title).to eq("sir")
         end
 
         it "does not persist the second field" do
+          expect {
+            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
 
       context "when updating via update_attributes!" do
 
-        before do
-          person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
-          person.save
-        end
-
         it "does not update the first field" do
+          expect {
+            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.title).to eq("sir")
         end
 
         it "does not update the second field" do
+          expect {
+            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.aliased_timestamp).to eq(Time.at(42))
         end
 
         it "does not persist the first field" do
+          expect {
+            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.title).to eq("sir")
         end
 
         it "does not persist the second field" do
+          expect {
+            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end