mongo 0.18.3 → 0.19

data/lib/mongo/util/server_version.rb

@@ -1,5 +1,5 @@
 # --
-# Copyright (C) 2008-2009 10gen Inc.
+# Copyright (C) 2008-2010 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/util/support.rb

@@ -1,5 +1,5 @@
 # --
-# Copyright (C) 2008-2009 10gen Inc.
+# Copyright (C) 2008-2010 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/mongo-ruby-driver.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--main', 'README.rdoc', '--inline-source']
   s.extra_rdoc_files = ['README.rdoc']
 
-  s.authors = ['Jim Menard', 'Mike Dirolf']
+  s.authors = ['Jim Menard', 'Mike Dirolf', 'Kyle Banker']
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
 end

data/test/auxillary/authentication_test.rb

@@ -0,0 +1,68 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: This test requires bouncing the server.
+# It also requires that a user exists on the admin database.
+class AuthenticationTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    @conn = Mongo::Connection.new
+    @db1 = @conn.db('mongo-ruby-test-auth1')
+    @db2 = @conn.db('mongo-ruby-test-auth2')
+    @admin = @conn.db('admin')
+  end
+
+  def teardown
+    @db1.authenticate('user1', 'secret')
+    @db2.authenticate('user2', 'secret')
+    @conn.drop_database('mongo-ruby-test-auth1')
+    @conn.drop_database('mongo-ruby-test-auth2')
+  end
+
+  def test_authenticate
+    @admin.authenticate('bob', 'secret')
+    @db1.add_user('user1', 'secret')
+    @db2.add_user('user2', 'secret')
+    @admin.logout
+
+    assert_raise Mongo::OperationFailure do
+      @db1['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    assert_raise Mongo::OperationFailure do
+      @db2['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    @db1.authenticate('user1', 'secret')
+    @db2.authenticate('user2', 'secret')
+
+    assert @db1['stuff'].insert({:a => 2}, :safe => true)
+    assert @db2['stuff'].insert({:a => 2}, :safe => true)
+
+    puts "Please bounce the server."
+    gets
+
+    # Here we reconnect.
+    begin
+      @db1['stuff'].find.to_a
+      rescue Mongo::ConnectionFailure
+    end
+
+    assert @db1['stuff'].insert({:a => 2}, :safe => true)
+    assert @db2['stuff'].insert({:a => 2}, :safe => true)
+
+    @db1.logout
+    assert_raise Mongo::OperationFailure do
+      @db1['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    @db2.logout
+    assert_raise Mongo::OperationFailure do
+      assert @db2['stuff'].insert({:a => 2}, :safe => true)
+    end
+  end
+
+end

data/test/auxillary/autoreconnect_test.rb

@@ -0,0 +1,41 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'test/unit'
+require 'test/test_helper'
+
+# NOTE: This test requires bouncing the server
+class AutoreconnectTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    @conn = Mongo::Connection.new
+    @db = @conn.db('mongo-ruby-test')
+    @db.drop_collection("test-connect")
+    @coll = @db.collection("test-connect")
+  end
+
+  def test_query
+    @coll.save({:a => 20})
+    @coll.save({:a => 30})
+    @coll.save({:a => 40})
+    results = []
+    @coll.find.each {|r| results << r}
+    [20, 30, 40].each do |a|
+      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+    end
+
+    puts "Please disconnect and then reconnect the current master."
+    gets
+
+    begin
+      @coll.find.to_a
+      rescue Mongo::ConnectionFailure
+    end
+
+    results = []
+      @coll.find.each {|r| results << r}
+      [20, 30, 40].each do |a|
+        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
+      end
+  end
+end

data/test/binary_test.rb

@@ -0,0 +1,15 @@
+# encoding:utf-8
+require 'test/test_helper'
+
+class BinaryTest < Test::Unit::TestCase
+  context "Inspecting" do
+    setup do
+      @data = ("THIS IS BINARY " * 50).unpack("c*")
+    end
+
+    should "not display actual data" do
+      binary = Mongo::Binary.new(@data)
+      assert_equal "<Mongo::Binary:#{binary.object_id}>", binary.inspect
+    end
+  end
+end

data/test/{test_bson.rb → bson_test.rb}

@@ -138,10 +138,9 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, doc2
 
     r = doc2['doc']
-    assert_kind_of RegexpOfHolding, r
-    assert_equal '', r.extra_options_str
+    assert_kind_of Regexp, r
 
-    r.extra_options_str << 'zywcab'
+    r = RegexpOfHolding.new('st', 0, 'zywcab')
     assert_equal 'zywcab', r.extra_options_str
 
     doc = {'doc' => r}
@@ -263,19 +262,19 @@ class BSONTest < Test::Unit::TestCase
     val = OrderedHash.new
     val['not_id'] = 1
     val['_id'] = 2
-    roundtrip = BSON.deserialize(BSON.serialize(val).to_a)
+    roundtrip = BSON.deserialize(BSON.serialize(val, false, true).to_a)
     assert_kind_of OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
 
     val = {'a' => 'foo', 'b' => 'bar', :_id => 42, 'z' => 'hello'}
-    roundtrip = BSON.deserialize(BSON.serialize(val).to_a)
+    roundtrip = BSON.deserialize(BSON.serialize(val, false, true).to_a)
     assert_kind_of OrderedHash, roundtrip
     assert_equal '_id', roundtrip.keys.first
   end
 
   def test_nil_id
     doc = {"_id" => nil}
-    assert_equal doc, BSON.deserialize(bson = BSON.serialize(doc).to_a)
+    assert_equal doc, BSON.deserialize(bson = BSON.serialize(doc, false, true).to_a)
   end
 
   def test_timestamp
@@ -357,6 +356,13 @@ class BSONTest < Test::Unit::TestCase
     assert_equal BSON.serialize(one).to_a, BSON.serialize(dup).to_a
   end
 
+  def test_no_duplicate_id_when_moving_id
+    dup = {"_id" => "foo", :_id => "foo"}
+    one = {:_id => "foo"}
+
+    assert_equal BSON.serialize(one, false, true).to_s, BSON.serialize(dup, false, true).to_s
+  end
+
   def test_null_character
     doc = {"a" => "\x00"}
 
@@ -394,4 +400,55 @@ class BSONTest < Test::Unit::TestCase
     end
   end
 
+  def test_move_id
+    a = OrderedHash.new
+    a['text'] = 'abc'
+    a['key'] = 'abc'
+    a['_id']  = 1
+
+
+    assert_equal ")\000\000\000\020_id\000\001\000\000\000\002text" +
+                 "\000\004\000\000\000abc\000\002key\000\004\000\000\000abc\000\000",
+                 BSON.serialize(a, false, true).to_s
+    assert_equal ")\000\000\000\002text\000\004\000\000\000abc\000\002key" +
+                 "\000\004\000\000\000abc\000\020_id\000\001\000\000\000\000",
+                 BSON.serialize(a, false, false).to_s
+  end
+
+  def test_move_id_with_nested_doc
+    b = OrderedHash.new
+    b['text'] = 'abc'
+    b['_id']   = 2
+    c = OrderedHash.new
+    c['text'] = 'abc'
+    c['hash'] = b
+    c['_id']  = 3
+    assert_equal ">\000\000\000\020_id\000\003\000\000\000\002text" +
+                 "\000\004\000\000\000abc\000\003hash\000\034\000\000" +
+                 "\000\002text\000\004\000\000\000abc\000\020_id\000\002\000\000\000\000\000",
+                 BSON.serialize(c, false, true).to_s
+    assert_equal ">\000\000\000\002text\000\004\000\000\000abc\000\003hash" +
+                 "\000\034\000\000\000\002text\000\004\000\000\000abc\000\020_id" +
+                 "\000\002\000\000\000\000\020_id\000\003\000\000\000\000",
+                 BSON.serialize(c, false, false).to_s
+  end
+
+  begin
+  require 'active_support'
+  rescue LoadError
+    warn 'Could not test BSON with HashWithIndifferentAccess.'
+  end
+
+  if defined?(HashWithIndifferentAccess)
+    def test_keep_id_with_hash_with_indifferent_access
+      doc = HashWithIndifferentAccess.new
+      doc[:_id] = ObjectID.new
+      BSON.serialize(doc, false, false).to_a
+      assert doc.has_key?("_id")
+
+      doc['_id'] = ObjectID.new
+      BSON.serialize(doc, false, false).to_a
+      assert doc.has_key?("_id")
+    end
+  end
 end

data/test/{test_collection.rb → collection_test.rb}

@@ -1,7 +1,7 @@
 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)
+  @@connection ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
   @@db   = @@connection.db('ruby-mongo-test')
   @@test = @@db.collection("test")
   @@version = @@connection.server_version
@@ -75,32 +75,31 @@ class TestCollection < Test::Unit::TestCase
   end
 
   if @@version > "1.1"
-    context "distinct queries" do
-      setup do
-        @@test.remove
-        @@test.insert([{:a => 0, :b => {:c => "a"}},
-                       {:a => 1, :b => {:c => "b"}},
-                       {:a => 1, :b => {:c => "c"}},
-                       {:a => 2, :b => {:c => "a"}},
-                       {:a => 3},
-                       {:a => 3}])
-      end
-
-      should "return distinct values" do
-        assert_equal [0, 1, 2, 3], @@test.distinct(:a).sort
-        assert_equal ["a", "b", "c"], @@test.distinct("b.c").sort
-      end
-
-      if @@version >= "1.2"
+    def setup_for_distinct
+      @@test.remove
+      @@test.insert([{:a => 0, :b => {:c => "a"}},
+                     {:a => 1, :b => {:c => "b"}},
+                     {:a => 1, :b => {:c => "c"}},
+                     {:a => 2, :b => {:c => "a"}},
+                     {:a => 3},
+                     {:a => 3}])
+    end
 
-        should "filter collection with query" do
-          assert_equal [2, 3], @@test.distinct(:a, {:a => {"$gt" => 1}}).sort
-        end
+    def test_distinct_queries
+      setup_for_distinct
+      assert_equal [0, 1, 2, 3], @@test.distinct(:a).sort
+      assert_equal ["a", "b", "c"], @@test.distinct("b.c").sort
+    end
 
-        should "filter nested objects" do
-          assert_equal ["a", "b"], @@test.distinct("b.c", {"b.c" => {"$ne" => "c"}}).sort
-        end
+    if @@version >= "1.2"
+      def test_filter_collection_with_query
+        setup_for_distinct
+        assert_equal [2, 3], @@test.distinct(:a, {:a => {"$gt" => 1}}).sort
+      end
 
+      def test_filter_nested_objects
+        setup_for_distinct
+        assert_equal ["a", "b"], @@test.distinct("b.c", {"b.c" => {"$ne" => "c"}}).sort
       end
     end
   end
@@ -191,7 +190,7 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
-  def test_safe_remove
+  def test_mocked_safe_remove
     @conn = Connection.new
     @db   = @conn['mongo-ruby-test']
     @test = @db['test-safe-remove']
@@ -204,6 +203,15 @@ class TestCollection < Test::Unit::TestCase
     @test.drop
   end
 
+  def test_safe_remove
+    @conn = Connection.new
+    @db   = @conn['mongo-ruby-test']
+    @test = @db['test-safe-remove']
+    @test.save({:a => 50})
+    @test.remove({}, :safe => true)
+    @test.drop
+  end
+
   def test_count
     @@test.drop
 
@@ -429,15 +437,9 @@ class TestCollection < Test::Unit::TestCase
       assert_equal 4, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 2}))[0]["count"]
     end
 
