@@ -419,10 +419,6 @@ module MongoRecord # # Person.update_all({:name => 'Bob'}, {:name => 'Fred'}) # Person.update_all({'$set' => {:name => 'Bob'}, '$inc' => {:age => 1}}, {:name => 'Fred'}) - # - # Note that, due to a current limitation of Mongo, you can't use $inc/$set on an - # indexed field. In this case, update_all will silently fail unless :safe => true - # is specified. def update_all(updates, conditions = nil, options = {}) all(:conditions => conditions).each do |row| collection.update(criteria_from(conditions).merge(:_id => row.id.to_oid), update_fields_from(updates), options) @@ -524,19 +520,11 @@ module MongoRecord find_one(options) end - # This does not work for some reason - # def find_one(options) - # cursor = find_every(options) - # one = cursor.next_object - # cursor.close # cleanup memory - # one - # end - def find_one(options) one = nil cursor = find_every(options) - cursor.each{|row| one = row; break} # short-circuit - cursor.close # cleanup memory + one = cursor.detect {|c| c} + cursor.close one end lib/mongo_record/base.rb @@ -107,10 +107,10 @@ class CallbacksTest < Test::Unit::TestCase MongoRecord::Base.connection = @@db @@was_called = [] - @@students.clear - @@courses.clear - @@tracks.clear - @@playlists.clear + @@students.remove + @@courses.remove + @@tracks.remove + @@playlists.remove # Manually insert data without using MongoRecord::Base @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'}) @@ -133,10 +133,10 @@ class CallbacksTest < Test::Unit::TestCase end def teardown - @@students.clear - @@courses.clear - @@tracks.clear - @@playlists.clear + @@students.remove + @@courses.remove + @@tracks.remove + @@playlists.remove super end @@ -146,16 +146,11 @@ class CallbacksTest < Test::Unit::TestCase assert_equal true, t.new_record? t.save assert_equal false, t.new_record? - puts $callbacks_called.inspect assert_equal [:before_save, :before_create, :after_create, :after_save], $callbacks_called assert_equal 'Your Unpleasant Family,before_save,before_create', t.song assert_equal 8, t.track - t2 = Track1.find_by_id(99) - assert_equal t.song, t2.song - assert_equal t.track, t2.track - $callbacks_called = [] t.track = 7 t.save tests/test_callbacks.rb @@ -59,10 +59,10 @@ class MongoTest < Test::Unit::TestCase super MongoRecord::Base.connection = @@db - @@students.clear - @@courses.clear - @@tracks.clear - @@playlists.clear + @@students.remove + @@courses.remove + @@tracks.remove + @@playlists.remove # Manually insert data without using MongoRecord::Base @@tracks.insert({:_id => Mongo::ObjectID.new, :artist => 'Thomas Dolby', :album => 'Aliens Ate My Buick', :song => 'The Ability to Swing'}) @@ -85,10 +85,10 @@ class MongoTest < Test::Unit::TestCase end def teardown - @@students.clear - @@courses.clear - @@tracks.clear - @@playlists.clear + @@students.remove + @@courses.remove + @@tracks.remove + @@playlists.remove super end @@ -749,7 +749,7 @@ class MongoTest < Test::Unit::TestCase # Make sure collection exists coll = alt_db.collection('students') coll.insert('name' => 'foo') - coll.clear + coll.remove assert_equal 0, coll.count() s = Student.new(:name => 'Spongebob Squarepants', :address => @spongebob_addr) tests/test_mongo.rb 46a043948012b268bd0fc32fcd37e3d34232c4fc Kyle Banker kylebanker@gmail.com http://github.com/mongodb/mongo-activerecord-ruby/commit/85262218fe6d851c18e243a79edd09d8f9b79c79 85262218fe6d851c18e243a79edd09d8f9b79c79 2009-11-11T08:26:21-08:00 2009-11-11T08:26:21-08:00 doc fixes; changed coll#clear to coll#remove c61556cbd42508c05ec3fc661c202ff063eec67a Kyle Banker kylebanker@gmail.com