mongoid 2.3.5 → 2.4.0

data/lib/mongoid/relations/many.rb

@@ -116,6 +116,19 @@ module Mongoid #:nodoc:
         target.map { |document| document.serializable_hash(options) }
       end
 
+      # Get a criteria for the embedded documents without the default scoping
+      # applied.
+      #
+      # @example Get the unscoped criteria.
+      #   person.addresses.unscoped
+      #
+      # @return [ Criteria ] The unscoped criteria.
+      #
+      # @since 2.4.0
+      def unscoped
+        criteria.unscoped
+      end
+
       private
 
       # Find the first object given the supplied attributes or create/initialize it.

data/lib/mongoid/relations/metadata.rb

@@ -197,13 +197,13 @@ module Mongoid # :nodoc:
       # @example Get the eager loading criteria.
       #   metadata.eager_load(criteria)
       #
-      # @param [ Criteria ] criteria The criteria to load from.
+      # @param [ Array<Object> ] ids The ids of the returned parents.
       #
       # @return [ Criteria ] The eager loading criteria.
       #
       # @since 2.2.0
-      def eager_load(criteria)
-        relation.eager_load(self, criteria.clone)
+      def eager_load(ids)
+        relation.eager_load(self, ids)
       end
 
       # Will determine if the relation is an embedded one or not. Currently

data/lib/mongoid/relations/nested_builder.rb

@@ -60,15 +60,16 @@ module Mongoid # :nodoc:
       # @todo Durran: Move this into a common reusable place.
       #
       # @example Convert the id.
-      #   builder.convert_id("4d371b444835d98b8b000010")
+      #   builder.convert_id(Person, "4d371b444835d98b8b000010")
       #
+      # @param [ Class ] klass The class we're trying to convert for.
       # @param [ String ] id The id, usually coming from the form.
       #
       # @return [ BSON::ObjectId, String, Object ] The converted id.
       #
       # @since 2.0.0.rc.6
-      def convert_id(id)
-        metadata.constraint.convert(id)
+      def convert_id(klass, id)
+        BSON::ObjectId.convert(klass, id)
       end
     end
   end

data/lib/mongoid/relations/proxy.rb

@@ -18,7 +18,6 @@ module Mongoid # :nodoc:
       # Backwards compatibility with Mongoid beta releases.
       delegate :klass, :to => :metadata
       delegate :bind_one, :unbind_one, :to => :binding
-      delegate :collection_name, :to => :base
 
       # Convenience for setting the target and the metadata properties since
       # all proxies will need to do this.

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

@@ -38,11 +38,12 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.2, batch-relational-insert
         def batched(&block)
-          inserter = Threaded.insert ||= Insert.new
+          name = collection.name
+          inserter = Threaded.insert(name) || Threaded.set_insert(name, Insert.new)
           count_executions(&block)
         ensure
           if @executions.zero?
-            Threaded.insert = nil
+            Threaded.set_insert(name, nil)
             inserter.execute(collection)
           end
         end

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

@@ -117,15 +117,15 @@ module Mongoid # :nodoc:
           #   Proxy.eager_load(metadata, criteria)
           #
           # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Criteria ] criteria The criteria being used.
+          # @param [ Array<Object> ] ids The ids of the target docs.
           #
           # @return [ Criteria ] The criteria to eager load the relation.
           #
           # @since 2.2.0
-          def eager_load(metadata, criteria)
+          def eager_load(metadata, ids)
             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|
+            klass.any_in("_id" => ids).each do |doc|
               IdentityMap.set(doc)
             end
           end

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

@@ -29,16 +29,40 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0.beta.1
         def <<(*args)
+          docs = args.flatten
+          return concat(docs) if docs.size > 1
+          if doc = docs.first
+            append(doc)
+            doc.save if persistable? && !_assigning? && !doc.validated?
+          end
+        end
+        alias :push :<<
+
+        # Appends an array of documents to the relation. Performs a batch
+        # insert of the documents instead of persisting one at a time.
+        #
+        # @note When performing batch inserts the *after* callbacks will get
+        #   executed before the documents have actually been persisted to the
+        #   database due to an issue with Active Support's callback system - we
+        #   cannot explicitly fire the after callbacks by themselves.
+        #
+        # @example Concat with other documents.
+        #   person.posts.concat([ post_one, post_two ])
+        #
+        # @param [ Array<Document> ] documents The docs to add.
+        #
+        # @return [ Array<Document> ] The documents.
+        #
+        # @since 2.4.0
+        def concat(documents)
           batched do