-    should "group results using command form" do
-      assert_equal 1, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 0.5}), true)[0]["count"]
-      assert_equal 2, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 1}), true)[0]["count"]
-      assert_equal 4, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 2}), true)[0]["count"]
-    end
-
     should "finalize grouped results" do
       @finalize = "function(doc) {doc.f = doc.count + 200; }"
-      assert_equal 202, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 1}), true, @finalize)[0]["f"]
+      assert_equal 202, @@test.group([], {}, @initial, Code.new(@reduce_function, {"inc_value" => 1}), @finalize)[0]["f"]
     end
   end
 
@@ -455,16 +457,10 @@ class TestCollection < Test::Unit::TestCase
     end
 
     should "group results" do
-      results = @@test.group(@keyf, {}, @initial, @reduce, true).sort {|a, b| a['count'] <=> b['count']}
+      results = @@test.group(@keyf, {}, @initial, @reduce).sort {|a, b| a['count'] <=> b['count']}
       assert results[0]['even'] && results[0]['count'] == 2.0
       assert results[1]['odd'] && results[1]['count'] == 3.0
     end
-
-    should "raise an error if trying to use keyf as a group eval" do
-      assert_raise OperationFailure do
-        @@test.group(@keyf, {}, @initial, @reduce)
-      end
-    end
   end
 
   context "A collection with two records" do

