mongoid 2.8.1 → 3.0.0.rc

data/lib/mongoid/threaded/lifecycle.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Threaded #:nodoc:
+module Mongoid
+  module Threaded
 
     # This module contains convenience methods for document lifecycle that
     # resides on thread locals.
@@ -22,10 +22,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.2.0
       def _assigning
-        Threaded.begin(:assign)
+        Threaded.begin("assign")
         yield
       ensure
-        Threaded.exit(:assign)
+        Threaded.exit("assign")
       end
 
       # Is the current thread in assigning mode?
@@ -37,7 +37,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _assigning?
-        Threaded.executing?(:assign)
+        Threaded.executing?("assign")
       end
 
       # Execute a block in binding mode.
@@ -51,10 +51,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _binding
-        Threaded.begin(:bind)
+        Threaded.begin("bind")
         yield
       ensure
-        Threaded.exit(:bind)
+        Threaded.exit("bind")
       end
 
       # Is the current thread in binding mode?
@@ -66,7 +66,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _binding?
-        Threaded.executing?(:bind)
+        Threaded.executing?("bind")
       end
 
       # Execute a block in building mode.
@@ -80,10 +80,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _building
-        Threaded.begin(:build)
+        Threaded.begin("build")
         yield
       ensure
-        Threaded.exit(:build)
+        Threaded.exit("build")
       end
 
       # Is the current thread in building mode?
@@ -95,7 +95,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _building?
-        Threaded.executing?(:build)
+        Threaded.executing?("build")
       end
 
       # Is the current thread in creating mode?
@@ -107,7 +107,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.1.0
       def _creating?
-        Threaded.executing?(:create)
+        Threaded.executing?("create")
       end
 
       # Execute a block in loading mode.
@@ -121,10 +121,10 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.2
       def _loading
-        Threaded.begin(:load)
+        Threaded.begin("load")
         yield
       ensure
-        Threaded.exit(:load)
+        Threaded.exit("load")
       end
 
       # Is the current thread in loading mode?
@@ -136,7 +136,7 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.2
       def _loading?
-        Threaded.executing?(:load)
+        Threaded.executing?("load")
       end
 
       # Execute a block in loading revision mode.
@@ -150,13 +150,13 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.4
       def _loading_revision
-        Threaded.begin(:load_revision)
+        Threaded.begin("load_revision")
         yield
       ensure
-        Threaded.exit(:load_revision)
+        Threaded.exit("load_revision")
       end
 
-      module ClassMethods #:nodoc:
+      module ClassMethods
 
         # Execute a block in creating mode.
         #
@@ -169,11 +169,10 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def _creating
-          Threaded.begin(:create)
+          Threaded.begin("create")
           yield
         ensure
-          Threaded.exit(:create)
-          Threaded.clear_safety_options!
+          Threaded.exit("create")
         end
 
         # Is the current thread in loading revision mode?
@@ -185,7 +184,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.3.4
         def _loading_revision?
-          Threaded.executing?(:load_revision)
+          Threaded.executing?("load_revision")
         end
       end
     end

data/lib/mongoid/timestamps.rb

@@ -3,7 +3,7 @@ require "mongoid/timestamps/created"
 require "mongoid/timestamps/updated"
 require "mongoid/timestamps/timeless"
 
-module Mongoid #:nodoc:
+module Mongoid
 
   # This module handles the behaviour for setting up document created at and
   # updated at timestamps.

data/lib/mongoid/timestamps/created.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
   module Timestamps
     # This module handles the behaviour for setting up document created at
     # timestamp.
@@ -7,8 +7,8 @@ module Mongoid #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        field :created_at, :type => Time
-        set_callback :create, :before, :set_created_at, :if => :timestamping?
+        field :created_at, type: Time
+        set_callback :create, :before, :set_created_at, if: :timestamping?
       end
 
       # Update the created_at field on the Document to the current time. This is
@@ -17,7 +17,11 @@ module Mongoid #:nodoc:
       # @example Set the created at time.
       #   person.set_created_at
       def set_created_at
