@@ -38,13 +38,8 @@ module DataMapper def #{name}_association @#{name}_association ||= begin relationship = self.class.relationships(repository.name)[:#{name}] - - association = Proxy.new(relationship, self) do - relationship.get_parent(self) - end - + association = Proxy.new(relationship, self) child_associations << association - association end end @@ -55,7 +50,7 @@ module DataMapper class Proxy def parent - @parent_resource ||= @parent_loader.call + @parent_resource ||= @relationship.get_parent(@child_resource) end def parent=(parent_resource) @@ -74,13 +69,12 @@ module DataMapper private - def initialize(relationship, child_resource, &parent_loader) + def initialize(relationship, child_resource) # raise ArgumentError, "+relationship+ should be a DataMapper::Association::Relationship, but was #{relationship.class}", caller unless Relationship === relationship # raise ArgumentError, "+child_resource+ should be a DataMapper::Resource, but was #{child_resource.class}", caller unless Resource === child_resource @relationship = relationship @child_resource = child_resource - @parent_loader = parent_loader end end # class Proxy end # module ManyToOne lib/data_mapper/associations/many_to_one.rb @@ -29,7 +29,7 @@ module DataMapper def #{name} @#{name}_association ||= begin relationship = self.class.relationships(repository.name)[:#{name}] - association = Proxy.new(relationship, self, relationship.get_children(self)) + association = Proxy.new(relationship, self) parent_associations << association association end @@ -40,43 +40,52 @@ module DataMapper end class Proxy + def children + @children ||= @relationship.get_children(@parent_resource) + end + + def children=(resources) + each { |resource| remove_resource(resource) } + replace(resources) + end + def push(*resources) append_resource(resources) - @children.push(*resources) + children.push(*resources) self end def unshift(*resources) append_resource(resources) - @children.unshift(*resources) + children.unshift(*resources) self end def <<(resource) append_resource([ resource ]) - @children << resource + children << resource self end def pop - remove_resource(@children.pop) + remove_resource(children.pop) end def shift - remove_resource(@children.shift) + remove_resource(children.shift) end def delete(resource, &block) - remove_resource(@children.delete(resource, &block)) + remove_resource(children.delete(resource, &block)) end def delete_at(index) - remove_resource(@children.delete_at(index)) + remove_resource(children.delete_at(index)) end def clear each { |resource| remove_resource(resource) } - @children.clear + children.clear self end @@ -87,14 +96,12 @@ module DataMapper private - def initialize(relationship, parent_resource, collection) + def initialize(relationship, parent_resource) # raise ArgumentError, "+relationship+ should be a DataMapper::Association::Relationship, but was #{relationship.class}", caller unless Relationship === relationship # raise ArgumentError, "+parent_resource+ should be a DataMapper::Resource, but was #{parent_resource.class}", caller unless Resource === parent_resource -# raise ArgumentError, "+collection+ should be a DataMapper::Collection, but was #{collection.class}", caller unless Collection === parent_resource @relationship = relationship @parent_resource = parent_resource - @children = collection @dirty_children = [] end @@ -105,7 +112,7 @@ module DataMapper resource.save end rescue - @children << resource + children << resource raise end resource @@ -129,8 +136,8 @@ module DataMapper end def method_missing(method, *args, &block) - if @children.respond_to?(method) - @children.__send__(method, *args, &block) + if children.respond_to?(method) + children.__send__(method, *args, &block) else super end lib/data_mapper/associations/one_to_many.rb @@ -39,7 +39,7 @@ module DataMapper def #{name}_association @#{name}_association ||= begin relationship = self.class.relationships(repository.name)[:#{name}] - association = Associations::OneToMany::Proxy.new(relationship, self, relationship.get_children(self)) + association = Associations::OneToMany::Proxy.new(relationship, self) parent_associations << association association end lib/data_mapper/associations/one_to_one.rb @@ -109,21 +109,20 @@ describe DataMapper::Associations::OneToMany do end describe DataMapper::Associations::OneToMany::Proxy do - describe "when adding a resource" do - before do - @parent = mock("parent") - @resource = mock("resource", :null_object => true) - @collection = mock("collection") - @repository = mock("repository", :save => nil) - @relationship = mock("relationship") - @association = DataMapper::Associations::OneToMany::Proxy.new(@relationship, @parent, @collection) - end + before do + @parent = mock("parent") + @resource = mock("resource", :null_object => true) + @collection = [] + @repository = mock("repository", :save => nil) + @relationship = mock("relationship", :get_children => @collection, :repository_name => :a_symbol) + @association = DataMapper::Associations::OneToMany::Proxy.new(@relationship, @parent) + end + describe "when adding a resource" do describe "with a persisted parent" do it "should save the resource" do @parent.should_receive(:new_record?).with(no_args).once.and_return(false) - @relationship.should_receive(:attach_parent).with(@resource, @parent) - @relationship.should_receive(:repository_name).with(no_args).once.and_return(:a_symbol) + @relationship.should_receive(:attach_parent).with(@resource, @parent).once @collection.should_receive(:<<).with(@resource).once.and_return(@collection) @association << @resource @@ -152,26 +151,73 @@ describe DataMapper::Associations::OneToMany::Proxy do end describe "when deleting a resource" do - it "should delete the resource from the database" + before do + @collection.stub!(:delete).and_return(@resource) + @relationship.stub!(:attach_parent).once + end - it "should delete the resource from the association" + it "should delete the resource from the database" do + @resource.should_receive(:save).with(no_args).once - it "should erase the ex-parent's keys from the resource" + @association.delete(@resource) + end + + it "should delete the resource from the association" do + @collection.should_receive(:delete).with(@resource).once.and_return(@resource) + + @association.delete(@resource) + end + + it "should erase the ex-parent's keys from the resource" do + @relationship.should_receive(:attach_parent).with(@resource, nil).once + + @association.delete(@resource) + end end describe "when deleting the parent" do + it "should delete all the children without calling destroy if relationship :dependent is :delete_all" + + it "should destroy all the children if relationship :dependent is :destroy" + + it "should set the children's parent key to nil if relationship :dependent is :nullify" + it "should restrict the parent from being deleted if a child remains if relationship :dependent is restrict" + + it "should be restrict by default if relationship :dependent is not specified" end - describe "with an unsaved parent" do - describe "when deleting a resource from an unsaved parent" do - it "should remove the resource from the association" do + describe "when replacing the children" do + before do + @children = [ + mock("child 1"), + mock("child 2"), + ] + @collection << @resource + @relationship.stub!(:attach_parent) + end - end + it "should remove each resource" do + @relationship.should_receive(:attach_parent).with(@resource, nil).once + @resource.should_receive(:save).with(no_args).once + + @association.children = @children end - end -end -describe "when changing a resource's parent" do + it "should replace the children in the collection" do + @children.should_not == @collection + @association.children.should == @collection + @association.children = @children + + @collection.should == @children + @association.children.object_id.should == @collection.object_id + end + end + + describe "with an unsaved parent" do + describe "when deleting a resource from an unsaved parent" do + it "should remove the resource from the association" + end + end end spec/unit/associations/one_to_many_spec.rb 73f5841d62c9212e49e064b10db9d37b277eacae Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/5b3c7c27c694b586d0ec2f807ae9811407223c84 5b3c7c27c694b586d0ec2f807ae9811407223c84 2008-05-09T00:53:51-07:00 2008-05-09T00:53:51-07:00 Simplified Association Proxy class interfaces * No longer need to pass in a loader block into ManyToOne::Proxy * No longer need to pass in a collection to OneToMany::Proxy * Added OneToMany::Proxy#children= to allow mass-assignment of children in one step * Speced out :dependent option for OneToMany::Proxy b4a166fae1e0f25cfc1f24c823acf874314f879f Dan Kubb dan.kubb@autopilotmarketing.com