mongoid 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/mongoid/associations.rb

@@ -1,87 +1,104 @@
 require "mongoid/associations/decorator"
-require "mongoid/associations/factory"
-require "mongoid/associations/belongs_to_association"
-require "mongoid/associations/has_many_association"
-require "mongoid/associations/has_one_association"
+require "mongoid/associations/accessor"
+require "mongoid/associations/belongs_to"
+require "mongoid/associations/has_many"
+require "mongoid/associations/has_one"
 
 module Mongoid # :nodoc:
-  module Associations
-
-    # Adds the association back to the parent document. This macro is
-    # necessary to set the references from the child back to the parent
-    # document. If a child does not define this association calling
-    # persistence methods on the child object will cause a save to fail.
-    #
-    # Options:
-    #
-    # association_name: A +Symbol+ that matches the name of the parent class.
-    #
-    # Example:
-    #
-    #   class Person < Mongoid::Document
-    #     has_many :addresses
-    #   end
-    #
-    #   class Address < Mongoid::Document
-    #     belongs_to :person
-    #   end
-    def belongs_to(association_name)
-      @embedded = true
-      add_association(:belongs_to, association_name.to_s.classify, association_name)
+  module Associations #:nodoc:
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+        extend ClassMethods
+      end
     end
 
-    # Adds the association from a parent document to its children. The name
-    # of the association needs to be a pluralized form of the child class
-    # name.
-    #
-    # Options:
-    #
-    # association_name: A +Symbol+ that is the plural child class name.
-    #
-    # Example:
-    #
-    #   class Person < Mongoid::Document
-    #     has_many :addresses
-    #   end
-    #
-    #   class Address < Mongoid::Document
-    #     belongs_to :person
-    #   end
-    def has_many(association_name, options = {})
-      add_association(:has_many, association_name.to_s.classify, association_name, options)
+    module InstanceMethods
+      def associations
+        self.class.associations
+      end
     end
 
-    # Adds the association from a parent document to its child. The name
-    # of the association needs to be a singular form of the child class
-    # name.
-    #
-    # Options:
-    #
-    # association_name: A +Symbol+ that is the plural child class name.
-    #
-    # Example:
-    #
-    #   class Person < Mongoid::Document
-    #     has_many :addresses
-    #   end
-    #
-    #   class Address < Mongoid::Document
-    #     belongs_to :person
-    #   end
-    def has_one(association_name, options = {})
-      add_association(:has_one, association_name.to_s.titleize, association_name, options)
-    end
+    module ClassMethods
+      def associations
+        @associations ||= HashWithIndifferentAccess.new
+      end
+      # Adds the association back to the parent document. This macro is
+      # necessary to set the references from the child back to the parent
+      # document. If a child does not define this association calling
+      # persistence methods on the child object will cause a save to fail.
+      #
+      # Options:
+      #
+      # association_name: A +Symbol+ that matches the name of the parent class.
+      #
+      # Example:
+      #
+      #   class Person < Mongoid::Document
+      #     has_many :addresses
+      #   end
+      #
+      #   class Address < Mongoid::Document
+      #     belongs_to :person
+      #   end
+      def belongs_to(association_name)
+        @embedded = true
+        add_association(:belongs_to, association_name.to_s.classify, association_name)
+      end
+
+      # Adds the association from a parent document to its children. The name
+      # of the association needs to be a pluralized form of the child class
+      # name.
+      #
+      # Options:
+      #
+      # association_name: A +Symbol+ that is the plural child class name.
+      #
+      # Example:
+      #
+      #   class Person < Mongoid::Document
+      #     has_many :addresses
+      #   end
+      #
+      #   class Address < Mongoid::Document
+      #     belongs_to :person
+      #   end
+      def has_many(association_name, options = {})
+        add_association(:has_many, association_name.to_s.classify, association_name, options)
+      end
 
-    private
-    # Adds the association to the associations hash with the type as the key,
-    # then adds the accessors for the association.
-    def add_association(type, class_name, name, options = {})
-      define_method(name) do
-        Associations::Factory.create(type, name, self, options)
+      # Adds the association from a parent document to its child. The name
+      # of the association needs to be a singular form of the child class
+      # name.
+      #
+      # Options:
+      #
+      # association_name: A +Symbol+ that is the plural child class name.
+      #
+      # Example:
+      #
+      #   class Person < Mongoid::Document
+      #     has_many :addresses
+      #   end
+      #
+      #   class Address < Mongoid::Document
+      #     belongs_to :person
+      #   end
+      def has_one(association_name, options = {})
+        add_association(:has_one, association_name.to_s.titleize, association_name, options)
       end
