mongoid 5.4.1 → 6.0.0.beta

data/lib/mongoid/relations/referenced/many_to_many.rb

@@ -7,6 +7,24 @@ module Mongoid
       # many-to-many between documents in different collections.
       class ManyToMany < Many
 
+        # The allowed options when defining this relation.
+        #
+        # @return [ Array<Symbol> ] The allowed options when defining this relation.
+        #
+        # @since 6.0.0
+        VALID_OPTIONS = [
+          :after_add,
+          :after_remove,
+          :autosave,
+          :before_add,
+          :before_remove,
+          :dependent,
+          :foreign_key,
+          :index,
+          :order,
+          :primary_key
+        ].freeze
+
         # Appends a document or array of documents to the relation. Will set
         # the parent and update the index in the process.
         #
@@ -19,7 +37,7 @@ module Mongoid
         # @example Concat with other documents.
         #   person.posts.concat([ post_one, post_two ])
         #
-        # @param [ Document, Array<Document> ] args Any number of documents.
+        # @param [ Document, Array<Document> ] *args Any number of documents.
         #
         # @return [ Array<Document> ] The loaded docs.
         #
@@ -439,18 +457,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [
-              :after_add,
-              :after_remove,
-              :autosave,
-              :before_add,
-              :before_remove,
-              :dependent,
-              :foreign_key,
-              :index,
-              :order,
-              :primary_key
-            ]
+            VALID_OPTIONS
           end
 
           # Get the default validation setting for the relation. Determines if

data/lib/mongoid/relations/referenced/one.rb

@@ -7,6 +7,20 @@ module Mongoid
       # one-to-one between documents in different collections.
       class One < Relations::One
 
+        # The allowed options when defining this relation.
+        #
+        # @return [ Array<Symbol> ] The allowed options when defining this relation.
+        #
+        # @since 6.0.0
+        VALID_OPTIONS = [
+          :as,
+          :autobuild,
+          :autosave,
+          :dependent,
+          :foreign_key,
+          :primary_key
+        ].freeze
+
         # Instantiate a new references_one relation. Will set the foreign key
         # and the base on the inverse object.
         #
@@ -69,6 +83,8 @@ module Mongoid
         # @example Get the binding.
         #   relation.binding([ address ])
         #
+        # @param [ Document ] new_target The new target of the relation.
+        #
         # @return [ Binding ] The binding object.
         def binding
           Bindings::Referenced::One.new(base, target, __metadata)
@@ -254,7 +270,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [ :as, :autobuild, :autosave, :dependent, :foreign_key, :primary_key ]
+            VALID_OPTIONS
           end
 
           # Get the default validation setting for the relation. Determines if

data/lib/mongoid/relations/reflections.rb

@@ -24,7 +24,7 @@ module Mongoid
       # @example Find multiple relation metadata by macro.
       #   person.reflect_on_all_associations(:embeds_many)
       #
-      # @param [ Array<Symbol> ] macros The relation macros.
+      # @param [ Array<String, Symbol> ] *macros The relation macros.
       #
       # @return [ Array<Metadata> ] The matching relation metadata.
       def reflect_on_all_associations(*macros)
@@ -50,13 +50,11 @@ module Mongoid
         # @example Find multiple relation metadata by macro.
         #   Person.reflect_on_all_associations(:embeds_many)
         #
-        # @param [ Array<Symbol> ] macros The relation macros.
+        # @param [ Array<String, Symbol> ] *macros The relation macros.
         #
         # @return [ Array<Metadata> ] The matching relation metadata.
         def reflect_on_all_associations(*macros)
-          association_reflections = relations.values
-          association_reflections.select! { |reflection| macros.include?(reflection.macro) } unless macros.empty?
-          association_reflections
+          relations.values.select { |meta| macros.include?(meta.macro) }
         end
       end
     end

data/lib/mongoid/relations/touchable.rb

@@ -78,7 +78,7 @@ module Mongoid
         # @return [ Symbol ] The method name.
         def define_relation_touch_method(name)
           method_name = "touch_#{name}_after_create_or_destroy"
