mongoid 2.0.0.alpha → 2.0.0.beta.5

data/lib/mongoid/associations/{embed_many.rb → embeds_many.rb}

@@ -1,8 +1,9 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class EmbedMany
-      include Proxy
+    # Represents embedding many documents within a parent document, which will
+    # be an array as the underlying storage mechanism.
+    class EmbedsMany < Proxy
 
       attr_accessor :association_name, :klass
 
@@ -12,6 +13,7 @@ module Mongoid #:nodoc:
         documents.flatten.each do |doc|
           doc.parentize(@parent, @association_name)
           @target << doc
+          doc._index = @target.size - 1
           doc.notify
         end
       end
@@ -19,15 +21,6 @@ module Mongoid #:nodoc:
       alias :concat :<<
       alias :push :<<
 
-      # Clears the association, and notifies the parents of the removal.
-      def clear
-        unless @target.empty?
-          document = @target.first
-          document.notify_observers(document, true)
-          @target.clear
-        end
-      end
-
       # Builds a new Document and adds it to the association collection. The
       # document created will be of the same class as the others in the
       # association, and the attributes will be passed into the constructor.
@@ -40,9 +33,19 @@ module Mongoid #:nodoc:
         document.parentize(@parent, @association_name)
         document.write_attributes(attrs)
         @target << document
+        document._index = @target.size - 1
         document
       end
 
+      # Clears the association, and notifies the parents of the removal.
+      def clear
+        unless @target.empty?
+          document = @target.first
+          document.notify_observers(document, true)
+          @target.clear
+        end
+      end
+
       # Creates a new Document and adds it to the association collection. The
       # document created will be of the same class as the others in the
       # association, and the attributes will be passed into the constructor and
@@ -52,8 +55,7 @@ module Mongoid #:nodoc:
       #
       # The newly created Document.
       def create(attrs = {}, type = nil)
-        object = build(attrs, type)
-        object.run_callbacks(:create) { object.save }; object
+        build(attrs, type).tap(&:save)
       end
 
       # Creates a new Document and adds it to the association collection. The
@@ -72,6 +74,32 @@ module Mongoid #:nodoc:
         document
       end
 
+      # Delete all the documents in the association without running callbacks.
+      #
+      # Example:
+      #
+      # <tt>addresses.delete_all</tt>
+      #
+      # Returns:
+      #
+      # The number of documents deleted.
+      def delete_all(conditions = {})
+        remove(:delete, conditions)
+      end
+
+      # Delete all the documents in the association and run destroy callbacks.
+      #
+      # Example:
+      #
+      # <tt>addresses.destroy_all</tt>
+      #
+      # Returns:
+      #
+      # The number of documents destroyed.
+      def destroy_all(conditions = {})
+        remove(:destroy, conditions)
+      end
+
       # Finds a document in this association.
       #
       # If :all is passed, returns all the documents
@@ -98,13 +126,19 @@ module Mongoid #:nodoc:
       #
       # parent: The parent document to the association.
       # options: The association options.
-      def initialize(parent, options)
+      def initialize(parent, options, target_array = nil)
         @parent, @association_name = parent, options.name
         @klass, @options = options.klass, options
-        initialize_each(parent.raw_attributes[@association_name])
+        if target_array
+          build_children_from_target_array(target_array)
+        else
+          build_children_from_attributes(parent.raw_attributes[@association_name])
+        end
         extends(options)
       end
 
+
+
       # If the target array does not respond to the supplied method then try to
       # find a named scope or criteria on the class and send the call there.
       #
@@ -128,9 +162,18 @@ module Mongoid #:nodoc:
       # Returns:
       #
       # The newly build target Document.
-      def nested_build(attributes)
-        attributes.values.each do |attrs|
-          build(attrs)
+      def nested_build(attributes, options = {})
+        attributes.each do |index, attrs|
+          if document = detect { |document| document._index == index.to_i }
+            if options && options[:allow_destroy] && attrs['_destroy']
+              @target.delete(document)
+              document.destroy
+            else
+              document.write_attributes(attrs)
+            end
+          else
+            build(attrs)
+          end
         end
       end
 
@@ -147,45 +190,71 @@ module Mongoid #:nodoc:
       def paginate(options)
         criteria = Mongoid::Criteria.translate(@klass, options)
         criteria.documents = @target
-        criteria.paginate
+        criteria.paginate(options)
       end
 
       protected
       # Initializes each of the attributes in the hash.
