mongoid 3.1.7 → 4.0.2

data/lib/mongoid/threaded.rb

@@ -6,6 +6,17 @@ module Mongoid
   # This module contains logic for easy access to objects that have a lifecycle
   # on the current thread.
   module Threaded
+    DATABASE_OVERRIDE_KEY = "[mongoid]:db-override"
+    SESSIONS_KEY = "[mongoid]:sessions"
+    SESSION_OVERRIDE_KEY = "[mongoid]:session-override"
+    SCOPE_STACK_KEY = "[mongoid]:scope-stack"
+    AUTOSAVES_KEY = "[mongoid]:autosaves"
+    VALIDATIONS_KEY = "[mongoid]:validations"
+
+    STACK_KEYS = Hash.new do |hash, key|
+      hash[key] = "[mongoid]:#{key}-stack"
+    end
+
     extend self
 
     # Begin entry into a named thread local stack.
@@ -31,7 +42,7 @@ module Mongoid
     #
     # @since 3.0.0
     def database_override
-      Thread.current["[mongoid]:db-override"]
+      Thread.current[DATABASE_OVERRIDE_KEY]
     end
 
     # Set the global database override.
@@ -45,7 +56,7 @@ module Mongoid
     #
     # @since 3.0.0
     def database_override=(name)
-      Thread.current["[mongoid]:db-override"] = name
+      Thread.current[DATABASE_OVERRIDE_KEY] = name
     end
 
     # Get the database sessions from the current thread.
@@ -57,7 +68,7 @@ module Mongoid
     #
     # @since 3.0.0
     def sessions
-      Thread.current["[mongoid]:sessions"] ||= {}
+      Thread.current[SESSIONS_KEY] ||= {}
     end
 
     # Are in the middle of executing the named stack
@@ -99,7 +110,7 @@ module Mongoid
     #
     # @since 2.4.0
     def stack(name)
-      Thread.current["[mongoid]:#{name}-stack"] ||= []
+      Thread.current[STACK_KEYS[name]] ||= []
     end
 
     # Begin autosaving a document on the current thread.
@@ -111,7 +122,7 @@ module Mongoid
     #
     # @since 3.0.0
     def begin_autosave(document)
-      autosaves_for(document.class).push(document.id)
+      autosaves_for(document.class).push(document._id)
     end
 
     # Begin validating a document on the current thread.
@@ -123,22 +134,7 @@ module Mongoid
     #
     # @since 2.1.9
     def begin_validate(document)
-      validations_for(document.class).push(document.id)
-    end
-
-    # Clear out all the persistence options.
-    #
-    # @example Clear out the persistence options.
-    #   Threaded.clear_persistence_options(Band)
-    #
-    # @param [ Class ] klass The model class.
-    #
-    # @return [ true ] true.
-    #
-    # @since 2.0.0
-    def clear_persistence_options(klass)
-      Thread.current["[mongoid][#{klass}]:persistence-options"] = nil
-      true
+      validations_for(document.class).push(document._id)
     end
 
     # Exit autosaving a document on the current thread.
@@ -150,7 +146,7 @@ module Mongoid
     #
     # @since 3.0.0
     def exit_autosave(document)
-      autosaves_for(document.class).delete_one(document.id)
+      autosaves_for(document.class).delete_one(document._id)
     end
 
     # Exit validating a document on the current thread.
@@ -162,149 +158,7 @@ module Mongoid
     #
     # @since 2.1.9
     def exit_validate(document)
