mongoid 2.0.1 → 2.0.2

data/lib/mongoid/paranoia.rb

@@ -49,7 +49,7 @@ module Mongoid #:nodoc:
     # true
     def remove(options = {})
       now = Time.now
-      collection.update({ :_id => self.id }, { '$set' => { :deleted_at => Time.now } })
+      collection.update({ :_id => id }, { '$set' => { :deleted_at => now } })
       @attributes["deleted_at"] = now
       true
     end
@@ -72,7 +72,7 @@ module Mongoid #:nodoc:
     #
     # <tt>document.restore</tt>
     def restore
-      collection.update({ :_id => self.id }, { '$unset' => { :deleted_at => true } })
+      collection.update({ :_id => id }, { '$unset' => { :deleted_at => true } })
       @attributes.delete("deleted_at")
     end
 

data/lib/mongoid/persistence.rb

@@ -57,7 +57,7 @@ module Mongoid #:nodoc:
     # @return [ TrueClass ] True.
     def remove(options = {})
       if Remove.new(self, options).persist
-        raw_attributes.freeze
+        attributes.freeze
         self.destroyed = true
         cascade!
       end; true
@@ -102,7 +102,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0.rc.6
     def update_attribute(name, value)
-      write_attribute(name, value) and save(:validate => false)
+      write_attribute(name, value) ? save(:validate => false) : true
     end
 
     # Update the document attributes in the datbase.

data/lib/mongoid/persistence/update.rb

@@ -50,11 +50,12 @@ module Mongoid #:nodoc:
                 child.move_changes
                 child.new_record = false if child.new_record?
               end
+              true
             else
               return false
             end
           end
-        end; true
+        end
       end
 
       protected

data/lib/mongoid/railtie.rb

@@ -45,8 +45,9 @@ module Rails #:nodoc:
       #
       # @example mongoid.yml
       #
-      #   defaults: &defaults
+      #   development:
       #     host: localhost
+      #     database: mongoid
       #     slaves:
       #       # - host: localhost
       #         # port: 27018
@@ -56,9 +57,6 @@ module Rails #:nodoc:
       #     parameterize_keys: false
       #     persist_in_safe_mode: false
       #
-      #   development:
-      #     <<: *defaults
-      #     database: mongoid
       initializer "setup database" do
         config_file = Rails.root.join("config", "mongoid.yml")
         if config_file.file?
@@ -131,7 +129,7 @@ module Rails #:nodoc:
         config.after_initialize do
           ::Mongoid.instantiate_observers
 
-          ActionDispatch::Callbacks.to_prepare(:mongoid_instantiate_observers) do
+          ActionDispatch::Callbacks.to_prepare do
             ::Mongoid.instantiate_observers
           end
         end

data/lib/mongoid/relations.rb

@@ -14,6 +14,7 @@ require "mongoid/relations/embedded/atomic"
 require "mongoid/relations/embedded/in"
 require "mongoid/relations/embedded/many"
 require "mongoid/relations/embedded/one"
+require "mongoid/relations/referenced/batch"
 require "mongoid/relations/referenced/in"
 require "mongoid/relations/referenced/many"
 require "mongoid/relations/referenced/many_to_many"

data/lib/mongoid/relations/builders.rb

@@ -45,11 +45,11 @@ module Mongoid # :nodoc:
         # @return [ Class ] The class being set up.
         #
         # @since 2.0.0.rc.1
-        def builder(name)
+        def builder(name, metadata)
           tap do
             define_method("build_#{name}") do |*args|
-              attributes = (args.any? ? args : []) + [{:binding => true}]
-              send("#{name}=", *attributes)
+              document = Factory.build(metadata.klass, args.first || {})
+              send("#{name}=", document, :binding => true)
             end
           end
         end

data/lib/mongoid/relations/builders/embedded/in.rb

@@ -16,7 +16,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless object.is_a?(Hash)
-            Mongoid::Factory.build(metadata.klass, object)
+            Mongoid::Factory.from_db(metadata.klass, object)
           end
         end
       end

data/lib/mongoid/relations/builders/embedded/many.rb

@@ -21,7 +21,7 @@ module Mongoid # :nodoc:
             return object if object.first.is_a?(Document)
             object.inject([]) do |documents, attrs|
               documents.tap do |docs|
-                docs << Mongoid::Factory.build(metadata.klass, attrs)
+                docs << Mongoid::Factory.from_db(metadata.klass, attrs)
               end
             end
           end

data/lib/mongoid/relations/builders/embedded/one.rb

@@ -17,8 +17,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless object.is_a?(Hash)
-            object.delete(:binding)
-            Mongoid::Factory.build(metadata.klass, object)
+            Mongoid::Factory.from_db(metadata.klass, object)
           end
         end
       end

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

@@ -16,9 +16,6 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless query?
-            if object.is_a?(Hash)
-              return Mongoid::Factory.build(metadata.klass, object)
-            end
             begin
               (type ? type.constantize : metadata.klass).find(object)
             rescue Errors::DocumentNotFound

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

