mongoid 2.1.9 → 2.2.0

data/lib/mongoid/relations/metadata.rb

@@ -178,6 +178,23 @@ module Mongoid # :nodoc:
         !!dependent
       end
 
+      # Get the criteria needed to eager load this relation.
+      #
+      # @example Get the eager loading criteria.
+      #   metadata.eager_load(criteria)
+      #
+      # @param [ Criteria ] criteria The criteria to load from.
+      #
+      # @return [ Criteria ] The eager loading criteria.
+      #
+      # @since 2.2.0
+      def eager_load(criteria)
+        relation.eager_load(
+          self,
+          criteria.clone.tap { |crit| crit.inclusions.clear }
+        )
+      end
+
       # Will determine if the relation is an embedded one or not. Currently
       # only checks against embeds one and many.
       #

data/lib/mongoid/relations/polymorphic.rb

@@ -9,7 +9,18 @@ module Mongoid # :nodoc:
 
       included do
         class_attribute :polymorphic
-        delegate :polymorphic?, :to => "self.class"
+      end
+
+      # Is the document in a polymorphic relation?
+      #
+      # @note Refactored from using delegate for class load performance.
+      #
+      # @example Is the document polymorphic?
+      #   model.polymorphic?
+      #
+      # @return [ true, false ] If the document is in a polymorphic relation.
+      def polymorphic?
+        self.class.polymorphic?
       end
 
       module ClassMethods #:nodoc:

data/lib/mongoid/relations/proxy.rb

@@ -50,6 +50,18 @@ module Mongoid # :nodoc:
 
       protected
 
+      # Is the current thread in assigning mode?
+      #
+      # @example Is the current thread in assigning mode?
+      #   proxy.assigning?
+      #
+      # @return [ true, false ] If the thread is assigning.
+      #
+      # @since 2.1.0
+      def assigning?
+        Threaded.assigning?
+      end
+
       # Is the current thread in binding mode?
       #
       # @example Is the current thread in binding mode?
@@ -74,6 +86,18 @@ module Mongoid # :nodoc:
         Threaded.building?
       end
 
+      # Is the current thread in creating mode?
+      #
+      # @example Is the current thread in creating mode?
+      #   proxy.creating?
+      #
+      # @return [ true, false ] If the thread is creating.
+      #
+      # @since 2.1.0
+      def creating?
+        Threaded.creating?
+      end
+
       # Get the collection from the root of the hierarchy.
       #
       # @example Get the collection.

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

@@ -109,6 +109,26 @@ module Mongoid # :nodoc:
             type.where(:_id => object)
           end
 
+          # Get the criteria that is used to eager load a relation of this
+          # type.
+          #
+          # @example Get the eager load criteria.
+          #   Proxy.eager_load(metadata, criteria)
+          #
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Criteria ] criteria The criteria being used.
+          #
+          # @return [ Criteria ] The criteria to eager load the relation.
+          #
+          # @since 2.2.0
+          def eager_load(metadata, criteria)
+            raise Errors::EagerLoad.new(metadata.name) if metadata.polymorphic?
+            klass, foreign_key = metadata.klass, metadata.foreign_key
+            klass.any_in("_id" => criteria.load_ids(foreign_key).uniq).each do |doc|
+              IdentityMap.set(doc)
+            end
+          end
+
           # Returns true if the relation is an embedded one. In this case
           # always false.
           #

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

@@ -245,10 +245,14 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.beta.1
         def purge
-          criteria.delete_all
-          target.clear do |doc|
-            unbind_one(doc)
-            doc.destroyed = true
+          unless metadata.destructive?
+            nullify
+          else
+            criteria.delete_all
+            target.clear do |doc|
+              unbind_one(doc)
+              doc.destroyed = true
+            end
           end
         end
         alias :clear :purge
@@ -267,8 +271,10 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            proxy.purge
-            proxy.push(replacement.compact) if replacement
+            if replacement != proxy.in_memory
+              proxy.purge
+              proxy.push(replacement.compact) if replacement
+            end
           end
         end
 
@@ -464,6 +470,24 @@ module Mongoid #:nodoc:
             metadata.klass.where(metadata.foreign_key => object)
           end
 
+          # Eager load the relation based on the criteria.
+          #
+          # @example Eager load the criteria.
+          #   Proxy.eager_load(metadata, criteria)
+          #
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Criteria ] criteria The criteria being used.
+          #
+          # @return [ Criteria ] The criteria to eager load the relation.
+          #
+          # @since 2.2.0
+          def eager_load(metadata, criteria)
+            klass, foreign_key = metadata.klass, metadata.foreign_key
+            klass.any_in(foreign_key => criteria.load_ids("_id").uniq).each do |doc|
+              IdentityMap.set_many(doc, foreign_key => doc.send(foreign_key))
+            end
+          end
+
           # Returns true if the relation is an embedded one. In this case
           # always false.
           #

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

