mongo 1.9.2 → 1.10.0.rc0

data/test/unit/sharding_pool_manager_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 require 'test_helper'
 include Mongo
 
-class ShardingPoolManagerTest < Test::Unit::TestCase
+class ShardingPoolManagerUnitTest < Test::Unit::TestCase
 
   context "Initialization: " do
 
@@ -45,8 +45,10 @@ class ShardingPoolManagerTest < Test::Unit::TestCase
       @ismaster = {
         'hosts' => @hosts,
         'arbiters' => @arbiters,
+        'maxBsonObjectSize' => 1024,
         'maxMessageSizeBytes' => 1024 * 2.5,
-        'maxBsonObjectSize' => 1024
+        'maxWireVersion' => 1,
+        'minWireVersion' => 0
       }
     end
 
@@ -58,8 +60,10 @@ class ShardingPoolManagerTest < Test::Unit::TestCase
 
         # Subsequent calls to configure pools.
         @ismaster.merge({'ismaster' => true}),
-        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
         @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 500}),
+        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
+        @ismaster.merge({'secondary' => true, 'maxWireVersion' => 0}),
+        @ismaster.merge({'secondary' => true, 'minWireVersion' => 0}),
         @ismaster.merge({'arbiterOnly' => true})
       )
 
@@ -72,7 +76,9 @@ class ShardingPoolManagerTest < Test::Unit::TestCase
 
       assert manager.seeds.include? formatted_seed
       assert_equal 500, manager.max_bson_size
-      assert_equal 700 , manager.max_message_size
+      assert_equal 700, manager.max_message_size
+      assert_equal 0, manager.max_wire_version
+      assert_equal 0, manager.min_wire_version
     end
   end
 end

data/test/unit/write_concern_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 require 'test_helper'
 
-class WriteConcernTest < Test::Unit::TestCase
+class WriteConcernUnitTest < Test::Unit::TestCase
 
   context "Write-Concern modes on Mongo::MongoClient " do
     setup do
@@ -35,28 +35,28 @@ class WriteConcernTest < Test::Unit::TestCase
     end
 
     should "propogate to DB" do
-      db = @client['foo']
+      db = @client[TEST_DB]
       assert_equal @write_concern, db.write_concern
 
 
-      db = @client.db('foo')
+      db = @client.db(TEST_DB)
       assert_equal @write_concern, db.write_concern
 
-      db = DB.new('foo', @client)
+      db = DB.new(TEST_DB, @client)
       assert_equal @write_concern, db.write_concern
     end
 
     should "allow db override" do
-      db = DB.new('foo', @client, :w => 0)
+      db = DB.new(TEST_DB, @client, :w => 0)
       assert_equal 0, db.write_concern[:w]
 
-      db = @client.db('foo', :w => 0)
+      db = @client.db(TEST_DB, :w => 0)
       assert_equal 0, db.write_concern[:w]
     end
 
     context "on DB: " do
       setup do
-        @db = @client['foo']
+        @db = @client[TEST_DB]
       end
 
       should "propogate to collection" do
@@ -81,7 +81,7 @@ class WriteConcernTest < Test::Unit::TestCase
 
     context "on operations supporting 'gle' mode" do
       setup do
-        @collection = @client['foo']['bar']
+        @collection = @client[TEST_DB]['bar']
       end
 
       should "not send w = 1 to the server" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0.rc0
 platform: ruby
 authors:
 - Tyler Brock
@@ -14,41 +14,42 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTEzMDIwMTE0MTEzN1oXDTE0MDIwMTE0MTEzN1owQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE0MDIxODIyMDQwMVoXDTE1MDIxODIyMDQwMVowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUW3dZsX70mlSM
-  CiPrZxAGA1vwfNcwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQCIa/Y6
-  xS7YWBxkn9WP0EMnJ3pY9vef9DTmLSi/2jz8PzwlKQ89zNTrqSUD8LoQZmBqCJBt
-  dKSQ/RUnaHJuxh8HWvWubP8EBYTuf+I1DFnRv648IF3MR1tCQumVL0XcYMvZcxBj
-  a/p+8DomWTQqUdNbNoGywwjtVBWfDdwFV8Po1XcN/AtpILOJQd9J77INIGGCHxZo
-  6SOHHaNknlE9H0w6q0SVxZKZI8/+2c447V0NrHIw1Qhe0tAGJ9V1u3ky8gyxe0SM
-  8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
-  RNTuXsVG5NDACo7Q
+  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdoZILE3alL
+  V5OGgh2hkgVTd79nRV3akueIZgu9qXhNHixXsyxBnaSPbrK7s1bWurgVT/Klp//3
+  ASnU78R5ChmCX5/xMRp+E9FO69nCt33njUKyYU0+SwiEID02At+bUb3iS7S5CIMO
+  tLSybh/DhH9Hi5g+FqwpRQy/RQcTJ6Uz/75+Ng2J0oz6eVvXAuEz75apE3qJcLb3
+  w699mm0e4qqpfHcSkgJbOGpmbrb+XimNy+AXdagkKYk2tUjYiCwkLop0hf/XBEWu
+  ap8vwBNdAn+ox1eNQUSdowBf4dJvIJWepRjqeFRcLPUrF5JES7qyHbnyi7nqtaCS
+  GwLBeSsgxdECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFEfmGN56RK0OIRqm4XYACgI7AXbsMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
+  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
+  KoZIhvcNAQEFBQADggEBAFcxu5xBsPg6szjBrkej2P+Qa9LK22rdIZtECnK8TLsQ
+  tmNdYMraNgiYf96U1zZKvjgzI04BRYmIeCnIDdg2MkpOZO35d/v/Hu0N9tiu08NX
+  aSSw+yzt43hIzEtYgs0WlSxXqnmu0ClA37t+mA0OTzp64pkQSiJfYlMbsCpElk4r
+  vJ5hsT7hMiPKABow5+pXckFwznEuciyBCx3ox9MnEic8qsjdiZgleeAJKDpKb+uX
+  ZLLlRFg7YfmA+N2giYd0oQz670xnBy5ZOvtXZe1wLLfGyeDwXeTrQGUE3oBRpr/t
+  eokvmuSJOtUOXE7dArS2jfgXfYsg1YZt4HttbJ9Z4ZM=
   -----END CERTIFICATE-----
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.10.0.rc0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.10.0.rc0
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -56,17 +57,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- mongo.gemspec
 - LICENSE