@@ -18,7 +18,27 @@ module Mongoid # :nodoc:
             return object unless query?
             return [] if object.is_a?(Array)
             key = metadata.foreign_key
-            metadata.klass.all(:conditions => { key => object })
+            metadata.klass.where(key => convertable(metadata, object))
+          end
+
+          private
+
+          # Get the value for the foreign key in convertable or unconvertable
+          # form.
+          #
+          # @example Get the value.
+          #   builder.convertable
+          #
+          # @return [ String, Unconvertable, BSON::ObjectId ] The string or object id.
+          #
+          # @since 2.0.2
+          def convertable(metadata, object)
+            inverse = metadata.inverse_klass
+            if inverse.using_object_ids? || object.is_a?(BSON::ObjectId)
+              object
+            else
+              Mongoid::Criterion::Unconvertable.new(object)
+            end
           end
         end
       end

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

@@ -16,10 +16,6 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless query?
-            if object.is_a?(Hash)
-              object.delete(:binding)
-              return Mongoid::Factory.build(metadata.klass, object)
-            end
             metadata.klass.first(
               :conditions => { metadata.foreign_key => object }
             )

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

@@ -232,22 +232,6 @@ module Mongoid # :nodoc:
           end
         end
 
-        # Paginate the association. Will create a new criteria, set the documents
-        # on it and execute in an enumerable context.
-        #
-        # @example Paginate the relation.
-        #   person.addresses.paginate(:page => 1, :per_page => 20)
-        #
-        # @param [ Hash ] options The pagination options.
-        #
-        # @option options [ Integer ] :page The page number.
-        # @option options [ Integer ] :per_page The number on each page.
-        #
-        # @return [ WillPaginate::Collection ] The paginated documents.
-        def paginate(options)
-          criteria.paginate(options)
-        end
-
         # Substitutes the supplied target documents for the existing documents
         # in the relation.
         #
@@ -370,7 +354,7 @@ module Mongoid # :nodoc:
           load!(:binding => true) and return super if target.respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
-            criteria.send(name, *args)
+            criteria.send(name, *args, &block)
           end
         end
 

data/lib/mongoid/relations/macros.rb

@@ -104,7 +104,7 @@ module Mongoid # :nodoc:
         def embeds_one(name, options = {}, &block)
           characterize(name, Embedded::One, options, &block).tap do |meta|
             relate(name, meta)
-            builder(name).creator(name)
+            builder(name, meta).creator(name)
             validates_relation(meta)
           end
         end