-        self.created_at = Time.now.utc if !created_at
+        if !created_at
+          time = Time.now.utc
+          self.updated_at = time if is_a?(Updated)
+          self.created_at = time
+        end
       end
     end
   end

data/lib/mongoid/timestamps/timeless.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
   module Timestamps
 
     # This module adds behaviour for turning off timestamping in single or
@@ -16,7 +16,8 @@ module Mongoid #:nodoc:
       #
       # @since 2.3.0
       def timeless
-        tap { Threaded.timeless = true }
+        Threaded.timeless = true
+        self
       end
 
       # Are we currently timestamping?
@@ -31,7 +32,7 @@ module Mongoid #:nodoc:
         Threaded.timestamping?
       end
 
-      module ClassMethods #:nodoc
+      module ClassMethods
 
         # Begin an execution that should skip timestamping.
         #
@@ -42,7 +43,8 @@ module Mongoid #:nodoc:
         #
         # @since 2.3.0
         def timeless
-          tap { Threaded.timeless = true }
+          Threaded.timeless = true
+          self
         end
       end
     end

data/lib/mongoid/timestamps/updated.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
+module Mongoid
   module Timestamps
     # This module handles the behaviour for setting up document updated at
     # timestamp.
@@ -7,8 +7,8 @@ module Mongoid #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        field :updated_at, :type => Time
-        set_callback :save, :before, :set_updated_at, :if => :able_to_set_updated_at?
+        field :updated_at, type: Time
+        set_callback :save, :before, :set_updated_at, if: :able_to_set_updated_at?
       end
 
       # Update the updated_at field on the Document to the current time.

data/lib/mongoid/unit_of_work.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+module Mongoid
+
+  # This module handles unit of work functionality with regards to the identity
+  # map.
+  module UnitOfWork
+
+    # We can process a unit of work in Mongoid and have the identity map
+    # automatically clear itself out after the work is complete.
+    #
+    # @example Process a unit of work.
+    #   Mongoid.unit_of_work do
+    #     Person.create(title: "Sir")
+    #   end
+    #
+    # @example Process with identity map disabled on the current thread.
+    #   Mongoid.unit_of_work(disable: :current) do
+    #     Person.create(title: "Sir")
+    #   end
+    #
+    # @example Process with identity map disabled on all threads.
+    #   Mongoid.unit_of_work(disable: :all) do
+    #     Person.create(title: "Sir")
+    #   end
+    #
+    # @param [ Hash ] options The disabling options.
+    #
+    # @option [ Symbol ] :disable Either :all or :current to indicate whether
+    #   to temporarily disable the identity map on the current thread or all
+    #   threads.
+    #
+    # @return [ Object ] The result of the block.
+    #
+    # @since 2.1.0
+    def unit_of_work(options = {})
+      disable = options[:disable]
+      begin
+        Threaded.disable_identity_map(disable) if disable
+        yield if block_given?
+      ensure
+        if disable
+          Threaded.enable_identity_map(disable)
+        else
+          IdentityMap.clear
+        end
+      end
+    end
+
+    # Are we currently using the identity map?
+    #
+    # @example Is the identity map currently enabled?
+    #   Mongoid.using_identity_map?
+    #
+    # @return [ true, false ] If the identity map is in use.
+    #
+    # @since 3.0.0
+    def using_identity_map?
+      Mongoid.identity_map_enabled? && Threaded.identity_map_enabled?
+    end
+  end
+end

data/lib/mongoid/validations.rb

@@ -6,7 +6,7 @@ require "mongoid/validations/length"
 require "mongoid/validations/presence"
 require "mongoid/validations/uniqueness"
 
-module Mongoid #:nodoc:
+module Mongoid
 
   # This module provides additional validations that ActiveModel does not
   # provide: validates_associated and validates_uniqueness_of.
