mongoid 2.0.0.beta.20 → 2.0.0.rc.1

data/lib/mongoid/persistence/command.rb

@@ -26,6 +26,26 @@ module Mongoid #:nodoc:
       #
       # <tt>DeleteAll.new(Person, { :validate => true }, {})</tt>
       def initialize(document_or_class, options = {}, selector = {})
+        init(document_or_class)
+        validate = options[:validate]
+        @validate = (validate.nil? ? true : validate)
+        @selector = selector
+        @options = { :safe => safe_mode?(options) }
+      end
+
+      private
+
+      # Setup the proper instance variables based on if the supplied argument
+      # was a document object or a class object.
+      #
+      # Example:
+      #
+      # <tt>init(document_or_class)</tt>
+      #
+      # Options:
+      #
+      # document_or_class: A document or a class.
+      def init(document_or_class)
         if document_or_class.is_a?(Mongoid::Document)
           @document = document_or_class
           @collection = @document.embedded? ? @document._root.collection : @document.collection
@@ -33,10 +53,6 @@ module Mongoid #:nodoc:
           @klass = document_or_class
           @collection = @klass.collection
         end
-        validate = options[:validate]
-        @selector = selector
-        @validate = (validate.nil? ? true : validate)
-        @options = { :safe => safe_mode?(options) }
       end
     end
   end

data/lib/mongoid/persistence/insert.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Insert is a persistence command responsible for taking a document that
     # has not been saved to the database and saving it.
     #
@@ -11,6 +12,7 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class Insert < Command
+
       # Insert the new document in the database. This delegates to the standard
       # MongoDB collection's insert command.
       #
@@ -22,28 +24,28 @@ module Mongoid #:nodoc:
       #
       # The +Document+, whether the insert succeeded or not.
       def persist
-        return @document if @validate && @document.invalid?(:create)
-        @document.run_callbacks(:create) do
-          @document.run_callbacks(:save) do
+        return document if validate && document.invalid?(:create)
+        document.run_callbacks(:create) do
+          document.run_callbacks(:save) do
             if insert
-              @document.new_record = false
-              @document._children.each { |child| child.new_record = false }
-              @document.move_changes
+              document.new_record = false
+              document._children.each { |child| child.new_record = false }
+              document.move_changes
             end
           end
-        end; @document
+        end; document
       end
 
       protected
       # Insert the document into the database.
       def insert
-        if @document.embedded?
+        if document.embedded?
           Persistence::InsertEmbedded.new(
-            @document,
-            @options.merge(:validate => @validate)
+            document,
+            options.merge(:validate => validate)
           ).persist
         else
-          @collection.insert(@document.raw_attributes, @options)
+          collection.insert(document.to_hash, options)
         end
       end
     end

data/lib/mongoid/persistence/insert_embedded.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Insert is a persistence command responsible for taking a document that
     # has not been saved to the database and saving it. This specific class
     # handles the case when the document is embedded in another.
@@ -12,6 +13,7 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class InsertEmbedded < Command
+
       # Insert the new document in the database. If the document's parent is a
       # new record, we will call save on the parent, otherwise we will $push
       # the document onto the parent.
@@ -24,16 +26,16 @@ module Mongoid #:nodoc:
       #
       # The +Document+, whether the insert succeeded or not.
       def persist
-        return @document if @validate && @document.invalid?(:create)
-        parent = @document._parent
+        return document if validate && document.invalid?(:create)
+        parent = document._parent
         if parent.new_record?
           parent.insert
         else
-          update = { @document._inserter => { @document._position => @document.raw_attributes } }
-          @collection.update(parent._selector, update, @options.merge(:multi => false))
-          @document.new_record = false
+          update = { document._inserter => { document._position => document.raw_attributes } }
+          collection.update(parent._selector, update, options.merge(:multi => false))
+          document.new_record = false
         end
-        @document
+        document
       end
     end
   end

data/lib/mongoid/persistence/remove.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Remove is a persistence command responsible for deleting a document from
     # the database.
     #
@@ -11,6 +12,7 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class Remove < Command
+
       # Remove the document from the database: delegates to the MongoDB
       # collection remove method.
       #
@@ -28,13 +30,13 @@ module Mongoid #:nodoc:
       protected
       # Remove the document from the database.
       def remove
-        if @document.embedded?
+        if document.embedded?
           Persistence::RemoveEmbedded.new(
-            @document,
-            @options.merge(:validate => @validate)
+            document,
+            options.merge(:validate => validate)
           ).persist
         else
-          @collection.remove({ :_id => @document.id }, @options)
+          collection.remove({ :_id => document.id }, options)
         end; true
       end
     end

data/lib/mongoid/persistence/remove_all.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Remove is a persistence command responsible for deleting a document from
     # the database.
     #