-            args.flatten.each do |doc|
+            documents.each do |doc|
               next unless doc
               append(doc)
-              doc.save if persistable? && !doc.validated?
+              doc.save if persistable?
             end
           end
         end
-        alias :concat :<<
-        alias :push :<<
 
         # Build a new document from the attributes and append it to this
         # relation without saving.
@@ -66,6 +90,7 @@ module Mongoid #:nodoc:
           Factory.build(type || klass, attributes, options).tap do |doc|
             append(doc)
             yield(doc) if block_given?
+            doc.run_callbacks(:build) { doc }
           end
         end
         alias :new :build
@@ -293,13 +318,37 @@ module Mongoid #:nodoc:
         # @since 2.0.0.rc.1
         def substitute(replacement)
           tap do |proxy|
-            if replacement != proxy.in_memory
+            if replacement
+              if replacement != proxy.in_memory
+                new_docs, docs = replacement.compact.uniq, []
+                new_ids = new_docs.map { |doc| doc.id }
+                remove_not_in(new_ids)
+                new_docs.each do |doc|
+                  docs.push(doc) if doc.send(metadata.foreign_key) != base.id
+                end
+                proxy.concat(docs)
+              end
+            else
               proxy.purge
-              proxy.push(replacement.compact.uniq) if replacement
             end
           end
         end
 
+        # Get a criteria for the documents without the default scoping
+        # applied.
+        #
+        # @example Get the unscoped criteria.
+        #   person.posts.unscoped
+        #
+        # @return [ Criteria ] The unscoped criteria.
+        #
+        # @since 2.4.0
+        def unscoped
+          klass.unscoped.where(
+            metadata.foreign_key => Conversions.flag(base.id, metadata)
+          )
+        end
+
         private
 
         # Appends the document to the target array, updating the index on the
@@ -408,7 +457,7 @@ module Mongoid #:nodoc:
         #
         # @since 2.1.0
         def persistable?
-          _creating? || base.persisted? && !_binding? && !_building?
+          !_binding? && (_creating? || base.persisted? && !_building?)
         end
 
         # Deletes all related documents from the database given the supplied
@@ -437,6 +486,36 @@ module Mongoid #:nodoc:
           end
         end
 
+        # Remove all the documents in the proxy that do not have the provided
+        # ids.
+        #
+        # @todo: Durran: Refactor 3.0. Temp for bug fix in 2.4.
+        #
+        # @example Remove all documents without the ids.
+        #   proxy.remove_not_in([ id ])
+        #
+        # @param [ Array<Object> ] ids The ids.
+        #
+        # @since 2.4.0
+        def remove_not_in(ids)
+          removed = criteria.not_in(:_id => ids)
+          if metadata.destructive?
+            removed.delete_all
+          else
+            removed.update(metadata.foreign_key => nil)
+          end
+          in_memory.each do |doc|
+            if !ids.include?(doc.id)
+              unbind_one(doc)
+              added.try { |p| p.delete_one(doc) }
+              loaded.try { |p| p.delete_one(doc) }
+              if metadata.destructive?
+                doc.destroyed = true
+              end
+            end
+          end
+        end
+
         class << self
 
           # Return the builder that is responsible for generating the documents
@@ -479,14 +558,14 @@ module Mongoid #:nodoc:
           #   Proxy.eager_load(metadata, criteria)
           #
           # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Criteria ] criteria The criteria being used.
+          # @param [ Array<Object> ] ids The ids of the base docs.
           #
           # @return [ Criteria ] The criteria to eager load the relation.
           #
           # @since 2.2.0
-          def eager_load(metadata, criteria)
+          def eager_load(metadata, ids)
             klass, foreign_key = metadata.klass, metadata.foreign_key
-            klass.any_in(foreign_key => criteria.load_ids("_id").uniq).each do |doc|
+            klass.any_in(foreign_key => ids).each do |doc|
               IdentityMap.set_many(doc, foreign_key => doc.send(foreign_key))
             end
           end

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

@@ -81,49 +81,6 @@ module Mongoid # :nodoc:
         end
         alias :new :build
 