-      define_method("#{name}=") do |object|
-        object.parentize(self, name)
-        @attributes[name] = object.mongoidize
+
+      private
+      # Adds the association to the associations hash with the type as the key,
+      # then adds the accessors for the association.
+      def add_association(type, class_name, name, options = {})
+        associations[name] = type
+        define_method(name) do
+          Associations::Accessor.get(type, name, self, options)
+        end
+        define_method("#{name}=") do |object|
+          Associations::Accessor.set(type, name, self, object, options)
+        end
       end
     end
   end

data/lib/mongoid/associations/accessor.rb

@@ -0,0 +1,41 @@
+module Mongoid #:nodoc:
+  module Associations #:nodoc:
+    class Accessor #:nodoc:
+      class << self
+        # Gets an association, based on the type provided and
+        # passes the name and document into the newly instantiated
+        # 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)
+            else raise InvalidAssociationError
+          end
+        end
+
+        # Set an object association. This is used to set the parent reference
+        # in a +BelongsTo+, a child reference in a +HasOne+, or many child
+        # references in a +HasMany+.
+        #
+        # Options:
+        #
+        # type: The association type
+        # name: The name of the association
+        # document: The base document to handle the access for.
+        # object: The object that was passed in to the setter method.
+        # options: optional options.
+        def set(type, name, document, object, options ={})
+          case type
+            when :belongs_to then BelongsTo.update(document, object)
+            when :has_many then HasMany.update(object, document, name)
+            when :has_one then HasOne.update(object, document, name)
+            else raise InvalidAssociationError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/associations/{belongs_to_association.rb → belongs_to.rb}

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class BelongsToAssociation #:nodoc:
+    class BelongsTo #:nodoc:
       include Decorator
 
       # Creates the new association by setting the internal 
@@ -21,6 +21,20 @@ module Mongoid #:nodoc:
         @document
       end
 
+      class << self
+        # 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 a has_one or a has_many.
+        def update(child, parent)
+          name = child.class.name.demodulize.downcase
+          if parent.associations[name]
+            child.parentize(parent, name)
+          else
+            child.parentize(parent, name.tableize)
+          end
+          child.notify
+        end
+      end
     end
   end
 end

data/lib/mongoid/associations/{has_many_association.rb → has_many.rb}

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class HasManyAssociation < DelegateClass(Array) #:nodoc:
+    class HasMany < DelegateClass(Array) #:nodoc:
 
       attr_accessor :association_name
 
@@ -12,6 +12,14 @@ module Mongoid #:nodoc:
         object.is_a?(Array) ? object.each(&:notify) : object.notify
       end
 
+      # Clears the association, and notifies the parents of the removal.
+      def clear
+        object = @documents.first
+        object.changed(true)
+        object.notify_observers(object, true)
+        super
+      end
+
       # Appends the object to the +Array+, setting its parent in
       # the process.
       def push(object)
@@ -65,6 +73,19 @@ module Mongoid #:nodoc:
         super(@documents)
       end
 
+      class << self
+        # 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, name)
+          parent.attributes.delete(name)
+          children.each do |child|
+            child.parentize(parent, name)
+            child.notify
+          end
+        end
+      end
+
     end
   end
 end

data/lib/mongoid/associations/{has_one_association.rb → has_one.rb}

@@ -1,6 +1,6 @@
 module Mongoid #:nodoc:
   module Associations #:nodoc:
-    class HasOneAssociation #:nodoc:
+    class HasOne #:nodoc:
       include Decorator
 
       delegate :valid?, :to => :document
@@ -16,10 +16,19 @@ module Mongoid #:nodoc:
         klass = class_name ? class_name.constantize : name.to_s.camelize.constantize
         attributes = document.attributes[name]
         @document = klass.new(attributes)
-        @document.parent = document
+        @document.parentize(document, name)
         decorate!
       end
 
+      class << self
+        # Perform an update of the relationship of the parent and child. This
+        # is initialized by setting the has_one to the supplied child.
+        def update(child, parent, name)
+          child.parentize(parent, name)
+          child.notify
+        end
+      end
+
     end
   end
 end

data/lib/mongoid/document.rb

