mongo 1.2.2 → 1.2.3

data/docs/HISTORY.md

@@ -1,5 +1,12 @@
 # MongoDB Ruby Driver History
 
+### 1.2.3
+2011-2-22
+
+* Updated docs for v1.8 map-reduce and ensure that :raw option
+  is used when no collection name is returned.
+* Minor Collection#group doc update.
+
 ### 1.2.2
 2011-2-15
 

data/lib/mongo.rb

@@ -19,7 +19,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end
 
 module Mongo

data/lib/mongo/collection.rb

@@ -521,13 +521,18 @@ module Mongo
     # @option opts [Integer] :limit (nil) if passing a query, number of objects to return from the collection.
     # @option opts [String, BSON::Code] :finalize (nil) a javascript function to apply to the result set after the
     #   map/reduce operation has finished.
-    # @option opts [String] :out (nil) the name of the output collection. If specified, the collection will not be treated as temporary.
-    # @option opts [Boolean] :keeptemp (false) if true, the generated collection will be persisted. default is false.
+    # @option opts [String] :out (nil) a valid output type. In versions of MongoDB prior to v1.7.6,
+    #   this option takes the name of a collection for the output results. In versions 1.7.6 and later,
+    #   this option specifies the output type. See the core docs for available output types.
+    # @option opts [Boolean] :keeptemp (false) if true, the generated collection will be persisted. The defualt
+    #   is false. Note that this option has no effect is versions of MongoDB > v1.7.6.
     # @option opts [Boolean ] :verbose (false) if true, provides statistics on job execution time.
     # @option opts [Boolean] :raw (false) if true, return the raw result object from the map_reduce command, and not
-    #   the instantiated collection that's returned by default.
+    #   the instantiated collection that's returned by default. Note if a collection name isn't returned in the
+    #   map-reduce output (as, for example, when using :out => {:inline => 1}), then this option will be
+    #   forced to true.
     #
-    # @return [Collection] a collection containing the results of the operation.
+    # @return [Collection, Hash] a Mongo::Collection object or a Hash with the map-reduce command's results.
     #
     # @see http://www.mongodb.org/display/DOCS/MapReduce Offical MongoDB map/reduce documentation.
     #
@@ -548,7 +553,7 @@ module Mongo
         raise Mongo::OperationFailure, "map-reduce failed: #{result['errmsg']}"
       end
 
-      if raw
+      if raw || !result["result"]
         result
       else
         @db[result["result"]]
@@ -576,7 +581,7 @@ module Mongo
       if opts.is_a?(Hash)
         return new_group(opts)
       else
-        warn "Collection#group no longer take a list of paramters. This usage is deprecated." +
+        warn "Collection#group no longer take a list of parameters. This usage is deprecated." +
              "Check out the new API at http://api.mongodb.org/ruby/current/Mongo/Collection.html#group-instance_method"
       end
 

data/test/bson/bson_string_test.rb

@@ -0,0 +1,30 @@
+# encoding:utf-8
+require './test/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/collection_test.rb

@@ -465,6 +465,29 @@ class TestCollection < Test::Unit::TestCase
       assert res["counts"]
       assert res["timeMillis"]
     end
+
+    def test_map_reduce_with_collection_merge
+      @@test << {:user_id => 1}
+      @@test << {:user_id => 2}
+      output_collection = "test-map-coll"
+      m = Code.new("function() { emit(this.user_id, {count: 1}); }")
+      r = Code.new("function(k,vals) { var sum = 0;" +
+        " vals.forEach(function(v) { sum += v.count;} ); return {count: sum}; }")
+      res = @@test.map_reduce(m, r, :out => output_collection)
+
+      @@test.remove
+      @@test << {:user_id => 3}
+      res = @@test.map_reduce(m, r, :out => {:merge => output_collection})
+      assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 1}
+
+      @@test.remove
+      @@test << {:user_id => 3}
+      res = @@test.map_reduce(m, r, :out => {:reduce => output_collection})
+      assert res.find.to_a.any? {|doc| doc["_id"] == 3 && doc["value"]["count"] == 2}
+
+      res = @@test.map_reduce(m, r, :out => {:inline => 1})
+      assert res["results"]
+    end
   end
 
   if @@version > "1.3.0"

