mongo 2.0.4 → 2.0.5

data/lib/mongo/operation/aggregate/result.rb

@@ -31,6 +31,16 @@ module Mongo
         # @since 2.0.0
         CURSOR_ID = 'id'.freeze
 
+        # The field name for the aggregation explain information.
+        #
+        # @since 2.0.5
+        EXPLAIN = 'stages'.freeze
+
+        # The legacy field name for the aggregation explain information.
+        #
+        # @since 2.0.5
+        EXPLAIN_LEGACY = 'serverPipeline'.freeze
+
         # The field name for the first batch of a cursor.
         #
         # @since 2.0.0
@@ -70,11 +80,16 @@ module Mongo
         #
         # @since 2.0.0
         def documents
-          reply.documents[0][RESULT] || cursor_document[FIRST_BATCH]
+          reply.documents[0][RESULT] || explain_document ||
+              cursor_document[FIRST_BATCH]
         end
 
         private
 
+        def explain_document
+          first_document[EXPLAIN] || first_document[EXPLAIN_LEGACY]
+        end
+
         def cursor_document
           @cursor_document ||= reply.documents[0][CURSOR]
         end

data/lib/mongo/operation/map_reduce.rb

@@ -63,7 +63,7 @@ module Mongo
       #
       # @since 2.0.0
       def execute(context)
-        unless context.standalone? || context.mongos? || context.primary? || secondary_ok?
+        unless valid_context?(context)
           raise Error::NeedPrimaryServer.new(ERROR_MESSAGE)
         end
         execute_message(context)
@@ -71,21 +71,19 @@ module Mongo
 
       private
 
+      def valid_context?(context)
+        context.standalone? || context.mongos? || context.primary? || secondary_ok?
+      end
+
       def execute_message(context)
         context.with_connection do |connection|
           Result.new(connection.dispatch([ message(context) ])).validate!
         end
       end
 
-      # Whether this operation can be executed on a replica set secondary server.
-      # The map reduce operation may not be executed on a secondary if the user has specified
-      # an output collection to which the results will be written.
-      #
-      # @return [ true, false ] Whether the operation can be executed on a secondary.
-      #
-      # @since 2.0.0
       def secondary_ok?
-        selector[:out] == 'inline'
+        selector[:out].respond_to?(:keys) &&
+          selector[:out].keys.first.to_s.downcase == 'inline'
       end
 
       def query_coll

data/lib/mongo/operation/read/query.rb

@@ -58,7 +58,7 @@ module Mongo
 
         def execute_message(context)
           context.with_connection do |connection|
-            Result.new(connection.dispatch([ message(context) ]))
+            Result.new(connection.dispatch([ message(context) ])).validate!
           end
         end
 

data/lib/mongo/operation/read_preferrable.rb

@@ -20,21 +20,27 @@ module Mongo
     # @since 2.0.0
     module ReadPreferrable
 
+      # The constant for slave ok flags.
+      #
+      # @since 2.0.5
+      SLAVE_OK = :slave_ok
+
       private
 
       def update_selector(context)
         if context.mongos? && read_pref = read.to_mongos
-          selector.merge(:$readPreference => read_pref)
+          sel = selector[:$query] ? selector : { :$query => selector }
+          sel.merge(:$readPreference => read_pref)
         else
           selector
         end
       end
 
       def update_options(context)
-        if context.slave_ok?
-          options.merge(flags: [:slave_ok])
-        elsif !context.mongos? && read.slave_ok?
-          options.merge(flags: [:slave_ok])
+        if context.slave_ok? || (!context.mongos? && read.slave_ok?)
+          options.dup.tap do |opts|
+            (opts[:flags] ||= []) << SLAVE_OK
+          end
         else
           options
         end

data/lib/mongo/operation/result.rb

@@ -192,7 +192,7 @@ module Mongo
         if first_document.has_key?(OK)
           first_document[OK] == 1 && parser.message.empty?
         else
-          parser.message.empty?
+          !query_failure? && parser.message.empty?
         end
       end
 
@@ -254,6 +254,10 @@ module Mongo
       def first_document
         @first_document ||= first || BSON::Document.new
       end
+
+      def query_failure?
+        replies.first && replies.first.query_failure?
+      end
     end
   end
 end

data/lib/mongo/operation/write.rb

@@ -20,5 +20,6 @@ require 'mongo/operation/write/update'
 require 'mongo/operation/write/create_index'
 require 'mongo/operation/write/drop_index'
 require 'mongo/operation/write/create_user'