@@ -1,8 +1,7 @@
 module Mongoid #:nodoc:
   class Document
     include ActiveSupport::Callbacks
-    include Attributes, Commands, Observable, Validatable
-    extend Associations
+    include Associations, Attributes, Commands, Observable, Validatable
 
     attr_accessor :association_name, :parent
     attr_reader :attributes, :new_record
@@ -199,6 +198,10 @@ module Mongoid #:nodoc:
       generate_key
     end
 
+    def inspect
+      "Class: #{self.class.name} | Attributes: #{@attributes.inspect} | Parent: #{@parent.class.name}"
+    end
+
     # Return the +Document+ primary key.
     def primary_key
       self.class.primary_key
@@ -231,8 +234,9 @@ module Mongoid #:nodoc:
     end
 
     # Update the document based on notify from child
-    def update(child)
-      @attributes.insert(child.association_name, child.attributes)
+    def update(child, clear = false)
+      @attributes.insert(child.association_name, child.attributes) unless clear
+      @attributes.delete(child.association_name) if clear
       notify
     end
 

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2009-11-01}
+  s.date = %q{2009-11-02}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.textile"
@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/mongoid.rb",
      "lib/mongoid/associations.rb",
-     "lib/mongoid/associations/belongs_to_association.rb",
+     "lib/mongoid/associations/accessor.rb",
+     "lib/mongoid/associations/belongs_to.rb",
      "lib/mongoid/associations/decorator.rb",
-     "lib/mongoid/associations/factory.rb",
-     "lib/mongoid/associations/has_many_association.rb",
-     "lib/mongoid/associations/has_one_association.rb",
+     "lib/mongoid/associations/has_many.rb",
+     "lib/mongoid/associations/has_one.rb",
      "lib/mongoid/attributes.rb",
      "lib/mongoid/commands.rb",
      "lib/mongoid/commands/create.rb",
@@ -61,11 +61,11 @@ Gem::Specification.new do |s|
      "spec/integration/mongoid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/belongs_to_association_spec.rb",
+     "spec/unit/mongoid/associations/accessor_spec.rb",
+     "spec/unit/mongoid/associations/belongs_to_spec.rb",
      "spec/unit/mongoid/associations/decorator_spec.rb",
-     "spec/unit/mongoid/associations/factory_spec.rb",
-     "spec/unit/mongoid/associations/has_many_association_spec.rb",
-     "spec/unit/mongoid/associations/has_one_association_spec.rb",
+     "spec/unit/mongoid/associations/has_many_spec.rb",
+     "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
@@ -103,11 +103,11 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/integration/mongoid/document_spec.rb",
      "spec/spec_helper.rb",
-     "spec/unit/mongoid/associations/belongs_to_association_spec.rb",
+     "spec/unit/mongoid/associations/accessor_spec.rb",
+     "spec/unit/mongoid/associations/belongs_to_spec.rb",
      "spec/unit/mongoid/associations/decorator_spec.rb",
-     "spec/unit/mongoid/associations/factory_spec.rb",
-     "spec/unit/mongoid/associations/has_many_association_spec.rb",
-     "spec/unit/mongoid/associations/has_one_association_spec.rb",
+     "spec/unit/mongoid/associations/has_many_spec.rb",
+     "spec/unit/mongoid/associations/has_one_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",

data/spec/integration/mongoid/document_spec.rb

@@ -10,6 +10,23 @@ class Person < Mongoid::Document
   has_one :name
 end
 
+class PetOwner < Mongoid::Document
+  field :title
+  has_one :pet
+end
+
+class Pet < Mongoid::Document
+  field :name
+  field :weight, :type => Float, :default => 0.0
+  has_many :vet_visits
+  belongs_to :pet_owner
+end
+
+class VetVisit < Mongoid::Document
+  field :date, :type => Date
+  belongs_to :pet
+end
+
 class Address < Mongoid::Document
   field :street
   field :city
@@ -172,6 +189,24 @@ describe Mongoid::Document do
 
   end
 
+  context "when has many exists through a has one" do
+
+    before do
+      @owner = PetOwner.new(:title => "Sir")
+      @pet = Pet.new(:name => "Fido")
+      @visit = VetVisit.new(:date => Date.today)
+      @pet.vet_visits << @visit
+      @owner.pet = @pet
+    end
+
+    it "can clear the association" do
+      @owner.pet.vet_visits.size.should == 1
+      @owner.pet.vet_visits.clear
+      @owner.pet.vet_visits.size.should == 0
+    end
+
+  end
+
   context "the lot" do
 
     before do
