mongo 0.19.3 → 0.20

data/lib/mongo/util/support.rb

@@ -18,6 +18,7 @@ require 'digest/md5'
 
 module Mongo
   module Support
+    include Mongo::Conversions
     extend self
 
     # Generate an MD5 for authentication.
@@ -49,11 +50,21 @@ module Mongo
 
       [" ", ".", "$", "/", "\\"].each do |invalid_char|
         if db_name.include? invalid_char
-          raise InvalidName, "database names cannot contain the character '#{invalid_char}'"
+          raise Mongo::InvalidNSName, "database names cannot contain the character '#{invalid_char}'"
         end
       end
-      raise InvalidName, "database name cannot be the empty string" if db_name.empty?
+      raise Mongo::InvalidNSName, "database name cannot be the empty string" if db_name.empty?
       db_name
     end
+
+    def format_order_clause(order)
+      case order
+        when String, Symbol then string_as_sort_parameters(order)
+        when Array then array_as_sort_parameters(order)
+        else
+          raise InvalidSortValueError, "Illegal sort clause, '#{order.class.name}'; must be of the form " +
+            "[['field1', '(ascending|descending)'], ['field2', '(ascending|descending)']]"
+      end
+    end
   end
 end

data/mongo-ruby-driver.gemspec

@@ -12,11 +12,13 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.files  = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec', 'LICENSE.txt']
-  s.files += Dir['lib/**/*.rb'] + Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
+  s.files += ['lib/mongo.rb'] + Dir['lib/mongo/**/*.rb']
+  s.files += Dir['examples/**/*.rb'] + Dir['bin/**/*.rb']
   s.test_files = Dir['test/**/*.rb']
 
   s.has_rdoc = true
   s.test_files = Dir['test/**/*.rb']
+  s.test_files -= Dir['test/mongo_bson/*.rb'] # remove these files from the manifest
 
   s.has_rdoc = true
   s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']

data/test/collection_test.rb

@@ -2,23 +2,23 @@ require 'test/test_helper'
 
 class TestCollection < Test::Unit::TestCase
   @@connection ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-  @@db   = @@connection.db('ruby-mongo-test')
+  @@db   = @@connection.db(MONGO_TEST_DB)
   @@test = @@db.collection("test")
   @@version = @@connection.server_version
 
   def setup
-    @@test.drop()
+    @@test.remove
   end
 
   def test_optional_pk_factory
     @coll_default_pk = @@db.collection('stuff')
-    assert_equal Mongo::ObjectID, @coll_default_pk.pk_factory
+    assert_equal BSON::ObjectID, @coll_default_pk.pk_factory
     @coll_default_pk = @@db.create_collection('more-stuff')
-    assert_equal Mongo::ObjectID, @coll_default_pk.pk_factory
+    assert_equal BSON::ObjectID, @coll_default_pk.pk_factory
 
     # Create a db with a pk_factory.
     @db = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test', :pk => Object.new)
+                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB, :pk => Object.new)
     @coll = @db.collection('coll-with-pk')
     assert @coll.pk_factory.is_a?(Object)
 
@@ -27,11 +27,11 @@ class TestCollection < Test::Unit::TestCase
   end
 
   def test_valid_names
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db["te$t"]
     end
 
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db['$main']
     end
 
@@ -161,6 +161,7 @@ class TestCollection < Test::Unit::TestCase
       assert_raise OperationFailure do
         @@test.update({}, {"$inc" => {"x" => 1}}, :safe => true)
       end
+      @@test.drop
     end
   else
     def test_safe_update
@@ -176,6 +177,7 @@ class TestCollection < Test::Unit::TestCase
       assert_raise OperationFailure do
         @@test.update({}, {"x" => 10}, :safe => true)
       end
+      @@test.drop
     end
   end
 
@@ -188,11 +190,12 @@ class TestCollection < Test::Unit::TestCase
     assert_raise OperationFailure do
       @@test.save({"hello" => "world"}, :safe => true)
     end
+    @@test.drop
   end
 
   def test_mocked_safe_remove
     @conn = Connection.new
