mongo 1.5.0.rc0 → 1.5.0

data/README.md

@@ -208,14 +208,14 @@ keys. This is the PKFactory that comes with the MongoRecord code (an
 ActiveRecord-like framework for non-Rails apps) and the AR Mongo adapter code
 (for Rails):
 
-  class PKFactory
-    def create_pk(row)
-      return row if row[:_id]
-      row.delete(:_id)      # in case it exists but the value is nil
-      row['_id'] ||= Mongo::ObjectID.new
-      row
+    class PKFactory
+      def create_pk(row)
+        return row if row[:_id]
+        row.delete(:_id)      # in case it exists but the value is nil
+        row['_id'] ||= Mongo::ObjectID.new
+        row
+      end
     end
-  end
 
 A database's PK factory object may be set either when a DB object is created
 or immediately after you obtain it, but only once. The only reason it is

data/docs/HISTORY.md

@@ -1,5 +1,24 @@
 # MongoDB Ruby Driver History
 
+### 1.5.0
+2011-11-28
+
+This releases fixes bugs introduced in 1.4.0 and 1.4.1 that
+were introduced as a result of adding replica set refresh modes.
+
+* Removed :async refresh mode.
+* Disabled auto refresh mode by default. If you want the driver
+to automatically check the state of the replica set, you must
+use :sync mode. Note that replica set refresh is designed only to
+account for benign changes to the replica set (adding and removing
+nodes that don't affect current connections).
+* Fixed bug with commands being sent to secondary nodes. The next
+release will allow you to specify where commands can be sent.
+* Support :j safe mode option.
+* Fix :max_scan and :show_disk_loc Cursor options.
+
+You can see the remaining issues at https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10005&version=10992
+
 ### 1.5.0.rc0
 2011-11-18
 

data/lib/mongo/collection.rb

@@ -86,6 +86,7 @@ module Mongo
 
       @db, @name  = db, name
       @connection = @db.connection
+      @logger     = @connection.logger
       @cache_time = @db.cache_time
       @cache = Hash.new(0)
       unless pk_factory

data/lib/mongo/networking.rb

@@ -225,7 +225,7 @@ module Mongo
       cmd = BSON::OrderedHash.new
       cmd[:getlasterror] = 1
       if opts.is_a?(Hash)
-        opts.assert_valid_keys(:w, :wtimeout, :fsync)
+        opts.assert_valid_keys(:w, :wtimeout, :fsync, :j)
         cmd.merge!(opts)
       end
       message.put_binary(BSON::BSON_CODER.serialize(cmd, false).to_s)

data/lib/mongo/version.rb

@@ -1,3 +1,3 @@
 module Mongo
-  VERSION = "1.5.0.rc0"
+  VERSION = "1.5.0"
 end

data/test/collection_test.rb

@@ -206,6 +206,14 @@ class TestCollection < Test::Unit::TestCase
     end
   end
 
+  if @@version >= "2.0.0"
+    def test_safe_mode_with_journal_commit_option
+      @@test.insert({:foo => 1}, :safe => {:j => true})
+      @@test.update({:foo => 1}, {:foo => 2}, :safe => {:j => true})
+      @@test.remove({:foo => 2}, :safe => {:j => true})
+    end
+  end
+
   def test_update
     id1 = @@test.save("x" => 5)
     @@test.update({}, {"$inc" => {"x" => 1}})
@@ -661,13 +669,13 @@ class TestCollection < Test::Unit::TestCase
 
     @@test.ensure_index([["x", Mongo::DESCENDING]], {})
     assert_equal 2, @@test.index_information.keys.count
-    assert @@test.index_information.keys.include? "x_-1"
+    assert @@test.index_information.keys.include?("x_-1")
 
     @@test.ensure_index([["x", Mongo::ASCENDING]])
-    assert @@test.index_information.keys.include? "x_1"
+    assert @@test.index_information.keys.include?("x_1")
 
     @@test.ensure_index([["type", 1], ["date", -1]])
-    assert @@test.index_information.keys.include? "type_1_date_-1"
+    assert @@test.index_information.keys.include?("type_1_date_-1")
 
     @@test.drop_index("x_1")
     assert_equal 3, @@test.index_information.keys.count
@@ -676,7 +684,7 @@ class TestCollection < Test::Unit::TestCase
 
     @@test.ensure_index([["x", Mongo::DESCENDING]], {})
     assert_equal 3, @@test.index_information.keys.count
-    assert @@test.index_information.keys.include? "x_-1"
+    assert @@test.index_information.keys.include?("x_-1")
 
     # Make sure that drop_index expires cache properly
     @@test.ensure_index([['a', 1]])

data/test/unit/collection_test.rb

@@ -125,5 +125,15 @@ class CollectionTest < Test::Unit::TestCase
 
       @coll.ensure_index [["x", Mongo::DESCENDING], ["y", Mongo::DESCENDING]]
     end
+
+    should "use the connection's logger" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @coll = @db.collection('books')
+      @logger.expects(:warn).with do |msg|
+        msg == "MONGODB [WARNING] test warning"
+      end
+      @coll.log(:warn, "test warning")
+    end
   end
 end

metadata

@@ -1,236 +1,221 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.5.0.rc0
+version: !ruby/object:Gem::Version
+  version: 1.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jim Menard
 - Mike Dirolf
 - Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-18 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bson
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10966820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0.rc0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *10966820
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
-executables: 
+executables:
 - mongo_console
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - mongo.gemspec
 - LICENSE.txt
 - lib/mongo.rb
 - lib/mongo/collection.rb
-- lib/mongo/connection.rb
-- lib/mongo/cursor.rb
-- lib/mongo/db.rb
-- lib/mongo/exceptions.rb
+- lib/mongo/networking.rb
 - lib/mongo/gridfs/grid.rb
 - lib/mongo/gridfs/grid_ext.rb
 - lib/mongo/gridfs/grid_file_system.rb
 - lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_io_fix.rb
-- lib/mongo/networking.rb
-- lib/mongo/repl_set_connection.rb
+- lib/mongo/version.rb
+- lib/mongo/util/pool_manager.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/core_ext.rb
-- lib/mongo/util/logging.rb
-- lib/mongo/util/node.rb
+- lib/mongo/util/ssl_socket.rb
 - lib/mongo/util/pool.rb
-- lib/mongo/util/pool_manager.rb
+- lib/mongo/util/node.rb
+- lib/mongo/util/uri_parser.rb
 - lib/mongo/util/server_version.rb
-- lib/mongo/util/ssl_socket.rb
 - lib/mongo/util/support.rb
-- lib/mongo/util/timeout.rb
-- lib/mongo/util/uri_parser.rb
-- lib/mongo/version.rb
+- lib/mongo/util/logging.rb
+- lib/mongo/connection.rb
+- lib/mongo/exceptions.rb
+- lib/mongo/repl_set_connection.rb
+- lib/mongo/db.rb
+- lib/mongo/cursor.rb
 - docs/CREDITS.md
-- docs/FAQ.md
+- docs/WRITE_CONCERN.md
+- docs/RELEASES.md
 - docs/GridFS.md
 - docs/HISTORY.md
-- docs/READ_PREFERENCE.md
-- docs/RELEASES.md
+- docs/FAQ.md
+- docs/TUTORIAL.md
 - docs/REPLICA_SETS.md
+- docs/READ_PREFERENCE.md
 - docs/TAILABLE_CURSORS.md
-- docs/TUTORIAL.md
-- docs/WRITE_CONCERN.md
 - bin/mongo_console
-- test/auxillary/1.4_features.rb
-- test/auxillary/authentication_test.rb
+- test/tools/repl_set_manager.rb
+- test/tools/auth_repl_set_manager.rb
+- test/uri_test.rb
+- test/conversions_test.rb
+- test/grid_io_test.rb
+- test/cursor_fail_test.rb
+- test/unit/cursor_test.rb
+- test/unit/pool_test.rb
+- test/unit/pool_manager_test.rb
+- test/unit/collection_test.rb
+- test/unit/node_test.rb
+- test/unit/db_test.rb
+- test/unit/connection_test.rb
+- test/unit/read_test.rb
+- test/unit/safe_test.rb
+- test/unit/grid_test.rb
+- test/support_test.rb
+- test/cursor_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
+- test/test_helper.rb
+- test/threading_test.rb
+- test/auxillary/repl_set_auth_test.rb
 - test/auxillary/autoreconnect_test.rb
+- test/auxillary/threaded_authentication_test.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/1.4_features.rb
 - test/auxillary/fork_test.rb
-- test/auxillary/repl_set_auth_test.rb
 - test/auxillary/slave_connection_test.rb
-- test/auxillary/threaded_authentication_test.rb
+- test/threading/threading_with_large_pool_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/read_preference_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/basic_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/refresh_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/collection_test.rb
+- test/cursor_message_test.rb
 - test/bson/binary_test.rb
-- test/bson/bson_string_test.rb
-- test/bson/bson_test.rb
-- test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
 - test/bson/json_test.rb
-- test/bson/object_id_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/object_id_test.rb
 - test/bson/test_helper.rb
+- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
-- test/collection_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/load/unicorn/load.rb
+- test/load/thin/load.rb
+- test/db_test.rb
 - test/connection_test.rb
-- test/conversions_test.rb
-- test/cursor_fail_test.rb
-- test/cursor_message_test.rb
-- test/cursor_test.rb
 - test/db_api_test.rb
-- test/db_connection_test.rb
-- test/db_test.rb
 - test/grid_file_system_test.rb
-- test/grid_io_test.rb
-- test/grid_test.rb
-- test/load/thin/load.rb
-- test/load/unicorn/load.rb
-- test/pool_test.rb
-- test/replica_sets/basic_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/query_test.rb
-- test/replica_sets/read_preference_test.rb
-- test/replica_sets/refresh_test.rb
-- test/replica_sets/refresh_with_threads_test.rb
-- test/replica_sets/replication_ack_test.rb
-- test/replica_sets/rs_test_helper.rb
-- test/replica_sets/threading_test.rb
 - test/safe_test.rb
-- test/support/hash_with_indifferent_access.rb
-- test/support/keys.rb
-- test/support_test.rb
-- test/test_helper.rb
-- test/threading/threading_with_large_pool_test.rb
-- test/threading_test.rb
-- test/timeout_test.rb
-- test/tools/auth_repl_set_manager.rb
-- test/tools/repl_set_manager.rb
-- test/unit/collection_test.rb
-- test/unit/connection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/db_test.rb
-- test/unit/grid_test.rb
-- test/unit/node_test.rb
-- test/unit/pool_manager_test.rb
-- test/unit/pool_test.rb
-- test/unit/read_test.rb
-- test/unit/safe_test.rb
-- test/uri_test.rb
-has_rdoc: true
+- test/db_connection_test.rb
+- test/grid_test.rb
 homepage: http://www.mongodb.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
-test_files: 
-- test/auxillary/1.4_features.rb
-- test/auxillary/authentication_test.rb
+test_files:
+- test/tools/repl_set_manager.rb
+- test/tools/auth_repl_set_manager.rb
+- test/uri_test.rb
+- test/conversions_test.rb
+- test/grid_io_test.rb
+- test/cursor_fail_test.rb
+- test/unit/cursor_test.rb
+- test/unit/pool_test.rb
+- test/unit/pool_manager_test.rb
+- test/unit/collection_test.rb
+- test/unit/node_test.rb
+- test/unit/db_test.rb
+- test/unit/connection_test.rb
+- test/unit/read_test.rb
+- test/unit/safe_test.rb
+- test/unit/grid_test.rb
+- test/support_test.rb
+- test/cursor_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
+- test/test_helper.rb
+- test/threading_test.rb
+- test/auxillary/repl_set_auth_test.rb
 - test/auxillary/autoreconnect_test.rb
+- test/auxillary/threaded_authentication_test.rb
+- test/auxillary/authentication_test.rb
+- test/auxillary/1.4_features.rb
 - test/auxillary/fork_test.rb
-- test/auxillary/repl_set_auth_test.rb
 - test/auxillary/slave_connection_test.rb
-- test/auxillary/threaded_authentication_test.rb
+- test/threading/threading_with_large_pool_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/read_preference_test.rb
+- test/replica_sets/connect_test.rb
+- test/replica_sets/basic_test.rb
+- test/replica_sets/count_test.rb
+- test/replica_sets/refresh_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/refresh_with_threads_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/collection_test.rb
+- test/cursor_message_test.rb
 - test/bson/binary_test.rb
-- test/bson/bson_string_test.rb
-- test/bson/bson_test.rb
-- test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
 - test/bson/json_test.rb
-- test/bson/object_id_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/ordered_hash_test.rb
+- test/bson/object_id_test.rb
 - test/bson/test_helper.rb
+- test/bson/bson_test.rb
 - test/bson/timestamp_test.rb
-- test/collection_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/load/unicorn/load.rb
+- test/load/thin/load.rb
+- test/db_test.rb
 - test/connection_test.rb
-- test/conversions_test.rb
-- test/cursor_fail_test.rb
-- test/cursor_message_test.rb
-- test/cursor_test.rb
 - test/db_api_test.rb
-- test/db_connection_test.rb
-- test/db_test.rb
 - test/grid_file_system_test.rb
-- test/grid_io_test.rb
-- test/grid_test.rb
-- test/load/thin/load.rb
-- test/load/unicorn/load.rb
-- test/pool_test.rb
-- test/replica_sets/basic_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/query_test.rb
-- test/replica_sets/read_preference_test.rb
-- test/replica_sets/refresh_test.rb
-- test/replica_sets/refresh_with_threads_test.rb
-- test/replica_sets/replication_ack_test.rb
-- test/replica_sets/rs_test_helper.rb
-- test/replica_sets/threading_test.rb
 - test/safe_test.rb
-- test/support/hash_with_indifferent_access.rb
-- test/support/keys.rb
-- test/support_test.rb
-- test/test_helper.rb
-- test/threading/threading_with_large_pool_test.rb
-- test/threading_test.rb
-- test/timeout_test.rb
-- test/tools/auth_repl_set_manager.rb
-- test/tools/repl_set_manager.rb
-- test/unit/collection_test.rb
-- test/unit/connection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/db_test.rb
-- test/unit/grid_test.rb
-- test/unit/node_test.rb
-- test/unit/pool_manager_test.rb
-- test/unit/pool_test.rb
-- test/unit/read_test.rb
-- test/unit/safe_test.rb
-- test/uri_test.rb
+- test/db_connection_test.rb
+- test/grid_test.rb

data/lib/mongo/util/timeout.rb

@@ -1,42 +0,0 @@
-# encoding: UTF-8
-
-# --
-# Copyright (C) 2008-2011 10gen Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ++
-module Mongo #:nodoc:
-  module TimeoutWrapper
-    extend self
-
-    def timeout_lib=(lib)
-      @@timeout_lib = lib
-    end
-
-    def timeout_lib
-      @@timeout_lib
-    end
-
-    def timeout(delay, &block)
-      if timeout_lib
-        begin
-        timeout_lib.timeout(delay, &block)
-        rescue ::Timeout::Error
-          raise Mongo::OperationTimeout
-        end
-      else
-        yield
-      end
-    end
-  end
-end

data/test/bson/bson_string_test.rb

@@ -1,30 +0,0 @@
-# encoding:utf-8
-require './test/bson/test_helper'
-require 'complex'
-require 'bigdecimal'
-require 'rational'
-
-class BSONTest < Test::Unit::TestCase
-
-  include BSON
-
-  def setup
-    @encoder = BSON::BSON_CODER
-  end
-
-  def assert_doc_pass(doc, options={})
-    bson = @encoder.serialize(doc)
-    if options[:debug]
-      puts "DEBUGGING DOC:"
-      p bson.to_a
-      puts "DESERIALIZES TO:"
-    end
-    assert_equal @encoder.serialize(doc).to_a, bson.to_a
-    assert_equal doc, @encoder.deserialize(bson)
-  end
-
-  def test_string
-    assert_doc_pass({:a => "hello"})
-  end
-
-end

data/test/pool_test.rb

@@ -1,21 +0,0 @@
-require './test/test_helper'
-require 'logger'
-require 'stringio'
-require 'thread'
-
-class TestPool < Test::Unit::TestCase
-
-  include Mongo
-  include BSON
-
-  def setup
-    @conn = standard_connection
-  end
-
-  def teardown
-    @conn[MONGO_TEST_DB].get_last_error
-  end
-
-  def test_foo
-  end
-end

data/test/replica_sets/threading_test.rb

@@ -1,111 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require './test/replica_sets/rs_test_helper'
-
-class ReplicaSetThreadingTest < Test::Unit::TestCase
-  include ReplicaSetTest
-
-  def setup_safe_data
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                 :pool_size => 100)
-    @db = @conn[MONGO_TEST_DB]
-    @coll = @db.collection('thread-test-collection')
-    @db.drop_collection('duplicate')
-    @db.drop_collection('unique')
-    @duplicate = @db.collection('duplicate')
-    @unique    = @db.collection('unique')
-
-    @duplicate.insert("test" => "insert")
-    @duplicate.insert("test" => "update")
-    @unique.insert("test" => "insert")
-    @unique.insert("test" => "update")
-    @unique.create_index("test", :unique => true)
-  end
-
-  def test_safe_update
-    setup_safe_data
-    times = []
-    threads = []
-    100.times do |i|
-      threads[i] = Thread.new do
-        10.times do
-          if i % 2 == 0
-            assert_raise Mongo::OperationFailure do
-              t1 = Time.now
-              @unique.update({"test" => "insert"},
-                             {"$set" => {"test" => "update"}}, :safe => true)
-              times << Time.now - t1
-            end
-          else
-            t1 = Time.now
-            @duplicate.update({"test" => "insert"},
-                              {"$set" => {"test" => "update"}}, :safe => true)
-            times << Time.now - t1
-          end
-        end
-      end
-    end
-
-    100.times do |i|
-      threads[i].join
-    end
-    @conn.close
-  end
-
-  def test_safe_insert
-    setup_safe_data
-    threads = []
-    100.times do |i|
-      threads[i] = Thread.new do
-        if i % 2 == 0
-          assert_raise Mongo::OperationFailure do
-            @unique.insert({"test" => "insert"}, :safe => true)
-          end
-        else
-          @duplicate.insert({"test" => "insert"}, :safe => true)
-        end
-      end
-    end
-
-    100.times do |i|
-      threads[i].join
-    end
-    @conn.close
-  end
-
-  def setup_replica_set_connection
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                 :pool_size => 100, :auto_refresh => :sync,
-                                 :refresh_interval => 2)
-    @db = @conn[MONGO_TEST_DB]
-    @coll = @db.collection('thread-test-collection')
-  end
-
-  def test_threading_with_queries
-    setup_replica_set_connection
-    @coll.drop
-    @coll = @db.collection('thread-test-collection')
-
-    1000.times do |i|
-      @coll.insert("x" => i)
-    end
-
-    threads = []
-
-    10.times do |i|
-      threads[i] = Thread.new do
-        100.times do
-          sum = 0
-          @coll.find().each do |document|
-            sum += document["x"]
-          end
-          assert_equal 499500, sum
-        end
-      end
-    end
-
-    10.times do |i|
-      threads[i].join
-    end
-    @conn.close
-  end
-end

data/test/timeout_test.rb

@@ -1,14 +0,0 @@
-require './test/test_helper'
-
-class TestTimeout < Test::Unit::TestCase
-
-  def test_timeout
-    @conn = standard_connection(:op_timeout => 2)
-    assert @conn[MONGO_TEST_DB]['test'].save({:a => 1})
-    assert @conn[MONGO_TEST_DB]['test'].find.next
-    assert_raise OperationTimeout do
-      @conn[MONGO_TEST_DB]['test'].find({'$where' => 'function() { while(true) { this.a == 1 } }'}).next
-    end
-  end
-
-end