-      def initialize_each(attributes)
-        @target = attributes ? attributes.collect do |attrs|
-          klass = attrs.klass
-          child = klass ? klass.instantiate(attrs) : @klass.instantiate(attrs)
-          child.parentize(@parent, @association_name)
-          child
-        end : []
+      def build_children_from_attributes(attributes)
+        @target = []
+        if attributes
+          attributes.each_with_index do |attrs, index|
+            klass = attrs.klass
+            child = klass ? klass.instantiate(attrs) : @klass.instantiate(attrs)
+            child.parentize(@parent, @association_name)
+            child._index = index
+            @target << child
+          end
+        end
+      end
+
+      # Initializes the target array from an existing array of documents.
+      def build_children_from_target_array(target_array)
+        @target = target_array
+        @target.each_with_index do |child, index|
+          child._index = index
+        end
+      end
+
+      # Removes documents based on a method.
+      def remove(method, conditions)
+        criteria = @klass.find(conditions || {})
+        criteria.documents = @target
+        count = criteria.size
+        criteria.each do |doc|
+          @target.delete(doc); doc.send(method)
+        end; count
       end
 
       class << self
 
-        # Preferred method of creating a new +EmbedMany+ association. It will
+        # Preferred method of creating a new +EmbedsMany+ association. It will
         # delegate to new.
         #
         # Options:
         #
         # document: The parent +Document+
         # options: The association options
-        def instantiate(document, options)
-          new(document, options)
+        def instantiate(document, options, target_array = nil)
+          new(document, options, target_array)
         end
 
         # Returns the macro used to create the association.
         def macro
-          :embed_many
+          :embeds_many
         end
 
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting the has_many to the supplied +Enumerable+
         # and setting up the parentization.
         def update(children, parent, options)
-          parent.remove_attribute(options.name)
+          parent.raw_attributes.delete(options.name)
           children.assimilate(parent, options)
-          instantiate(parent, options)
+          if children && children.first.is_a?(Mongoid::Document)
+            instantiate(parent, options, children)
+          else
+            instantiate(parent, options)
+          end
         end
       end
     end

data/lib/mongoid/associations/{embed_one.rb → embeds_one.rb}

@@ -1,8 +1,9 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class EmbedOne #:nodoc:
-      include Proxy
+    # Represents an association that is embedded in a parent document as a
+    # one-to-one relationship.
+    class EmbedsOne < Proxy
 
       # Build a new object for the association.
       def build(attrs = {}, type = nil)
@@ -41,12 +42,12 @@ module Mongoid #:nodoc:
       # Returns:
       #
       # A new target document.
-      def nested_build(attributes)
-        build(attributes)
+      def nested_build(attributes, options = nil)
+        build(attributes) unless @target.blank? && options[:update_only]
       end
 
       class << self
-        # Preferred method of instantiating a new +EmbedOne+, since nil values
+        # Preferred method of instantiating a new +EmbedsOne+, since nil values
         # will be handled properly.
         #
         # Options:
@@ -56,7 +57,7 @@ module Mongoid #:nodoc:
         #
         # Returns:
         #
-        # A new +EmbedOne+ association proxy.
+        # A new +EmbedsOne+ association proxy.
         def instantiate(document, options)
           attributes = document.raw_attributes[options.name]
           return nil if attributes.blank?
@@ -65,7 +66,7 @@ module Mongoid #:nodoc:
 
         # Returns the macro used to create the association.
         def macro
-          :embed_one
+          :embeds_one
         end
 
         # Perform an update of the relationship of the parent and child. This
@@ -79,17 +80,16 @@ module Mongoid #:nodoc:
         #
         # Example:
         #
-        # <tt>EmbedOne.update({:first_name => "Hank"}, person, options)</tt>
+        # <tt>EmbedsOne.update({:first_name => "Hank"}, person, options)</tt>
         #
         # Returns:
         #
-        # A new +EmbedOne+ association proxy.
+        # A new +EmbedsOne+ association proxy.
         def update(child, parent, options)
           child.assimilate(parent, options)
           instantiate(parent, options)
         end
       end
-
     end
   end
 end

data/lib/mongoid/associations/has_many_related.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class HasManyRelated #:nodoc:
-      include Proxy
+    # Represents an relational one-to-many association with an object in a
+    # separate collection or database.
+    class HasManyRelated < Proxy
 
       # Appends the object to the +Array+, setting its parent in
       # the process.
@@ -40,8 +41,41 @@ module Mongoid #:nodoc:
       #
       # Returns the newly created object.
       def create(attributes)