-    @db   = @conn['mongo-ruby-test']
+    @db   = @conn[MONGO_TEST_DB]
     @test = @db['test-safe-remove']
     @test.save({:a => 20})
     @conn.stubs(:receive).returns([[{'ok' => 0, 'err' => 'failed'}], 1, 0])
@@ -205,7 +208,7 @@ class TestCollection < Test::Unit::TestCase
 
   def test_safe_remove
     @conn = Connection.new
-    @db   = @conn['mongo-ruby-test']
+    @db   = @conn[MONGO_TEST_DB]
     @test = @db['test-safe-remove']
     @test.save({:a => 50})
     @test.remove({}, :safe => true)
@@ -250,6 +253,25 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  def test_fields_as_hash
+    @@test.save(:a => 1, :b => 1, :c => 1)
+
+    doc = @@test.find_one({:a => 1}, :fields => {:b => 0})
+    assert_nil doc['b']
+    assert doc['a']
+    assert doc['c']
+
+    doc = @@test.find_one({:a => 1}, :fields => {:a => 1, :b => 1})
+    assert_nil doc['c']
+    assert doc['a']
+    assert doc['b']
+
+
+    assert_raise Mongo::OperationFailure do
+      @@test.find_one({:a => 1}, :fields => {:a => 1, :b => 0})
+    end
+  end
+
   def test_find_one
     id = @@test.save("hello" => "world", "foo" => "bar")
 
@@ -355,6 +377,37 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  if @@version > "1.3.0"
+    def test_find_and_modify
+      @@test << { :a => 1, :processed => false }
+      @@test << { :a => 2, :processed => false }
+      @@test << { :a => 3, :processed => false }
+
+      @@test.find_and_modify(:query => {}, :sort => [['a', -1]], :update => {"$set" => {:processed => true}})
+
+      assert @@test.find_one({:a => 3})['processed']
+    end
+
+    def test_find_and_modify_with_invalid_options
+      @@test << { :a => 1, :processed => false }
+      @@test << { :a => 2, :processed => false }
+      @@test << { :a => 3, :processed => false }
+
+      assert_raise Mongo::OperationFailure do
+        @@test.find_and_modify(:blimey => {})
+      end
+    end
+  end
+
+  if @@version >= "1.3.5"
+    def test_coll_stats
+      @@test << {:n => 1}
+      @@test.create_index("n")
+
+      assert_equal "#{MONGO_TEST_DB}.test", @@test.stats['ns']
+    end
+  end
+
   def test_saving_dates_pre_epoch
     begin
       @@test.save({'date' => Time.utc(1600)})

data/test/connection_test.rb

@@ -7,6 +7,7 @@ require 'thread'
 class TestConnection < Test::Unit::TestCase
 
   include Mongo
+  include BSON
 
   def setup
     @host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
@@ -15,7 +16,7 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def teardown
-    @mongo.db('ruby-mongo-test').error
+    @mongo.db(MONGO_TEST_DB).error
   end
 
   def test_server_info
@@ -31,25 +32,25 @@ class TestConnection < Test::Unit::TestCase
   def test_invalid_database_names
     assert_raise TypeError do @mongo.db(4) end
 
-    assert_raise InvalidName do @mongo.db('') end
-    assert_raise InvalidName do @mongo.db('te$t') end
-    assert_raise InvalidName do @mongo.db('te.t') end
-    assert_raise InvalidName do @mongo.db('te\\t') end
-    assert_raise InvalidName do @mongo.db('te/t') end
-    assert_raise InvalidName do @mongo.db('te st') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('te$t') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('te.t') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('te\\t') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('te/t') end
+    assert_raise Mongo::InvalidNSName do @mongo.db('te st') end
   end
 
   def test_database_info
-    @mongo.drop_database('ruby-mongo-info-test')
-    @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)
+    @mongo.drop_database(MONGO_TEST_DB)
+    @mongo.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
 
     info = @mongo.database_info
     assert_not_nil info
     assert_kind_of Hash, info
