mongoid 2.0.0.beta.9 → 2.0.0.beta.10

data/README.rdoc

@@ -6,14 +6,12 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
 == Project Tracking
 
-* {Mongoid on Pivotal Tracker}[http://www.pivotaltracker.com/projects/27482]
 * {Mongoid Google Group}[http://groups.google.com/group/mongoid]
-* {Mongoid on CI Joe}[http://ci.mongoid.org/]
 * {Mongoid Website and Documentation}[http://mongoid.org]
 
 == Compatibility
 
-Mongoid is developed against Ruby 1.8.6, 1.8.7, 1.9.1, 1.9.2
+Mongoid is developed against Ruby 1.8.7, 1.9.1, 1.9.2
 
 = Documentation
 
@@ -22,7 +20,7 @@ Please see the new Mongoid website for up-to-date documentation:
 
 = License
 
-Copyright (c) 2009 Durran Jordan
+Copyright (c) 2009, 2010 Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mongoid.rb

@@ -63,6 +63,7 @@ require "mongoid/hierarchy"
 require "mongoid/identity"
 require "mongoid/indexes"
 require "mongoid/javascript"
+require "mongoid/logger"
 require "mongoid/matchers"
 require "mongoid/memoization"
 require "mongoid/named_scope"
@@ -111,7 +112,7 @@ module Mongoid #:nodoc
       block_given? ? yield(config) : config
     end
 
-    # Easy convenience method for having an alert generated from the
+    # Easy convenience method for generating an alert from the
     # deprecation module.
     #
     # Example:

data/lib/mongoid/associations.rb

@@ -229,8 +229,8 @@ module Mongoid # :nodoc:
 
       alias :has_one_related :references_one
 
-      # Returns the macro associated with the supplied association name. This
-      # will return embeds_on, embeds_many, embedded_in or nil.
+      # Returns the association reflection object with the supplied association
+      # name.
       #
       # Options:
       #
@@ -241,7 +241,6 @@ module Mongoid # :nodoc:
       # <tt>Person.reflect_on_association(:addresses)</tt>
       def reflect_on_association(name)
         association = associations[name.to_s]
-        association ? association.macro : nil
       end
 
       protected

data/lib/mongoid/associations/embeds_many.rb

@@ -175,9 +175,10 @@ module Mongoid #:nodoc:
       #
       # The newly build target Document.
       def nested_build(attributes, options = {})
+        @parent.instance_variable_set(:@building_nested, true)
         attributes.each do |index, attrs|
           if document = detect { |document| document._index == index.to_i }
-            if options && options[:allow_destroy] && attrs['_destroy']
+            if options && options[:allow_destroy] && Boolean.set(attrs['_destroy'])
               @target.delete(document)
               document.destroy
             else
@@ -186,7 +187,10 @@ module Mongoid #:nodoc:
           else
             build(attrs)
           end
-        end; self
+        end
+        @target.each_with_index { |document, index| document._index = index }
+        @parent.instance_variable_set(:@building_nested, false)
+        self
       end
 
       # Paginate the association. Will create a new criteria, set the documents

data/lib/mongoid/associations/embeds_one.rb

@@ -44,9 +44,7 @@ module Mongoid #:nodoc:
       # A new target document.
       def nested_build(attributes, options = nil)
         unless @target.blank? && options[:update_only]
-          (attributes || {}).each do |key, value|
-            @target.write_attribute(key, value)
-          end
+          @target.write_attributes(attributes)
         end; @target
       end
 

data/lib/mongoid/associations/options.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class Options #:nodoc:
+    class Options < Hash #:nodoc:
 
       # Create the new +Options+ object, which provides convenience methods for
       # accessing values out of an options +Hash+.
       def initialize(attributes = {})
-        @attributes = attributes
+        self.merge!(attributes)
       end
 
       # Returns the extension if it exists, nil if not.
       def extension
-        @attributes[:extend]
+        self[:extend]
       end
 
       # Returns true is the options have extensions.
@@ -19,15 +19,16 @@ module Mongoid #:nodoc:
         !extension.nil?
       end
 
-      # Return the foreign key based off the association name.
+      # Return the foreign key if it exists, otherwise inflect it from the
+      # associated class name.
       def foreign_key
-        key = @attributes[:foreign_key] || klass.name.to_s.foreign_key
+        key = self[:foreign_key] || klass.name.to_s.foreign_key
         key.to_s
       end
 
       # Returns the name of the inverse_of association
       def inverse_of
-        @attributes[:inverse_of]
+        self[:inverse_of]
       end
 
       # Return a +Class+ for the options. See #class_name
@@ -39,22 +40,22 @@ module Mongoid #:nodoc:
       # was provided, then the constantized class_name will be returned. If not,
       # a constant based on the association name will be returned.
       def class_name
-        @attributes[:class_name] || name.to_s.classify
+        self[:class_name] || name.to_s.classify
       end
 
       # Returns the association name of the options.
       def name
-        @attributes[:name].to_s
+        self[:name].to_s
       end
 
       # Returns whether or not this association is polymorphic.
       def polymorphic
-        @attributes[:polymorphic] == true
+        self[:polymorphic] == true
       end
 
       # Used with references_many to save as array of ids.
       def stored_as
-        @attributes[:stored_as]
+        self[:stored_as]
       end
     end
   end

data/lib/mongoid/associations/references_many.rb

@@ -26,7 +26,7 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def build(attributes = nil)
         load_target
-        name = @parent.class.to_s.underscore
+        name = determine_name
         object = @klass.instantiate((attributes || {}).merge(name => @parent))
         @target << object
         object
@@ -38,7 +38,7 @@ module Mongoid #:nodoc:
       # the new object will then be saved.
       #
       # Returns the newly created object.
-      def create(attributes)
+      def create(attributes = nil)
         build(attributes).tap(&:save)
       end
 
@@ -46,7 +46,7 @@ module Mongoid #:nodoc:
       # validation fails an error is raised.
       #
       # Returns the newly created object.
-      def create!(attributes)
+      def create!(attributes = nil)
         build(attributes).tap(&:save!)
       end
 
@@ -144,6 +144,11 @@ module Mongoid #:nodoc:
         @target = @target.entries if @parent.new_record?
       end
 
+      def determine_name
+        @proxy ||= class << self; self; end
+        @proxy.send(:determine_name, @parent, @options)
+      end
+
       # The default query used for retrieving the documents from the database.
       # In this case we use the common API between Mongoid, ActiveRecord, and
       # DataMapper so we can do one-to-many relationships with data in other
@@ -212,10 +217,28 @@ module Mongoid #:nodoc:
         #
         # <tt>RelatesToOne.update(game, person, options)</tt>
         def update(target, document, options)
-          name = document.class.to_s.underscore
+          name = determine_name(document, options)
           target.each { |child| child.send("#{name}=", document) }
           instantiate(document, options, target)
         end
+
+        protected
+        def determine_name(document, options)
+          target = document.class
+
+          if (inverse = options.inverse_of) && inverse.is_a?(Array)
+            inverse = [*inverse].detect { |name| target.respond_to?(name) }
+          end
+
+          if !inverse
+            association = options.klass.associations.values.detect do |metadata|
+              metadata.options.klass == target
+            end
+            inverse = association.name if association
+          end
+
+          inverse || target.to_s.underscore
+        end
       end
     end
   end

data/lib/mongoid/associations/references_many_as_array.rb

@@ -22,7 +22,15 @@ module Mongoid #:nodoc:
           # clean way to handle this with new documents - we want to set the
           # actual objects as well, but dont want to get in an infinite loop
           # while doing so.
-          object.send(reverse_key(object)) << @parent.id
+          if inverse?
+            reverse_key = reverse_key(object)
+            case inverse_of(object).macro
+            when :references_many
+              object.send(reverse_key) << @parent.id
+            when :referenced_in
+              object.send("#{reverse_key}=", @parent.id)
+            end
+          end
           @target << object
         end
       end
@@ -42,9 +50,22 @@ module Mongoid #:nodoc:
       end
 
       protected
+
       # Find the inverse key for the supplied document.
       def reverse_key(document)
-        document.send(@options.inverse_of).options.foreign_key
+        inverse_of(document).options.foreign_key
+      end
+
+      # Returns +true+ if there is an inverse association on the referenced
+      # model.
+      def inverse?
+        !!@options.inverse_of
+      end
+
+      # Returns the association on +document+ which is the inverse of this
+      # association.
+      def inverse_of(document)
+        document.class.associations[@options.inverse_of.to_s]
       end
 
       # The default query used for retrieving the documents from the database.
@@ -67,8 +88,7 @@ module Mongoid #:nodoc:
         # <tt>RelatesToManyAsArray.update(preferences, person, options)</tt>
         def update(target, document, options)
           target.each do |child|
-            name = child.associations[options.inverse_of.to_s].options.name
-            child.send(name) << document
+            document.send(options.name) << child
           end
           instantiate(document, options, target)
         end

data/lib/mongoid/associations/references_one.rb

@@ -24,7 +24,7 @@ module Mongoid #:nodoc:
       # newly created document.
       #
       # Returns the newly created object.
-      def create(attributes)
+      def create(attributes = {})
         build(attributes).tap(&:save)
       end
 
@@ -93,7 +93,6 @@ module Mongoid #:nodoc:
           target
         end
       end
-
     end
   end
 end

data/lib/mongoid/atomicity.rb

@@ -4,7 +4,7 @@ module Mongoid #:nodoc:
     extend ActiveSupport::Concern
 
     # Get all the atomic updates that need to happen for the current
-    # +Document+. This will include all changes that need to happen in the
+    # +Document+. This includes all changes that need to happen in the
     # entire hierarchy that exists below where the save call was made.
     #
     # Example:
@@ -15,9 +15,22 @@ module Mongoid #:nodoc:
     #
     # A +Hash+ of all atomic updates that need to occur.
     def _updates
-      _children.inject({ "$set" => _sets, "$push" => {}}) do |updates, child|
-        updates["$set"].update(child._sets)
-        updates["$push"].update(child._pushes)
+      processed = {}
+      
+      _children.inject({ "$set" => _sets, "$pushAll" => {}, :other => {} }) do |updates, child|
+        changes = child._sets
+        updates["$set"].update(changes)
+        processed[child.class] = true unless changes.empty?
+        
+        target = processed.has_key?(child.class) ? :other : "$pushAll"
+        
+        child._pushes.each do |attr, val|
+          if updates[target].has_key?(attr)
+            updates[target][attr] << val
+          else
+            updates[target].update({attr => [val]})
+          end
+        end
         updates
       end.delete_if do |key, value|
         value.empty?

data/lib/mongoid/config.rb

@@ -11,10 +11,11 @@ module Mongoid #:nodoc
       :parameterize_keys,
       :persist_in_safe_mode,
       :raise_not_found_error,
+      :autocreate_indexes,
       :use_object_ids,
       :skip_version_check
 
-    # Defaults the configuration options to true.
+    # Initializes the configuration with default settings.
     def initialize
       reset
     end
@@ -56,7 +57,7 @@ module Mongoid #:nodoc
     #
     # Returns:
     #
-    # The Master DB instance.
+    # The master +Mongo::DB+ instance.
     def master=(db)
       check_database!(db)
       @master = db
@@ -73,14 +74,21 @@ module Mongoid #:nodoc
     #
     # The master +Mongo::DB+
     def master
-      @master || (raise Errors::InvalidDatabase.new(nil))
+      raise Errors::InvalidDatabase.new(nil) unless @master
+
+      if @reconnect
+        @reconnect = false
+        reconnect!
+      end
+
+      @master
     end
 
     alias :database :master
     alias :database= :master=
 
-    # Sets the Mongo::DB slave databases to be used. If the objects trying to me
-    # set are not valid +Mongo::DBs+, then an error will be raise.
+    # Sets the Mongo::DB slave databases to be used. If the objects provided
+    # are not valid +Mongo::DBs+ an error will be raised.
     #
     # Example:
     #
@@ -88,7 +96,7 @@ module Mongoid #:nodoc
     #
     # Returns:
     #
-    # The slaves DB instances.
+    # The slave DB instances.
     def slaves=(dbs)
       return unless dbs
       dbs.each do |db|
@@ -97,7 +105,7 @@ module Mongoid #:nodoc
       @slaves = dbs
     end
 
-    # Returns the slave databases, or if none has been set nil
+    # Returns the slave databases or nil if none have been set.
     #
     # Example:
     #
@@ -110,6 +118,26 @@ module Mongoid #:nodoc
       @slaves
     end
 
+    # Returns the logger, or defaults to Rails logger or stdout logger.
+    #
+    # Example:
+    #
+    # <tt>Config.logger</tt>
+    def logger
+      return @logger if defined?(@logger)
+
+      @logger = defined?(Rails) ? Rails.logger : ::Logger.new($stdout)
+    end
+
+    # Sets the logger for Mongoid to use.
+    #
+    # Example:
+    #
+    # <tt>Config.logger = Logger.new($stdout, :warn)</tt>
+    def logger=(logger)
+      @logger = logger
+    end
+
     # Return field names that could cause destructive things to happen if
     # defined in a Mongoid::Document
     #
@@ -129,7 +157,8 @@ module Mongoid #:nodoc
       }.call
     end
 
-    # Configure mongoid from a hash that was usually parsed out of yml.
+    # Configure mongoid from a hash. This is usually called after parsing a
+    # yaml config file such as mongoid.yml.
     #
     # Example:
     #
@@ -137,11 +166,27 @@ module Mongoid #:nodoc
     def from_hash(settings)
       _master(settings)
       _slaves(settings)
-      settings.except("database").each_pair do |name, value|
+      settings.except("database", "slaves").each_pair do |name, value|
         send("#{name}=", value) if respond_to?(name)
       end
     end
 
+    # Convenience method for connecting to the master database after forking a
+    # new process.
+    #
+    # Example:
+    #
+    # <tt>Mongoid.reconnect!</tt>
+    def reconnect!(now = true)
+      if now
+        master.connection.connect_to_master
+      else
+        # We set a @reconnect flag so that #master knows to reconnect the next
+        # time the connection is accessed.
+        @reconnect = true
+      end
+    end
+
     # Reset the configuration options to the defaults.
     #
     # Example:
@@ -153,11 +198,48 @@ module Mongoid #:nodoc
       @persist_in_safe_mode = true
       @raise_not_found_error = true
       @reconnect_time = 3
+      @autocreate_indexes = false
       @use_object_ids = false
       @skip_version_check = false
       @time_zone = nil
     end
 
+    ##
+    # If Mongoid.use_object_ids = true
+    #   Convert args to BSON::ObjectID
+    #   If this args is an array, convert all args inside
+    # Else
+    #   return args
+    #
+    # Options:
+    #
+    #  args : A +String+ or an +Array+ convert to +BSON::ObjectID+
+    #  cast :  A +Boolean+ define if we can or not cast to BSON::ObjectID. If false, we use the default type of args
+    #
+    # Example:
+    #
+    # <tt>Mongoid.convert_to_object_id("4ab2bc4b8ad548971900005c", true)</tt>
+    # <tt>Mongoid.convert_to_object_id(["4ab2bc4b8ad548971900005c", "4ab2bc4b8ad548971900005d"])</tt>
+    #
+    # Returns:
+    #
+    # If Mongoid.use_object_ids = true
+    #   An +Array+ of +BSON::ObjectID+ of each element if params is an +Array+
+    #   A +BSON::ObjectID+ from params if params is +String+
+    # Else
+    #   <tt>args</tt>
+    #
+    def convert_to_object_id(args, cast=true)
+      return args if !use_object_ids || args.is_a?(BSON::ObjectID) || !cast
+      if args.is_a?(String)
+        BSON::ObjectID(args)
+      else
+        args.map{ |a|
+          a.is_a?(BSON::ObjectID) ? a : BSON::ObjectID(a)
+        }
+      end
+    end
+
     protected
 
     # Check if the database is valid and the correct version.
@@ -173,17 +255,10 @@ module Mongoid #:nodoc
       end
     end
 
-    # Get a Rails logger or stdout logger.
-    #
-    # Example:
-    #
-    # <tt>config.logger</tt>
-    def logger
-      defined?(Rails) ? Rails.logger : Logger.new($stdout)
-    end
-
     # Get a master database from settings.
     #
+    # TODO: Durran: This code's a bit hairy, refactor.
+    #
     # Example:
     #
     # <tt>config._master({}, "test")</tt>
@@ -193,11 +268,11 @@ module Mongoid #:nodoc
       name = settings["database"] || mongo_uri.path.to_s.sub("/", "")
       host = settings["host"] || mongo_uri.host || "localhost"
       port = settings["port"] || mongo_uri.port || 27017
-      pool_size = settings["pool_size"] || 1 
+      pool_size = settings["pool_size"] || 1
       username = settings["username"] || mongo_uri.user
       password = settings["password"] || mongo_uri.password
 
-      connection = Mongo::Connection.new(host, port, :logger => logger, :pool_size => pool_size)
+      connection = Mongo::Connection.new(host, port, :logger => Mongoid::Logger.new, :pool_size => pool_size)
       if username || password
         connection.add_auth(name, username, password)
         connection.apply_saved_authentication
@@ -207,6 +282,8 @@ module Mongoid #:nodoc
 
     # Get a bunch-o-slaves from settings and names.
     #
+    # TODO: Durran: This code's a bit hairy, refactor.
+    #
     # Example:
     #
     # <tt>config._slaves({}, "test")</tt>