@@ -131,6 +131,7 @@ module Mongoid # :nodoc:
           characterize(name, Referenced::In, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
+            autosave(meta)
             validates_relation(meta)
           end
         end
@@ -218,7 +219,7 @@ module Mongoid # :nodoc:
           characterize(name, Referenced::One, options, &block).tap do |meta|
             relate(name, meta)
             reference(meta)
-            builder(name).creator(name).autosave(meta)
+            builder(name, meta).creator(name).autosave(meta)
             validates_relation(meta)
           end
         end

data/lib/mongoid/relations/many.rb

@@ -6,6 +6,8 @@ module Mongoid #:nodoc:
     # proxies.
     class Many < Proxy
 
+      delegate :avg, :max, :min, :sum, :to => :criteria
+
       # Appends a document or array of documents to the relation. Will set
       # the parent and update the index in the process.
       #

data/lib/mongoid/relations/proxy.rb

@@ -62,7 +62,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def instantiated(type = nil)
-        type ? type.instantiate : metadata.klass.instantiate
+        type ? type.new : metadata.klass.new
       end
 
       # Determines if the target been loaded into memory or not.

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

@@ -0,0 +1,71 @@
+# encoding: utf-8
+require "mongoid/relations/referenced/batch/insert"
+
+module Mongoid #:nodoc:
+  module Relations #:nodoc:
+    module Referenced #:nodoc:
+
+      # This module provides the ability for single insert calls to be batch
+      # inserted.
+      module Batch
+
+        private
+
+        # Executes a number of save calls in a single batch. Mongoid will
+        # intercept all database inserts while in this block and combine them
+        # into a single database call. When the block concludes the batch
+        # insert will occur.
+        #
+        # Since the collection is accessed through the class it would not be
+        # thread safe to give it state so we access the atomic updater via the
+        # current thread.
+        #
+        # @note This operation is not safe when attemping to do illegal updates
+        #   for different objects or collections, since the updator is not
+        #   scoped on the thread. This is meant for Mongoid internal use only
+        #   to keep existing design clean.
+        #
+        # @example Batch update multiple appends.
+        #   batched do
+        #     person.posts << [ post_one, post_two, post_three ]
+        #   end
+        #
+        # @param [ Proc ] block The block to execute.
+        #
+        # @return [ Object ] The result of the operation.
+        #
+        # @since 2.0.2, batch-relational-insert
+        def batched(&block)
+          inserter = Thread.current[:mongoid_batch_insert] ||= Insert.new
+          count_executions(&block)
+        ensure
+          if @executions.zero?
+            Thread.current[:mongoid_batch_insert] = nil
+            raise_mixed if embedded?
+            inserter.execute(collection)
+          end
+        end
+
+        # Execute the block, incrementing the executions before the call and
+        # decrementing them after in order to be able to nest blocks within
+        # each other.
+        #
+        # @todo Durran: Combine common code with embedded atomics.
+        #
+        # @example Execute and increment.
+        #   execute { block.call }
+        #
+        # @param [ Proc ] block The block to call.
+        #
+        # @since 2.0.2, batch-relational-insert
+        def count_executions
+          @executions ||= 0
+          @executions += 1
+          yield
+        ensure
+          @executions -=1
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Relations #:nodoc:
+    module Referenced #:nodoc:
+      module Batch #:nodoc:
+
+        # Handles all the batch insert collection.
+        class Insert
+          attr_accessor :documents, :options
+
+          # Consumes an execution that was supposed to hit the database, but is
+          # now being deferred to later in favor of a single batch insert.
+          #
+          # @example Consume the operation.
+          #   set.consume({ "field" => "value" }, { :safe => true })
+          #
+          # @param [ Hash ] document The document to collect.
+          # @param [ Hash ] options The persistence options.
+          #
+          # @option options [ true, false ] :safe Persist in safe mode.
+          #
+          # @since 2.0.2, batch-relational-insert
+          def consume(document, options = {})
+            @consumed, @options = true, options
+            (@documents ||= []).push(document)
+          end
+
+          # Has this operation consumed any executions?
+          #
+          # @example Is this consumed?
+          #   insert.consumed?
+          #
+          # @return [ true, false ] If the operation has consumed anything.
+          #
+          # @since 2.0.2, batch-relational-insert
+          def consumed?
+            !!@consumed
+          end
+
+          # Execute the batch insert operation on the collection.
+          #
+          # @example Execute the operation.
+          #   insert.execute(collection)
+          #
+          # @param [ Collection ] collection The root collection.
+          #
+          # @since 2.0.2, batch-relational-insert
+          def execute(collection)
+            if collection && consumed?
+              collection.insert(documents, options)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,33 @@ module Mongoid #:nodoc:
       # This class defines the behaviour for all relations that are a
       # one-to-many between documents in different collections.
       class Many < Relations::Many
+        include Batch
+
+        # Appends a document or array of documents to the relation. Will set
+        # the parent and update the index in the process.
+        #
+        # @example Append a document.
+        #   person.posts << post
+        #
+        # @example Push a document.
+        #   person.posts.push(post)
+        #
+        # @example Concat with other documents.
+        #   person.posts.concat([ post_one, post_two ])
+        #
+        # @param [ Document, Array<Document> ] *args Any number of documents.
+        def <<(*args)
+          options = default_options(args)
+          batched do
+            args.flatten.each do |doc|
+              return doc unless doc
+              append(doc, options)
+              doc.save if base.persisted? && !options[:binding]
+            end
+          end
+        end
+        alias :concat :<<
+        alias :push :<<
 
         # Binds the base object to the inverse of the relation. This is so we
         # are referenced to the actual objects themselves and dont hit the
@@ -286,6 +313,38 @@ module Mongoid #:nodoc:
           Bindings::Referenced::Many.new(base, new_target || target, metadata)
         end
 
+        # Get the collection of the relation in question.
+        #
+        # @example Get the collection of the relation.
+        #   relation.collection
+        #
+        # @return [ Collection ] The collection of the relation.
+        #
+        # @since 2.0.2, batch-relational-insert
+        def collection
+          metadata.klass.collection
+        end
+
+        # Get the value for the foreign key in convertable or unconvertable
+        # form.
+        #
+        # @todo Durran: Find a common place for this.
+        #
+        # @example Get the value.
+        #   relation.convertable
+        #
+        # @return [ String, Unconvertable, BSON::ObjectId ] The string or object id.
+        #
+        # @since 2.0.2
+        def convertable
+          inverse = metadata.inverse_klass
+          if inverse.using_object_ids? || base.id.is_a?(BSON::ObjectId)
+            base.id
+          else
+            Mongoid::Criterion::Unconvertable.new(base.id)
+          end
+        end
+
         # Returns the criteria object for the target class with its documents set
         # to target.
         #
@@ -295,7 +354,7 @@ module Mongoid #:nodoc:
         # @return [ Criteria ] A new criteria.
         def criteria
           raise_mixed if klass.embedded?
-          metadata.klass.where(metadata.foreign_key => base.id)
+          metadata.klass.where(metadata.foreign_key => convertable)
         end
 
         # Tells if the target array been initialized.
@@ -341,7 +400,7 @@ module Mongoid #:nodoc:
           load!(:binding => true) and return super if [].respond_to?(name)
           klass = metadata.klass
           klass.send(:with_scope, criteria) do
-            criteria.send(name, *args)
+            criteria.send(name, *args, &block)
           end
         end