-        object = build(attributes)
-        object.run_callbacks(:create) { object.save }; object
+        build(attributes).tap(&:save)
+      end
+
+      # Creates a new Document and adds it to the association collection. If
+      # validation fails an error is raised.
+      #
+      # Returns the newly created object.
+      def create!(attributes)
+        build(attributes).tap(&:save!)
+      end
+
+      # Delete all the associated objects.
+      #
+      # Example:
+      #
+      # <tt>person.posts.delete_all</tt>
+      #
+      # Returns:
+      #
+      # The number of objects deleted.
+      def delete_all(conditions = {})
+        remove(:delete_all, conditions[:conditions])
+      end
+
+      # Destroy all the associated objects.
+      #
+      # Example:
+      #
+      # <tt>person.posts.destroy_all</tt>
+      #
+      # Returns:
+      #
+      # The number of objects destroyed.
+      def destroy_all(conditions = {})
+        remove(:destroy_all, conditions[:conditions])
       end
 
       # Finds a document in this association.
@@ -59,7 +93,7 @@ module Mongoid #:nodoc:
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
       def initialize(document, options, target = nil)
-        @parent, @klass = document, options.klass
+        @parent, @klass, @options = document, options.klass, options
         @foreign_key = options.foreign_key
         @base = lambda { @klass.all(:conditions => { @foreign_key => document.id }) }
         @target = target || @base.call
@@ -93,6 +127,18 @@ module Mongoid #:nodoc:
         @target = @target.entries if @parent.new_record?
       end
 
+      # Remove the objects based on conditions.
+      def remove(method, conditions)
+        selector = { @foreign_key => @parent.id }.merge(conditions || {})
+        removed = @klass.send(method, :conditions => selector)
+        reset; removed
+      end
+
+      # Reset the memoized association on the parent.
+      def reset
+        @parent.send(:reset, @options.name) { @base.call }
+      end
+
       class << self
         # Preferred method for creating the new +HasManyRelated+ association.
         #

data/lib/mongoid/associations/has_one_related.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class HasOneRelated #:nodoc:
-      include Proxy
+    # Represents an relational one-to-one association with an object in a
+    # separate collection or database.
+    class HasOneRelated < Proxy
 
       delegate :nil?, :to => :target
 
@@ -11,7 +12,10 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def build(attributes = {})
         @target = @klass.instantiate(attributes)
-        name = @parent.class.to_s.underscore
+        inverse = @target.associations.values.detect do |metadata|
+          metadata.options.klass == @parent.class
+        end
+        name = inverse.name
         @target.send("#{name}=", @parent)
         @target
       end
@@ -21,7 +25,7 @@ module Mongoid #:nodoc:
       #
       # Returns the newly created object.
       def create(attributes)
-        build(attributes); @target.save; @target
+        build(attributes).tap(&:save)
       end
 
       # Initializing a related association only requires looking up the objects
@@ -33,7 +37,7 @@ module Mongoid #:nodoc:
       # options: The association +Options+.
       def initialize(document, options, target = nil)
         @parent, @klass = document, options.klass
-        @foreign_key = document.class.to_s.foreign_key
+        @foreign_key = options.foreign_key
         @target = target || @klass.first(:conditions => { @foreign_key => @parent.id })
         extends(options)
       end

data/lib/mongoid/associations/meta_data.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class MetaData #:nodoc:
+    # This class contains metadata about association proxies.
+    class MetaData
 
       attr_reader :association, :options
 

data/lib/mongoid/associations/options.rb

@@ -21,7 +21,8 @@ module Mongoid #:nodoc:
 
       # Return the foreign key based off the association name.
       def foreign_key
-        @attributes[:foreign_key] || klass.name.to_s.foreign_key
+        key = @attributes[:foreign_key] || klass.name.to_s.foreign_key
+        key.to_s
       end
 
       # Returns the name of the inverse_of association
@@ -29,12 +30,16 @@ module Mongoid #:nodoc:
         @attributes[:inverse_of]
       end
 
-      # Return a +Class+ for the options. If a class_name was provided, then the
-      # constantized class_name will be returned. If not, a constant based on the
-      # association name will be returned.
+      # Return a +Class+ for the options. See #class_name
       def klass
-        class_name = @attributes[:class_name]
-        class_name ? class_name.constantize : name.to_s.classify.constantize
+        class_name.constantize
+      end
+
+      # Return a +String+ representing the associated class_name. If a class_name
+      # 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
       end
 
       # Returns the association name of the options.
@@ -47,6 +52,10 @@ module Mongoid #:nodoc:
         @attributes[:polymorphic] == true
       end
 
+      # Used with has_many_related to save as array of ids.
+      def stored_as
+        @attributes[:stored_as]
+      end
     end
   end
 end