mongoid 1.9.5 → 2.0.0.alpha

data/lib/mongoid/associations/belongs_to_related.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    # Represents a relational association to a "parent" object.
-    class BelongsToRelated < Proxy
+    class BelongsToRelated #:nodoc:
+      include Proxy
 
       # Initializing a related association only requires looking up the object
       # by its id.
@@ -53,6 +53,7 @@ module Mongoid #:nodoc:
           instantiate(document, options, target)
         end
       end
+
     end
   end
 end

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

@@ -1,9 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    # Represents embedding many documents within a parent document, which will
-    # be an array as the underlying storage mechanism.
-    class EmbedsMany < Proxy
+    class EmbedMany
+      include Proxy
 
       attr_accessor :association_name, :klass
 
@@ -13,7 +12,6 @@ module Mongoid #:nodoc:
         documents.flatten.each do |doc|
           doc.parentize(@parent, @association_name)
           @target << doc
-          doc._index = @target.size - 1
           doc.notify
         end
       end
@@ -21,6 +19,15 @@ 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.
@@ -33,19 +40,9 @@ 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
@@ -55,8 +52,8 @@ module Mongoid #:nodoc:
       #
       # The newly created Document.
       def create(attrs = {}, type = nil)
-        document = build(attrs, type)
-        document.save; document
+        object = build(attrs, type)
+        object.run_callbacks(:create) { object.save }; object
       end
 
       # Creates a new Document and adds it to the association collection. The
@@ -75,32 +72,6 @@ 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
@@ -127,19 +98,13 @@ module Mongoid #:nodoc:
       #
       # parent: The parent document to the association.
       # options: The association options.
-      def initialize(parent, options, target_array = nil)
+      def initialize(parent, options)
         @parent, @association_name = parent, options.name
         @klass, @options = options.klass, options
-        if target_array
-          build_children_from_target_array(target_array)
-        else
-          build_children_from_attributes(parent.raw_attributes[@association_name])
-        end
+        initialize_each(parent.raw_attributes[@association_name])
         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.
       #
@@ -182,71 +147,45 @@ module Mongoid #:nodoc:
       def paginate(options)
         criteria = Mongoid::Criteria.translate(@klass, options)
         criteria.documents = @target
-        criteria.paginate(options)
+        criteria.paginate
       end
 
       protected
       # Initializes each of the attributes in the hash.
-      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
+      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 : []
       end
 
       class << self
 
-        # Preferred method of creating a new +EmbedsMany+ association. It will
+        # Preferred method of creating a new +EmbedMany+ association. It will
         # delegate to new.
         #
         # Options:
         #
         # document: The parent +Document+
         # options: The association options
-        def instantiate(document, options, target_array = nil)
-          new(document, options, target_array)
+        def instantiate(document, options)
+          new(document, options)
         end
 
         # Returns the macro used to create the association.
         def macro
-          :embeds_many
+          :embed_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.raw_attributes.delete(options.name)
+          parent.remove_attribute(options.name)
           children.assimilate(parent, options)
-          if children && children.first.is_a?(Mongoid::Document)
-            instantiate(parent, options, children)
-          else
-            instantiate(parent, options)
-          end
+          instantiate(parent, options)
         end
       end
     end

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

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

data/lib/mongoid/associations/embedded_in.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    # Represents an association that is embedded within another document in the
-    # database, either as one or many.
-    class EmbeddedIn < Proxy
+    class EmbeddedIn #:nodoc:
+      include Proxy
 
       # Creates the new association by setting the internal
       # target as the passed in Document. This should be the
@@ -49,23 +48,16 @@ module Mongoid #:nodoc:
 
         # Perform an update of the relationship of the parent and child. This
         # is initialized by setting a parent object as the association on the
-        # +Document+. Will properly set an embeds_one or an embeds_many.
+        # +Document+. Will properly set an embed_one or an embed_many.
         #
         # Returns:
         #
         # A new +EmbeddedIn+ association proxy.
         def update(target, child, options)
-          child.parentize(target, determine_name(target, options))
+          child.parentize(target, options.inverse_of)
           child.notify
           instantiate(child, options)
         end
-
-        protected
-        def determine_name(target, options)
-          inverse = options.inverse_of
-          return inverse unless inverse.is_a?(Array)
-          inverse.detect { |name| target.respond_to?(name) }
-        end
       end
     end
   end

data/lib/mongoid/associations/has_many_related.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    # Represents an relational one-to-many association with an object in a
-    # separate collection or database.
-    class HasManyRelated < Proxy
+    class HasManyRelated #:nodoc:
+      include Proxy
 
       # Appends the object to the +Array+, setting its parent in
       # the process.
@@ -42,42 +41,7 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def create(attributes)
         object = build(attributes)
-        object.save; object
-      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)
-        object = build(attributes)
-        object.save!; object
-      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])
+        object.run_callbacks(:create) { object.save }; object
       end
 
       # Finds a document in this association.
@@ -95,7 +59,7 @@ module Mongoid #:nodoc:
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
       def initialize(document, options, target = nil)
-        @parent, @klass, @options = document, options.klass, options
+        @parent, @klass = document, options.klass
         @foreign_key = options.foreign_key
         @base = lambda { @klass.all(:conditions => { @foreign_key => document.id }) }
         @target = target || @base.call
@@ -129,18 +93,6 @@ 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,9 +1,8 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    # Represents an relational one-to-one association with an object in a
-    # separate collection or database.
-    class HasOneRelated < Proxy
+    class HasOneRelated #:nodoc:
+      include Proxy
 
       delegate :nil?, :to => :target
 
@@ -12,10 +11,7 @@ module Mongoid #:nodoc:
       # Returns the newly created object.
       def build(attributes = {})
         @target = @klass.instantiate(attributes)
-        inverse = @target.associations.values.detect do |metadata|
-          metadata.options.klass == @parent.class
-        end
-        name = inverse.name
+        name = @parent.class.to_s.underscore
         @target.send("#{name}=", @parent)
         @target
       end
@@ -37,7 +33,7 @@ module Mongoid #:nodoc:
       # options: The association +Options+.
       def initialize(document, options, target = nil)
         @parent, @klass = document, options.klass
-        @foreign_key = options.foreign_key
+        @foreign_key = document.class.to_s.foreign_key
         @target = target || @klass.first(:conditions => { @foreign_key => @parent.id })
         extends(options)
       end

data/lib/mongoid/associations/meta_data.rb

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

data/lib/mongoid/associations/options.rb

@@ -21,8 +21,7 @@ module Mongoid #:nodoc:
 
       # Return the foreign key based off the association name.
       def foreign_key
-        key = @attributes[:foreign_key] || klass.name.to_s.foreign_key
-        key.to_s
+        @attributes[:foreign_key] || klass.name.to_s.foreign_key
       end
 
       # Returns the name of the inverse_of association
@@ -48,10 +47,6 @@ 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