data/test/pool_test.rb

@@ -0,0 +1,21 @@
+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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  hash: 25
+  prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 1
         - 2
-        - 2
-        version: 1.2.2
+        - 3
+        version: 1.2.3
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -50,95 +50,88 @@ files:
 - mongo.gemspec
 - LICENSE.txt
 - lib/mongo.rb
-- lib/mongo/cursor.rb
 - lib/mongo/collection.rb
-- lib/mongo/exceptions.rb
 - lib/mongo/connection.rb
-- lib/mongo/repl_set_connection.rb
-- lib/mongo/test.rb
-- lib/mongo/gridfs/grid_io.rb
-- lib/mongo/gridfs/grid_file_system.rb
+- lib/mongo/cursor.rb
+- lib/mongo/db.rb
+- lib/mongo/exceptions.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/repl_set_connection.rb
 - lib/mongo/util/conversions.rb
-- lib/mongo/util/support.rb
-- lib/mongo/util/pool.rb
 - lib/mongo/util/core_ext.rb
+- lib/mongo/util/pool.rb
 - lib/mongo/util/server_version.rb
+- lib/mongo/util/support.rb
 - lib/mongo/util/uri_parser.rb
-- lib/mongo/db.rb
-- docs/HISTORY.md
-- docs/TUTORIAL.md
+- docs/1.0_UPGRADE.md
 - docs/CREDITS.md
 - docs/FAQ.md
-- docs/REPLICA_SETS.md
-- docs/1.0_UPGRADE.md
 - docs/GridFS.md
+- docs/HISTORY.md
+- docs/REPLICA_SETS.md
+- docs/TUTORIAL.md
 - docs/WRITE_CONCERN.md
 - bin/mongo_console
-- test/grid_file_system_test.rb
-- test/unit/db_test.rb
-- test/unit/repl_set_connection_test.rb
-- test/unit/collection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/grid_test.rb
-- test/unit/connection_test.rb
-- test/unit/pool_test.rb
-- test/unit/safe_test.rb
-- test/db_test.rb
-- test/collection_test.rb
-- test/async/collection_test.rb
-- test/async/cursor_test.rb
-- test/async/connection_test.rb
-- test/async/worker_pool_test.rb
-- test/cursor_test.rb
-- test/load/unicorn/unicorn.rb
-- test/load/unicorn/load.rb
-- test/load/thin/load.rb
-- test/grid_test.rb
-- test/db_api_test.rb
-- test/auxillary/slave_connection_test.rb
-- test/auxillary/threaded_authentication_test.rb
+- test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
 - test/auxillary/repl_set_auth_test.rb
-- test/auxillary/1.4_features.rb
-- test/conversions_test.rb
-- test/connection_test.rb
-- test/uri_test.rb
-- test/cursor_message_test.rb
-- test/tools/test.rb
-- test/tools/repl_set_manager.rb
-- test/tools/auth_repl_set_manager.rb
-- test/tools/load.rb
-- test/tools/sharding_manager.rb
-- test/cursor_fail_test.rb
-- test/threading/threading_with_large_pool_test.rb
-- test/test_helper.rb
-- test/grid_io_test.rb
-- test/bson/byte_buffer_test.rb
+- test/auxillary/slave_connection_test.rb
+- test/auxillary/threaded_authentication_test.rb
 - test/bson/binary_test.rb
-- test/bson/object_id_test.rb
-- test/bson/json_test.rb
+- test/bson/bson_string_test.rb
 - test/bson/bson_test.rb