@@ -11,6 +12,7 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class RemoveAll < Command
+
       # Remove the document from the database: delegates to the MongoDB
       # collection remove method.
       #
@@ -28,10 +30,10 @@ module Mongoid #:nodoc:
       protected
       # Remove the document from the database.
       def remove
-        selector = (@klass.hereditary? ? @selector.merge(:_type => @klass.name) : @selector)
-        count = @collection.find(selector).count
-        @collection.remove(selector, @options)
-        count
+        select = (klass.hereditary? ? selector.merge(:_type => klass.name) : selector)
+        collection.find(select).count.tap do
+          collection.remove(select, options)
+        end
       end
     end
   end

data/lib/mongoid/persistence/remove_embedded.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Remove is a persistence command responsible for deleting a document from
     # the database.
     #
@@ -11,6 +12,7 @@ module Mongoid #:nodoc:
     #     false
     #   );
     class RemoveEmbedded < Command
+
       # Remove the document from the database. If the parent is a new record,
       # it will get removed in Ruby only. If the parent is not a new record
       # then either an $unset or $set will occur, depending if it's an
@@ -24,22 +26,22 @@ module Mongoid #:nodoc:
       #
       # +true+ or +false+, depending on if the removal passed.
       def persist
-        parent = @document._parent
-        parent.remove(@document)
+        parent = document._parent
+        parent.remove_child(document)
         unless parent.new_record?
-          update = { @document._remover => removal_selector }
-          @collection.update(parent._selector, update, @options.merge(:multi => false))
+          update = { document._remover => removal_selector }
+          collection.update(parent._selector, update, options.merge(:multi => false))
         end; true
       end
 
       protected
       # Get the value to pass to the removal modifier.
       def setter
-        @document._index ? @document.id : true
+        document._index ? document.id : true
       end
 
       def removal_selector
-        @document._index ? { @document._pull => { "_id" => @document.id } } : { @document._path => setter }
+        document._index ? { document._pull => { "_id" => document.id } } : { document._path => setter }
       end
     end
   end

data/lib/mongoid/persistence/update.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Persistence #:nodoc:
+
     # Update is a persistence command responsible for taking a document that
     # has already been saved to the database and saving it, depending on
     # whether or not the document has been modified.
@@ -28,6 +29,7 @@ module Mongoid #:nodoc:
     #   );
     #
     class Update < Command
+
       # Persist the document that is to be updated to the database. This will
       # only write changed fields via MongoDB's $set modifier operation.
       #
@@ -39,12 +41,12 @@ module Mongoid #:nodoc:
       #
       # +true+ or +false+, depending on validation.
       def persist
-        return false if validate && @document.invalid?(:update)
-        @document.run_callbacks(:save) do
-          @document.run_callbacks(:update) do
+        return false if validate && document.invalid?(:update)
+        document.run_callbacks(:save) do
+          document.run_callbacks(:update) do
             if update
-              @document.move_changes
-              @document._children.each do |child|
+              document.move_changes
+              document._children.each do |child|
                 child.move_changes
                 child.new_record = false if child.new_record?
               end
@@ -58,14 +60,14 @@ module Mongoid #:nodoc:
       protected
       # Update the document in the database atomically.
       def update
-        updates = @document._updates
+        updates = document._updates
         unless updates.empty?
           other_pushes = updates.delete(:other)