-- VERSION
 - README.md
 - Rakefile
+- VERSION
 - bin/mongo_console
 - lib/mongo.rb
+- lib/mongo/bulk_write_collection_view.rb
 - lib/mongo/collection.rb
+- lib/mongo/collection_writer.rb
+- lib/mongo/connection.rb
+- lib/mongo/connection/node.rb
+- lib/mongo/connection/pool.rb
+- lib/mongo/connection/pool_manager.rb
+- lib/mongo/connection/sharding_pool_manager.rb
+- lib/mongo/connection/socket.rb
+- lib/mongo/connection/socket/socket_util.rb
+- lib/mongo/connection/socket/ssl_socket.rb
+- lib/mongo/connection/socket/tcp_socket.rb
+- lib/mongo/connection/socket/unix_socket.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
-- lib/mongo/exceptions.rb
+- lib/mongo/exception.rb
+- lib/mongo/functional.rb
+- lib/mongo/functional/authentication.rb
+- lib/mongo/functional/logging.rb
+- lib/mongo/functional/read_preference.rb
+- lib/mongo/functional/uri_parser.rb
+- lib/mongo/functional/write_concern.rb
+- lib/mongo/gridfs.rb
 - lib/mongo/gridfs/grid.rb
 - lib/mongo/gridfs/grid_ext.rb
 - lib/mongo/gridfs/grid_file_system.rb
@@ -76,26 +95,18 @@ files:
 - lib/mongo/mongo_replica_set_client.rb
 - lib/mongo/mongo_sharded_client.rb
 - lib/mongo/networking.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/pool.rb
-- lib/mongo/util/pool_manager.rb
-- lib/mongo/util/read_preference.rb
-- lib/mongo/util/server_version.rb
-- lib/mongo/util/sharding_pool_manager.rb
-- lib/mongo/util/socket_util.rb
-- lib/mongo/util/ssl_socket.rb
-- lib/mongo/util/support.rb
-- lib/mongo/util/tcp_socket.rb
-- lib/mongo/util/thread_local_variable_manager.rb
-- lib/mongo/util/unix_socket.rb
-- lib/mongo/util/uri_parser.rb
-- lib/mongo/util/write_concern.rb
+- lib/mongo/utils.rb
+- lib/mongo/utils/conversions.rb
+- lib/mongo/utils/core_ext.rb
+- lib/mongo/utils/server_version.rb
+- lib/mongo/utils/support.rb
+- lib/mongo/utils/thread_local_variable_manager.rb
+- mongo.gemspec
 - test/functional/authentication_test.rb
+- test/functional/bulk_write_collection_view_test.rb
+- test/functional/client_test.rb
 - test/functional/collection_test.rb
-- test/functional/connection_test.rb
+- test/functional/collection_writer_test.rb
 - test/functional/conversions_test.rb
 - test/functional/cursor_fail_test.rb
 - test/functional/cursor_message_test.rb
@@ -110,10 +121,11 @@ files:
 - test/functional/safe_test.rb
 - test/functional/ssl_test.rb
 - test/functional/support_test.rb
-- test/functional/threading_test.rb
 - test/functional/timeout_test.rb
 - test/functional/uri_test.rb
 - test/functional/write_concern_test.rb
+- test/helpers/general.rb
+- test/helpers/test_unit.rb
 - test/replica_set/authentication_test.rb
 - test/replica_set/basic_test.rb
 - test/replica_set/client_test.rb
@@ -130,7 +142,9 @@ files:
 - test/replica_set/replication_ack_test.rb
 - test/replica_set/ssl_test.rb
 - test/sharded_cluster/basic_test.rb