-        # Creates a new document on the references many relation. This will
-        # save the document if the parent has been persisted.
-        #
-        # @example Create and save the new document.
-        #   person.posts.create(:text => "Testing")
-        #
-        # @param [ Hash ] attributes The attributes to create with.
-        # @param [ Class ] type The optional type of document to create.
-        #
-        # @return [ Document ] The newly created document.
-        #
-        # @since 2.0.0.beta.1
-        def create(attributes = nil, type = nil, &block)
-          super.tap do |doc|
-            base.send(metadata.foreign_key).delete_one(doc.id)
-            base.push(metadata.foreign_key, doc.id)
-            base.synced[metadata.foreign_key] = false
-          end
-        end
-
-        # Creates a new document on the references many relation. This will
-        # save the document if the parent has been persisted and will raise an
-        # error if validation fails.
-        #
-        # @example Create and save the new document.
-        #   person.posts.create!(:text => "Testing")
-        #
-        # @param [ Hash ] attributes The attributes to create with.
-        # @param [ Class ] type The optional type of document to create.
-        #
-        # @raise [ Errors::Validations ] If validation failed.
-        #
-        # @return [ Document ] The newly created document.
-        #
-        # @since 2.0.0.beta.1
-        def create!(attributes = nil, type = nil, &block)
-          super.tap do |doc|
-            base.send(metadata.foreign_key).delete_one(doc.id)
-            base.push(metadata.foreign_key, doc.id)
-            base.synced[metadata.foreign_key] = false
-          end
-        end
-
         # Delete the document from the relation. This will set the foreign key
         # on the document to nil. If the dependent options on the relation are
         # :delete or :destroy the appropriate removal will occur.
@@ -171,6 +128,40 @@ module Mongoid # :nodoc:
         alias :clear :nullify
         alias :purge :nullify
 
+        # Substitutes the supplied target documents for the existing documents
+        # in the relation. If the new target is nil, perform the necessary
+        # deletion.
+        #
+        # @example Replace the relation.
+        # person.preferences.substitute([ new_post ])
+        #
+        # @param [ Array<Document> ] replacement The replacement target.
+        #
+        # @return [ Many ] The relation.
+        #
+        # @since 2.0.0.rc.1
+        def substitute(replacement)
+          tap do |proxy|
+            if replacement != proxy.in_memory
+              proxy.purge
+              proxy.push(replacement.compact.uniq) if replacement
+            end
+          end
+        end
+
+        # Get a criteria for the documents without the default scoping
+        # applied.
+        #
+        # @example Get the unscoped criteria.
+        #   person.preferences.unscoped
+        #
+        # @return [ Criteria ] The unscoped criteria.
+        #
+        # @since 2.4.0
+        def unscoped
+          klass.unscoped.any_in(:_id => base.send(metadata.foreign_key))
+        end
+
         private
 
         # Appends the document to the target array, updating the index on the

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

@@ -53,7 +53,11 @@ module Mongoid # :nodoc:
         def substitute(replacement)
           unbind_one
           if persistable?
-            metadata.destructive? ? send(metadata.dependent) : save
+            if metadata.destructive?
+              send(metadata.dependent)
+            else
+              save if persisted?
+            end
           end
           return nil unless replacement
           One.new(base, replacement, metadata)
@@ -128,14 +132,14 @@ module Mongoid # :nodoc:
           #   Proxy.eager_load(metadata, criteria)
           #
           # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Criteria ] criteria The criteria being used.
+          # @param [ Array<Object> ] ids The ids of the base docs.
           #
           # @return [ Criteria ] The criteria to eager load the relation.
           #
           # @since 2.2.0
-          def eager_load(metadata, criteria)
+          def eager_load(metadata, ids)
             klass, foreign_key = metadata.klass, metadata.foreign_key
-            klass.any_in(foreign_key => criteria.load_ids("_id").uniq).each do |doc|
+            klass.any_in(foreign_key => ids).each do |doc|
               IdentityMap.set_one(doc, foreign_key => doc.send(foreign_key))
             end
           end

data/lib/mongoid/relations/synchronization.rb

@@ -75,11 +75,28 @@ module Mongoid # :nodoc:
       #
       # @since 2.1.0
       def update_inverse_keys(meta)
