mongoid 5.4.1 → 6.1.1

data/lib/mongoid/traversable.rb

@@ -153,7 +153,7 @@ module Mongoid
     def _root
       object = self
       while (object._parent) do object = object._parent; end
-      object.with(@persistence_options) || self
+      object
     end
 
     # Is this document the root document of the hierarchy?

data/lib/mongoid/validatable/uniqueness.rb

@@ -169,7 +169,6 @@ module Mongoid
           name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])
         end
-        criteria = criteria.with(document.persistence_options)
         criteria
       end
 
@@ -274,7 +273,7 @@ module Mongoid
         criteria = create_criteria(klass, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
-        if criteria.with(criteria.persistence_options).read(mode: :primary).exists?
+        if criteria.read(mode: :primary).exists?
           add_error(document, attribute, value)
         end
       end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "5.4.1"
+  VERSION = "6.1.1"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -34,11 +34,13 @@ development:
         #   - 'dbOwner'
 
         # Change the default authentication mechanism. Valid options are: :scram,
-        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
-        # on 2.4 and 2.6 is :plain)
+        # :mongodb_cr, :mongodb_x509, and :plain. Note that all authentication
+        # mechanisms require username and password, with the exception of :mongodb_x509.
+        # Default on mongoDB 3.0 is :scram, default on 2.4 and 2.6 is :plain.
         # auth_mech: :scram
 
-        # The database or source to authenticate the user against. (default: admin)
+        # The database or source to authenticate the user against.
+        # (default: the database specified above or admin)
         # auth_source: admin
 
         # Force a the driver cluster to behave in a certain manner instead of auto-
@@ -120,6 +122,10 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
+    # Raise an error when defining a field with the same name as an
+    # existing method. (default: false)
+    # duplicate_fields_exception: false
+
     # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
@@ -131,6 +137,11 @@ development:
     # otherwise.(default: :info)
     # log_level: :info
 
+    # Control whether `belongs_to` association is required. By default
+    # `belongs_to` will trigger a validation error if the association
+    # is not present. (default: true)
+    # belongs_to_required_by_default: true
+
     # Application name that is printed to the mongodb logs upon establishing a
     # connection in server versions >= 3.4. Note that the name cannot exceed 128 bytes.
     # app_name: MyApplicationName

data/spec/app/models/album.rb

@@ -9,6 +9,10 @@ class Album
   private
 
   def set_parent_name
-    artist.name = "destroyed"
+    artist.name = "destroyed" if artist
+  end
+
+  def set_parent_name_fail
+    throw(:abort)
   end
 end

data/spec/app/models/artist.rb

@@ -13,16 +13,37 @@ class Artist
   after_create :create_songs
   before_save :before_save_stub
   before_destroy :before_destroy_stub
+  before_update :before_update_stub
 
   protected
   def before_create_stub
     true
   end
 
+  def before_update_stub
+    true
+  end
+
+  def before_update_fail_stub
+    throw(:abort)
+  end
+
+  def before_save_fail_stub
+    throw(:abort)
+  end
+
+  def before_create_fail_stub
+    throw(:abort)
+  end
+
   def before_save_stub
     true
   end
 
+  def before_destroy_fail_stub
+    throw(:abort)
+  end
+
   def before_destroy_stub
     true
   end

data/spec/app/models/book.rb

@@ -1,6 +1,7 @@
 class Book
   include Mongoid::Document
   include Mongoid::Attributes::Dynamic
+  include Mongoid::Timestamps
   field :title, type: String
   field :chapters, type: Integer
   belongs_to :series
@@ -11,5 +12,5 @@ class Book
     doc.chapters = 5
   end
 
-  embeds_many :pages
+  embeds_many :pages, cascade_callbacks: true
 end

data/spec/app/models/dokument.rb

@@ -2,4 +2,5 @@ class Dokument
   include Mongoid::Document
   include Mongoid::Timestamps
   embeds_many :addresses, as: :addressable, validate: false
+  field :title
 end

data/spec/app/models/ordered_post.rb

@@ -3,4 +3,9 @@ class OrderedPost
   field :title, type: String
   field :rating, type: Integer
   belongs_to :person
+
+  after_destroy do
+    person.title = 'Minus one ordered post.'
+    person.save
+  end
 end

data/spec/app/models/oscar.rb

@@ -7,9 +7,8 @@ class Oscar
   def complain
     if destroy_after_save?
       destroy
-      true
     else
-      false
+      throw(:abort)
     end
   end
 end

data/spec/app/models/page.rb

@@ -3,7 +3,7 @@ class Page
   embedded_in :quiz
   embeds_many :page_questions
 
-  embedded_in :book
+  embedded_in :book, touch: true
   embeds_many :notes
   field :content, :type => String
 

data/spec/app/models/person.rb

@@ -36,6 +36,7 @@ class Person
   field :overridden_setter, type: String
   field :arrays, type: Array
   field :range, type: Range
+  field :species, type: Symbol
 
   index age: 1
   index addresses: 1
@@ -43,8 +44,6 @@ class Person
   index name: 1
   index title: 1
 
-  index({ ssn: 1 }, { unique: true })
-
   attr_reader :rescored
 
   embeds_many :favorites, order: :title.desc, inverse_of: :perp, validate: false
@@ -134,7 +133,8 @@ class Person
     self.score_without_rescoring = score
   end
 
-  alias_method_chain :score=, :rescoring
+  alias_method :score_without_rescoring=, :score=
+  alias_method :score=, :score_with_rescoring=
 
   def update_addresses
     addresses.each do |address|

data/spec/app/models/princess.rb

@@ -1,8 +1,10 @@
 class Princess
   include Mongoid::Document
   field :primary_color
+  field :name, type: String
   def color
     primary_color.to_s
   end
   validates_presence_of :color
+  validates :name, presence: true, on: :update
 end

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/subscription.rb

@@ -1,4 +1,5 @@
 class Subscription
   include Mongoid::Document
   has_many :packs, class_name: "ShippingPack"
+  field :packs_count, type: Integer
 end

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

@@ -17,6 +17,10 @@ test:
       database: reports
       hosts:
         - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
+      options:
+        user: "mongoid-user"
+        password: "password"
+        auth_source: "admin"
   options:
     include_root_in_json: false
     include_type_for_serialization: false
@@ -26,4 +30,15 @@ test:
     use_activesupport_time_zone: true
     use_utc: false
     log_level: :warn
+    belongs_to_required_by_default: false
     app_name: 'testing'
+test_with_max_staleness:
+  clients:
+    default:
+      database: mongoid_test
+      hosts:
+        - <%=ENV["MONGOID_SPEC_HOST"]%>:<%=ENV["MONGOID_SPEC_PORT"]%>
+      options:
+        read:
+          mode: :primary_preferred
+          max_staleness: 100

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"
                     ]
-                  }] }
+                  }]
                 }
               }
             )