mongo 2.2.7 → 2.3.0

data/lib/mongo/operation/write/idable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/insert.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,13 +50,13 @@ module Mongo
 
         private
 
-        def execute_write_command(context)
+        def execute_write_command(server)
           command_spec = spec.merge(:documents => ensure_ids(documents))
-          Result.new(Command::Insert.new(command_spec).execute(context), @ids).validate!
+          Result.new(Command::Insert.new(command_spec).execute(server), @ids).validate!
         end
 
-        def execute_message(context)
-          context.with_connection do |connection|
+        def execute_message(server)
+          server.with_connection do |connection|
             Result.new(connection.dispatch([ message, gle ].compact), @ids).validate!
           end
         end

data/lib/mongo/operation/write/insert/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/remove_user.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/update.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/update/result.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/update_user.rb

@@ -1,5 +1,5 @@
 
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/operation/write/write_command_enabled.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,26 +26,27 @@ module Mongo
         # Execute the operation.
         #
         # @example Execute the operation.
-        #   operation.execute(context)
+        #   operation.execute(server)
         #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
+        # @param [ Mongo::Server ] server The server to send this operation to.
         #
         # @return [ Result ] The operation result.
         #
         # @since 2.1.0
-        def execute(context)
-          if context.features.write_command_enabled?
-            execute_write_command(context)
+        def execute(server)
+          if !server.features.write_command_enabled? ||
+               (write_concern && write_concern.get_last_error.nil?)
+            execute_message(server)
           else
-            execute_message(context)
+            execute_write_command(server)
           end
         end
 
         private
 
-        def execute_write_command(context)
+        def execute_write_command(server)
           result_class = self.class.const_defined?(:Result, false) ? self.class::Result : Result
-          result_class.new(write_command_op.execute(context)).validate!
+          result_class.new(write_command_op.execute(server)).validate!
         end
       end
     end

data/lib/mongo/protocol/bit_vector.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ module Mongo
         # @param value [ Array<Symbol> ] Array of flags to encode
         #
         # @return [ String ] Buffer that received the serialized vector
-        def serialize(buffer, value)
+        def serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           bits = 0
           value.each { |flag| bits |= @masks[flag] }
           buffer.put_int32(bits)

data/lib/mongo/protocol/delete.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/protocol/get_more.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/protocol/insert.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -75,6 +75,10 @@ module Mongo
 
       private
 
+      def validating_keys?
+        true
+      end
+
       attr_reader :upconverter
 
       # The operation code required to specify an Insert message.

data/lib/mongo/protocol/kill_cursors.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/protocol/message.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -199,16 +199,16 @@ module Mongo
           if field[:multi]
             value.each do |item|
               if field[:type].respond_to?(:size_limited?)
-                field[:type].serialize(buffer, item, max_bson_size)
+                field[:type].serialize(buffer, item, max_bson_size, validating_keys?)
               else
-                field[:type].serialize(buffer, item)
+                field[:type].serialize(buffer, item, validating_keys?)
               end
             end
           else
             if field[:type].respond_to?(:size_limited?)
-              field[:type].serialize(buffer, value, max_bson_size)
+              field[:type].serialize(buffer, value, max_bson_size, validating_keys?)
             else
-              field[:type].serialize(buffer, value)
+              field[:type].serialize(buffer, value, validating_keys?)
             end
           end
         end
@@ -292,6 +292,10 @@ module Mongo
           field[:type].deserialize(io)
         )
       end
+
+      def validating_keys?
+        @options[:validating_keys] if @options
+      end
     end
   end
 end

data/lib/mongo/protocol/query.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/protocol/reply.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/protocol/serializers.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ module Mongo
         # @param value [ String ] Header value to be serialized.
         #
         # @return [ String ] Buffer with serialized value.
-        def self.serialize(buffer, value)
+        def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           buffer.put_bytes(value.pack(HEADER_PACK))
         end
 
@@ -76,7 +76,7 @@ module Mongo
         # @param value [ String ] The string to be serialized.
         #
         # @return [ String ] Buffer with serialized value.
-        def self.serialize(buffer, value)
+        def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           buffer.put_cstring(value)
         end
       end
@@ -92,7 +92,7 @@ module Mongo
         # @param value [ Fixnum ] Ignored value.
         #
         # @return [ String ] Buffer with serialized value.