@@ -53,7 +53,7 @@ module Mongoid #:nodoc:
         relation = send(attr)
         exit_validate
         relation.do_or_do_not(:in_memory) || relation
-      elsif fields[attribute] && fields[attribute].localized?
+      elsif fields[attribute].try(:localized?)
         attributes[attribute]
       else
         send(attr)
@@ -74,7 +74,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0.rc.6
     def valid?(context = nil)
-      super context ? context : (new? ? :create : :update)
+      super context ? context : (new_record? ? :create : :update)
     end
 
     # Used to prevent infinite loops in associated validations.
@@ -89,22 +89,7 @@ module Mongoid #:nodoc:
       Threaded.validated?(self)
     end
 
-    module ClassMethods #:nodoc:
-
-      # Validates whether or not a field matches a certain regular expression.
-      #
-      # @example
-      #   class Person
-      #     include Mongoid::Document
-      #     field :website
-      #
-      #     validates_format_of :website, :with => URI.regexp
-      #   end
-      #
-      # @param [ Array ] *args The arguments to pass to the validator.
-      def validates_format_of(*args)
-        validates_with(FormatValidator, _merge_attributes(args))
-      end
+    module ClassMethods
 
       # Validates whether or not an association is valid or not. Will correctly
       # handle has one and has many associations.
@@ -192,6 +177,29 @@ module Mongoid #:nodoc:
         validates_with(PresenceValidator, _merge_attributes(args))
       end
 
+      # Add validation with the supplied validators forthe provided fields
+      # with options.
+      #
+      # @example Validate with a specific validator.
+      #   validates_with MyValidator, on: :create
+      #
+      # @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
+      #   added.
+      #
+      # @since 3.0.0
+      def validates_with(*args, &block)
+        if args.first == PresenceValidator
+          args.last[:attributes].each do |name|
+            metadata = relations[name.to_s]
+            autosave(metadata.merge!(autosave: true)) if metadata
+          end
+        end
+        super
+      end
+
       protected
 
       # Adds an associated validator for the relation if the validate option

data/lib/mongoid/validations/associated.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Validations #:nodoc:
+module Mongoid
+  module Validations
 
     # Validates whether or not an association is valid or not. Will correctly
     # handle has one and has many associations.

data/lib/mongoid/validations/format.rb

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

data/lib/mongoid/validations/presence.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Validations #:nodoc:
+module Mongoid
+  module Validations
 
     # Validates that the specified attributes are not blank (as defined by
     # Object#blank?).
@@ -28,17 +28,43 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         field = document.fields[attribute.to_s]
         if field.try(:localized?) && !value.blank?
-          value.each_pair do |locale, value|
-            document.errors.add(attribute, :blank_on_locale, options.merge(:location => locale)) if value.blank?
+          value.each_pair do |_locale, _value|
+            document.errors.add(
+              attribute,
+              :blank_in_locale,
+              options.merge(location: _locale)
+            ) if _value.blank?
           end
         elsif document.relations.has_key?(attribute.to_s)
-          if value.blank? && document.send(attribute).blank?
+          if relation_or_fk_missing?(document, attribute, value)
             document.errors.add(attribute, :blank, options)
           end
         else
           document.errors.add(attribute, :blank, options) if value.blank?
         end
       end
+
+      private
+
+      # Returns true if the relation is blank or the foreign key is blank.
+      #
+      # @api private
+      #
+      # @example Check is the relation or fk is blank.
+      #   validator.relation_or_fk_mising(doc, :name, "")
+      #
+      # @param [ Document ] doc The document.
+      # @param [ Symbol ] attr The attribute.
+      # @param [ Object ] value The value.
+      #
+      # @return [ true, false ] If the doc is missing.
+      #
+      # @since 3.0.0
+      def relation_or_fk_missing?(doc, attr, value)
+        return true if value.blank? && doc.send(attr).blank?
+        metadata = doc.relations[attr.to_s]
+        metadata.stores_foreign_key? && doc.send(metadata.foreign_key).blank?
+      end
     end
   end
 end