mongo 1.8.6 → 1.9.0

data/lib/mongo/util/uri_parser.rb

@@ -1,3 +1,17 @@
+# 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 'cgi'
 
 module Mongo
@@ -225,7 +239,7 @@ module Mongo
       end
 
       if @slaveok && !@readpreference
-        if direct?
+        unless replicaset?
           opts[:slave_ok] = true
         else
           opts[:read] = :secondary_preferred
@@ -233,10 +247,7 @@ module Mongo
       end
 
       opts[:ssl] = @ssl
-
-      if direct?
-        opts[:auths] = auths
-      end
+      opts[:auths] = auths
 
       if replicaset.is_a?(String)
         opts[:name] = replicaset
@@ -290,9 +301,6 @@ module Mongo
         raise MongoArgumentError, "MongoDB URI must include username, password, "
           "and db if username and password are specified."
       end
-
-      # The auths are repeated for each host in a replica set
-      @auths *= hosturis.length
     end
 
     # This method uses the lambdas defined in OPT_VALID and OPT_CONV to validate

data/lib/mongo/util/write_concern.rb

@@ -1,3 +1,17 @@
+# 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.
+
 module Mongo
   module WriteConcern
 
@@ -29,7 +43,7 @@ module Mongo
 
     # todo: throw exception for conflicting write concern options
     def get_write_concern(opts, parent=nil)
