mongo 0.18.2 → 0.18.3

data/test/test_collection.rb

@@ -191,6 +191,19 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  def test_safe_remove
+    @conn = Connection.new
+    @db   = @conn['mongo-ruby-test']
+    @test = @db['test-safe-remove']
+    @test.save({:a => 20})
+    @conn.stubs(:receive).returns([[{'ok' => 0, 'err' => 'failed'}], 1, 0])
+
+    assert_raise OperationFailure do
+      @test.remove({}, :safe => true)
+    end
+    @test.drop
+  end
+
   def test_count
     @@test.drop
 

data/test/test_connection.rb

@@ -1,6 +1,7 @@
 require 'test/test_helper'
 require 'logger'
 require 'stringio'
+require 'thread'
 
 # NOTE: assumes Mongo is running
 class TestConnection < Test::Unit::TestCase
@@ -122,4 +123,38 @@ class TestConnection < Test::Unit::TestCase
     assert_equal ['bar', Connection::DEFAULT_PORT], nodes[0]
     assert_equal ['foo', 123], nodes[1]
   end
+
+  context "Connection exceptions" do
+    setup do
+      @conn = Mongo::Connection.new('localhost', 27017, :pool_size => 10, :timeout => 10)
+      @coll = @conn['mongo-ruby-test']['test-connection-exceptions']
+    end
+
+    should "release connection if an exception is raised on send_message" do
+      @conn.stubs(:send_message_on_socket).raises(ConnectionFailure)
+      assert_equal 0, @conn.checked_out.size
+      assert_raise ConnectionFailure do
+        @coll.insert({:test => "insert"})
+      end
+      assert_equal 0, @conn.checked_out.size
+    end
+
+    should "release connection if an exception is raised on send_with_safe_check" do
+      @conn.stubs(:receive).raises(ConnectionFailure)
+      assert_equal 0, @conn.checked_out.size
+      assert_raise ConnectionFailure do
+        @coll.insert({:test => "insert"}, :safe => true)
+      end
+      assert_equal 0, @conn.checked_out.size
+    end
+
+    should "release connection if an exception is raised on receive_message" do
+      @conn.stubs(:receive).raises(ConnectionFailure)
+      assert_equal 0, @conn.checked_out.size
+      assert_raise ConnectionFailure do
+        @coll.find.to_a
+      end
+      assert_equal 0, @conn.checked_out.size
+    end
+  end
 end

data/test/test_conversions.rb

@@ -1,5 +1,5 @@
 require 'test/test_helper'
-require 'mongo/errors'
+require 'mongo/exceptions'
 require 'mongo/util/conversions'
 require 'mongo/util/ordered_hash'
 

data/test/test_cursor.rb

@@ -1,4 +1,5 @@
 require 'test/test_helper'
+require 'logger'
 
 # NOTE: assumes Mongo is running
 class CursorTest < Test::Unit::TestCase
@@ -17,11 +18,6 @@ class CursorTest < Test::Unit::TestCase
     @@coll_full_name = 'ruby-mongo-test.test'
   end
 
-  def teardown
-    @@coll.remove
-    @@db.error
-  end
-
   def test_explain
     cursor = @@coll.find('a' => 1)
     explaination = cursor.explain
@@ -112,6 +108,42 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 2004, @@coll.find().sort([[:created_at, :desc]]).next_document["created_at"].year
   end
 
+  def test_sort_min_max_keys
+    @@coll.remove
+    @@coll.insert({"n" => 1000000})
+    @@coll.insert({"n" => -1000000})
+    @@coll.insert({"n" => MaxKey.new})
+    @@coll.insert({"n" => MinKey.new})
+
+    results = @@coll.find.sort([:n, :asc]).to_a
+
+    assert_equal MinKey.new, results[0]['n']
+    assert_equal -1000000,   results[1]['n']
+    assert_equal 1000000,    results[2]['n']
+    assert_equal MaxKey.new, results[3]['n']
+  end
+
+  def test_id_range_queries
+    @@coll.remove
+
+    t1 = Time.now
+    t1_id = ObjectID.from_time(t1)
+    @@coll.save({:t => 't1'})
+    @@coll.save({:t => 't1'})
+    @@coll.save({:t => 't1'})
+    sleep(2)
+    t2 = Time.now
+    t2_id = ObjectID.from_time(t2)
+    @@coll.save({:t => 't2'})
+    @@coll.save({:t => 't2'})
+    @@coll.save({:t => 't2'})
+
+    assert_equal 3, @@coll.find({'_id' => {'$gt' => t1_id}, '_id' => {'$lt' => t2_id}}).count
+    @@coll.find({'_id' => {'$gt' => t2_id}}).each do |doc|
+      assert_equal 't2', doc['t']
+    end
+  end
+
   def test_limit
     @@coll.remove
 