+require 'mongo/operation/write/update_user'
 require 'mongo/operation/write/remove_user'
 require 'mongo/operation/write/command'

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

@@ -19,4 +19,5 @@ require 'mongo/operation/write/command/update'
 require 'mongo/operation/write/command/drop_index'
 require 'mongo/operation/write/command/create_index'
 require 'mongo/operation/write/command/create_user'
+require 'mongo/operation/write/command/update_user'
 require 'mongo/operation/write/command/remove_user'

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

@@ -0,0 +1,43 @@
+
+# Copyright (C) 2014-2015 MongoDB, 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 Operation
+    module Write
+      module Command
+
+        # Update user command on non-legacy servers.
+        #
+        # @since 2.0.0
+        class UpdateUser
+          include Specifiable
+          include Executable
+          include Writable
+
+          private
+
+          # The query selector for this update user command operation.
+          #
+          # @return [ Hash ] The selector describing this update user operation.
+          #
+          # @since 2.0.0
+          def selector
+            { :updateUser => user.name, :digestPassword => false }.merge(user.spec)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+
+# Copyright (C) 2014-2015 MongoDB, 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 Operation
+    module Write
+
+      # A MongoDB update user operation.
+      #
+      # @example Initialize the operation.
+      #   Write::UpdateUser.new(:db_name => 'test', :user => user)
+      #
+      # @param [ Hash ] spec The specifications for the update.
+      #
+      # @option spec :user [ Auth::User ] The user to update.
+      # @option spec :db_name [ String ] The name of the database.
+      #
+      # @since 2.0.0
+      class UpdateUser
+        include Executable
+        include Specifiable
+
+        # Execute the operation.
+        #
+        # @note Updating users behaves different on 2.7+, 2.6.x, and
+        #   2.4- so we need to break this out into separate operations.
+        #
+        # @example Execute the operation.
+        #   operation.execute(context)
+        #
+        # @param [ Mongo::Server::Context ] context The context for this operation.
+        #
+        # @return [ Result ] The operation result.
+        #
+        # @since 2.0.0
+        def execute(context)
+          if context.features.write_command_enabled?
+            execute_write_command(context)
+          else
+            execute_message(context)
+          end
+        end
+
+        private
+
+        def execute_write_command(context)
+          Result.new(Command::UpdateUser.new(spec).execute(context)).validate!
+        end
+
+        def execute_message(context)
+          context.with_connection do |connection|
+            Result.new(connection.dispatch([ message, gle ].compact)).validate!
+          end
+        end
+
+        def message
+          user_spec = { user: user.name }.merge(user.spec)
+          Protocol::Update.new(db_name, Auth::User::COLLECTION, { user: user.name }, user_spec)
+        end
+      end
+    end
+  end
+end

data/lib/mongo/protocol/reply.rb

@@ -26,6 +26,18 @@ module Mongo
     # @api semipublic
     class Reply < Message
 
+      # Determine if the reply had a query failure flag.
+      #
+      # @example Did the reply have a query failure.
+      #   reply.query_failure?
+      #
+      # @return [ true, false ] If the query failed.
+      #
+      # @since 2.0.5
+      def query_failure?
+        flags.include?(:query_failure)
+      end
+
       private
 
       # The operation code required to specify a Reply message.

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

@@ -73,7 +73,7 @@ module Mongo
         # @since 2.0.0
         def enqueue(connection)
           mutex.synchronize do
-            queue.push(connection)
+            queue.unshift(connection)
             resource.broadcast
           end
         end
@@ -96,7 +96,7 @@ module Mongo
           @block = block
           @connections = 0
           @options = options
-          @queue = Array.new(min_size, create_connection)
+          @queue = Array.new(min_size) { create_connection }
           @mutex = Mutex.new
           @resource = ConditionVariable.new
         end
@@ -155,7 +155,7 @@ module Mongo
         def dequeue_connection
           deadline = Time.now + wait_timeout
           loop do
-            return queue.delete_at(0) unless queue.empty?
+            return queue.pop unless queue.empty?
             connection = create_connection
             return connection if connection
             wait_for_next!(deadline)

data/lib/mongo/socket.rb

@@ -56,13 +56,12 @@ module Mongo
     #
     # @since 2.0.0
     def alive?
-      if Kernel::select([ socket ], nil, [ socket ], 0)
-        !eof? rescue false
+      sock_arr = [ @socket ]
+      if Kernel::select(sock_arr, nil, sock_arr, 0)
+        eof?
       else
         true
       end