-      write_concern_from_legacy(opts) if opts.key?(:safe) || @legacy_write_concern
+      write_concern_from_legacy(opts) if opts.key?(:safe) || legacy_write_concern
       write_concern = {
         :w        => 1,
         :j        => false,
@@ -51,4 +65,4 @@ module Mongo
     end
 
   end
-end
+end

data/test/functional/authentication_test.rb

@@ -1,3 +1,17 @@
+# 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'
 require 'shared/authentication'
 
@@ -13,6 +27,17 @@ class AuthenticationTest < Test::Unit::TestCase
 
   def test_authenticate_with_connection_uri
     @db.add_user('eunice', 'uritest')
-    assert MongoClient.from_uri("mongodb://eunice:uritest@#{host_port}/#{@db.name}")
+
+    client =
+      MongoClient.from_uri("mongodb://eunice:uritest@#{host_port}/#{@db.name}")
+
+    assert client
+    assert_equal client.auths.size, 1
+    assert client[MONGO_TEST_DB]['auth_test'].count
+
+    auth = client.auths.first
+    assert_equal @db.name, auth[:db_name]
+    assert_equal 'eunice', auth[:username]
+    assert_equal 'uritest', auth[:password]
   end
 end

data/test/functional/collection_test.rb

@@ -1,3 +1,17 @@
+# 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 'rbconfig'
 require 'test_helper'
 
@@ -244,6 +258,26 @@ class TestCollection < Test::Unit::TestCase
     assert_equal error_docs, invalid_docs
   end
 
+  def test_insert_one_error_doc_with_collect_on_error
+    invalid_doc = {'$invalid-key' => 1}
+    invalid_docs = [invalid_doc]
+    doc_ids, error_docs = @@test.insert(invalid_docs, :collect_on_error => true)
+    assert_equal [], doc_ids
+    assert_equal [invalid_doc], error_docs
+  end
+
+  def test_insert_empty_docs_raises_exception
+    assert_raise OperationFailure do
+      @@test.insert([])
+    end
+  end
+
+  def test_insert_empty_docs_with_collect_on_error_raises_exception
+    assert_raise OperationFailure do
+      @@test.insert([], :collect_on_error => true)
+    end
+  end
+
   def limited_collection
     conn = standard_connection(:connect => false)
     admin_db = Object.new
@@ -258,28 +292,93 @@ class TestCollection < Test::Unit::TestCase
     return conn.db(MONGO_TEST_DB)["test"]
   end
 
-  def test_maximum_insert_size
+  def test_chunking_batch_insert
+     docs = []
+     10.times do
+       docs << {'foo' => 'a' * 950}
+     end
+     limited_collection.insert(docs)
+     assert_equal 10, limited_collection.count
+   end
+
+  def test_chunking_batch_insert_without_collect_on_error
     docs = []
-    3.times do
+    4.times do
       docs << {'foo' => 'a' * 950}
     end
-    assert_equal limited_collection.insert(docs).length, 3
+    invalid_docs = []
+    invalid_docs << {'$invalid-key' => 1} # non utf8 encoding
+    docs += invalid_docs
+    4.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    assert_raise BSON::InvalidKeyName do
+      limited_collection.insert(docs, :collect_on_error => false)
+    end
   end
 
-  def test_maximum_document_size
-    assert_raise InvalidDocument do
-      limited_collection.insert({'foo' => 'a' * 1024})
+  def test_chunking_batch_insert_with_collect_on_error
+   # Broken for current JRuby
+   if RUBY_PLATFORM == 'java' then return end
+    docs = []
+    4.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    invalid_docs = []
+    invalid_docs << {'$invalid-key' => 1} # non utf8 encoding
+    docs += invalid_docs
+    4.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    doc_ids, error_docs = limited_collection.insert(docs, :collect_on_error => true)
+    assert_equal 8, doc_ids.count
+    assert_equal doc_ids.count, limited_collection.count
+    assert_equal error_docs, invalid_docs
+  end
+
+  def test_chunking_batch_insert_with_continue_on_error
+    docs = []
+    4.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    docs << {'_id' => 'b', 'foo' => 'a'}
+    docs << {'_id' => 'b', 'foo' => 'c'}
+    4.times do
+      docs << {'foo' => 'a' * 950}
     end
+    assert_raise OperationFailure do
+      limited_collection.insert(docs, :continue_on_error => true)
+    end
+    assert_equal 9, limited_collection.count
   end
 
-  def test_maximum_message_size
+  def test_chunking_batch_insert_without_continue_on_error
     docs = []
     4.times do
       docs << {'foo' => 'a' * 950}
     end
+    docs << {'_id' => 'b', 'foo' => 'a'}
+    docs << {'_id' => 'b', 'foo' => 'c'}
+    4.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    assert_raise OperationFailure do
+      limited_collection.insert(docs, :continue_on_error => false)
+    end
+    assert_equal 5, limited_collection.count
+  end
+
+  def test_maximum_insert_size
+    docs = []
+    3.times do
+      docs << {'foo' => 'a' * 950}
+    end
+    assert_equal limited_collection.insert(docs).length, 3
+  end
 
-    assert_raise InvalidOperation do
-      limited_collection.insert(docs)
+  def test_maximum_document_size
+    assert_raise InvalidDocument do
+      limited_collection.insert({'foo' => 'a' * 1024})
     end
   end
 
@@ -629,42 +728,42 @@ class TestCollection < Test::Unit::TestCase
     # save some data
     @@test.save( {
         "_id" => 1,
-        "title" => "this is my title", 
-        "author" => "bob", 
+        "title" => "this is my title",
+        "author" => "bob",
         "posted" => Time.utc(2000),
-        "pageViews" => 5 , 
+        "pageViews" => 5 ,
         "tags" => [ "fun" , "good" , "fun" ],
-        "comments" => [ 
-                        { "author" => "joe", "text" => "this is cool" }, 
-                        { "author" => "sam", "text" => "this is bad" } 
+        "comments" => [
+                        { "author" => "joe", "text" => "this is cool" },
+                        { "author" => "sam", "text" => "this is bad" }
             ],
         "other" => { "foo" => 5 }
         } )
 
     @@test.save( {
          "_id" => 2,
-         "title" => "this is your title", 
-         "author" => "dave", 
+         "title" => "this is your title",
+         "author" => "dave",
          "posted" => Time.utc(2001),
-         "pageViews" => 7, 
+         "pageViews" => 7,
          "tags" => [ "fun" , "nasty" ],
-         "comments" => [ 
-                         { "author" => "barbara" , "text" => "this is interesting" }, 
-                         { "author" => "jenny", "text" => "i like to play pinball", "votes" => 10 } 
+         "comments" => [
+                         { "author" => "barbara" , "text" => "this is interesting" },
+                         { "author" => "jenny", "text" => "i like to play pinball", "votes" => 10 }
          ],
           "other" => { "bar" => 14 }
         })
 
     @@test.save( {
             "_id" => 3,
-            "title" => "this is some other title", 
-            "author" => "jane", 
+            "title" => "this is some other title",
+            "author" => "jane",
             "posted" => Time.utc(2002),
-            "pageViews" => 6 , 
+            "pageViews" => 6 ,
             "tags" => [ "nasty", "filthy" ],
-            "comments" => [ 
-                { "author" => "will" , "text" => "i don't like the color" } , 
-                { "author" => "jenny" , "text" => "can i get that in green?" } 
+            "comments" => [
+                { "author" => "will" , "text" => "i don't like the color" } ,
+                { "author" => "jenny" , "text" => "can i get that in green?" }
             ],
             "other" => { "bar" => 14 }
         })
@@ -696,8 +795,8 @@ class TestCollection < Test::Unit::TestCase
 
     def test_aggregate_pipeline_operators_using_strings
       setup_aggregate_data
-      desired_results = [ {"_id"=>1, "pageViews"=>5, "tags"=>["fun", "good", "fun"]}, 
-                          {"_id"=>2, "pageViews"=>7, "tags"=>["fun", "nasty"]}, 
+      desired_results = [ {"_id"=>1, "pageViews"=>5, "tags"=>["fun", "good", "fun"]},
+                          {"_id"=>2, "pageViews"=>7, "tags"=>["fun", "nasty"]},
                           {"_id"=>3, "pageViews"=>6, "tags"=>["nasty", "filthy"]} ]
       results = @@test.aggregate([{"$project" => {"tags" => 1, "pageViews" => 1}}])
       assert_equal desired_results, results
@@ -705,8 +804,8 @@ class TestCollection < Test::Unit::TestCase
 
     def test_aggregate_pipeline_operators_using_symbols
       setup_aggregate_data
-      desired_results = [ {"_id"=>1, "pageViews"=>5, "tags"=>["fun", "good", "fun"]}, 
-                          {"_id"=>2, "pageViews"=>7, "tags"=>["fun", "nasty"]}, 
+      desired_results = [ {"_id"=>1, "pageViews"=>5, "tags"=>["fun", "good", "fun"]},
+                          {"_id"=>2, "pageViews"=>7, "tags"=>["fun", "nasty"]},
                           {"_id"=>3, "pageViews"=>6, "tags"=>["nasty", "filthy"]} ]
       results = @@test.aggregate([{"$project" => {:tags => 1, :pageViews => 1}}])
       assert_equal desired_results, results
@@ -721,25 +820,25 @@ class TestCollection < Test::Unit::TestCase
     def test_aggregate_pipeline_unwind
       setup_aggregate_data
       desired_results = [ {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
-                          "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
+                          "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"},
                             {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
                           {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
-                            "pageViews"=>5, "tags"=>"good", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
+                            "pageViews"=>5, "tags"=>"good", "comments"=>[{"author"=>"joe", "text"=>"this is cool"},
                             {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
                           {"_id"=>1, "title"=>"this is my title", "author"=>"bob", "posted"=>Time.utc(2000),
-                            "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"}, 
+                            "pageViews"=>5, "tags"=>"fun", "comments"=>[{"author"=>"joe", "text"=>"this is cool"},
                               {"author"=>"sam", "text"=>"this is bad"}], "other"=>{"foo"=>5 } },
                           {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(2001),
-                            "pageViews"=>7, "tags"=>"fun", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"}, 
+                            "pageViews"=>7, "tags"=>"fun", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"},
                               {"author"=>"jenny", "text"=>"i like to play pinball", "votes"=>10 }], "other"=>{"bar"=>14 } },
                           {"_id"=>2, "title"=>"this is your title", "author"=>"dave", "posted"=>Time.utc(2001),
-                            "pageViews"=>7, "tags"=>"nasty", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"}, 
+                            "pageViews"=>7, "tags"=>"nasty", "comments"=>[{"author"=>"barbara", "text"=>"this is interesting"},
                               {"author"=>"jenny", "text"=>"i like to play pinball", "votes"=>10 }], "other"=>{"bar"=>14 } },
                           {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(2002),
-                            "pageViews"=>6, "tags"=>"nasty", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"}, 
+                            "pageViews"=>6, "tags"=>"nasty", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"},
                               {"author"=>"jenny", "text"=>"can i get that in green?"}], "other"=>{"bar"=>14 } },
                           {"_id"=>3, "title"=>"this is some other title", "author"=>"jane", "posted"=>Time.utc(2002),
-                            "pageViews"=>6, "tags"=>"filthy", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"}, 
+                            "pageViews"=>6, "tags"=>"filthy", "comments"=>[{"author"=>"will", "text"=>"i don't like the color"},
                               {"author"=>"jenny", "text"=>"can i get that in green?"}], "other"=>{"bar"=>14 } }
                           ]
       results = @@test.aggregate([{"$unwind"=> "$tags"}])
@@ -1059,7 +1158,7 @@ end
   end
 
   def test_ensure_index_timeout
-    @@db.cache_time = 2
+    @@db.cache_time = 1
     coll = @@db['ensure_test']
     coll.expects(:generate_indexes).twice
     coll.ensure_index([['a', 1]])
@@ -1070,7 +1169,7 @@ end
     coll.ensure_index([['a', 1]])
     coll.ensure_index([['a', 1]])
 
-    sleep(3)
+    sleep(1)
     # This won't be, so generate_indexes will be called twice
     coll.ensure_index([['a', 1]])
   end
@@ -1143,7 +1242,7 @@ end
   end
 
   context "Grouping with a key function" do
-    setup do 
+    setup do
       @@test.remove
       @@test.save("a" => 1)
       @@test.save("a" => 2)

data/test/functional/connection_test.rb

@@ -1,3 +1,17 @@
+# 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'
 require 'logger'
 require 'stringio'
@@ -243,12 +257,11 @@ class TestConnection < Test::Unit::TestCase
     assert_match(/unlock/, @client.unlock!['info'])
     unlocked = false
     counter  = 0
-    while counter < 5
+    while counter < 100
       if @client['admin']['$cmd.sys.inprog'].find_one['fsyncLock'].nil?
         unlocked = true
         break
       else
-        sleep(1)
         counter += 1
       end
     end
@@ -336,8 +349,8 @@ class TestConnection < Test::Unit::TestCase
   context "Saved authentications" do
     setup do
       @client = standard_connection
-      @auth = {:db_name => 'test', :username => 'bob', :password => 'secret'}
-      @client.add_auth(@auth[:db_name], @auth[:username], @auth[:password])
+      @auth = {:db_name => 'test', :username => 'bob', :password => 'secret', :source => nil}
+      @client.add_auth(@auth[:db_name], @auth[:username], @auth[:password], @auth[:source])
     end
 
     teardown do
@@ -349,9 +362,9 @@ class TestConnection < Test::Unit::TestCase
     end
 
     should "not allow multiple authentications for the same db" do
-      auth = {:db_name => 'test', :username => 'mickey', :password => 'm0u53'}
+      auth = {:db_name => 'test', :username => 'mickey', :password => 'm0u53', :source => nil}
       assert_raise Mongo::MongoArgumentError do
-        @client.add_auth(auth[:db_name], auth[:username], auth[:password])
+        @client.add_auth(auth[:db_name], auth[:username], auth[:password], auth[:source])
       end
     end