mongo 1.8.6 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdb78ad2291ea3ecb387526ccdbd162ffd51687
-  data.tar.gz: 6b3ec42fadc3f0beea953a08fe07a2d2ff206cba
+  metadata.gz: 7f7fb956c60cb3b6d5b8388b45c3b03596d42215
+  data.tar.gz: 42c3a9fdf43eaf64304bd119a5f0aa07957b7ada
 SHA512:
-  metadata.gz: 83bb86f711779590a47d0d8d83fea4d844cd8ebdcde6617109c9172dd9d6961688d3faf03c1c7d0c0601575ed1a253522aecc2b26f2e81fb7980079ca3dff9fd
-  data.tar.gz: 880a70826f29e9e60fff3d26ede30390da593e78ad095f635743ffec711ce22af34da2d89318fd48f7825e2583bbec02da80c78899d4388386a76c769ee1e80e
+  metadata.gz: 08c9bcfd41885ddfebffbf0bf3bed97298e5a17751ab67aeb1e15a1c2639d5bc7830efe319c9d4873793b86cc7aeb62523f8e2e8f6f52c7158dcb908581ab9a9
+  data.tar.gz: 4dd3325d16fd0729c9943b79eefb7f88a72818ac67a6a9822bc802fdba8b804fec651ea9ea54d614d32cb390a3cdf543e30492f0a29b43ab8b307c9ab02bece9

data/Rakefile

@@ -1,4 +1,16 @@
-# -*- mode: ruby; -*-
+# 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 'rubygems'
 

data/VERSION

@@ -1 +1 @@
-1.8.6
+1.9.0

data/bin/mongo_console

@@ -1,4 +1,19 @@
 #!/usr/bin/env ruby
+
+# 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.
+
 org_argv = ARGV.dup
 ARGV.clear
 

data/lib/mongo.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
   ASCENDING   =  1
   DESCENDING  = -1

data/lib/mongo/collection.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
 
   # A named collection of documents in a database.
@@ -1066,43 +1080,32 @@ module Mongo
       nil
     end
 
-    # Sends a Mongo::Constants::OP_INSERT message to the database.
-    # Takes an array of +documents+, an optional +collection_name+, and a
-    # +check_keys+ setting.
-    def insert_documents(documents, collection_name=@name, check_keys=true, write_concern={}, flags={})
-      message = BSON::ByteBuffer.new("", @connection.max_message_size)
-      if flags[:continue_on_error]
-        message.put_int(1)
-      else
-        message.put_int(0)
+    def generate_index_name(spec)
+      indexes = []
+      spec.each_pair do |field, type|
+        indexes.push("#{field}_#{type}")
       end
+      indexes.join("_")
+    end
 
-      collect_on_error = !!flags[:collect_on_error]
-      error_docs = [] if collect_on_error
-
+    def insert_buffer(collection_name, continue_on_error)
+      message = BSON::ByteBuffer.new("", @connection.max_message_size)
+      message.put_int(continue_on_error ? 1 : 0)
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
-      documents =
-        if collect_on_error
-          documents.select do |doc|
-            begin
-              message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
-              true
-            rescue StandardError # StandardError will be replaced with BSONError
-              doc.delete(:_id)
-              error_docs << doc
-              false
-            end
-          end
-        else
-          documents.each do |doc|
-            message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
-          end
-        end
+      message
+    end
 
-      if message.size > @connection.max_message_size
-        raise InvalidOperation, "Exceded maximum insert size of #{@connection.max_message_size} bytes"
+    def insert_batch(message, documents, write_concern, continue_on_error, errors, collection_name=@name)
+      begin
+        send_insert_message(message, documents, collection_name, write_concern)
+      rescue ConnectionFailure, OperationFailure, OperationTimeout, SystemStackError,
+        NoMemoryError, SystemCallError => ex
+        raise ex unless continue_on_error
+        errors << ex
       end
+    end
 
+    def send_insert_message(message, documents, collection_name, write_concern)
       instrument(:insert, :database => @db.name, :collection => collection_name, :documents => documents) do
         if Mongo::WriteConcern.gle?(write_concern)
           @connection.send_message_with_gle(Mongo::Constants::OP_INSERT, message, @db.name, nil, write_concern)
@@ -1110,21 +1113,56 @@ module Mongo
           @connection.send_message(Mongo::Constants::OP_INSERT, message)
         end
       end
+    end
 