data/test/{test_connection.rb → connection_test.rb}

@@ -69,8 +69,6 @@ class TestConnection < Test::Unit::TestCase
     assert_kind_of Array, names
     assert names.length >= 1
     assert names.include?('ruby-mongo-info-test')
-
-    @mongo.drop_database('ruby-mongo-info-test')
   end
 
   def test_logging
@@ -80,7 +78,7 @@ class TestConnection < Test::Unit::TestCase
     db = Connection.new(@host, @port, :logger => logger).db('ruby-mongo-test')
     assert output.string.include?("admin.$cmd.find")
   end
-  
+
   def test_connection_logger
     output = StringIO.new
     logger = Logger.new(output)
@@ -124,6 +122,38 @@ class TestConnection < Test::Unit::TestCase
     assert_equal ['foo', 123], nodes[1]
   end
 
+  context "Saved authentications" do
+    setup do
+      @conn = Mongo::Connection.new
+      @auth = {'db_name' => 'test', 'username' => 'bob', 'password' => 'secret'}
+      @conn.add_auth(@auth['db_name'], @auth['username'], @auth['password'])
+    end
+
+    should "save the authentication" do
+      assert_equal @auth, @conn.auths[0]
+    end
+
+    should "replace the auth if given a new auth for the same db" do
+      auth = {'db_name' => 'test', 'username' => 'mickey', 'password' => 'm0u53'}
+      @conn.add_auth(auth['db_name'], auth['username'], auth['password'])
+      assert_equal 1, @conn.auths.length
+      assert_equal auth, @conn.auths[0]
+    end
+
+    should "remove auths by database" do
+      @conn.remove_auth('non-existent database')
+      assert_equal 1, @conn.auths.length
+
+      @conn.remove_auth('test')
+      assert_equal 0, @conn.auths.length
+    end
+
+    should "remove all auths" do
+      @conn.clear_auths
+      assert_equal 0, @conn.auths.length
+    end
+  end
+
   context "Connection exceptions" do
     setup do
       @conn = Mongo::Connection.new('localhost', 27017, :pool_size => 10, :timeout => 10)

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

@@ -54,13 +54,6 @@ class CursorTest < Test::Unit::TestCase
     assert_equal 0, @@db['acollectionthatdoesn'].count()
   end
 
-  def test_next_object_deprecation
-    @@coll.remove
-    @@coll.insert({"a" => 1})
-
-    assert_equal 1, @@coll.find().next_object["a"]
-  end
-
   def test_sort
     @@coll.remove
     5.times{|x| @@coll.insert({"age" => x}) }