lib/mongoid/associations/accessor.rb in mongoid-0.6.4 vs lib/mongoid/associations/accessor.rb in mongoid-0.6.5

@@ -7,12 +7,15 @@
         # association.
         #
         # If the type is invalid a InvalidAssociationError will be thrown.
         def get(type, name, document, options = {})
           case type
-            when :belongs_to then BelongsTo.new(document)
-            when :has_many then HasMany.new(name, document, options)
-            when :has_one then HasOne.new(name, document, options)
+            when :belongs_to
+              BelongsTo.new(document)
+            when :has_many
+              HasMany.new(name, document, options)
+            when :has_one
+              document ? HasOne.new(name, document, options) : nil
             else raise InvalidAssociationError
           end
         end
 
         # Set an object association. This is used to set the parent reference