-    assert_not_nil info['ruby-mongo-info-test']
-    assert info['ruby-mongo-info-test'] > 0
+    assert_not_nil info[MONGO_TEST_DB]
+    assert info[MONGO_TEST_DB] > 0
 
-    @mongo.drop_database('ruby-mongo-info-test')
+    @mongo.drop_database(MONGO_TEST_DB)
   end
 
   def test_copy_database
@@ -78,21 +79,21 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_database_names
-    @mongo.drop_database('ruby-mongo-info-test')
-    @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)
+    @mongo.drop_database(MONGO_TEST_DB)
+    @mongo.db(MONGO_TEST_DB).collection('info-test').insert('a' => 1)
 
     names = @mongo.database_names
     assert_not_nil names
     assert_kind_of Array, names
     assert names.length >= 1
-    assert names.include?('ruby-mongo-info-test')
+    assert names.include?(MONGO_TEST_DB)
   end
 
   def test_logging
     output = StringIO.new
     logger = Logger.new(output)
     logger.level = Logger::DEBUG
-    db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
+    db = Connection.new(@host, @port, :logger => logger).db(MONGO_TEST_DB)
     assert output.string.include?("admin['$cmd'].find")
   end
 
@@ -120,23 +121,11 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_nodes
-    db = Connection.new({:left => ['foo', 123]}, nil, :connect => false)
-    nodes = db.nodes
-    assert_equal 2, db.nodes.length
-    assert_equal ['foo', 123], nodes[0]
-    assert_equal ['localhost', Connection::DEFAULT_PORT], nodes[1]
-
-    db = Connection.new({:right => 'bar'}, nil, :connect => false)
-    nodes = db.nodes
-    assert_equal 2, nodes.length
-    assert_equal ['localhost', Connection::DEFAULT_PORT], nodes[0]
-    assert_equal ['bar', Connection::DEFAULT_PORT], nodes[1]
-
-    db = Connection.new({:right => ['foo', 123], :left => 'bar'}, nil, :connect => false)
+    db = Connection.paired([['foo', 27017], ['bar', 27018]], :connect => false)
     nodes = db.nodes
     assert_equal 2, nodes.length
-    assert_equal ['bar', Connection::DEFAULT_PORT], nodes[0]
-    assert_equal ['foo', 123], nodes[1]
+    assert_equal ['foo', 27017], nodes[0]
+    assert_equal ['bar', 27018], nodes[1]
   end
 
   context "Saved authentications" do
@@ -174,7 +163,7 @@ class TestConnection < Test::Unit::TestCase
   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']
+      @coll = @conn[MONGO_TEST_DB]['test-connection-exceptions']
     end
 
     should "release connection if an exception is raised on send_message" do

data/test/conversions_test.rb

@@ -1,7 +1,7 @@
 require 'test/test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
-require 'mongo/util/ordered_hash'
+require 'bson/ordered_hash'
 
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions

data/test/cursor_test.rb

@@ -8,14 +8,14 @@ class CursorTest < Test::Unit::TestCase
 
   @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-  @@db   = @@connection.db('ruby-mongo-test')