-- test/bson/ordered_hash_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/hash_with_indifferent_access_test.rb
-- test/support/keys.rb
-- test/support/hash_with_indifferent_access.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/collection_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/replica_sets/rs_test_helper.rb
-- test/replica_sets/pooled_insert_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/connect_test.rb
+- test/replica_sets/connection_string_test.rb
 - test/replica_sets/count_test.rb
-- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/pooled_insert_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
-- test/replica_sets/connection_string_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/connect_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/rs_test_helper.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/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/pool_test.rb
+- test/unit/repl_set_connection_test.rb
+- test/unit/safe_test.rb
+- test/uri_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -171,70 +164,64 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-- test/grid_file_system_test.rb
-- test/unit/db_test.rb
-- test/unit/repl_set_connection_test.rb
-- test/unit/collection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/grid_test.rb
-- test/unit/connection_test.rb
-- test/unit/pool_test.rb
-- test/unit/safe_test.rb
-- test/db_test.rb
-- test/collection_test.rb
-- test/async/collection_test.rb
-- test/async/cursor_test.rb
-- test/async/connection_test.rb
-- test/async/worker_pool_test.rb
-- test/cursor_test.rb
-- test/load/unicorn/unicorn.rb
-- test/load/unicorn/load.rb
-- test/load/thin/load.rb
-- test/grid_test.rb
-- test/db_api_test.rb
-- test/auxillary/slave_connection_test.rb
-- test/auxillary/threaded_authentication_test.rb
+- test/auxillary/1.4_features.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
 - test/auxillary/repl_set_auth_test.rb
-- test/auxillary/1.4_features.rb
-- test/conversions_test.rb
-- test/connection_test.rb
-- test/uri_test.rb
-- test/cursor_message_test.rb
-- test/tools/test.rb
-- test/tools/repl_set_manager.rb
-- test/tools/auth_repl_set_manager.rb
-- test/tools/load.rb
-- test/tools/sharding_manager.rb
-- test/cursor_fail_test.rb
-- test/threading/threading_with_large_pool_test.rb
-- test/test_helper.rb
-- test/grid_io_test.rb
-- test/bson/byte_buffer_test.rb
+- test/auxillary/slave_connection_test.rb
+- test/auxillary/threaded_authentication_test.rb
 - test/bson/binary_test.rb
-- test/bson/object_id_test.rb
-- test/bson/json_test.rb
+- test/bson/bson_string_test.rb
 - test/bson/bson_test.rb
-- test/bson/ordered_hash_test.rb
+- test/bson/byte_buffer_test.rb
 - test/bson/hash_with_indifferent_access_test.rb
-- test/support/keys.rb
-- test/support/hash_with_indifferent_access.rb
+- test/bson/json_test.rb
+- test/bson/object_id_test.rb
+- test/bson/ordered_hash_test.rb
+- test/collection_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/replica_sets/rs_test_helper.rb
-- test/replica_sets/pooled_insert_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/connect_test.rb
+- test/replica_sets/connection_string_test.rb
 - test/replica_sets/count_test.rb
-- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/pooled_insert_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
-- test/replica_sets/connection_string_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/connect_test.rb
+- test/replica_sets/replication_ack_test.rb
+- test/replica_sets/rs_test_helper.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/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/pool_test.rb
+- test/unit/repl_set_connection_test.rb
+- test/unit/safe_test.rb
+- test/uri_test.rb

data/lib/mongo/test.rb

@@ -1,20 +0,0 @@
-
-class Foo
-
-  def zed
-    puts "Foo"
-  end
-
-end
-
-class Bar < Foo
-
-  def zed(n=nil)
-    if n.nil?
-      puts "Bar"
-    else
-      super()
-    end
-  end
-
-end

data/test/async/collection_test.rb