-    rescue IOError
-      false
     end
 
     # Close the socket.
@@ -74,7 +73,7 @@ module Mongo
     #
     # @since 2.0.0
     def close
-      socket.close rescue true
+      @socket.close rescue true
       true
     end
 
@@ -89,7 +88,7 @@ module Mongo
     #
     # @since 2.0.0
     def gets(*args)
-      handle_errors { socket.gets(*args) }
+      handle_errors { @socket.gets(*args) }
     end
 
     # Create the new socket for the provided family - ipv4, piv6, or unix.
@@ -107,7 +106,7 @@ module Mongo
     end
 
     # Will read all data from the socket for the provided number of bytes.
-    # If less data is returned than requested, an exception will be raised.
+    # If no data is returned, an exception will be raised.
     #
     # @example Read all the requested data from the socket.
     #   socket.read(4096)
@@ -122,8 +121,11 @@ module Mongo
     def read(length)
       handle_errors do
         data = read_from_socket(length)
+        raise IOError unless (data.length > 0 || length == 0)
         while data.length < length
-          data << read_from_socket(length - data.length)
+          chunk = read_from_socket(length - data.length)
+          raise IOError unless (chunk.length > 0 || length == 0)
+          data << chunk
         end
         data
       end
@@ -138,7 +140,7 @@ module Mongo
     #
     # @since 2.0.0
     def readbyte
-      handle_errors { socket.readbyte }
+      handle_errors { @socket.readbyte }
     end
 
     # Writes data to the socket instance.
@@ -152,13 +154,22 @@ module Mongo
     #
     # @since 2.0.0
     def write(*args)
-      handle_errors { socket.write(*args) }
+      handle_errors { @socket.write(*args) }
+    end
+
+    # Tests if this socket has reached EOF. Primarily used for liveness checks.
+    #
+    # @since 2.0.5
+    def eof?
+      @socket.eof?
+    rescue IOError, SystemCallError => e
+      true
     end
 
     private
 
     def read_from_socket(length)
-      socket.read(length) || String.new
+      @socket.read(length) || String.new
     end
 
     def set_socket_options(sock)

data/lib/mongo/socket/ssl.rb

@@ -29,6 +29,9 @@ module Mongo
       # @return [ String ] host The host to connect to.
       attr_reader :host
 
+      # @return [ String ] host_name The original host name.
+      attr_reader :host_name
+
       # @return [ Hash ] The ssl options.
       attr_reader :options
 
@@ -72,8 +75,8 @@ module Mongo
       # @param [ Hash ] options The ssl options.
       #
       # @since 2.0.0
-      def initialize(host, port, timeout, family, options = {})
-        @host, @port, @timeout, @options = host, port, timeout, options
+      def initialize(host, port, host_name, timeout, family, options = {})
+        @host, @port, @host_name, @timeout, @options = host, port, host_name, timeout, options
         @context = create_context(options)
         @family = family
         @tcp_socket = ::Socket.new(family, SOCK_STREAM, 0)
@@ -117,7 +120,7 @@ module Mongo
 
       def verify_certificate!(socket)
         if context.verify_mode == OpenSSL::SSL::VERIFY_PEER
-          unless OpenSSL::SSL.verify_certificate_identity(socket.peer_cert, host)
+          unless OpenSSL::SSL.verify_certificate_identity(socket.peer_cert, host_name)
             raise Error::SocketError, 'SSL handshake failed due to a hostname mismatch.'
           end
         end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/spec/mongo/auth/user/view_spec.rb

@@ -36,6 +36,48 @@ describe Mongo::Auth::User::View do
     end
   end
 
+  describe '#update' do
+
+    before do
+      view.create(
+          'durran',
+          password: 'password', roles: [ Mongo::Auth::Roles::READ_WRITE ]
+      )
+    end
+
+    after do
+      view.remove('durran')
+    end
+
+    context 'when a user password is updated' do
+
+      let!(:response) do
+        view.update(
+            'durran',
+            password: '123', roles: [ Mongo::Auth::Roles::READ_WRITE ]
+        )
+      end
+
+      it 'updates the password' do
+        expect(response).to be_successful
+      end
+    end
+
+    context 'when the roles of a user are updated' do
+
+      let!(:response) do
+        view.update(
+            'durran',
+            password: 'password', roles: [ Mongo::Auth::Roles::READ ]
+        )
+      end
+
+      it 'updates the roles' do
+        expect(response).to be_successful
+      end
+    end
+  end
+
   describe '#remove' do
 
     context 'when user removal was successful' do