+  @@db   = @@connection.db(MONGO_TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@connection.server_version
 
   def setup
     @@coll.remove
     @@coll.insert('a' => 1)     # collection not created until it's used
-    @@coll_full_name = 'ruby-mongo-test.test'
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
   def test_explain

data/test/db_api_test.rb

@@ -3,10 +3,11 @@ require 'test/test_helper'
 # NOTE: assumes Mongo is running
 class DBAPITest < Test::Unit::TestCase
   include Mongo
+  include BSON
 
   @@conn = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
                         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-  @@db   = @@conn.db("ruby-mongo-test")
+  @@db   = @@conn.db(MONGO_TEST_DB)
   @@coll = @@db.collection('test')
   @@version = @@conn.server_version
 
@@ -14,7 +15,7 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.remove
     @r1 = {'a' => 1}
     @@coll.insert(@r1) # collection not created until it's used
-    @@coll_full_name = 'ruby-mongo-test.test'
+    @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
   def teardown
@@ -29,8 +30,8 @@ class DBAPITest < Test::Unit::TestCase
   end
 
   def test_insert
-    assert_kind_of ObjectID, @@coll.insert('a' => 2)
-    assert_kind_of ObjectID, @@coll.insert('b' => 3)
+    assert_kind_of BSON::ObjectID, @@coll.insert('a' => 2)
+    assert_kind_of BSON::ObjectID, @@coll.insert('b' => 3)
 
     assert_equal 3, @@coll.count
     docs = @@coll.find().to_a
@@ -62,7 +63,7 @@ class DBAPITest < Test::Unit::TestCase
     ids = @@coll.insert([{'a' => 2}, {'b' => 3}])
 
     ids.each do |i|
-      assert_kind_of ObjectID, i
+      assert_kind_of BSON::ObjectID, i
     end
 
     assert_equal 3, @@coll.count
@@ -240,7 +241,7 @@ class DBAPITest < Test::Unit::TestCase
     names = @@db.collection_names
     assert names.length >= 2
     assert names.include?(@@coll.name)
-    assert names.include?('ruby-mongo-test.test2')
+    assert names.include?('mongo-ruby-test.test2')
   ensure
     @@db.drop_collection('test2')
   end
@@ -413,7 +414,7 @@ class DBAPITest < Test::Unit::TestCase
       @@db.collection('does-not-exist')
       fail "expected exception"
     rescue => ex
-      assert_equal MongoDBError, ex.class
+      assert_equal Mongo::MongoDBError, ex.class
       assert_equal "Collection does-not-exist doesn't exist. Currently in strict mode.", ex.to_s
     ensure
       @@db.strict = false
@@ -433,7 +434,7 @@ class DBAPITest < Test::Unit::TestCase
     end
 
     # Now the collection exists. This time we should see an exception.
-    assert_raise MongoDBError do
+    assert_raise Mongo::MongoDBError do
       @@db.create_collection('foobar')
     end
     @@db.strict = false
@@ -545,7 +546,7 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal 1, test.group([], {"a" => {"$gt" => 1}}, {"count" => 0}, "function (obj, prev) { prev.count++; }")[0]["count"]
 
     finalize = "function (obj) { obj.f = obj.count - 1; }"
-    assert_equal 2, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", true, finalize)[0]["f"]
+    assert_equal 2, test.group([], {}, {"count" => 0}, "function (obj, prev) { prev.count++; }", finalize)[0]["f"]
 
     test.insert("a" => 2, "b" => 3)
     expected = [{"a" => 2, "count" => 2},
@@ -646,32 +647,32 @@ class DBAPITest < Test::Unit::TestCase
     @@coll.insert({"hello" => "world"})
     @@coll.insert({"hello" => {"hello" => "world"}})
 
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"$hello" => "world"})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello" => {"$hello" => "world"}})
     end
 
     @@coll.insert({"he$llo" => "world"})
     @@coll.insert({"hello" => {"hell$o" => "world"}})
 
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({".hello" => "world"})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello" => {".hello" => "world"}})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello." => "world"})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello" => {"hello." => "world"}})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hel.lo" => "world"})
     end
-    assert_raise InvalidName do
+    assert_raise BSON::InvalidKeyName do
       @@coll.insert({"hello" => {"hel.lo" => "world"}})
     end
   end
@@ -680,19 +681,19 @@ class DBAPITest < Test::Unit::TestCase
     assert_raise TypeError do
       @@db.collection(5)
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db.collection("")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db.collection("te$t")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db.collection(".test")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db.collection("test.")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       @@db.collection("tes..t")
     end
   end
@@ -706,19 +707,19 @@ class DBAPITest < Test::Unit::TestCase
     assert_raise TypeError do
       a.rename(5)
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       a.rename("")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       a.rename("te$t")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       a.rename(".test")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       a.rename("test.")
     end
-    assert_raise InvalidName do
+    assert_raise Mongo::InvalidNSName do
       a.rename("tes..t")
     end