@@ -30,14 +30,14 @@ module Mongoid # :nodoc:
               args.flatten.each do |doc|
                 next unless doc
                 append(doc)
-                if persistable?
+                if persistable? || creating?
                   ids.push(doc.id)
                   doc.save
                 else
                   base.send(metadata.foreign_key).push(doc.id)
                 end
               end
-              if persistable?
+              if persistable? || creating?
                 base.push_all(metadata.foreign_key, ids)
                 base.synced[metadata.foreign_key] = false
               end
@@ -232,6 +232,22 @@ module Mongoid # :nodoc:
             metadata.klass.any_in(:_id => object)
           end
 
+          # Get the criteria that is used to eager load a relation of this
+          # type.
+          #
+          # @example Get the eager load criteria.
+          #   Proxy.eager_load(metadata, criteria)
+          #
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Criteria ] criteria The criteria being used.
+          #
+          # @return [ Criteria ] The criteria to eager load the relation.
+          #
+          # @since 2.2.0
+          def eager_load(metadata, criteria)
+            raise Errors::EagerLoad.new(metadata.name)
+          end
+
           # Returns true if the relation is an embedded one. In this case
           # always false.
           #

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

@@ -122,6 +122,25 @@ module Mongoid # :nodoc:
             metadata.klass.where(metadata.foreign_key => object)
           end
 
+          # Get the criteria that is used to eager load a relation of this
+          # type.
+          #
+          # @example Get the eager load criteria.
+          #   Proxy.eager_load(metadata, criteria)
+          #
+          # @param [ Metadata ] metadata The relation metadata.
+          # @param [ Criteria ] criteria The criteria being used.
+          #
+          # @return [ Criteria ] The criteria to eager load the relation.
+          #
+          # @since 2.2.0
+          def eager_load(metadata, criteria)
+            klass, foreign_key = metadata.klass, metadata.foreign_key
+            klass.any_in(foreign_key => criteria.load_ids("_id").uniq).each do |doc|
+              IdentityMap.set_one(doc, foreign_key => doc.send(foreign_key))
+            end
+          end
+
           # Returns true if the relation is an embedded one. In this case
           # always false.
           #

data/lib/mongoid/relations/reflections.rb

@@ -7,9 +7,29 @@ module Mongoid # :nodoc:
     module Reflections
       extend ActiveSupport::Concern
 
-      delegate \
-        :reflect_on_association,
-        :reflect_on_all_associations, :to => "self.class"
+      # Returns the relation metadata for the supplied name.
+      #
+      # @example Find relation metadata by name.
+      #   person.reflect_on_association(:addresses)
+      #
+      # @param [ String, Symbol ] name The name of the relation to find.
+      #
+      # @return [ Metadata ] The matching relation metadata.
+      def reflect_on_association(name)
+        self.class.reflect_on_association(name)
+      end
+
+      # Returns all relation metadata for the supplied macros.
+      #
+      # @example Find multiple relation metadata by macro.
+      #   person.reflect_on_all_associations(:embeds_many)
+      #
+      # @param [ Array<String, Symbol> ] *macros The relation macros.
+      #
+      # @return [ Array<Metadata> ] The matching relation metadata.
+      def reflect_on_all_associations(*macros)
+        self.class.reflect_on_all_associations(*macros)
+      end
 
       module ClassMethods #:nodoc
 

data/lib/mongoid/relations/targets/enumerable.rb

@@ -189,7 +189,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def first
-          (loaded? ? loaded.first : unloaded.first) || added.first
+          added.first || (loaded? ? loaded.first : unloaded.first)
         end
 
         # Initialize the new enumerable either with a criteria or an array.
@@ -320,6 +320,34 @@ module Mongoid #:nodoc:
         end
         alias :length :size
 
+        # Send #to_json to the entries.
+        #
+        # @example Get the enumerable as json.
+        #   enumerable.to_json
+        #
+        # @param [ Hash ] options Optional parameters.
+        #
+        # @return [ String ] The entries all loaded as a string.
+        #
+        # @since 2.2.0
+        def to_json(options = {})
+          entries.to_json(options)
+        end
+
+        # Send #as_json to the entries, without encoding.
+        #
+        # @example Get the enumerable as json.
+        #   enumerable.as_json
+        #
+        # @param [ Hash ] options Optional parameters.
+        #
+        # @return [ Hash ] The entries all loaded as a hash.
+        #
+        # @since 2.2.0
+        def as_json(options = {})
+          entries.as_json(options)
+        end
+
         # Return all the unique documents in the enumerable.
         #
         # @note This operation loads all documents from the database.

data/lib/mongoid/serialization.rb

@@ -74,7 +74,7 @@ module Mongoid # :nodoc:
       inclusions = options[:include]
       relation_names(inclusions).each do |name|
         metadata = relations[name.to_s]
