mongoid 3.1.6 → 4.0.2

data/lib/mongoid/timestamps/updated/short.rb

@@ -3,8 +3,8 @@ module Mongoid
   module Timestamps
     module Updated
 
-      # Adds a created_at timestamp to the document, but it is stored as c_at
-      # with a created_at alias.
+      # Adds an updated_at timestamp to the document, but it is stored as u_at
+      # with an updated_at alias.
       module Short
         extend ActiveSupport::Concern
 

data/lib/mongoid/{hierarchy.rb → traversable.rb}

@@ -1,10 +1,18 @@
 # encoding: utf-8
 module Mongoid
-  module Hierarchy
+
+  # Provides behaviour around traversing the document graph.
+  #
+  # @since 4.0.0
+  module Traversable
     extend ActiveSupport::Concern
 
-    included do
-      attr_accessor :_parent
+    def _parent
+      @__parent
+    end
+
+    def _parent=(p)
+      @__parent = p
     end
 
     # Get all child +Documents+ to this +Document+, going n levels deep if
@@ -19,7 +27,7 @@ module Mongoid
     #
     # @return [ Array<Document> ] All child documents in the hierarchy.
     def _children
-      @_children ||= collect_children
+      @__children ||= collect_children
     end
 
     # Collect all the children of this document.
@@ -37,7 +45,7 @@ module Mongoid
           child = send(name)
           Array.wrap(child).each do |doc|
             children.push(doc)
-            children.concat(doc._children) unless metadata.versioned?
+            children.concat(doc._children)
           end if child
         end
       end
@@ -116,6 +124,7 @@ module Mongoid
         child.move_changes
         child.new_record = false
       end
+      @__children = nil
     end
 
     # Return the root document in the object graph. If the current document
@@ -174,7 +183,6 @@ module Mongoid
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup
         subclass._declared_scopes = Hash.new { |hash,key| self._declared_scopes[key] }
-        subclass.autosaved_relations = autosaved_relations.dup
 
         # We only need the _type field if inheritance is in play, but need to
         # add to the root class as well for backwards compatibility.
@@ -182,7 +190,7 @@ module Mongoid
           field(:_type, default: self.name, type: String)
         end
         subclass_default = subclass.name || ->{ self.class.name }
-        subclass.field(:_type, default: subclass_default, type: String)
+        subclass.field(:_type, default: subclass_default, type: String, overwrite: true)
       end
     end
   end

data/lib/mongoid/{validations.rb → validatable.rb}

@@ -1,20 +1,19 @@
 # encoding: utf-8
-require "mongoid/validations/macros"
-require "mongoid/validations/localizable"
-require "mongoid/validations/associated"
-require "mongoid/validations/format"
-require "mongoid/validations/length"
-require "mongoid/validations/queryable"
-require "mongoid/validations/presence"
-require "mongoid/validations/uniqueness"
+require "mongoid/validatable/macros"
+require "mongoid/validatable/localizable"
+require "mongoid/validatable/associated"
+require "mongoid/validatable/format"
+require "mongoid/validatable/length"
+require "mongoid/validatable/queryable"
+require "mongoid/validatable/presence"
+require "mongoid/validatable/uniqueness"
 
 module Mongoid
 
   # This module provides additional validations that ActiveModel does not
   # provide: validates_associated and validates_uniqueness_of.
-  module Validations
+  module Validatable
     extend ActiveSupport::Concern
-    include ActiveModel::Validations
 
     included do
       extend Macros
@@ -41,6 +40,20 @@ module Mongoid
       Threaded.exit_validate(self)
     end
 
+    # Given the provided options, are we performing validations?
+    #
+    # @example Are we performing validations?
+    #   document.performing_validations?(validate: true)
+    #
+    # @param [ Hash ] options The options to check.
+    #
+    # @return [ true, false ] If we are validating.
+    #
+    # @since 4.0.0
+    def performing_validations?(options = {})
+      options[:validate].nil? ? true : options[:validate]
+    end
+
     # Overrides the default ActiveModel behaviour since we need to handle
     # validations of relations slightly different than just calling the
     # getter.