-- test/shared/authentication.rb
+- test/shared/authentication/basic_auth_shared.rb
+- test/shared/authentication/sasl_plain_shared.rb
+- test/shared/ssl_shared.rb
 - test/test_helper.rb
 - test/threading/basic_test.rb
 - test/tools/mongo_config.rb
@@ -144,12 +158,10 @@ files:
 - test/unit/mongo_sharded_client_test.rb
 - test/unit/node_test.rb
 - test/unit/pool_manager_test.rb
-- test/unit/pool_test.rb
 - test/unit/read_pref_test.rb
 - test/unit/read_test.rb
 - test/unit/safe_test.rb
 - test/unit/sharding_pool_manager_test.rb
-- test/unit/util_test.rb
 - test/unit/write_concern_test.rb
 homepage: http://www.mongodb.org
 licenses:
@@ -161,24 +173,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
 test_files:
 - test/functional/authentication_test.rb
+- test/functional/bulk_write_collection_view_test.rb
+- test/functional/client_test.rb
 - test/functional/collection_test.rb
-- test/functional/connection_test.rb
+- test/functional/collection_writer_test.rb
 - test/functional/conversions_test.rb
 - test/functional/cursor_fail_test.rb
 - test/functional/cursor_message_test.rb
@@ -193,10 +207,11 @@ test_files:
 - test/functional/safe_test.rb
 - test/functional/ssl_test.rb
 - test/functional/support_test.rb
-- test/functional/threading_test.rb
 - test/functional/timeout_test.rb
 - test/functional/uri_test.rb
 - test/functional/write_concern_test.rb
+- test/helpers/general.rb
+- test/helpers/test_unit.rb
 - test/replica_set/authentication_test.rb
 - test/replica_set/basic_test.rb
 - test/replica_set/client_test.rb
@@ -213,7 +228,9 @@ test_files:
 - test/replica_set/replication_ack_test.rb
 - test/replica_set/ssl_test.rb
 - test/sharded_cluster/basic_test.rb
-- test/shared/authentication.rb
+- test/shared/authentication/basic_auth_shared.rb
+- test/shared/authentication/sasl_plain_shared.rb
+- test/shared/ssl_shared.rb
 - test/test_helper.rb
 - test/threading/basic_test.rb
 - test/tools/mongo_config.rb
@@ -227,11 +244,9 @@ test_files:
 - test/unit/mongo_sharded_client_test.rb
 - test/unit/node_test.rb
 - test/unit/pool_manager_test.rb
-- test/unit/pool_test.rb
 - test/unit/read_pref_test.rb
 - test/unit/read_test.rb
 - test/unit/safe_test.rb
 - test/unit/sharding_pool_manager_test.rb
-- test/unit/util_test.rb
 - test/unit/write_concern_test.rb
 has_rdoc: yard

data/test/functional/threading_test.rb

@@ -1,109 +0,0 @@
-# Copyright (C) 2013 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.
-
-require 'test_helper'
-
-class TestThreading < Test::Unit::TestCase
-
-  include Mongo
-
-  @@client = standard_connection(:pool_size => 2, :pool_timeout => 30)
-  @@db     = @@client[MONGO_TEST_DB]
-  @@coll   = @@db.collection('thread-test-collection')
-
-  def set_up_safe_data
-    @@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
-    times = []
-    set_up_safe_data
-    threads = []
-    25.times do |i|
-      threads[i] = Thread.new do
-        100.times do
-          if i % 2 == 0
-            assert_raise Mongo::OperationFailure do
-              t1 = Time.now
-              @unique.update({"test" => "insert"}, {"$set" => {"test" => "update"}})
-              times << Time.now - t1
-            end
-          else
-            t1 = Time.now
-            @duplicate.update({"test" => "insert"}, {"$set" => {"test" => "update"}})
-            times << Time.now - t1
-          end
-        end
-      end
-    end
-
-    25.times do |i|
-      threads[i].join
-    end
-  end
-
-  def test_safe_insert
-    set_up_safe_data
-    threads = []
-    25.times do |i|
-      threads[i] = Thread.new do
-        if i % 2 == 0
-          assert_raise Mongo::OperationFailure do
-            @unique.insert({"test" => "insert"})
-          end
-        else
-          @duplicate.insert({"test" => "insert"})
-        end
-      end
-    end
-
-    25.times do |i|
-      threads[i].join
-    end
-  end
-
-  def test_threading
-    @@coll.drop
-    @@coll = @@db.collection('thread-test-collection')
-
-    docs = []
-    1000.times {|i| docs << {:x => i}}
-    @@coll.insert(docs)
-
-    threads = []
-
-    10.times do |i|
-      threads[i] = Thread.new do
-        sum = 0
-        @@coll.find().each do |document|
-          sum += document["x"]
-        end
-        assert_equal 499500, sum
-      end
-    end
-
-    10.times do |i|
-      threads[i].join
-    end
-  end
-end