@@ -794,6 +794,14 @@ module MongoRecord value = instance_variable_get("@#{key}").to_mongo_value if value.instance_of? Hash and value["_ns"] value = XGen::Mongo::Driver::DBRef.new(value["_ns"], value["_id"]) + elsif value.instance_of? Array + value = value.map {|v| + if v.instance_of? Hash and v["_ns"] + XGen::Mongo::Driver::DBRef.new(v["_ns"], v["_id"]) + else + v + end + } end h[key] = value } @@ -921,7 +929,12 @@ module MongoRecord elsif self.class.arrays.keys.include?(sym) klazz = self.class.arrays[sym] val = [val] unless val.kind_of?(Array) - instance_variable_set(ivar_name, val.collect {|v| v.kind_of?(MongoRecord::Base) ? v : klazz.new(v)}) + instance_variable_set(ivar_name, val.collect {|v| + if v.instance_of? XGen::Mongo::Driver::DBRef + v = self.class.collection.db.dereference(v) + end + v.kind_of?(MongoRecord::Base) ? v : klazz.new(v) + }) else instance_variable_set(ivar_name, val) end lib/mongo_record/base.rb @@ -584,6 +584,27 @@ class MongoTest < Test::Unit::TestCase assert_not_nil s assert_equal 1, s.scores.length assert_equal 'changed', s.scores.first.for_course.name + + + # Now try with has_many + score.save + s.scores = [score] + s.save + + assert_equal 3.5, s.scores.first.grade + + s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'") + assert_not_nil s + assert_equal 1, s.scores.length + assert_equal 3.5, s.scores.first.grade + + score.grade = 4.0 + score.save + + s = Student.find(:first, :conditions => "name = 'Spongebob Squarepants'") + assert_not_nil s + assert_equal 1, s.scores.length + assert_equal 4.0, s.scores.first.grade end def test_subobjects_have_no_ids tests/test_mongo.rb 2b13714eabdf15981df20bb0caacc7a007532bb1 Mike Dirolf mike@10gen.com http://github.com/squeejee/mongo-activerecord-ruby/commit/8efb075ddebe9370a8165a8889434628b337c625 8efb075ddebe9370a8165a8889434628b337c625 2009-04-28T12:50:14-07:00 2009-04-28T12:50:14-07:00 support for DBRefs w/in has_many as well e541b3b317f4c6facd88aac64c44e735a7d5a684 Mike Dirolf mike@10gen.com