-        return unless changes.has_key?(meta.foreign_key)
-        old, new = changes[meta.foreign_key]
-        adds, subs = new - (old || []), (old || []) - new
-        meta.criteria(adds).add_to_set(meta.inverse_foreign_key, id) unless adds.empty?
-        meta.criteria(subs).pull(meta.inverse_foreign_key, id) unless subs.empty?
+        if changes.has_key?(meta.foreign_key)
+          old, new = changes[meta.foreign_key]
+          adds, subs = new - (old || []), (old || []) - new
+
+          # If we are autosaving we don't want a duplicate to get added - the
+          # $addToSet would run previously and then the $pushAll from the
+          # inverse on the autosave would cause this. We delete each id from
+          # what's in memory in case a mix of id addition and object addition
+          # had occurred.
+          if meta.autosave?
+            send(meta.name).in_memory.each do |doc|
+              adds.delete_one(doc.id)
+            end
+          end
+
+          unless adds.empty?
+            meta.criteria(adds).add_to_set(meta.inverse_foreign_key, id)
+          end
+          unless subs.empty?
+            meta.criteria(subs).pull(meta.inverse_foreign_key, id)
+          end
+        end
       end
 
       module ClassMethods #:nodoc:

data/lib/mongoid/threaded.rb

@@ -8,76 +8,60 @@ module Mongoid #:nodoc:
   module Threaded
     extend self
 
-    # Begins a assigning block.
+    # Begin entry into a named thread local stack.
     #
-    # @example Begin the assign.
-    #   Threaded.begin_assign
+    # @example Begin entry into the stack.
+    #   Threaded.begin(:create)
     #
-    # @return [ true ] Always true.
+    # @param [ Symbol ] name The name of the stack
     #
-    # @since 2.1.9
-    def begin_assign
-      assign_stack.push(true)
-    end
-
-    # Begins a binding block.
-    #
-    # @example Begin the bind.
-    #   Threaded.begin_bind
+    # @return [ true ] True.
     #
-    # @return [ true ] Always true.
-    #
-    # @since 2.1.9
-    def begin_bind
-      bind_stack.push(true)
+    # @since 2.4.0
+    def begin(name)
+      stack(name).push(true)
     end
 
-    # Begins a building block.
+    # Are in the middle of executing the named stack
     #
-    # @example Begin the build.
-    #   Threaded.begin_build
+    # @example Are we in the stack execution?
+    #   Threaded.executing?(:create)
     #
-    # @return [ true ] Always true.
+    # @param [ Symbol ] name The name of the stack
     #
-    # @since 2.1.9
-    def begin_build
-      build_stack.push(true)
-    end
-
-    # Begins a creating block.
-    #
-    # @example Begin the create.
-    #   Threaded.begin_create
+    # @return [ true ] If the stack is being executed.
     #
-    # @return [ true ] Always true.
-    #
-    # @since 2.1.9
-    def begin_create
-      create_stack.push(true)
+    # @since 2.4.0
+    def executing?(name)
+      !stack(name).empty?
     end
 
-    # Begins a loading block.
+    # Exit from a named thread local stack.
     #
-    # @example Begin the load.
-    #   Threaded.begin_load
+    # @example Exit from the stack.
+    #   Threaded.exit(:create)
     #
-    # @return [ true ] Always true.
+    # @param [ Symbol ] name The name of the stack
     #
-    # @since 2.3.2
-    def begin_load
-      load_stack.push(true)
+    # @return [ true ] True.
+    #
+    # @since 2.4.0
+    def exit(name)
+      stack(name).pop
     end
 
-    # Begins a loading revision block.
+    # Get the named stack.
+    #
+    # @example Get a stack by name
+    #   Threaded.stack(:create)
     #
-    # @example Begin the revision load.
-    #   Threaded.begin_load_revision
+    # @param [ Symbol ] name The name of the stack
     #
-    # @return [ true ] Always true.
+    # @return [ Array ] The stack.
     #
-    # @since 2.3.4
-    def begin_load_revision
-      load_revision_stack.push(true)
+    # @since 2.4.0
+    def stack(name)
+      Thread.current[:"[mongoid]:#{name}-stack"] ||= []
     end
 
     # Begin validating a document on the current thread.