@@ -1,224 +0,0 @@
-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(MONGO_TEST_DB)
-  @@test = @@db.collection("test")
-  @@version = @@connection.server_version
-
-  def setup
-    @@test.remove
-  end
-
-  def wait_for_async
-    sleep 0.2
-  end
-
-  def test_async_update
-    id1 = @@test.save("x" => 5)
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @@test.update({}, {"$inc" => {"x" => 1}}, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-
-    assert_equal 1, @@test.count()
-    assert_equal 6, @@test.find_one(:_id => id1)["x"]
-  end
-
-  if @@version >= "1.1.3"
-    def test_async_multi_update
-      failsafe = mock('failsafe will get called in block', :call => true)
-
-      @@test.save("num" => 10)
-      @@test.save("num" => 10)
-      @@test.save("num" => 10)
-      assert_equal 3, @@test.count
-
-      @@test.update({"num" => 10}, {"$set" => {"num" => 100}}, :multi => true, :async => true) do |error, result|
-        assert_nil error
-        assert result
-        failsafe.call
-      end
-      wait_for_async
-    end
-  end
-
-  def test_async_upsert
-    failsafe = mock('failsafe will get called in block')
-    failsafe.expects(:call).times(2)
-
-    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-
-    @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-
-    assert_equal 1, @@test.count()
-    assert_equal 2, @@test.find_one()["count"]
-  end
-
-  def test_async_save
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    # note that the first parameter has explicit curly brackets around
-    # the hash; without those brackets as a delimiter, the :async key is
-    # viewed as part of the required +document+ parameter
-    @@test.save({"hello" => "world"}, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-    
-    assert_equal "world", @@test.find_one()["hello"]
-  end
-
-  def test_async_save_with_exception
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @@test.create_index("hello", :unique => true)
-    @@test.save("hello" => "world")
-    
-    # all async calls on collections occur in :safe mode
-    @@test.save({"hello" => "world"}, :async => true) do |error, result|
-      assert error
-      assert error.instance_of?(OperationFailure)
-      assert_nil result
-      failsafe.call
-    end
-    wait_for_async
-    
-    assert_equal 1, @@test.count()
-    @@test.drop
-  end
-
-  def test_async_remove
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @conn = Connection.new
-    @db   = @conn[MONGO_TEST_DB]
-    @test = @db['test-async-remove']
-    @test.save({:a => 50})
-    @test.remove({}, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-    
-    @test.drop
-  end
-
-  def test_async_count
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @@test.drop
-
-    @@test.save("x" => 1)
-    @@test.save("x" => 2)
-
-    @@test.count(:async => true) do |error, result|
-      assert_nil error
-      assert_equal 2, result
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  # Note: #size is just an alias for #count.
-  def test_async_size
-    failsafe = mock('failsafe will get called in block', :call => true)
-    
-    @@test.drop
-
-    @@test.save("x" => 1)
-    @@test.save("x" => 2)
-
-    @@test.size(:async => true) do |error, result|
-      assert_nil error
-      assert_equal 2, result
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_find_one
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    id = @@test.save("hello" => "world", "foo" => "bar")
-
-    @@test.find_one({}, :async => true) do |error, result|
-      assert_nil error
-      assert_equal @@test.find_one(id), result
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_insert
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    doc = {"hello" => "world"}
-    @@test.insert(doc, :async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-    
-    assert_equal 1, @@test.count
-  end
-
-  def test_async_find
-    assert_raise RuntimeError do
-      @@test.find({}, :async => true)
-    end
-  end
-
-  if @@version > "1.3.0"
-    def test_async_find_and_modify
-      failsafe = mock('failsafe will get called in block', :call => true)
-
-      @@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}}, :async => true) do |error, result|
-        assert_nil error
-        assert result
-        failsafe.call
-      end
-      wait_for_async
-
-      assert @@test.find_one({:a => 3})['processed']
-    end
-
-    def test_async_find_and_modify_with_invalid_options
-      failsafe = mock('failsafe will get called in block', :call => true)
-
-      @@test << { :a => 1, :processed => false }
-      @@test << { :a => 2, :processed => false }
-      @@test << { :a => 3, :processed => false }
-
-      @@test.find_and_modify(:blimey => {}, :async => true) do |error, result|
-        assert error
-        assert error.instance_of?(OperationFailure)
-        assert_nil result
-        failsafe.call
-      end
-      wait_for_async
-    end
-  end
-
-end

data/test/async/connection_test.rb

@@ -1,24 +0,0 @@
-require 'test/test_helper'
-include Mongo
-
-class ConnectionTest < Test::Unit::TestCase
-  context "Initialization: " do
-
-    context "given async connection options" do
-
-      should "default the workers pool to 1" do
-        Async::WorkerPool.expects(:new).with(1)
-
-        Connection.new('localhost', 27017)
-      end
-
-      should "override the workers pool size with the :worker_pool_size key" do
-        size = 6
-        Async::WorkerPool.expects(:new).with(size)
-
-        Connection.new('localhost', 27017, :worker_pool_size => size)
-      end
-    end # context 'given async connection options'
-
-  end # context 'Initialization'
-end

data/test/async/cursor_test.rb

@@ -1,162 +0,0 @@
-require 'test/test_helper'
-require 'logger'
-
-class CursorTest < Test::Unit::TestCase
-
-  include Mongo
-
-  @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-                        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-  @@db   = @@connection.db(MONGO_TEST_DB)
-  @@coll = @@db.collection('test')
-  @@version = @@connection.server_version
-
-  def wait_for_async
-    sleep 0.2
-  end
-
-  def setup
-    @@coll.remove
-    @@coll.insert('a' => 1)     # collection not created until it's used
-    @@coll_full_name = "#{MONGO_TEST_DB}.test"
-  end
-
-  def test_async_explain
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    cursor = @@coll.find('a' => 1)
-
-    cursor.explain(:async => true) do |error, result|
-      assert_not_nil result['cursor']
-      assert_kind_of Numeric, result['n']
-      assert_kind_of Numeric, result['millis']
-      assert_kind_of Numeric, result['nscanned']
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_count
-    failsafe = mock('failsafe will get called in block')
-    failsafe.expects(:call).times(3)
-
-    @@coll.remove
-
-    @@coll.find.count(:async => true) do |error, count|
-      assert_equal 0, count
-      failsafe.call
-    end
-    wait_for_async
-
-    10.times do |i|
-      @@coll.save("x" => i)
-    end
-
-    @@coll.find.count(:async => true) do |error, count|
-      assert_equal 10, count
-      failsafe.call
-    end
-    wait_for_async
-
-    @@coll.find({"x" => 1}).count(:async => true) do |error, count|
-      assert_equal 1, count
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_close
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @@coll.remove
-    cursor = @@coll.find
-    
-    cursor.close(:async => true) do |error, result|
-      assert_nil error
-      assert result
-      assert cursor.closed?
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_has_next
-    failsafe = mock('failsafe will get called in block', :call => true)
-
-    @@coll.remove
-    200.times do |n|
-      @@coll.save("x" => n)
-    end
-
-    cursor = @@coll.find
-    cursor.has_next?(:async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_next_document
-    failsafe = mock('failsafe will get called in block')
-    failsafe.expects(:call).times(2)
-
-    @@coll.remove
-    200.times do |n|
-      @@coll.save("x" => n)
-    end
-
-    cursor = @@coll.find
-    cursor.next_document(:async => true) do |error, result|
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-    wait_for_async
-
-    callback = Proc.new do |error, result| 
-      assert_nil error
-      assert result
-      failsafe.call
-    end
-
-    cursor.next_document(:async => true, :callback => callback)
-    wait_for_async
-  end
-
-  def test_async_to_a
-    failsafe = mock('failsafe will get called in block')
-    failsafe.expects(:call)
-
-    @@coll.remove
-    total = 200
-    total.times do |n|
-      @@coll.save("x" => n)
-    end
-
-    cursor = @@coll.find
-    cursor.to_a(:async => true) do |error, result|
-      assert_nil error
-      assert_equal total, result.size
-      failsafe.call
-    end
-    wait_for_async
-  end
-
-  def test_async_each
-    @@coll.remove
-    total = 200
-    total.times do |n|
-      @@coll.save("x" => n)
-    end
-
-    cursor = @@coll.find
-    count = 0
-    cursor.each(:async => true) do |error, result|
-      count += 1
-    end
-    wait_for_async
-    
-    assert_equal total, count
-  end
-end

data/test/async/worker_pool_test.rb

@@ -1,99 +0,0 @@
-require 'test/test_helper'
-include Mongo
-
-class WorkerPoolTest < Test::Unit::TestCase
-  context "Initialization: " do
-
-    def wait_for_async
-      sleep 0.2
-    end
-
-    setup do
-      def new_mock_queue
-        stub_everything('queue')
-      end
-
-      def new_mock_thread
-        stub_everything('thread')
-      end
-    end
-
-    context "given a size" do
-      setup do
-        @size = 5
-      end
-
-      should "allocate a Thread 'size' times" do
-        Queue.stubs(:new).returns(new_mock_queue)
-        Thread.expects(:new).times(@size).returns(new_mock_thread)
-        Async::WorkerPool.new @size
-      end
-
-      should "set 'abort_on_exception' for each current thread" do
-        Queue.stubs(:new).returns(new_mock_queue)
-        thread = new_mock_thread
-        Thread.stubs(:new).returns(thread)
-
-        thread.expects(:abort_on_exception=).with(true).times(@size)
-
-        Async::WorkerPool.new @size
-      end
-
-      should "save each thread into the workers queue" do
-        assert_equal @size, Async::WorkerPool.new(@size).workers.size
-      end
-
-    end # context 'given a size'
-
-
-    context "given a job" do
-      setup do
-        @pool = Async::WorkerPool.new 1
-        @command = stub_everything('command')
-        @cmd_args = stub_everything('command args')
-        @callback = stub_everything('callback')
-      end
-
-      should "remove nils from the command args array and pass the results to the callback" do
-        args = [nil, @cmd_args]
-        @command.expects(:call).with(@cmd_args).returns(2)
-        @callback.expects(:call).with(nil, 2)
-
-        @pool.enqueue @command, args, @callback
-        wait_for_async
-      end
-
-      should "execute the original command with args and pass the results to the callback" do
-        @cmd_args.expects(:compact).returns(@cmd_args)
-        @command.expects(:call).with(@cmd_args).returns(2)
-        @callback.expects(:call).with(nil, 2)
-
-        @pool.enqueue @command, @cmd_args, @callback
-        wait_for_async
-      end
-
-      should "capture any exceptions and pass them to the callback" do
-        args = [@cmd_args]
-        error = StandardError.new
-        @command.expects(:call).with(@cmd_args).raises(error)
-        @callback.expects(:call).with(error, nil)
-
-        @pool.enqueue @command, args, @callback
-        wait_for_async
-      end
-
-      should "abort the thread when the callback raises an exception" do
-        args = [@cmd_args]
-        error = StandardError.new
-        @callback.expects(:call).raises(error)
-
-        assert_raises(StandardError) do
-          @pool.enqueue @command, args, @callback
-          wait_for_async
-        end
-      end
-    end # context 'given a job'
-
-
-  end
-end

data/test/load/unicorn/unicorn.rb

@@ -1,29 +0,0 @@
-# set path to app that will be used to configure unicorn, 
-# # note the trailing slash in this example
-@dir = "/home/kyle/work/10gen/ruby-driver/test/load/"
-
-worker_processes 10
-working_directory @dir
-
-preload_app true
-
-timeout 30
-
-# Specify path to socket unicorn listens to,
-# we will use this in our nginx.conf later
-listen "#{@dir}tmp/sockets/unicorn.sock", :backlog => 64
-
-# Set process id path
-pid "#{@dir}tmp/pids/unicorn.pid"
-
-# # Set log file paths
-stderr_path "#{@dir}log/unicorn.stderr.log"
-stdout_path "#{@dir}log/unicorn.stdout.log" 
-
-# NOTE: You need this when using forking web servers!
-after_fork do |server, worker|
-  $con.close if $con
-  $con = Mongo::Connection.new
-  $db = $con['foo']
-  STDERR << "FORKED #{server} #{worker}"
-end

data/test/tools/load.rb

@@ -1,58 +0,0 @@
-require 'rubygems'
-require 'mongo'
-require 'sharding_manager'
-
-class MongoLoader
-
-  def initialize
-    @mongo = Mongo::Connection.new("localhost", 50000)
-    @data  = BSON::Binary.new(File.open("tools.gz").read)
-    @count = 0
-    @manager = ShardingManager.new(:config_count => 3)
-    @manager.start_cluster
-  end
-
-  def kill
-    @manager.kill_random
-  end
-
-  def restart
-    @manager.restart_killed_nodes
-  end
-
-  def run
-    Thread.new do
-      ("a".."z").each do |p|
-        seed(p)
-      end
-    end
-  end
-
-  def seed(prefix)
-    @queue = []
-    1000.times do |n|
-      id = BSON::OrderedHash.new
-      id[:p] = prefix
-      id[:c] = n
-      @queue << {:tid => id, :data => @data}
-    end
-
-    while @queue.length > 0 do
-      begin
-        doc = @queue.pop
-        @mongo['app']['photos'].insert(doc, :safe => {:w => 3})
-        @count += 1
-        p @count
-        rescue StandardError => e
-          p e
-          p @count
-          @queue.push(doc)
-          @count -= 1
-          sleep(10)
-          retry
-      end
-    end
-  end
-end
-
-@m = MongoLoader.new

data/test/tools/sharding_manager.rb

@@ -1,202 +0,0 @@
-require 'repl_set_manager'
-require 'thread'
-
-class ShardingManager
-
-  attr_accessor :shards
-
-  def initialize(opts={})
-    @durable = opts.fetch(:durable, true)
-    @host    = "localhost"
-
-    @mongos_port = opts[:mongos_port] || 50000
-    @config_port = opts[:config_port] || 40000
-    @shard_start_port = opts[:start_shard_port] || 30000
-    @path       = File.join(File.expand_path(File.dirname(__FILE__)), "data")
-    system("rm -rf #{@path}")
-
-    @shard_count  = 2
-    @mongos_count = 1
-    @config_count = opts.fetch(:config_count, 1)
-    if ![1, 3].include?(@config_count)
-      raise ArgumentError, "Must specify 1 or 3 config servers."
-    end
-
-    @config_servers = {}
-    @mongos_servers = {}
-    @shards = []
-    @ports  = []
-  end
-
-  def kill_random
-    shard_to_kill = rand(@shard_count)
-    @shards[shard_to_kill].kill_primary
-  end
-
-  def restart_killed
-    threads = []
-    @shards.each do |k, shard|
-      threads << Thread.new do
-        shard.restart_killed_nodes
-      end
-    end
-  end
-
-  def start_cluster
-    start_sharding_components
-    start_mongos_servers
-    configure_cluster
-  end
-
-  def configure_cluster
-    add_shards
-    enable_sharding
-    shard_collection
-  end
-
-  def enable_sharding
-    mongos['admin'].command({:enablesharding => "app"})
-  end
-
-  def shard_collection
-    cmd = BSON::OrderedHash.new
-    cmd[:shardcollection] = "app.photos"
-    cmd[:key] = {:tid => 1}
-    p mongos['admin'].command(cmd)
-  end
-
-  def add_shards
-    @shards.each do |shard|
-      cmd = {:addshard => shard.shard_string}
-      p cmd
-      p mongos['admin'].command(cmd)
-    end
-    p mongos['admin'].command({:listshards => 1})
-  end
-
-  def mongos
-    attempt do
-      @mongos ||= Mongo::Connection.new(@host, @mongos_servers[0]['port'])
-    end
-  end
-
-  private
-
-  def start_sharding_components
-    system("killall mongos")
-
-    threads = []
-    threads << Thread.new do
-      start_shards
-    end
-
-    threads << Thread.new do
-      start_config_servers
-    end
-    threads.each {|t| t.join}
-    puts "\nShards and config servers up!"
-  end
-
-  def start_shards
-    threads = []
-    @shard_count.times do |n|
-        threads << Thread.new do
-        port = @shard_start_port + n * 100
-        shard = ReplSetManager.new(:arbiter_count => 0, :secondary_count => 2,
-                       :passive_count => 0, :start_port => port, :durable => @durable,
-                       :name => "shard-#{n}")
-        shard.start_set
-        shard.ensure_up
-        @shards << shard
-      end
-    end
-    threads.each {|t| t.join}
-  end
-
-  def start_config_servers
-    @config_count.times do |n|
-      @config_servers[n] ||= {}
-      port = @config_port + n
-      @ports << port
-      @config_servers[n]['port'] = port
-      @config_servers[n]['db_path'] = get_path("config-#{port}")
-      @config_servers[n]['log_path'] = get_path("log-config-#{port}")
-      system("rm -rf #{@config_servers[n]['db_path']}")
-      system("mkdir -p #{@config_servers[n]['db_path']}")
-
-      @config_servers[n]['start'] = start_config_cmd(n)
-
-      start(@config_servers, n)
-    end
-  end
-
-  def start_mongos_servers
-    @mongos_count.times do |n|
-      @mongos_servers[n] ||= {}
-      port = @mongos_port + n
-      @ports << port
-      @mongos_servers[n]['port'] = port
-      @mongos_servers[n]['db_path'] = get_path("mongos-#{port}")
-      @mongos_servers[n]['pidfile_path'] = File.join(@mongos_servers[n]['db_path'], "mongod.lock")
-      @mongos_servers[n]['log_path'] = get_path("log-mongos-#{port}")
-      system("rm -rf #{@mongos_servers[n]['db_path']}")
-      system("mkdir -p #{@mongos_servers[n]['db_path']}")
-
-      @mongos_servers[n]['start'] = start_mongos_cmd(n)
-
-      start(@mongos_servers, n)
-    end
-  end
-
-  def start_config_cmd(n)
-    cmd = "mongod --configsvr --logpath '#{@config_servers[n]['log_path']}' " +
-     " --dbpath #{@config_servers[n]['db_path']} --port #{@config_servers[n]['port']} --fork"
-    cmd += " --dur" if @durable
-    cmd
-  end
-
-  def start_mongos_cmd(n)
-    "mongos --configdb #{config_db_string} --logpath '#{@mongos_servers[n]['log_path']}' " +
-      "--pidfilepath #{@mongos_servers[n]['pidfile_path']} --port #{@mongos_servers[n]['port']} --fork"
-  end
-
-  def config_db_string
-    @config_servers.map do |k, v|
-      "#{@host}:#{v['port']}"
-    end.join(',')
-  end
-
-  def start(set, node)
-    system(set[node]['start'])
-    set[node]['up'] = true
-    sleep(0.5)
-    set[node]['pid'] = File.open(File.join(set[node]['db_path'], 'mongod.lock')).read.strip
-  end
-  alias :restart :start
-
-  private
-
-  def cleanup_config
-  end
-
-  def get_path(name)
-    File.join(@path, name)
-  end
-
-  # TODO: put this into a shared module
-  def attempt
-    raise "No block given!" unless block_given?
-    count = 0
-
-    while count < 50 do
-      begin
-        return yield
-        rescue Mongo::OperationFailure, Mongo::ConnectionFailure
-          sleep(1)
-          count += 1
-      end
-    end
-
-    raise exception
-  end
-end

data/test/tools/test.rb

@@ -1,4 +0,0 @@
-require 'sharding_manager'
-
-m = ShardingManager.new(:config_count => 3)
-m.start_cluster