references_one.rb in mongoid-2.0.0.beta.15

- old
+ new

@@ -3,44 +3,52 @@
   module Associations #:nodoc:
     # Represents an relational one-to-one association with an object in a
     # separate collection or database.
     class ReferencesOne < Proxy
 
-      delegate :nil?, :to => :target
-
       # Builds a new Document and sets it as the association.
       #
       # 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
-        @target.send("#{name}=", @parent)
-        @target
+        target = @klass.instantiate(attributes)
+        replace(target)
+        target
       end
 
       # Builds a new Document and sets it as the association, then saves the
       # newly created document.
       #
       # Returns the newly created object.
       def create(attributes = {})
         build(attributes).tap(&:save)
       end
 
+      # Replaces the target with a new object
+      #
+      # Returns the association proxy
+      def replace(obj)
+        @target = obj
+        inverse = @target.associations.values.detect do |metadata|
+          metadata.options.klass == @parent.class
+        end
+        name = inverse.name
+        @target.send("#{name}=", @parent)
+
+        self
+      end
+
       # Initializing a related association only requires looking up the objects
       # by their ids.
       #
       # Options:
       #
       # document: The +Document+ that contains the relationship.
       # options: The association +Options+.
-      def initialize(document, options, target = nil)
+      def initialize(document, options)
         @parent, @klass = document, options.klass
         @foreign_key = options.foreign_key
-        @target = target || @klass.first(:conditions => { @foreign_key => @parent.id })
+        @target = @klass.first(:conditions => { @foreign_key => @parent.id })
         extends(options)
       end
 
       # Used for setting the association via a nested attributes setter on the
       # parent +Document+. Called when using accepts_nested_attributes_for.
@@ -55,20 +63,10 @@
       def nested_build(attributes, options = nil)
         build(attributes) unless @target.blank? && options[:update_only]
       end
 
       class << self
-        # Preferred method for creating the new +RelatesToMany+ association.
-        #
-        # Options:
-        #
-        # document: The +Document+ that contains the relationship.
-        # options: The association +Options+.
-        def instantiate(document, options, target = nil)
-          new(document, options, target)
-        end
-
         # Returns the macro used to create the association.
         def macro
           :references_one
         end
 
@@ -85,13 +83,13 @@
         #
         # <tt>HasOneToRelated.update(game, person, options)</tt>
         def update(target, document, options)
           if target
             name = document.class.to_s.underscore
-            target.send("#{name}=", document)
-            return instantiate(document, options, target)
+            proxy = new(document, options)
+            proxy.replace(target)
           end
-          target
+          proxy
         end
       end
     end
   end
 end