@@ -215,6 +250,22 @@ describe Mongoid::Document do
 
   end
 
+  context "setting belongs_to" do
+
+    before do
+      @person = Person.new(:title => "Mr")
+      @address = Address.new(:street => "Bloomsbury Ave")
+      @person.save!
+    end
+
+    it "allows the parent reference to change" do
+      @address.person = @person
+      @address.save!
+      @person.addresses.first.should == @address
+    end
+
+  end
+
   context "typecasting" do
 
     before do

data/spec/unit/mongoid/associations/accessor_spec.rb

@@ -0,0 +1,108 @@
+require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+
+class Person < Mongoid::Document
+  field :title
+  has_many :addresses
+  has_one :name
+end
+
+class Address < Mongoid::Document
+  field :street
+  key :street
+  belongs_to :person
+end
+
+class Name < Mongoid::Document
+  field :first_name
+  field :last_name
+  key :first_name, :last_name
+  belongs_to :person
+end
+
+describe Mongoid::Associations::Accessor do
+
+  describe "#get" do
+
+    before do
+      @document = Person.new
+      @object = stub
+    end
+
+    context "when type is has_many" do
+
+      it "returns a HasMany" do
+        association = Mongoid::Associations::Accessor.get(:has_many, :addresses, @document)
+        association.should be_a_kind_of(Mongoid::Associations::HasMany)
+      end
+
+    end
+
+    context "when type is has_one" do
+
+      it "returns a HasOne" do
+        association = Mongoid::Associations::Accessor.get(:has_one, :name, @document)
+        association.should be_a_kind_of(Mongoid::Associations::HasOne)
+      end
+
+    end
+
+    context "when type is belongs_to" do
+
+      it "returns a BelongsTo" do
+        association = Mongoid::Associations::Accessor.get(:belongs_to, :person, @document)
+        association.should be_a_kind_of(Mongoid::Associations::BelongsTo)
+      end
+
+    end
+
+    context "when type is invalid" do
+
+      it "raises an InvalidAssociationError" do
+        lambda { Mongoid::Associations::Accessor.get(:something, :person, @document) }.should raise_error
+      end
+
+    end
+
+  end
+
+  describe "#set" do
+
+    context "when type is has_many" do
+
+      it "returns a HasMany" do
+        Mongoid::Associations::HasMany.expects(:update).with(@document, @object, :addresses)
+        Mongoid::Associations::Accessor.set(:has_many, :addresses, @document, @object)
+      end
+
+    end
+
+    context "when type is has_one" do
+
+      it "returns a HasOne" do
+        Mongoid::Associations::HasOne.expects(:update).with(@document, @object, :name)
+        Mongoid::Associations::Accessor.set(:has_one, :name, @document, @object)
+      end
+
+    end
+
+    context "when type is belongs_to" do
+
+      it "returns a BelongsTo" do
+        Mongoid::Associations::BelongsTo.expects(:update).with(@document, @object)
+        Mongoid::Associations::Accessor.set(:belongs_to, :person, @document, @object)
+      end
+
+    end
+
+    context "when type is invalid" do
+
+      it "raises an InvalidAssociationError" do
+        lambda {
+          Mongoid::Associations::Accessor.set(:something, :person, @document, @object)
+        }.should raise_error
+      end
+
+    end
+  end
+
+end

data/spec/unit/mongoid/associations/belongs_to_spec.rb