data/test/test_db.rb

@@ -132,7 +132,7 @@ class DBTest < Test::Unit::TestCase
       db.pk_factory = Object.new
       fail "error: expected exception"
     rescue => ex
-      assert_match /can not change PK factory/, ex.to_s
+      assert_match /Cannot change/, ex.to_s
     ensure
       conn.close
     end
@@ -145,7 +145,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_logout
-    @@db.logout                  # only testing that we don't throw exception
+    assert @@db.logout
   end
 
   def test_error
@@ -202,4 +202,53 @@ class DBTest < Test::Unit::TestCase
     assert db.collection('users').remove
   end
 
+  context "database profiling" do
+    setup do
+      @db  = @@conn['ruby-mongo-test-admin-functions']
+      @coll = @db['test']
+      @coll.remove
+      @r1 = @coll.insert('a' => 1) # collection not created until it's used
+    end
+
+    should "set default profiling level" do
+      assert_equal :off, @db.profiling_level
+    end
+
+    should "change profiling level" do
+      @db.profiling_level = :slow_only
+      assert_equal :slow_only, @db.profiling_level
+      @db.profiling_level = :off
+      assert_equal :off, @db.profiling_level
+      @db.profiling_level = :all
+      assert_equal :all, @db.profiling_level
+      begin
+        @db.profiling_level = :medium
+        fail "shouldn't be able to do this"
+      rescue
+      end
+    end
+
+    should "return profiling info" do
+      @db.profiling_level = :all
+      @coll.find()
+      @db.profiling_level = :off
+
+      info = @db.profiling_info
+      assert_kind_of Array, info
+      assert info.length >= 1
+      first = info.first
+      assert_kind_of String, first['info']
+      assert_kind_of Time, first['ts']
+      assert_kind_of Numeric, first['millis']
+    end
+
+    should "validate collection" do
+      doc = @db.validate_collection(@coll.name)
+      assert_not_nil doc
+      result = doc['result']
+      assert_not_nil result
+      assert_match /firstExtent/, result
+    end
+
+  end
 end

data/test/test_db_api.rb

@@ -419,6 +419,7 @@ class DBAPITest < Test::Unit::TestCase
       @@db.collection('does-not-exist')
       fail "expected exception"
     rescue => ex
+      assert_equal MongoDBError, ex.class
       assert_equal "Collection does-not-exist doesn't exist. Currently in strict mode.", ex.to_s
     ensure
       @@db.strict = false
@@ -438,15 +439,11 @@ class DBAPITest < Test::Unit::TestCase
     end
 
     # Now the collection exists. This time we should see an exception.
-    begin
+    assert_raise MongoDBError do
       @@db.create_collection('foobar')
-      fail "expected exception"
-    rescue => ex
-      assert_equal "Collection foobar already exists. Currently in strict mode.", ex.to_s
-    ensure
-      @@db.strict = false
-      @@db.drop_collection('foobar')
     end
+    @@db.strict = false
+    @@db.drop_collection('foobar')
 
     # Now we're not in strict mode - should succeed
     @@db.create_collection('foobar')

data/test/test_grid_store.rb

@@ -151,6 +151,16 @@ class GridStoreTest < Test::Unit::TestCase
     assert_equal 0, @@files.count
     assert_equal 0, @@chunks.count
   end
+  
+  def test_mv
+    assert_equal 1, @@files.count
+    assert_equal 1, @@chunks.count
+    GridStore.mv(@@db, 'foobar', 'bazqux')
+    assert_equal 1, @@files.count
+    assert_equal 1, @@chunks.count
+    assert !GridStore.exist?(@@db, 'foobar')
+    assert GridStore.exist?(@@db, 'bazqux')
+  end
 
   def test_append
     GridStore.open(@@db, 'foobar', 'w+') { |f| f.write(" how are you?") }

data/test/test_objectid.rb

@@ -23,7 +23,7 @@ class ObjectIDTest < Test::Unit::TestCase
     doc = {:name => 'Mongo'}
     doc = ObjectID.create_pk(doc)
     assert doc[:_id]
-    
+
     doc = {:name => 'Mongo', :_id => '12345'}
     doc = ObjectID.create_pk(doc)
     assert_equal '12345', doc[:_id]