-      doc_ids = documents.collect { |o| o[:_id] || o['_id'] }
-      if collect_on_error
-        return doc_ids, error_docs
-      else
-        doc_ids
+    # Sends a Mongo::Constants::OP_INSERT message to the database.
+    # Takes an array of +documents+, an optional +collection_name+, and a
+    # +check_keys+ setting.
+    def insert_documents(documents, collection_name=@name, check_keys=true, write_concern={}, flags={})
+      continue_on_error = !!flags[:continue_on_error]
+      collect_on_error = !!flags[:collect_on_error]
+      error_docs = [] # docs with errors on serialization
+      errors = [] # for all errors on insertion
+      batch_start = 0
+
+      message = insert_buffer(collection_name, continue_on_error)
+
+      documents.each_with_index do |doc, index|
+        begin
+          serialized_doc = BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size)
+        rescue BSON::InvalidDocument, BSON::InvalidKeyName, BSON::InvalidStringEncoding => ex
+          raise ex unless collect_on_error
+          error_docs << doc
+          next
+        end
+
+        # Check if the current msg has room for this doc. If not, send current msg and create a new one.
+        # GLE is a sep msg with its own header so shouldn't be included in padding with header size.
+        total_message_size = Networking::STANDARD_HEADER_SIZE + message.size + serialized_doc.size
+        if total_message_size > @connection.max_message_size
+          docs_to_insert = documents[batch_start..index] - error_docs
+          insert_batch(message, docs_to_insert, write_concern, continue_on_error, errors, collection_name)
+          batch_start = index
+          message = insert_buffer(collection_name, continue_on_error)
+          redo
+        else
+          message.put_binary(serialized_doc.to_s)
+        end
       end
-    end
 
-    def generate_index_name(spec)
-      indexes = []
-      spec.each_pair do |field, type|
-        indexes.push("#{field}_#{type}")
+      docs_to_insert = documents[batch_start..-1] - error_docs
+      inserted_docs = documents - error_docs
+      inserted_ids = inserted_docs.collect {|o| o[:_id] || o['_id']}
+
+      # Avoid insertion if all docs failed serialization and collect_on_error
+      if error_docs.empty? || !docs_to_insert.empty?
+        insert_batch(message, docs_to_insert, write_concern, continue_on_error, errors, collection_name)
+        # insert_batch collects errors if w > 0 and continue_on_error is true,
+        # so raise the error here, as this is the last or only msg sent
+        raise errors.first unless errors.empty?
       end
-      indexes.join("_")
+
+      collect_on_error ? [inserted_ids, error_docs] : inserted_ids
     end
   end
 

data/lib/mongo/cursor.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
 
   # A cursor over query results. Returned objects are hashes.
@@ -424,7 +438,7 @@ module Mongo
           {fields => 1}
         when Array
           return nil if fields.length.zero?
-          fields.each_with_object({}) { |field, hash| hash[field] = 1 }
+          fields.inject({}) { |hash, field| hash[field] = 1; hash }
         when Hash
           return fields
       end

data/lib/mongo/db.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 'socket'
 require 'thread'
 
@@ -109,27 +123,35 @@ module Mongo
     # @param [String] password
     # @param [Boolean] save_auth
     #   Save this authentication to the client object using MongoClient#add_auth. This
-    #   will ensure that the authentication will be applied on database reconnect. Note
-    #   that this value must be true when using connection pooling.
+    #   will ensure that the authentication will be applied to all sockets and upon
+    #   database reconnect.
+    # @param source [String] Database with user credentials. This should be used to
+    #   authenticate against a database when the credentials exist elsewhere.
+    #
+    # @note save_auth must be true when using connection pooling or providing a source
+    #   for credentials.
     #
     # @return [Boolean]
     #
     # @raise [AuthenticationError]
     #
     # @core authenticate authenticate-instance_method
-    def authenticate(username, password, save_auth=true)
-      if @connection.pool_size > 1 && !save_auth
-        raise MongoArgumentError, "If using connection pooling, :save_auth must be set to true."
+    def authenticate(username, password=nil, save_auth=true, source=nil)
+      if (@connection.pool_size > 1 || source) && !save_auth
+        raise MongoArgumentError, "If using connection pooling or delegated auth, " +
+          ":save_auth must be set to true."
       end
 
       begin
         socket = @connection.checkout_reader(:mode => :primary_preferred)
-        issue_authentication(username, password, save_auth, :socket => socket)
+        issue_authentication(username, password, save_auth,
+          :socket => socket, :source => source)
       ensure
         socket.checkin if socket
       end
 
       @connection.authenticate_pools
+      true
     end
 
     def issue_authentication(username, password, save_auth=true, opts={})