@@ -0,0 +1,103 @@
+require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+
+class Person < Mongoid::Document
+  field :title
+  has_one :name
+  has_many :addresses
+end
+
+class Name < Mongoid::Document
+  field :first_name
+  field :last_name
+  key :first_name, :last_name
+  belongs_to :person
+end
+
+class Address < Mongoid::Document
+  field :street
+  belongs_to :person
+end
+
+describe Mongoid::Associations::BelongsTo do
+
+  describe "#update" do
+
+    context "when child is a has one" do
+
+      before do
+        @name = Name.new(:first_name => "Test", :last_name => "User")
+        @person = Person.new(:title => "Mrs")
+        Mongoid::Associations::BelongsTo.update(@name, @person)
+      end
+
+      it "updates the parent document" do
+        @person.name.should == @name
+        @person.attributes[:name].except(:_id).should ==
+          { "first_name" => "Test", "last_name" => "User" }
+      end
+
+    end
+
+    context "when child is a has many" do
+
+      before do
+        @address = Address.new(:street => "Broadway")
+        @person = Person.new(:title => "Mrs")
+        Mongoid::Associations::BelongsTo.update(@address, @person)
+      end
+
+      it "updates the parent document" do
+        @person.addresses.first.should == @address
+      end
+
+    end
+
+  end
+
+  describe "#find" do
+
+    before do
+      @parent = Name.new(:first_name => "Drexel")
+      @document = stub(:parent => @parent)
+      @association = Mongoid::Associations::BelongsTo.new(@document)
+    end
+
+    context "when finding by id" do
+
+      it "returns the document in the array with that id" do
+        name = @association.find(Mongo::ObjectID.new.to_s)
+        name.should == @parent
+      end
+
+    end
+
+  end
+
+  context "when decorating" do
+
+    before do
+      @parent = Name.new(:first_name => "Drexel")
+      @document = stub(:parent => @parent)
+      @association = Mongoid::Associations::BelongsTo.new(@document)
+    end
+
+    context "when getting values" do
+
+      it "delegates to the document" do
+        @association.first_name.should == "Drexel"
+      end
+
+    end
+
+    context "when setting values" do
+
+      it "delegates to the document" do
+        @association.first_name = "Test"
+        @association.first_name.should == "Test"
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/associations/{has_many_association_spec.rb → has_many_spec.rb}

@@ -11,7 +11,7 @@ class Address < Mongoid::Document
   belongs_to :person
 end
 