data/lib/mongoid/{validations → validatable}/associated.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates whether or not an association is valid or not. Will correctly
     # handle has one and has many associations.
@@ -26,11 +26,13 @@ module Mongoid
       # @param [ Document ] document The document to validate.
       # @param [ Symbol ] attribute The relation to validate.
       # @param [ Object ] value The value of the relation.
+      #
+      # @since 2.0.0
       def validate_each(document, attribute, value)
         begin
           document.begin_validate
           valid = Array.wrap(value).collect do |doc|
-            if doc.nil?
+            if doc.nil? || doc.flagged_for_destroy?
               true
             else
               doc.validated? ? true : doc.valid?

data/lib/mongoid/{validations → validatable}/format.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes do or do not match a certain
     # regular expression.

data/lib/mongoid/{validations → validatable}/length.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes do or do not match a certain
     # length.

data/lib/mongoid/{validations → validatable}/localizable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Adds localization support to validations.
     module Localizable

data/lib/mongoid/{validations → validatable}/macros.rb

@@ -1,5 +1,6 @@
+# encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
     module Macros
       extend ActiveSupport::Concern
 
@@ -52,7 +53,7 @@ module Mongoid
       #
       # @since 2.4.0
       def validates_format_of(*args)
-        validates_with(Mongoid::Validations::FormatValidator, _merge_attributes(args))
+        validates_with(FormatValidator, _merge_attributes(args))
       end
 
       # Validates the length of a field.
@@ -69,7 +70,7 @@ module Mongoid
       #
       # @since 2.4.0
       def validates_length_of(*args)
-        validates_with(Mongoid::Validations::LengthValidator, _merge_attributes(args))
+        validates_with(LengthValidator, _merge_attributes(args))
       end
 
       # Validates whether or not a field is present - meaning nil or empty.

data/lib/mongoid/{validations → validatable}/presence.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates that the specified attributes are not blank (as defined by
     # Object#blank?).

data/lib/mongoid/{validations → validatable}/queryable.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
     module Queryable
 
       # Wrap the validation inside the an execution block that alert's the
@@ -22,7 +22,6 @@ module Mongoid
           Threaded.begin_execution("#{klass.name}-validate-with-query")
           yield
         ensure
-          klass.clear_persistence_options unless document.errors.empty?
           Threaded.exit_execution("#{klass.name}-validate-with-query")
         end
       end

data/lib/mongoid/{validations → validatable}/uniqueness.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid
-  module Validations
+  module Validatable
 
     # Validates whether or not a field is unique against the documents in the
     # database.
@@ -13,23 +13,19 @@ module Mongoid
     #
     #     validates_uniqueness_of :title
     #   end
+    #
+    # It is also possible to limit the uniqueness constraint to a set of
+    # records matching certain conditions:
+    #   class Person
+    #     include Mongoid::Document
+    #     field :title
+    #     field :active, type: Boolean
+    #
+    #     validates_uniqueness_of :title, conditions: -> {where(active: true)}
+    #   end
     class UniquenessValidator < ActiveModel::EachValidator
       include Queryable
 
-      attr_reader :klass
-
-      # Unfortunately, we have to tie Uniqueness validators to a class.
-      #
-      # @example Setup the validator.
-      # UniquenessValidator.new.setup(Person)
-      #
-      # @param [ Class ] klass The class getting validated.
-      #
-      # @since 1.0.0
-      def setup(klass)
-        @klass = klass
-      end
-
       # Validate the document for uniqueness violations.
       #
       # @example Validate the document.
@@ -134,7 +130,7 @@ module Mongoid
         end
 
         if document.persisted? && !document.embedded?
-          selector.merge!(_id: { "$ne" => document.id })
+          selector.merge!(_id: { "$ne" => document._id })
         end
         selector
       end
@@ -168,12 +164,12 @@ module Mongoid
       # @return [ Criteria ] The scoped criteria.
       #
       # @since 2.3.0
-      def scope(criteria, document, attribute)
+      def scope(criteria, document, _attribute)
         Array.wrap(options[:scope]).each do |item|
           name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])
         end
-        criteria = criteria.where(deleted_at: nil) if document.paranoid?
+        criteria = criteria.with(document.persistence_options)
         criteria
       end
 