-      validations_for(document.class).delete_one(document.id)
-    end
-
-    # Get the identity map off the current thread.
-    #
-    # @example Get the identity map.
-    #   Threaded.identity_map
-    #
-    # @return [ IdentityMap ] The identity map.
-    #
-    # @since 2.1.0
-    def identity_map
-      Thread.current["[mongoid]:identity-map"] ||= IdentityMap.new
-    end
-
-    # Is the identity map enabled on the current thread?
-    #
-    # @example Is the identity map enabled?
-    #   Threaded.identity_map_enabled?
-    #
-    # @return [ true, false ] If the identity map is enabled.
-    #
-    # @since 3.0.0
-    def identity_map_enabled?
-      Thread.current["[mongoid]:identity-map-enabled"] != false
-    end
-
-    # Disable the identity map on either the current thread or all threads.
-    #
-    # @example Disable the identity map on all threads.
-    #   Threaded.disable_identity_map(:all)
-    #
-    # @example Disable the identity map on the current thread.
-    #   Threaded.disable_identity_map(:current)
-    #
-    # @param [ Symbol ] option The disabling option.
-    #
-    # @since 3.0.0
-    def disable_identity_map(option)
-      if option == :all
-        Thread.list.each do |thread|
-          thread["[mongoid]:identity-map-enabled"] = false
-        end
-      else
-        Thread.current["[mongoid]:identity-map-enabled"] = false
-      end
-    end
-
-    # Enable the identity map on either the current thread or all threads.
-    #
-    # @example Enable the identity map on all threads.
-    #   Threaded.enable_identity_map(:all)
-    #
-    # @example Enable the identity map on the current thread.
-    #   Threaded.enable_identity_map(:current)
-    #
-    # @param [ Symbol ] option The disabling option.
-    #
-    # @since 3.0.0
-    def enable_identity_map(option)
-      if option == :all
-        Thread.list.each do |thread|
-          thread["[mongoid]:identity-map-enabled"] = true
-        end
-      else
-        Thread.current["[mongoid]:identity-map-enabled"] = true
-      end
-    end
-
-    # Get the persistence options for the current thread.
-    #
-    # @example Get the persistence options.
-    #   Threaded.persistence_options(Band)
-    #
-    # @param [ Class ] klass The model class.
-    #
-    # @return [ Hash ] The current persistence options.
-    #
-    # @since 2.1.0
-    def persistence_options(klass)
-      Thread.current["[mongoid][#{klass}]:persistence-options"]
-    end
-
-    # Set the persistence options on the current thread.
-    #
-    # @example Set the persistence options.
-    #   Threaded.set_persistence_options(Band, { safe: { fsync: true }})
-    #
-    # @param [ Class ] klass The model class.
-    # @param [ Hash ] options The persistence options.
-    #
-    # @return [ Hash ] The persistence options.
-    #
-    # @since 2.1.0
-    def set_persistence_options(klass, options)
-      Thread.current["[mongoid][#{klass}]:persistence-options"] = options
-    end
-
-    # Get the field selection options from the current thread.
-    #
-    # @example Get the field selection options.
-    #   Threaded.selection
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    #
-    # @return [ Hash ] The field selection.
-    #
-    # @since 2.4.4
-    def selection(criteria_instance_id)
-      selections = Thread.current["[mongoid][selections]"]
-      selections[criteria_instance_id] if selections
-    end
-
-    # Set the field selection on the current thread.
-    #
-    # @example Set the field selection.
-    #   Threaded.set_selection(Person, { field: 1 })
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    # @param [ Hash ] value The current field selection.
-    #
-    # @return [ Hash ] The field selection.
-    #
-    # @since 2.4.4
-    def set_selection(criteria_instance_id, value)
-      Thread.current["[mongoid][selections]"] ||= {}
-      Thread.current["[mongoid][selections]"][criteria_instance_id] = value
-    end
-
-    # Delete the field selection on the current thread.
-    #
-    # @example Delete the field selection.
-    #   Threaded.delete_selection(Person)
-    #
-    # @param [ Integer ] criteria_instance_id The criteria instance id.
-    #
-    # @return [ Boolean ] Whether there was a field selection.
-    #
-    # @since 3.0.7
-    def delete_selection(criteria_instance_id)
-      selections = Thread.current["[mongoid][selections]"]
-      return false unless selections
-      !!selections.delete(criteria_instance_id)
+      validations_for(document.class).delete_one(document._id)
     end
 
     # Get the global session override.
@@ -316,7 +170,7 @@ module Mongoid
     #
     # @since 3.0.0
     def session_override
-      Thread.current["[mongoid]:session-override"]
+      Thread.current[SESSION_OVERRIDE_KEY]
     end
 
     # Set the global session override.
@@ -330,7 +184,7 @@ module Mongoid
     #
     # @since 3.0.0
     def session_override=(name)
-      Thread.current["[mongoid]:session-override"] = name
+      Thread.current[SESSION_OVERRIDE_KEY] = name
     end
 
     # Get the mongoid scope stack for chained criteria.
@@ -342,7 +196,7 @@ module Mongoid
     #
     # @since 2.1.0
     def scope_stack
-      Thread.current["[mongoid]:scope-stack"] ||= {}
+      Thread.current[SCOPE_STACK_KEY] ||= {}
     end
 
     # Is the document autosaved on the current thread?
@@ -356,7 +210,7 @@ module Mongoid
     #
     # @since 2.1.9
     def autosaved?(document)
-      autosaves_for(document.class).include?(document.id)
+      autosaves_for(document.class).include?(document._id)
     end
 
     # Is the document validated on the current thread?
@@ -370,7 +224,7 @@ module Mongoid
     #
     # @since 2.1.9
     def validated?(document)
-      validations_for(document.class).include?(document.id)
+      validations_for(document.class).include?(document._id)
     end
 
     # Get all autosaves on the current thread.
@@ -382,7 +236,7 @@ module Mongoid
     #
     # @since 3.0.0
     def autosaves
-      Thread.current["[mongoid]:autosaves"] ||= {}
+      Thread.current[AUTOSAVES_KEY] ||= {}
     end
 
     # Get all validations on the current thread.
@@ -394,7 +248,7 @@ module Mongoid
     #
     # @since 2.1.9
     def validations
-      Thread.current["[mongoid]:validations"] ||= {}
+      Thread.current[VALIDATIONS_KEY] ||= {}
     end
 
     # Get all autosaves on the current thread for the class.

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 → 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/{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/version.rb

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