@@ -5,6 +5,39 @@ module MongoMapper @_values = v.map { |e| e.kind_of?(EmbeddedDocument) ? e.attributes : e } reset end + + def build(opts={}) + owner = @owner + child = @association.klass.new(opts) + child.class_eval do + define_method(owner.class.name.underscore) do + owner + end + end + child._parent_document = owner + self << child + child + end + + def find(opts) + case opts + when :all + self + when String + if load_target + child = @target.detect {|item| item.id == opts} + if child + owner = @owner + child.class_eval do + define_method(owner.class.name.underscore) do + owner + end + end + end + child + end + end + end def <<(*docs) if load_target lib/mongomapper/associations/many_embedded_proxy.rb @@ -16,6 +16,13 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase project.addresses.push Address.new project.addresses.size.should == 2 end + + should "allow finding :all embedded documents" do + project = Project.new + project.addresses << Address.new + project.addresses << Address.new + project.save + end should "be embedded in document on save" do sb = Address.new(:city => 'South Bend', :state => 'IN') @@ -120,6 +127,13 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase doc.people.first.pets.first._parent_document.should == doc end + should "create properly-named reference to parent document when building off association proxy" do + person = RealPerson.new + pet = person.pets.build + person.should == pet.real_person + end + + should "create a reference to the parent document for all embedded documents" do meg = Person.new(:name => "Meg") sparky = Pet.new(:name => "Sparky", :species => "Dog") @@ -136,4 +150,22 @@ class ManyEmbeddedProxyTest < Test::Unit::TestCase from_db.people.first.pets.first._parent_document.should == doc end end + + should "allow retrieval via find(:all)" do + meg = Person.new(:name => "Meg") + sparky = Pet.new(:name => "Sparky", :species => "Dog") + + meg.pets << sparky + + meg.pets.find(:all).should include(sparky) + end + + should "allow retrieval via find(id)" do + meg = Person.new(:name => "Meg") + sparky = Pet.new(:name => "Sparky", :species => "Dog") + + meg.pets << sparky + + meg.pets.find(sparky.id).should == sparky + end end \ No newline at end of file test/functional/associations/test_many_embedded_proxy.rb 05633151d0de16e5d540be2e86317b480274567c John Nunemaker nunemaker@gmail.com http://github.com/andrewtimberlake/mongomapper/commit/3e4e26760d66887227193afa75de5fe7c2eef0ad 3e4e26760d66887227193afa75de5fe7c2eef0ad 2009-10-02T06:27:47-07:00 2009-10-02T06:27:47-07:00 added features to make embedded document collections compatible with Rails resource_controller nested routes and normal ActiveRecord association_proxy behavior. added a reference to parent doc named based on the parent class Conflicts: test/functional/associations/test_many_embedded_proxy.rb 9388ad42d098a97f29fcc8f6d2fb8c665690b215 John Nunemaker nunemaker@gmail.com