mongo 1.7.1 → 1.8.0

data/test/{conversions_test.rb → functional/conversions_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
 

data/test/{cursor_fail_test.rb → functional/cursor_fail_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'logger'
 
 class CursorFailTest < Test::Unit::TestCase
@@ -11,37 +11,11 @@ class CursorFailTest < Test::Unit::TestCase
   @@version = @@connection.server_version
 
   def setup
-    @@coll.remove
-    @@coll.insert('a' => 1)     # collection not created until it's used
+    @@coll.remove({})
+    @@coll.insert({'a' => 1})     # collection not created until it's used
     @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
-  def test_refill_via_get_more
-    assert_equal 1, @@coll.count
-    1000.times { |i|
-      assert_equal 1 + i, @@coll.count
-      @@coll.insert('a' => i)
-    }
-
-    assert_equal 1001, @@coll.count
-    count = 0
-    @@coll.find.each { |obj|
-      count += obj['a']
-    }
-    assert_equal 1001, @@coll.count
-
-    # do the same thing again for debugging
-    assert_equal 1001, @@coll.count
-    count2 = 0
-    @@coll.find.each { |obj|
-      count2 += obj['a']
-    }
-    assert_equal 1001, @@coll.count
-
-    assert_equal count, count2
-    assert_equal 499501, count
-  end
-
   def test_refill_via_get_more_alt_coll
     coll = @@db.collection('test-alt-coll')
     coll.remove

data/test/{cursor_message_test.rb → functional/cursor_message_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'logger'
 
 class CursorMessageTest < Test::Unit::TestCase

data/test/{cursor_test.rb → functional/cursor_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase
@@ -93,6 +93,10 @@ class CursorTest < Test::Unit::TestCase
     assert_kind_of Numeric, explaination['nscanned']
   end
 
+  def test_each_with_no_block
+    assert_kind_of(Enumerator, @@coll.find().each) if defined? Enumerator
+  end
+
   def test_count
     @@coll.remove
 

data/test/{db_api_test.rb → functional/db_api_test.rb}

@@ -1,13 +1,13 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class DBAPITest < Test::Unit::TestCase
   include Mongo
   include BSON
 
-  @@conn = standard_connection
-  @@db   = @@conn.db(MONGO_TEST_DB)
+  @@client = standard_connection
+  @@db   = @@client.db(MONGO_TEST_DB)
   @@coll = @@db.collection('test')
-  @@version = @@conn.server_version
+  @@version = @@client.server_version
 
   def setup
     @@coll.remove
@@ -329,8 +329,7 @@ class DBAPITest < Test::Unit::TestCase
 
     @@db.create_collection('foobar')
 
-    opts = {:safe => true}
-    coll = @@db.create_collection('foobar', opts)
+    coll = @@db.create_collection('foobar')
     assert_equal true, coll.safe
   end
 
@@ -429,9 +428,9 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_array
-    @@coll.remove({'$atomic' => true}, :safe => true)
-    @@coll.insert({'b' => [1, 2, 3]}, :safe => true)
-    @@coll.insert({'b' => [1, 2, 3]}, :safe => true)
+    @@coll.remove({'$atomic' => true})
+    @@coll.insert({'b' => [1, 2, 3]})
+    @@coll.insert({'b' => [1, 2, 3]})
     rows = @@coll.find({}, {:fields => ['b']}).to_a
     assert_equal 2, rows.length
     assert_equal [1, 2, 3], rows[1]['b']

data/test/{db_connection_test.rb → functional/db_connection_test.rb}

@@ -1,13 +1,11 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class DBConnectionTest < Test::Unit::TestCase
 
-  include Mongo
-
   def test_no_exceptions
     host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-    port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-    db = Connection.new(host, port).db(MONGO_TEST_DB)
+    port = ENV['MONGO_RUBY_DRIVER_PORT'] || MongoClient::DEFAULT_PORT
+    db = MongoClient.new(host, port).db(MONGO_TEST_DB)
     coll = db.collection('test')
     coll.remove
     db.get_last_error

data/test/{db_test.rb → functional/db_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'digest/md5'
 require 'stringio'
 require 'logger'
@@ -14,14 +14,14 @@ class DBTest < Test::Unit::TestCase
 
   include Mongo
 
-  @@conn  = standard_connection
-  @@db    = @@conn.db(MONGO_TEST_DB)
+  @@client  = standard_connection
+  @@db    = @@client.db(MONGO_TEST_DB)
   @@users = @@db.collection('system.users')
-  @@version = @@conn.server_version
+  @@version = @@client.server_version
 
   def test_close
-    @@conn.close
-    assert !@@conn.connected?
+    @@client.close
+    assert !@@client.connected?
     begin
       @@db.collection('test').insert('a' => 1)
       fail "expected 'NilClass' exception"
@@ -44,7 +44,7 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_get_and_drop_collection
-    db = @@conn.db(MONGO_TEST_DB, :strict => true)
+    db = @@client.db(MONGO_TEST_DB, :strict => true)
     db.create_collection('foo')
     assert db.collection('foo')
     assert db.drop_collection('foo')
@@ -160,11 +160,11 @@ class DBTest < Test::Unit::TestCase
 
   def test_authenticate_with_connection_uri
     @@db.add_user('spongebob', 'squarepants')
-    assert Mongo::Connection.from_uri("mongodb://spongebob:squarepants@#{host_port}/#{@@db.name}")
+    assert Mongo::MongoClient.from_uri("mongodb://spongebob:squarepants@#{host_port}/#{@@db.name}")
 
     assert_raise Mongo::AuthenticationError do
-      con = Mongo::Connection.from_uri("mongodb://wrong:info@#{host_port}/#{@@db.name}")
-      con['test']['foo'].find_one
+      client = Mongo::MongoClient.from_uri("mongodb://wrong:info@#{host_port}/#{@@db.name}")
+      client['test']['foo'].find_one
     end
   end
 
@@ -244,8 +244,8 @@ class DBTest < Test::Unit::TestCase
   end
 
   def test_text_port_number_raises_no_errors
-    conn = standard_connection
-    db   = conn[MONGO_TEST_DB]
+    client = standard_connection
+    db   = client[MONGO_TEST_DB]
     db.collection('users').remove
   end
 
@@ -287,7 +287,7 @@ class DBTest < Test::Unit::TestCase
 
   context "database profiling" do
     setup do
-      @db  = @@conn[MONGO_TEST_DB]
+      @db  = @@client[MONGO_TEST_DB]
       @coll = @db['test']
       @coll.remove
       @r1 = @coll.insert('a' => 1) # collection not created until it's used

data/test/{grid_file_system_test.rb → functional/grid_file_system_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do
@@ -16,7 +16,7 @@ class GridFileSystemTest < Test::Unit::TestCase
       setup do
         @chunks_data = "CHUNKS" * 50000
         @grid = GridFileSystem.new(@db)
-        @opts = {:safe => true}
+        @opts = {:w => 1}
         @original_opts = @opts.dup
         @grid.open('sample.file', 'w', @opts) do |f|
           f.write @chunks_data

data/test/{grid_io_test.rb → functional/grid_io_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class GridIOTest < Test::Unit::TestCase
 
@@ -186,24 +186,24 @@ class GridIOTest < Test::Unit::TestCase
 
     context "Grid MD5 check" do
       should "run in safe mode" do
-        file = GridIO.new(@files, @chunks, 'smallfile', 'w', :safe => true)
+        file = GridIO.new(@files, @chunks, 'smallfile', 'w')
         file.write("DATA" * 100)
         assert file.close
         assert_equal file.server_md5, file.client_md5
       end
 
       should "validate with a large file" do
-        io = File.open(File.join(File.dirname(__FILE__), 'data', 'sample_file.pdf'), 'r')
-        file = GridIO.new(@files, @chunks, 'bigfile', 'w', :safe => true)
+        io = File.open(File.join(TEST_DATA, 'sample_file.pdf'), 'r')
+        file = GridIO.new(@files, @chunks, 'bigfile', 'w')
         file.write(io)
         assert file.close
         assert_equal file.server_md5, file.client_md5
       end
 
       should "raise an exception when check fails" do
-        io = File.open(File.join(File.dirname(__FILE__), 'data', 'sample_file.pdf'), 'r')
+        io = File.open(File.join(TEST_DATA, 'sample_file.pdf'), 'r')
         @db.stubs(:command).returns({'md5' => '12345'})
-        file = GridIO.new(@files, @chunks, 'bigfile', 'w', :safe => true)
+        file = GridIO.new(@files, @chunks, 'bigfile', 'w')
         file.write(io)
         assert_raise GridMD5Failure do
           assert file.close

data/test/{grid_test.rb → functional/grid_test.rb}

@@ -1,8 +1,8 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 include Mongo
 
 def read_and_write_stream(filename, read_length, opts={})
-  io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r+b')
+  io   = File.open(File.join(TEST_DATA, filename), 'r+b')
   id   = @grid.put(io, opts.merge!(:filename => filename + read_length.to_s))
   file = @grid.get(id)
   io.rewind
@@ -59,12 +59,6 @@ class GridTest < Test::Unit::TestCase
         assert_equal 'sample', file['filename']
       end
 
-      should "not be able to overwrite an exising file" do
-        assert_raise GridError do
-          @grid.put(@data, :filename => 'sample', :_id => @id, :safe => true)
-        end
-      end
-
       should "return nil if it doesn't exist" do
         assert_nil @grid.exist?(:metadata => 'foo')
       end
@@ -170,7 +164,7 @@ class GridTest < Test::Unit::TestCase
       setup do
         @grid = Grid.new(@db, 'test-fs')
         filename = 'sample_data'
-        @io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
+        @io   = File.open(File.join(TEST_DATA, filename), 'r')
         id    = @grid.put(@io, :filename => filename)
         @file = @grid.get(id)
         @io.rewind
@@ -203,7 +197,7 @@ class GridTest < Test::Unit::TestCase
       setup do
         @grid = Grid.new(@db, 'test-fs')
         filename = 'empty_data'
-        @io   = File.open(File.join(File.dirname(__FILE__), 'data', filename), 'r')
+        @io   = File.open(File.join(TEST_DATA, filename), 'r')
         id = silently do
           @grid.put(@io, :filename => filename)
         end

data/test/{pool_test.rb → functional/pool_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 require 'thread'
 
 class PoolTest < Test::Unit::TestCase

data/test/functional/safe_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+include Mongo
+
+class SafeTest < Test::Unit::TestCase
+  context "Safe mode propogation: " do
+    setup do
+      @connection = standard_connection({:safe => true}, true) # Legacy
+      @db         = @connection[MONGO_TEST_DB]
+      @collection = @db['test-safe']
+      @collection.create_index([[:a, 1]], :unique => true)
+      @collection.remove
+    end
+
+    should "propogate safe option on insert" do
+      @collection.insert({:a => 1})
+
+      assert_raise_error(OperationFailure, "duplicate key") do
+        @collection.insert({:a => 1})
+      end
+    end
+
+    should "allow safe override on insert" do
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 1}, :safe => false)
+    end
+
+    should "allow safe override on save" do
+      @collection.insert({:a => 1})
+      id = @collection.insert({:a => 2})
+      assert_nothing_raised do
+        @collection.save({:_id => id.to_s, :a => 1}, :safe => false)
+      end
+    end
+
+    should "propogate safe option on save" do
+      @collection.insert({:a => 1})
+      id = @collection.insert({:a => 2})
+      assert_raise(OperationFailure) do
+        @collection.save({:_id => id.to_s, :a => 1})
+      end
+    end
+
+    should "propogate safe option on update" do
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 2})
+
+      assert_raise_error(OperationFailure, "duplicate key") do
+        @collection.update({:a => 2}, {:a => 1})
+      end
+    end
+
+    should "allow safe override on update" do
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 2})
+      @collection.update({:a => 2}, {:a => 1}, :safe => false)
+    end
+  end
+
+  context "Safe error objects" do
+    setup do
+      @connection = standard_connection({:safe => true}, true) # Legacy
+      @db         = @connection[MONGO_TEST_DB]
+      @collection = @db['test']
+      @collection.remove
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 1})
+      @collection.insert({:a => 1})
+    end
+
+    should "return object on update" do
+      response = @collection.update({:a => 1}, {"$set" => {:a => 2}},
+                             :multi => true)
+
+      assert response['updatedExisting']
+      assert_equal 3, response['n']
+    end
+
+    should "return object on remove" do
+      response = @collection.remove({})
+      assert_equal 3, response['n']
+    end
+  end
+
+end