-        relation = send(metadata.name, false, :eager => true)
+        relation = send(metadata.name)
         if relation
           attributes[metadata.name.to_s] =
             relation.serializable_hash(relation_options(inclusions, options, name))

data/lib/mongoid/sharding.rb

@@ -5,13 +5,23 @@ module Mongoid #:nodoc
   module Sharding
     extend ActiveSupport::Concern
 
-    delegate :shard_key_fields, :to => "self.class"
-
     included do
       cattr_accessor :shard_key_fields
       self.shard_key_fields = []
     end
 
+    # Get the shard key fields.
+    #
+    # @note Refactored from using delegate for class load performance.
+    #
+    # @example Get the shard key fields.
+    #   model.shard_key_fields
+    #
+    # @return [ Array<String> ] The shard key field names.
+    def shard_key_fields
+      self.class.shard_key_fields
+    end
+
     # Get the document selector with the defined shard keys.
     #
     # @example Get the selector for the shard keys.

data/lib/mongoid/threaded.rb

@@ -6,6 +6,18 @@ module Mongoid #:nodoc:
   module Threaded
     extend self
 
+    # Begins a assigning block.
+    #
+    # @example Begin the assign.
+    #   Threaded.begin_assign
+    #
+    # @return [ true ] Always true.
+    #
+    # @since 2.1.9
+    def begin_assign
+      assign_stack.push(true)
+    end
+
     # Begins a binding block.
     #
     # @example Begin the bind.
@@ -30,6 +42,18 @@ module Mongoid #:nodoc:
       build_stack.push(true)
     end
 
+    # Begins a creating block.
+    #
+    # @example Begin the create.
+    #   Threaded.begin_create
+    #
+    # @return [ true ] Always true.
+    #
+    # @since 2.1.9
+    def begin_create
+      create_stack.push(true)
+    end
+
     # Begin validating a document on the current thread.
     #
     # @example Begin validation.
@@ -42,6 +66,18 @@ module Mongoid #:nodoc:
       validations_for(document.class).push(document.id)
     end
 
+    # Is the current thread in assigning mode?
+    #
+    # @example Is the thread in assigning mode?
+    #   Threaded.assigning?
+    #
+    # @return [ true, false ] If the thread is in assigning mode?
+    #
+    # @since 2.1.0
+    def assigning?
+      !assign_stack.empty?
+    end
+
     # Is the current thread in binding mode?
     #
     # @example Is the thread in binding mode?
@@ -66,6 +102,31 @@ module Mongoid #:nodoc:
       !build_stack.empty?
     end
 
+    # Is the current thread in creating mode?
+    #
+    # @example Is the thread in creating mode?
+    #   Threaded.creating?
+    #
+    # @return [ true, false ] If the thread is in creating mode?
+    #
+    # @since 2.1.0
+    def creating?
+      !create_stack.empty?
+    end
+
+    # Get the assign stack for the current thread. Is simply an array of calls
+    # to Mongoid's assigning method.
+    #
+    # @example Get the assign stack.
+    #   Threaded.assign_stack
+    #
+    # @return [ Array ] The array of assign calls.
+    #
+    # @since 2.1.9
+    def assign_stack
+      Thread.current[:"[mongoid]:assign-stack"] ||= []
+    end
+
     # Get the bind stack for the current thread. Is simply an array of calls
     # to Mongoid's binding method.
     #
@@ -92,6 +153,19 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid]:build-stack"] ||= []
     end
 
+    # Get the create stack for the current thread. Is simply an array of calls
+    # to Mongoid's creating method.
+    #
+    # @example Get the create stack.
+    #   Threaded.create_stack
+    #
+    # @return [ Array ] The array of create calls.
+    #
+    # @since 2.1.9
+    def create_stack
+      Thread.current[:"[mongoid]:create-stack"] ||= []
+    end
+
     # Clear out all the safety options set using the safely proxy.
     #
     # @example Clear out the options.
@@ -104,6 +178,18 @@ module Mongoid #:nodoc:
       Thread.current[:"[mongoid]:safety-options"] = nil
     end
 
+    # Exit the assigning block.
+    #
+    # @example Exit the assigning block.
+    #   Threaded.exit_assign
+    #
+    # @return [ true ] The last element in the stack.
+    #
+    # @since 2.1.9
+    def exit_assign
+      assign_stack.pop
+    end
+
     # Exit the binding block.
     #
     # @example Exit the binding block.
@@ -128,6 +214,18 @@ module Mongoid #:nodoc:
       build_stack.pop
     end
 
+    # Exit the creating block.
+    #
+    # @example Exit the creating block.
+    #   Threaded.exit_create
+    #
+    # @return [ true ] The last element in the stack.
+    #
+    # @since 2.1.9
+    def exit_create
+      create_stack.pop
+    end
+
     # Exit validating a document on the current thread.
     #
     # @example Exit validation.