@@ -92,156 +76,6 @@ 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?
-    #   Threaded.binding?
-    #
-    # @return [ true, false ] If the thread is in binding mode?
-    #
-    # @since 2.1.0
-    def binding?
-      !bind_stack.empty?
-    end
-
-    # Is the current thread in building mode?
-    #
-    # @example Is the thread in building mode?
-    #   Threaded.building?
-    #
-    # @return [ true, false ] If the thread is in building mode?
-    #
-    # @since 2.1.0
-    def building?
-      !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
-
-    # Is the current thread in loading mode?
-    #
-    # @example Is the thread in loading mode?
-    #   Threaded.loading?
-    #
-    # @return [ true, false ] If the thread is in loading mode?
-    #
-    # @since 2.3.2
-    def loading?
-      !load_stack.empty?
-    end
-
-    # Is the current thread in revision load mode?
-    #
-    # @example Is the thread in revision load mode?
-    #   Threaded.loading_revision?
-    #
-    # @return [ true, false ] If the thread is in revision load mode?
-    #
-    # @since 2.3.4
-    def loading_revision?
-      !load_revision_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.
-    #
-    # @example Get the bind stack.
-    #   Threaded.bind_stack
-    #
-    # @return [ Array ] The array of bind calls.
-    #
-    # @since 2.1.9
-    def bind_stack
-      Thread.current[:"[mongoid]:bind-stack"] ||= []
-    end
-
-    # Get the build stack for the current thread. Is simply an array of calls
-    # to Mongoid's building method.
-    #
-    # @example Get the build stack.
-    #   Threaded.build_stack
-    #
-    # @return [ Array ] The array of build calls.
-    #
-    # @since 2.1.9
-    def build_stack
-      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
-
-    # Get the load stack for the current thread. Is simply an array of calls
-    # to Mongoid's loading method.
-    #
-    # @example Get the load stack.
-    #   Threaded.load_stack
-    #
-    # @return [ Array ] The array of load calls.
-    #
-    # @since 2.3.2
-    def load_stack
-      Thread.current[:"[mongoid]:load-stack"] ||= []
-    end
-
-    # Get the revision load stack for the current thread. Is simply an array
-    # of calls to Mongoid's loading_revision method.
-    #
-    # @example Get the revision load stack.
-    #   Threaded.load_revision_stack
-    #
-    # @return [ Array ] The array of load revision calls.
-    #
-    # @since 2.3.4
-    def load_revision_stack
-      Thread.current[:"[mongoid]:load-revision-stack"] ||= []
-    end
-
     # Clear out all the safety options set using the safely proxy.
     #
     # @example Clear out the options.
@@ -265,78 +99,6 @@ module Mongoid #:nodoc:
       self.timeless = false
     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.
-    #   Threaded.exit_bind
-    #
-    # @return [ true ] The last element in the stack.
-    #
-    # @since 2.1.9
-    def exit_bind
-      bind_stack.pop
-    end
-
-    # Exit the building block.
-    #
-    # @example Exit the building block.
-    #   Threaded.exit_build
-    #
-    # @return [ true ] The last element in the stack.
-    #
-    # @since 2.1.9
-    def exit_build
-      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 the loading block.
-    #
-    # @example Exit the loading block.
-    #   Threaded.exit_load
-    #
-    # @return [ true ] The last element in the stack.
-    #
-    # @since 2.1.9
-    def exit_load
-      load_stack.pop
-    end
-
-    # Exit the revision loading block.
-    #
-    # @example Exit the revision loading block.
-    #   Threaded.exit_load_revision
-    #
-    # @return [ true ] The last element in the stack.
-    #
-    # @since 2.3.4
-    def exit_load_revision
-      load_revision_stack.pop
-    end
-
     # Exit validating a document on the current thread.
     #
     # @example Exit validation.
@@ -369,8 +131,8 @@ module Mongoid #:nodoc:
     # @return [ Object ] The batch insert consumer.
     #
     # @since 2.1.0
-    def insert
-      Thread.current[:"[mongoid]:insert-consumer"]
+    def insert(name)
+      Thread.current[:"[mongoid][#{name}]:insert-consumer"]
     end
 
     # Set the insert consumer on the current thread.
@@ -383,8 +145,8 @@ module Mongoid #:nodoc:
     # @return [ Object ] The insert consumer.
     #
     # @since 2.1.0
-    def insert=(consumer)
-      Thread.current[:"[mongoid]:insert-consumer"] = consumer
+    def set_insert(name, consumer)
+      Thread.current[:"[mongoid][#{name}]:insert-consumer"] = consumer
     end
 
     # Get the safety options for the current thread.