-        def self.serialize(buffer, value)
+        def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           buffer.put_int32(ZERO)
         end
       end
@@ -108,7 +108,7 @@ module Mongo
         # @param value [ Fixnum ] 32-bit integer to be serialized.
         #
         # @return [String] Buffer with serialized value.
-        def self.serialize(buffer, value)
+        def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           buffer.put_int32(value)
         end
 
@@ -133,7 +133,7 @@ module Mongo
         # @param value [ Fixnum ] 64-bit integer to be serialized.
         #
         # @return [ String ] Buffer with serialized value.
-        def self.serialize(buffer, value)
+        def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           buffer.put_int64(value)
         end
 
@@ -158,9 +158,9 @@ module Mongo
         # @param value [ Hash ] Document to serialize as BSON.
         #
         # @return [ String ] Buffer with serialized value.
-        def self.serialize(buffer, value, max_bson_size = nil)
+        def self.serialize(buffer, value, max_bson_size = nil, validating_keys = BSON::Config.validating_keys?)
           start_size = buffer.length
-          value.to_bson(buffer)
+          value.to_bson(buffer, validating_keys)
           if max_bson_size && buffer.length - start_size > max_bson_size
             raise Error::MaxBSONSize.new(max_bson_size)
           end

data/lib/mongo/protocol/update.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,8 @@ module Mongo
                    :replica_set_name,
                    :secondary?,
                    :standalone?,
-                   :unknown?
+                   :unknown?,
+                   :unknown!
 
     # Is this server equal to another?
     #
@@ -88,6 +89,8 @@ module Mongo
     # @return [ Mongo::Server::Context ] context The server context.
     #
     # @since 2.0.0
+    #
+    # @deprecated Will be removed in version 3.0
     def context
       Context.new(self)
     end
@@ -102,7 +105,7 @@ module Mongo
     #
     # @since 2.1.0
     def connectable?
-      context.with_connection do |connection|
+      with_connection do |connection|
         connection.connectable?
       end
     end
@@ -212,5 +215,39 @@ module Mongo
     def reconnect!
       monitor.restart! and true
     end
+
+    # Execute a block of code with a connection, that is checked out of the
+    # server's pool and then checked back in.
+    #
+    # @example Send a message with the connection.
+    #   server.with_connection do |connection|
+    #     connection.dispatch([ command ])
+    #   end
+    #
+    # @return [ Object ] The result of the block execution.
+    #
+    # @since 2.3.0
+    def with_connection(&block)
+      pool.with_connection(&block)
+    end
+
+    # Handle authentication failure.
+    #
+    # @example Handle possible authentication failure.
+    #   server.handle_auth_failure! do
+    #     Auth.get(user).login(self)
+    #   end
+    #
+    # @raise [ Auth::Unauthorized ] If the authentication failed.
+    #
+    # @return [ Object ] The result of the block execution.
+    #
+    # @since 2.3.0
+    def handle_auth_failure!
+      yield
+    rescue Auth::Unauthorized
+      unknown!
+      raise
+    end
   end
 end

data/lib/mongo/server/connectable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015 MongoDB, Inc.
+# Copyright (C) 2015-2016 MongoDB, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server/connection.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -162,7 +162,9 @@ module Mongo
       def authenticate!
         if options[:user]
           user = Auth::User.new(Options::Redacted.new(:auth_mech => default_mechanism).merge(options))
-          Auth.get(user).login(self)
+          @server.handle_auth_failure! do
+            Auth.get(user).login(self)
+          end
         end
       end
 

data/lib/mongo/server/connection_pool.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server/connection_pool/queue.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server/context.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ module Mongo
     # connection.
     #
     # @since 2.0.0
+    #
+    # @deprecated Will be removed in version 3.0
     class Context
       extend Forwardable
 

data/lib/mongo/server/description.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/server/description/inspector/description_changed.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/server/monitor.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB Inc.
+# Copyright (C) 2014-2016 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server_selector.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@ module Mongo
     #
     # @since 2.0.0
     def get(preference = {})
+      return preference if PREFERENCES.values.include?(preference.class)
       PREFERENCES.fetch(preference[:mode] || :primary).new(preference)
     end
   end

data/lib/mongo/server_selector/nearest.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.