-          class_eval <<-TOUCH, __FILE__, __LINE__ + 1
+          class_eval <<-TOUCH
             def #{method_name}
               without_autobuild do
                 relation = __send__(:#{name})

data/lib/mongoid/reloadable.rb

@@ -71,7 +71,7 @@ module Mongoid
     # @since 2.3.2
     def reload_embedded_document
       extract_embedded_attributes({}.merge(
-        _root.collection.find(_id: _root._id).read(mode: :primary).first
+        collection(_root).find(_id: _root._id).read(mode: :primary).first
       ))
     end
 

data/lib/mongoid/scopable.rb

@@ -80,7 +80,7 @@ module Mongoid
       #     default_scope ->{ where(active: true) }
       #   end
       #
-      # @param [ Proc, Criteria ] value The default scope.
+      # @param [ Proc, Criteria ] scope The default scope.
       #
       # @raise [ Errors::InvalidScope ] If the scope is not a proc or criteria.
       #
@@ -117,7 +117,7 @@ module Mongoid
       # @since 3.0.0
       def queryable
         crit = Threaded.current_scope(self) || Criteria.new(self)
-        crit.embedded = true if (crit.klass.embedded? && !crit.klass.cyclic?)
+        crit.embedded = true if crit.klass.embedded?
         crit
       end
 
@@ -136,7 +136,7 @@ module Mongoid
       #   end
       #
       # @param [ Symbol ] name The name of the scope.
-      # @param [ Proc ] value The conditions of the scope.
+      # @param [ Proc ] conditions The conditions of the scope.
       #
       # @raise [ Errors::InvalidScope ] If the scope is not a proc.
       # @raise [ Errors::ScopeOverwrite ] If the scope name already exists.

data/lib/mongoid/serializable.rb

@@ -138,7 +138,7 @@ module Mongoid
     # @example Get the relation names.
     #   document.relation_names(:include => [ :addresses ])
     #
-    # @param [ Hash, Symbol, Array<Symbol> ] inclusions The inclusions.
+    # @param [ Hash, Symbol, Array<Symbol ] inclusions The inclusions.
     #
     # @return [ Array<Symbol> ] The names of the included relations.
     #
@@ -153,8 +153,7 @@ module Mongoid
     # @example Get the relation options.
     #   document.relation_names(:include => [ :addresses ])
     #
-    # @param [ Hash, Symbol, Array<Symbol> ] inclusions The inclusions.
-    # @param [ Hash ] options The options.
+    # @param [ Hash, Symbol, Array<Symbol ] inclusions The inclusions.
     # @param [ Symbol ] name The name of the relation.
     #
     # @return [ Hash ] The options for the relation.

data/lib/mongoid/tasks/database.rb

@@ -36,8 +36,7 @@ module Mongoid
       # @example Return the list of unused indexes.
       #   Mongoid::Tasks::Database.undefined_indexes
       #
-      # @return [ Array<Hash> ] The list of undefined indexes by model.
-      #
+      # @return Hash{Class => Array(Hash)} The list of undefined indexes by model.
       def undefined_indexes(models = ::Mongoid.models)
         undefined_by_model = {}
 

data/lib/mongoid/threaded.rb

@@ -64,7 +64,7 @@ module Mongoid
     # @example Set the global database override.
     #   Threaded.database_override = :testing
     #
-    # @param [ String, Symbol ] name The global override name.
+    # @param [ String, Symbol ] The global override name.
     #
     # @return [ String, Symbol ] The override.
     #
@@ -180,7 +180,7 @@ module Mongoid
     # @example Set the global client override.
     #   Threaded.client_override = :testing
     #
-    # @param [ String, Symbol ] name The global override name.
+    # @param [ String, Symbol ] The global override name.
     #
     # @return [ String, Symbol ] The override.
     #
@@ -304,7 +304,7 @@ module Mongoid
     # @example Get all autosaves.
     #   Threaded.autosaves_for(Person)
     #
-    # @param [ Class ] klass The class to check.
+    # @param [ Class ] The class to check.
     #
     # @return [ Array ] The current autosaves.
     #
@@ -317,7 +317,7 @@ module Mongoid
     # @example Get all validations.
     #   Threaded.validations_for(Person)
     #
-    # @param [ Class ] klass The class to check.
+    # @param [ Class ] The class to check.
     #
     # @return [ Array ] The current validations.
     #

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

@@ -144,7 +144,7 @@ module Mongoid
       # @example Validate with a specific validator.
       #   validates_with MyValidator, on: :create
       #
-      # @param [ Class<Array>, Hash ] args The validator classes and options.
+      # @param [ Class<Array>, Hash ] *args The validator classes and options.
       #
       # @note See ActiveModel::Validations::With for full options. This is
       #   overridden to add autosave functionality when presence validation is

data/lib/mongoid/validatable/macros.rb

@@ -17,8 +17,7 @@ module Mongoid
       #     validates_associated :name, :addresses
       #   end
       #
-      # @param [ Array ] args The arguments to pass to the validator.
-      #
+      # @param [ Array ] *args The arguments to pass to the validator.
       def validates_associated(*args)
         validates_with(AssociatedValidator, _merge_attributes(args))
       end
@@ -35,8 +34,7 @@ module Mongoid
       #     validates_uniqueness_of :title
       #   end
       #
-      # @param [ Array ] args The arguments to pass to the validator.
-      #
+      # @param [ Array ] *args The arguments to pass to the validator.
       def validates_uniqueness_of(*args)
         validates_with(UniquenessValidator, _merge_attributes(args))
       end

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.0.0.beta"
 end

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

@@ -38,7 +38,8 @@ development:
         # 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-
@@ -50,8 +51,8 @@ development:
         # via ismaster commands. (default: 10)
         # heartbeat_frequency: 10
 
-        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
-        # local_threshold: 0.015
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        # local_threshold: 5
 
         # The timeout in seconds for selecting a server for an operation. (default: 30)
         # server_selection_timeout: 30
@@ -130,10 +131,6 @@ development:
     # environment. The Mongoid logger will be set to the Rails logger
     # otherwise.(default: :info)
     # log_level: :info
-
-    # 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
 test:
   clients:
     default:

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

@@ -13,7 +13,6 @@ class Band
   field :upserted, type: Mongoid::Boolean, default: false
   field :created, type: DateTime
   field :sales, type: BigDecimal
-  field :decimal, type: BSON::Decimal128
   field :y, as: :years, type: Integer
   field :founded, type: Date
   field :deleted, type: Boolean

data/spec/app/models/church.rb

@@ -1,6 +1,4 @@
 class Church
   include Mongoid::Document
   has_many :acolytes, validate: false
-  field :location, type: Hash
-  field :name, type: String
 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/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
@@ -134,7 +135,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/post.rb

@@ -11,7 +11,6 @@ class Post
 
   belongs_to :person, counter_cache: true
   belongs_to :author, foreign_key: :author_id, class_name: "User"
-  belongs_to :post_genre, foreign_key: :genre_id, counter_cache: true
   has_and_belongs_to_many :tags, before_add: :before_add_tag, after_add: :after_add_tag, before_remove: :before_remove_tag, after_remove: :after_remove_tag
   has_many :videos, validate: false
   has_many :roles, validate: false

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