-          @collection.update(@document._selector, updates, @options.merge(:multi => false))
-          @collection.update(
-            @document._selector,
+          collection.update(document._selector, updates, options.merge(:multi => false))
+          collection.update(
+            document._selector,
             { "$pushAll" => other_pushes },
-            @options.merge(:multi => false)
+            options.merge(:multi => false)
           ) if other_pushes
         end; true
       end

data/lib/mongoid/railtie.rb

@@ -26,7 +26,7 @@ module Rails #:nodoc:
       #       config.mongoid.reconnect_time = 10
       #     end
       #   end
-      config.mongoid = ::Mongoid::Config.instance
+      config.mongoid = ::Mongoid::Config
 
       # Initialize Mongoid. This will look for a mongoid.yml in the config
       # directory and configure mongoid appropriately.
@@ -78,7 +78,7 @@ module Rails #:nodoc:
       # environments.
       initializer "preload all application models" do |app|
         config.to_prepare do
-          ::Rails::Mongoid.load_models(app)
+          ::Rails::Mongoid.load_models(app) unless $rails_rake_task
         end
       end
 

data/lib/mongoid/railties/database.rake

@@ -98,14 +98,16 @@ namespace :db do
       end
     end
 
+    def collection_names
+      @collection_names ||= get_mongoid_models.map{ |d| d.collection.name }.uniq
+    end
+
     desc "Convert string objectids in mongo database to ObjectID type"
     task :objectid_convert => :environment do
-      documents = get_mongoid_models
-      documents.each do |document|
-        puts "Converting #{document.to_s} to use ObjectIDs"
+      collection_names.each do |collection_name|
+        puts "Converting #{collection_name} to use ObjectIDs"
 
         # get old collection
-        collection_name = document.collection.name
         collection = Mongoid.master.collection(collection_name)
 
         # get new collection (a clean one)
@@ -124,8 +126,7 @@ namespace :db do
       end
 
       # no errors. great! now rename _new to collection_name
-      documents.each do |document|
-        collection_name = document.collection.name
+      collection_names.each do |collection_name|
         collection = Mongoid.master.collection(collection_name)
         new_collection = collection.db["#{collection_name}_new"]
 
@@ -146,7 +147,7 @@ namespace :db do
         begin
           new_collection.rename(collection_name)
         rescue Exception => e
-          puts "Unable to rename database #{new_collection.name} to #{collection_name}_old"
+          puts "Unable to rename database #{new_collection.name} to #{collection_name}"
           puts "reason: #{e.message}\n\n"
         end
       end
@@ -156,8 +157,8 @@ namespace :db do
 
     desc "Clean up old collections backed up by objectid_convert"
     task :cleanup_old_collections => :environment do
-      get_mongoid_models.each do |document|
-        collection = document.collection
+      collection_names.each do |collection_name|
+        collection = Mongoid.master.collection(collection_name)
         collection.db["#{collection.name}_old"].drop
       end
     end

data/lib/mongoid/relations.rb

@@ -0,0 +1,104 @@
+# encoding: utf-8
+require "mongoid/relations/accessors"
+require "mongoid/relations/auto_save"
+require "mongoid/relations/cascading"
+require "mongoid/relations/cyclic"
+require "mongoid/relations/proxy"
+require "mongoid/relations/bindings"
+require "mongoid/relations/builders"
+require "mongoid/relations/many"
+require "mongoid/relations/one"
+require "mongoid/relations/polymorphic"
+require "mongoid/relations/embedded/in"
+require "mongoid/relations/embedded/many"
+require "mongoid/relations/embedded/one"
+require "mongoid/relations/referenced/in"
+require "mongoid/relations/referenced/many"
+require "mongoid/relations/referenced/many_to_many"
+require "mongoid/relations/referenced/one"
+require "mongoid/relations/reflections"
+require "mongoid/relations/metadata"
+require "mongoid/relations/macros"
+
+module Mongoid # :nodoc:
+
+  # All classes and modules under the relations namespace handle the
+  # functionality that has to do with embedded and referenced (relational)
+  # associations.
+  module Relations
+    extend ActiveSupport::Concern
+    include Accessors
+    include AutoSave
+    include Cascading
+    include Cyclic
+    include Builders
+    include Macros
+    include Polymorphic
+    include Reflections
+
+    included do
+      attr_accessor :metadata
+    end
+
+    # Determine if the document itself is embedded in another document via the
+    # proper channels. (If it has a parent document.)
+    #
+    # @example Is the document embedded?
+    #   address.embedded?
+    #
+    # @return [ true, false ] True if the document has a parent document.
+    #
+    # @since 2.0.0.rc.1
+    def embedded?
+      _parent.present?
+    end
+
+    # Determine if the document is part of an embeds_many relation.
+    #
+    # @example Is the document in an embeds many?
+    #   address.embedded_many?
+    #
+    # @return [ true, false ] True if in an embeds many.
+    #
+    # @since 2.0.0.rc.1
+    def embedded_many?
+      metadata && metadata.macro == :embeds_many
+    end
+
+    # Determine if the document is part of an embeds_one relation.
+    #
+    # @example Is the document in an embeds one?
+    #   address.embedded_one?
+    #
+    # @return [ true, false ] True if in an embeds one.
+    #
+    # @since 2.0.0.rc.1
+    def embedded_one?
+      metadata && metadata.macro == :embeds_one
+    end
+
+    # Determine if the document is part of an references_many relation.
+    #
+    # @example Is the document in a references many?
+    #   post.referenced_many?
+    #
+    # @return [ true, false ] True if in a references many.
+    #
+    # @since 2.0.0.rc.1
+    def referenced_many?
+      metadata && metadata.macro == :references_many
+    end
+
+    # Determine if the document is part of an references_one relation.
+    #
+    # @example Is the document in a references one?
+    #   address.referenced_one?
+    #
+    # @return [ true, false ] True if in a references one.
+    #
+    # @since 2.0.0.rc.1
+    def referenced_one?
+      metadata && metadata.macro == :references_one
+    end
+  end
+end