@@ -231,7 +227,7 @@ module Mongoid
       def to_validate(document, attribute, value)
         metadata = document.relations[attribute.to_s]
         if metadata && metadata.stores_foreign_key?
-          [ metadata.foreign_key, value.id ]
+          [ metadata.foreign_key, value && value._id ]
         else
           [ attribute, value ]
         end
@@ -253,6 +249,7 @@ module Mongoid
         return if skip_validation?(document)
         relation = document._parent.send(document.metadata_name)
         criteria = create_criteria(relation, document, attribute, value)
+        criteria = criteria.merge(options[:conditions].call) if options[:conditions]
         add_error(document, attribute, value) if criteria.count > 1
       end
 
@@ -269,7 +266,14 @@ module Mongoid
       #
       # @since 2.4.10
       def validate_root(document, attribute, value)
-        criteria = create_criteria(klass || document.class, document, attribute, value)
+        klass = document.class
+
+        while klass.superclass.respond_to?(:validators) && klass.superclass.validators.include?(self)
+          klass = klass.superclass
+        end
+        criteria = create_criteria(klass, document, attribute, value)
+        criteria = criteria.merge(options[:conditions].call) if options[:conditions]
+
         if criteria.with(persistence_options(criteria)).exists?
           add_error(document, attribute, value)
         end
@@ -306,7 +310,7 @@ module Mongoid
       #
       # @since 3.0.23
       def persistence_options(criteria)
-        (criteria.klass.persistence_options || {}).merge!(consistency: :strong)
+        (criteria.persistence_options || {}).merge!(read: :primary)
       end
 
       # Is the attribute localized?

data/lib/mongoid/version.rb

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

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

@@ -11,35 +11,60 @@ development:
       hosts:
         - localhost:27017
       options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        # w: 1
 
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :eventual
+        # Change the default consistency model to primary, secondary.
+        # 'secondary' will send reads to secondaries, 'primary' sends everything
+        # to master. (default: primary)
+        # read: secondary_preferred
 
         # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
+        # failure. (default: The number of nodes in the cluster)
+        # max_retries: 20
 
         # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
+        # operation on failure. (default: 0.25)
+        # retry_interval: 0.25
+        
+        # The connection pool size per-node.  This should match or exceed the
+        # number of threads for a multi-threaded application. (default: 5)
+        # pool_size: 5
+        
+        # The time in seconds that Moped should wait for the pool to provide
+        # an available connection.  This number should probably remain at the 
+        # default, unless for some reason you absolutely need to limit the
+        # pool_size, as this wait is only used when the pool is saturated.
+        # (default: 0.5)
+        # pool_timeout: 0.5
+
+        # The time in seconds before Moped will timeout connection and node
+        # operations. (default: 5)
+        # timeout: 5
+        
+        # The amount of time in seconds between forced refreshes of node 
+        # information including the discovery of new peers. (default: 300)
+        # refresh_interval: 300
+        
+        # The amount of time in seconds that a node will be flagged as down.
+        # (default: 30) 
+        # down_interval: 30
+        
+        # Whether connections should use SSL. (default: nil/false)
+        # ssl: false
+        
+        # Whether Moped will use the existing seeds/nodes to find other peers.
+        # (default: true)
+        # auto_discover: true
 
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
 
+  # Configure Mongoid specific options. (optional)
+  options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use
@@ -57,11 +82,7 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
+    # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
     # Ensure all times are UTC in the app side. (default: false)
@@ -73,7 +94,7 @@ test:
       hosts:
         - localhost:27017
       options:
-        consistency: :strong
+        read: primary
         # In the test environment we lower the retries and retry interval to
         # low amounts for fast failures.
         max_retries: 1

data/lib/rails/generators/mongoid/model/model_generator.rb

@@ -12,7 +12,6 @@ module Mongoid
 
       class_option :timestamps, type: :boolean
       class_option :parent,     type: :string, desc: "The parent class for the generated model"
-      class_option :versioning, type: :boolean, default: false, desc: "Enable mongoid versioning"
       class_option :collection, type: :string, desc: "The collection for storing model's documents"
 
       def create_model_file