data/test/{support_test.rb → functional/support_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class SupportTest < Test::Unit::TestCase
 

data/test/{threading_test.rb → functional/threading_test.rb}

@@ -1,12 +1,12 @@
-require File.expand_path("../test_helper", __FILE__)
+require 'test_helper'
 
 class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@con = standard_connection(:pool_size => 10, :pool_timeout => 30)
-  @@db  = @@con[MONGO_TEST_DB]
-  @@coll = @@db.collection('thread-test-collection')
+  @@client = standard_connection(:pool_size => 10, :pool_timeout => 30)
+  @@db     = @@client[MONGO_TEST_DB]
+  @@coll   = @@db.collection('thread-test-collection')
 
   def set_up_safe_data
     @@db.drop_collection('duplicate')
@@ -31,12 +31,12 @@ class TestThreading < Test::Unit::TestCase
           if i % 2 == 0
             assert_raise Mongo::OperationFailure do
               t1 = Time.now
-              @unique.update({"test" => "insert"}, {"$set" => {"test" => "update"}}, :safe => true)
+              @unique.update({"test" => "insert"}, {"$set" => {"test" => "update"}})
               times << Time.now - t1
             end
           else
             t1 = Time.now
-            @duplicate.update({"test" => "insert"}, {"$set" => {"test" => "update"}}, :safe => true)
+            @duplicate.update({"test" => "insert"}, {"$set" => {"test" => "update"}})
             times << Time.now - t1
           end
         end
@@ -55,10 +55,10 @@ class TestThreading < Test::Unit::TestCase
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
-            @unique.insert({"test" => "insert"}, :safe => true)
+            @unique.insert({"test" => "insert"})
           end
         else
-          @duplicate.insert({"test" => "insert"}, :safe => true)
+          @duplicate.insert({"test" => "insert"})
         end
       end
     end
@@ -73,7 +73,7 @@ class TestThreading < Test::Unit::TestCase
     @@coll = @@db.collection('thread-test-collection')
 
     1000.times do |i|
-      @@coll.insert("x" => i, :safe => true)
+      @@coll.insert({"x" => i})
     end
 
     threads = []