-describe Mongoid::Associations::HasManyAssociation do
+describe Mongoid::Associations::HasMany do
 
   before do
     @attributes = { :addresses => [
@@ -20,10 +20,29 @@ describe Mongoid::Associations::HasManyAssociation do
     @document = stub(:attributes => @attributes, :add_observer => true, :update => true)
   end
 
+  describe "#update" do
+
+    before do
+      @address = Address.new(:street => "Madison Ave")
+      @person = Person.new(:title => "Sir")
+      Mongoid::Associations::HasMany.update([@address], @person, :addresses)
+    end
+
+    it "parentizes the child document" do
+      @address.parent.should == @person
+    end
+
+    it "sets the attributes of the child on the parent" do
+      @person.attributes[:addresses].should ==
+        [{ "_id" => "madison-ave", "street" => "Madison Ave" }]
+    end
+
+  end
+
   describe "#[]" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
     end
 
     context "when the index is present in the association" do
@@ -48,7 +67,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#<<" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
       @address = Address.new
     end
 
@@ -69,7 +88,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#concat" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
       @address = Address.new
     end
 
@@ -84,7 +103,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
       @address = Address.new
     end
 
@@ -99,7 +118,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#build" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
     end
 
     it "adds a new document to the array with the suppied parameters" do
@@ -120,7 +139,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#find" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
     end
 
     context "when finding all" do
@@ -147,7 +166,7 @@ describe Mongoid::Associations::HasManyAssociation do
     context "when there are elements in the array" do
 
       before do
-        @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+        @association = Mongoid::Associations::HasMany.new(:addresses, @document)
       end
 
       it "returns the first element" do
@@ -160,7 +179,7 @@ describe Mongoid::Associations::HasManyAssociation do
     context "when the array is empty" do
 
       before do
-        @association = Mongoid::Associations::HasManyAssociation.new(:addresses, Person.new)
+        @association = Mongoid::Associations::HasMany.new(:addresses, Person.new)
       end
 
       it "returns nil" do
@@ -176,7 +195,7 @@ describe Mongoid::Associations::HasManyAssociation do
     context "#length" do
 
       it "returns the length of the delegated array" do
-        @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+        @association = Mongoid::Associations::HasMany.new(:addresses, @document)
         @association.length.should == 2
       end
 
@@ -187,7 +206,7 @@ describe Mongoid::Associations::HasManyAssociation do
   describe "#push" do
 
     before do
-      @association = Mongoid::Associations::HasManyAssociation.new(:addresses, @document)
+      @association = Mongoid::Associations::HasMany.new(:addresses, @document)
     end
 
     it "appends the document to the end of the array" do

data/spec/unit/mongoid/associations/has_one_spec.rb

@@ -0,0 +1,69 @@
+require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
+
+class MixedDrink < Mongoid::Document
+  field :name
+end
+
+class Person < Mongoid::Document
+  field :title
+  has_one :name
+end
+
+class Name < Mongoid::Document
+  field :first_name
+  key :first_name
+  belongs_to :person
+end
+
+describe Mongoid::Associations::HasOne do
+
+  before do
+    @attributes = { :mixed_drink => { :name => "Jack and Coke" } }
+    @document = stub(:attributes => @attributes, :update => true)
+  end
+
+  describe "#update" do
+
+    before do
+      @name = Name.new(:first_name => "Donald")
+      @person = Person.new(:title => "Sir")
+      Mongoid::Associations::HasOne.update(@name, @person, :name)
+    end
+
+    it "parentizes the child document" do
+      @name.parent.should == @person
+    end
+
+    it "sets the attributes of the child on the parent" do
+      @person.attributes[:name].should ==
+        { "_id" => "donald", "first_name" => "Donald" }
+    end
+
+  end
+
+  describe "#decorate!" do
+
+    before do
+      @association = Mongoid::Associations::HasOne.new(:mixed_drink, @document)
+    end
+
+    context "when getting values" do
+
+      it "delegates to the document" do
+        @association.name.should == "Jack and Coke"
+      end
+
+    end
+
+    context "when setting values" do
+
+      it "delegates to the document" do
+        @association.name = "Jack and Coke"
+        @association.name.should == "Jack and Coke"
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/mongoid/associations_spec.rb

@@ -79,6 +79,25 @@ describe Mongoid::Associations do
 
     end
 
+    context "when setting a parent" do
+
+      before do
+        @person = Person.new(:title => "Mr")
+        @address = Address.new(:street => "Picadilly Circus")
+        @address.person = @person
+      end
+
+      it "re-parentizes the association" do
+        @address.parent.should == @person
+      end
+
+      it "adds the child attributes to the parent" do
+        @person.attributes[:addresses].should ==
+          [{ "_id" => "picadilly-circus", "street" => "Picadilly Circus" }]
+      end
+
+    end
+
   end
 
   describe "#belongs_to" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,11 +79,11 @@ files:
 - VERSION
 - lib/mongoid.rb
 - lib/mongoid/associations.rb
-- lib/mongoid/associations/belongs_to_association.rb
+- lib/mongoid/associations/accessor.rb
+- lib/mongoid/associations/belongs_to.rb
 - lib/mongoid/associations/decorator.rb
-- lib/mongoid/associations/factory.rb
-- lib/mongoid/associations/has_many_association.rb
-- lib/mongoid/associations/has_one_association.rb
+- lib/mongoid/associations/has_many.rb
+- lib/mongoid/associations/has_one.rb
 - lib/mongoid/attributes.rb
 - lib/mongoid/commands.rb
 - lib/mongoid/commands/create.rb
@@ -117,11 +117,11 @@ files:
 - spec/integration/mongoid/document_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/unit/mongoid/associations/belongs_to_association_spec.rb
+- spec/unit/mongoid/associations/accessor_spec.rb
+- spec/unit/mongoid/associations/belongs_to_spec.rb
 - spec/unit/mongoid/associations/decorator_spec.rb
-- spec/unit/mongoid/associations/factory_spec.rb
-- spec/unit/mongoid/associations/has_many_association_spec.rb
-- spec/unit/mongoid/associations/has_one_association_spec.rb
+- spec/unit/mongoid/associations/has_many_spec.rb
+- spec/unit/mongoid/associations/has_one_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb
@@ -181,11 +181,11 @@ summary: ODM framework for MongoDB
 test_files: 
 - spec/integration/mongoid/document_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid/associations/belongs_to_association_spec.rb
+- spec/unit/mongoid/associations/accessor_spec.rb
+- spec/unit/mongoid/associations/belongs_to_spec.rb
 - spec/unit/mongoid/associations/decorator_spec.rb
-- spec/unit/mongoid/associations/factory_spec.rb
-- spec/unit/mongoid/associations/has_many_association_spec.rb
-- spec/unit/mongoid/associations/has_one_association_spec.rb
+- spec/unit/mongoid/associations/has_many_spec.rb
+- spec/unit/mongoid/associations/has_one_spec.rb
 - spec/unit/mongoid/associations_spec.rb
 - spec/unit/mongoid/attributes_spec.rb
 - spec/unit/mongoid/commands/create_spec.rb

data/lib/mongoid/associations/factory.rb

@@ -1,21 +0,0 @@
-module Mongoid #:nodoc:
-  module Associations #:nodoc:
-    class Factory #:nodoc:
-
-      # Creates a new association, based on the type provided and 
-      # passes the name and document into the newly instantiated
-      # association.
-      #
-      # If the type is invalid a InvalidAssociationError will be thrown.
-      def self.create(association_type, association_name, document, options = {})
-        case association_type
-          when :belongs_to then BelongsToAssociation.new(document)
-          when :has_many then HasManyAssociation.new(association_name, document, options)
-          when :has_one then HasOneAssociation.new(association_name, document, options)
-          else raise InvalidAssociationError
-        end
-      end
-
-    end
-  end
-end

data/spec/unit/mongoid/associations/belongs_to_association_spec.rb

@@ -1,59 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-describe Mongoid::Associations::BelongsToAssociation do
-
-  before do
-    @parent = Name.new(:first_name => "Drexel")
-    @document = stub(:parent => @parent)
-  end
-
-  describe "#find" do
-
-    before do
-      @association = Mongoid::Associations::BelongsToAssociation.new(@document)
-    end
-
-    context "when finding by id" do
-
-      it "returns the document in the array with that id" do
-        name = @association.find(Mongo::ObjectID.new.to_s)
-        name.should == @parent
-      end
-
-    end
-
-  end
-
-  context "when decorating" do
-
-    before do
-      @association = Mongoid::Associations::BelongsToAssociation.new(@document)
-    end
-
-    context "when getting values" do
-
-      it "delegates to the document" do
-        @association.first_name.should == "Drexel"
-      end
-
-    end
-
-    context "when setting values" do
-
-      it "delegates to the document" do
-        @association.first_name = "Test"
-        @association.first_name.should == "Test"
-      end
-
-    end
-
-  end
-
-end

data/spec/unit/mongoid/associations/factory_spec.rb

@@ -1,67 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class Person < Mongoid::Document
-  field :title
-  has_many :addresses
-  has_one :name
-end
-
-class Address < Mongoid::Document
-  field :street
-  key :street
-  belongs_to :person
-end
-
-class Name < Mongoid::Document
-  field :first_name
-  field :last_name
-  key :first_name, :last_name
-  belongs_to :person
-end
-
-describe Mongoid::Associations::Factory do
-
-  describe "#create" do
-
-    before do
-      @document = Person.new
-    end
-
-    context "when type is has_many" do
-
-      it "returns a HasManyAssociationProxy" do
-        association = Mongoid::Associations::Factory.create(:has_many, :addresses, @document)
-        association.should be_a_kind_of(Mongoid::Associations::HasManyAssociation)
-      end
-
-    end
-
-    context "when type is has_one" do
-
-      it "returns a HashOneAssociationProxy" do
-        association = Mongoid::Associations::Factory.create(:has_one, :name, @document)
-        association.should be_a_kind_of(Mongoid::Associations::HasOneAssociation)
-      end
-
-    end
-
-    context "when type is belongs_to" do
-
-      it "returns a BelongsToAssociationProxy" do
-        association = Mongoid::Associations::Factory.create(:belongs_to, :person, @document)
-        association.should be_a_kind_of(Mongoid::Associations::BelongsToAssociation)
-      end
-
-    end
-
-    context "when type is invalid" do
-
-      it "raises an InvalidAssociationError" do
-        lambda { Mongoid::Associations::Factory.create(:something, :person, @document) }.should raise_error
-      end
-
-    end
-
-  end
-
-end

data/spec/unit/mongoid/associations/has_one_association_spec.rb

@@ -1,39 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../../../spec_helper.rb")
-
-class MixedDrink < Mongoid::Document
-  field :name
-end
-
-describe Mongoid::Associations::HasOneAssociation do
-
-  before do
-    @attributes = { :mixed_drink => { :name => "Jack and Coke" } }
-    @document = stub(:attributes => @attributes)
-  end
-
-  describe "#decorate!" do
-
-    before do
-      @association = Mongoid::Associations::HasOneAssociation.new(:mixed_drink, @document)
-    end
-
-    context "when getting values" do
-
-      it "delegates to the document" do
-        @association.name.should == "Jack and Coke"
-      end
-
-    end
-
-    context "when setting values" do
-
-      it "delegates to the document" do
-        @association.name = "Jack and Coke"
-        @association.name.should == "Jack and Coke"
-      end
-
-    end
-
-  end
-
-end