@@ -136,7 +136,21 @@ class ObjectIDTest < Test::Unit::TestCase
   def test_generation_time
     time = Time.now
     id   = ObjectID.new
+    generated_time = id.generation_time
+
+    assert_in_delta time.to_i, generated_time.to_i, 2
+    assert_equal "UTC", generated_time.zone
+  end
+
+  def test_from_time
+    time = Time.now.utc
+    id   = ObjectID.from_time(time)
+
+    assert_equal time.to_i, id.generation_time.to_i
+  end
 
-    assert_in_delta time.to_i, id.generation_time.to_i, 2
+  def test_json
+    id = ObjectID.new
+    assert_equal "{\"$oid\": \"#{id}\"}", id.to_json
   end
 end

data/test/test_ordered_hash.rb

@@ -19,6 +19,12 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal a, b
   end
 
+  def test_hash_code
+    o = OrderedHash.new
+    o['number'] = 50
+    assert o.hash
+  end
+
   def test_empty
     assert_equal [], OrderedHash.new.keys
   end
@@ -130,6 +136,14 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal ['crab', 'apple', 3, 'foo'], @oh.values
   end
 
+  def test_update
+    other = OrderedHash.new
+    other['f'] = 'foo'
+    noob = @oh.update(other)
+    assert_equal @ordered_keys + ['f'], noob.keys
+    assert_equal [1, 2, 3, 'foo'], noob.values
+  end
+
   def test_inspect_retains_order
     assert_equal '{"c"=>1, "a"=>2, "z"=>3}', @oh.inspect
   end

data/test/threading/test_threading_large_pool.rb

@@ -25,7 +25,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
   def test_safe_update
     set_up_safe_data
     threads = []
-    1000.times do |i|
+    300.times do |i|
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
@@ -37,7 +37,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
       end
     end
 
-    1000.times do |i|
+    300.times do |i|
       threads[i].join
     end
   end
@@ -45,7 +45,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
   def test_safe_insert
     set_up_safe_data
     threads = []
-    1000.times do |i|
+    300.times do |i|
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
@@ -57,7 +57,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
       end
     end
 
-    1000.times do |i|
+    300.times do |i|
       threads[i].join
     end
   end

data/test/unit/db_test.rb

@@ -48,6 +48,49 @@ class DBTest < Test::Unit::TestCase
         @db.command(command, true, true)
       end
     end
+
+    should "raise an error if logging out fails" do
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.logout
+      end
+    end
+
+    should "raise an error if collection creation fails" do
+      @db.expects(:collection_names).returns([])
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.create_collection("foo")
+      end
+    end
+
+    should "raise an error if getlasterror fails" do
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.error
+      end
+    end
+
+    should "raise an error if rename fails" do
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.rename_collection("foo", "bar")
+      end
+    end
+
+    should "raise an error if drop_index fails" do
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.drop_index("foo", "bar")
+      end
+    end
+
+    should "raise an error if set_profiling_level fails" do
+      @db.expects(:command).returns({})
+      assert_raise MongoDBError do
+        @db.profiling_level = :slow_only
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -30,16 +30,16 @@ files:
 - lib/mongo/admin.rb
 - lib/mongo/collection.rb
 - lib/mongo/connection.rb
-- lib/mongo/constants.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
-- lib/mongo/errors.rb
+- lib/mongo/exceptions.rb
 - lib/mongo/gridfs/chunk.rb
 - lib/mongo/gridfs/grid_store.rb
 - lib/mongo/gridfs.rb
 - lib/mongo/types/binary.rb
 - lib/mongo/types/code.rb
 - lib/mongo/types/dbref.rb
+- lib/mongo/types/min_max_keys.rb
 - lib/mongo/types/objectid.rb
 - lib/mongo/types/regexp_of_holding.rb
 - lib/mongo/util/bson_c.rb
@@ -52,8 +52,6 @@ files:
 - lib/mongo/util/xml_to_ruby.rb
 - lib/mongo.rb
 - examples/admin.rb
-- examples/benchmarks.rb
-- examples/blog.rb
 - examples/capped.rb
 - examples/cursor.rb
 - examples/gridfs.rb
@@ -65,6 +63,7 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
+- bin/objectid_benchmark.rb
 - bin/perf.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
@@ -97,7 +96,6 @@ signing_key:
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-- test/mongo-qa/_common.rb
 - test/replica/count_test.rb
 - test/replica/insert_test.rb
 - test/replica/pooled_insert_test.rb