mongodb-mongo 0.7 → 0.8

data/README.rdoc

@@ -321,6 +321,8 @@ Adrian Madrid, aemadrid@gmail.com
 * Gem support.
 * Many other code suggestions and improvements.
 
+Aman Gupta, aman@tmm1.net
+* Collection#save
 
 = License
 

data/lib/mongo/collection.rb

@@ -73,6 +73,15 @@ module XGen
           cursor.next_object    # don't need to explicitly close b/c of limit
         end
 
+        # Save an updated +object+ to the collection, or insert it if it doesn't exist already.
+        def save(object)
+          if id = object[:_id] || object['_id']
+            modify({:_id => id}, object)
+          else
+            insert(object)
+          end
+        end
+
         # Insert +objects+, which are hashes. "<<" is aliased to this method.
         # Returns either the single inserted object or a new array containing
         # +objects+. The object(s) may have been modified by the database's PK

data/lib/mongo/db.rb

@@ -264,6 +264,27 @@ module XGen
           error != nil
         end
 
+        # Get the most recent error to have occured on this database
+        #
+        # Only returns errors that have occured since the last call to
+        # DB#reset_error_history - returns +nil+ if there is no such error.
+        def previous_error
+          error = db_command(:getpreverror => 1)
+          if error["err"]
+            error
+          else
+            nil
+          end
+        end
+
+        # Reset the error history of this database
+        #
+        # Calls to DB#previous_error will only return errors that have occurred
+        # since the most recent call to this method.
+        def reset_error_history
+          db_command(:reseterror => 1)
+        end
+
         # Returns true if this database is a master (or is not paired with any
         # other database), false if it is a slave.
         def master?

data/lib/mongo/util/ordered_hash.rb

@@ -21,9 +21,13 @@
 class OrderedHash < Hash
 
   def ==(other)
-    !other.nil? &&
-      keys == other.keys &&
-      values == other.values
+    begin
+      !other.nil? &&
+        keys == other.keys &&
+        values == other.values
+    rescue
+      false
+    end
   end
 
   # We only need the body of this class if the RUBY_VERSION is before 1.9

data/mongo-ruby-driver.gemspec

@@ -79,7 +79,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.7'
+  s.version = '0.8'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Ruby driver for the 10gen Mongo DB'
   s.description = 'A Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_db.rb

@@ -122,15 +122,33 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_error
-    doc = @@db.send(:db_command, :forceerror => 1)
+    @@db.reset_error_history
+    assert_nil @@db.error
+    assert !@@db.error?
+    assert_nil @@db.previous_error
+
+    @@db.send(:db_command, :forceerror => 1)
     assert @@db.error?
-    err = @@db.error
-    assert_match /forced error/, err
+    assert_not_nil @@db.error
+    assert_not_nil @@db.previous_error
 
-    # ask again
+    @@db.send(:db_command, :forceerror => 1)
     assert @@db.error?
-    err2 = @@db.error
-    assert_equal err, err2
+    assert @@db.error
+    prev_error = @@db.previous_error
+    assert_equal 1, prev_error['nPrev']
+    assert_equal prev_error["err"], @@db.error
+
+    @@db.collection('test').find_first
+    assert_nil @@db.error
+    assert !@@db.error?
+    assert @@db.previous_error
+    assert_equal 2, @@db.previous_error['nPrev']
+
+    @@db.reset_error_history
+    assert_nil @@db.error
+    assert !@@db.error?
+    assert_nil @@db.previous_error
   end
 
   def test_text_port_number

data/tests/test_db_api.rb

@@ -561,6 +561,30 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal nil, @@db.dereference(DBRef.new("test", nil))
   end
 
+  def test_save
+    @@coll.clear
+
+    a = {"hello" => "world"}
+
+    @@coll.save(a)
+    assert_equal 1, @@coll.count
+
+    @@coll.save(@@coll.find_first)
+    assert_equal 1, @@coll.count
+
+    assert_equal "world", @@coll.find_first()["hello"]
+
+    doc = @@coll.find_first
+    doc["hello"] = "mike"
+    @@coll.save(doc)
+    assert_equal 1, @@coll.count
+
+    assert_equal "mike", @@coll.find_first()["hello"]
+
+    @@coll.save(a)
+    assert_equal 2, @@coll.count
+  end
+
 # TODO this test fails with error message "Undefed Before end of object"
 # That is a database error. The undefined type may go away.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.8"
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: []