@@ -137,15 +159,19 @@ module Mongo
       raise MongoDBError, "Error retrieving nonce: #{doc}" unless ok?(doc)
       nonce = doc['nonce']
 
+      # issue authentication against this database if source option not provided
+      source = opts[:source]
+      db = source ? @connection[source] : self
+
       auth = BSON::OrderedHash.new
       auth['authenticate'] = 1
       auth['user'] = username
       auth['nonce'] = nonce
       auth['key'] = Mongo::Support.auth_key(username, password, nonce)
-      if ok?(doc = self.command(auth, :check_response => false, :socket => opts[:socket]))
-        @connection.add_auth(@name, username, password) if save_auth
+      if ok?(doc = db.command(auth, :check_response => false, :socket => opts[:socket]))
+        @connection.add_auth(name, username, password, source) if save_auth
       else
-        message = "Failed to authenticate user '#{username}' on db '#{self.name}'"
+        message = "Failed to authenticate user '#{username}' on db '#{db.name}'"
         raise Mongo::AuthenticationError.new(message, doc['code'], doc)
       end
       true
@@ -179,19 +205,30 @@ module Mongo
     end
 
     # Adds a user to this database for use with authentication. If the user already
-    # exists in the system, the password will be updated.
+    # exists in the system, the password and any additional fields provided in opts
+    # will be updated.
     #
     # @param [String] username
     # @param [String] password
     # @param [Boolean] read_only
     #   Create a read-only user.
     #
+    # @param [Hash] opts
+    #   Optional fields for the user document (e.g. +userSource+, or +roles+)
+    #
+    #   See {http://docs.mongodb.org/manual/reference/privilege-documents}
+    #   for more information.
+    #
+    # @note The use of the opts argument to provide or update additional fields
+    #   on the user document requires MongoDB >= 2.4.0
+    #
     # @return [Hash] an object representing the user.
-    def add_user(username, password, read_only = false)
+    def add_user(username, password=nil, read_only=false, opts={})
       users = self[SYSTEM_USER_COLLECTION]
       user  = users.find_one({:user => username}) || {:user => username}
-      user['pwd'] = Mongo::Support.hash_password(username, password)
-      user['readOnly'] = true if read_only;
+      user['pwd'] = Mongo::Support.hash_password(username, password) if password
+      user['readOnly'] = true if read_only
+      user.merge!(opts)
       begin
         users.save(user)
       rescue OperationFailure => ex
@@ -223,14 +260,14 @@ module Mongo
     #
     # @return [Boolean]
     def logout(opts={})
-      @connection.logout_pools(@name) if @connection.pool_size > 1
-      issue_logout(opts)
+      auth = @connection.auths.find { |a| a[:db_name] == name }
+      db = auth && auth[:source] ? @connection[auth[:source]] : self
+      auth ? @connection.logout_pools(db.name) : db.issue_logout(opts)
+      @connection.remove_auth(db.name)
     end
 
     def issue_logout(opts={})
-      if ok?(doc = command({:logout => 1}, :socket => opts[:socket]))
-        @connection.remove_auth(@name)
-      else
+      unless ok?(doc = command({:logout => 1}, :socket => opts[:socket]))
         raise MongoDBError, "Error logging out: #{doc.inspect}"
       end
       true
@@ -336,7 +373,7 @@ module Mongo
       return false if strict? && !collection_names.include?(name.to_s)
       begin
         ok?(command(:drop => name))
-      rescue OperationFailure => e
+      rescue OperationFailure
         false
       end
     end

data/lib/mongo/exceptions.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
   # Generic Mongo Ruby Driver exception class.
   class MongoRubyError < StandardError; end

data/lib/mongo/gridfs/grid.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
 
   # Implementation of the MongoDB GridFS specification. A file store.
@@ -21,7 +35,6 @@ module Mongo
       @fs_name = fs_name
 
       # This will create indexes only if we're connected to a primary node.
-      connection = @db.connection
       begin
         @chunks.ensure_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]], :unique => true)
       rescue Mongo::ConnectionFailure
@@ -46,8 +59,8 @@ module Mongo
     # @option opts [Integer] (262144) :chunk_size size of file chunks in bytes.
     # @option opts [String, Integer, Symbol] :w (1) Set write concern
     #
-    #   Notes on write concern:  
-    #      When :w > 0, the chunks sent to the server are validated using an md5 hash. 
+    #   Notes on write concern:
+    #      When :w > 0, the chunks sent to the server are validated using an md5 hash.
     #      If validation fails, an exception will be raised.
     #
     # @return [BSON::ObjectId] the file's id.