mongo 2.1.0.beta → 2.1.0.rc0

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

@@ -30,40 +30,14 @@ module Mongo
       #
       # @since 2.0.0
       class UpdateUser
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         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
+        def write_command_op
+          Command::UpdateUser.new(spec)
         end
 
         def message

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

@@ -0,0 +1,53 @@
+# 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
+
+      # This module contains common functionality for operations that send either
+      # a write command or a specific wire protocol message, depending on server version.
+      # For server versions >= 2.6, a write command is sent.
+      #
+      # @since 2.1.0
+      module WriteCommandEnabled
+
+        # Execute the operation.
+        #
+        # @example Execute the operation.
+        #   operation.execute(context)
+        #
+        # @param [ Mongo::Server::Context ] context The context for this operation.
+        #
+        # @return [ Result ] The operation result.
+        #
+        # @since 2.1.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_class = defined?(self.class::Result) ? self.class::Result : Result
+          result_class.new(write_command_op.execute(context)).validate!
+        end
+      end
+    end
+  end
+end

data/lib/mongo/options/mapper.rb

@@ -34,8 +34,10 @@ module Mongo
       #
       # @since 2.0.0
       def transform(options, mappings)
-        options.reduce({}) do |transformed, (key, value)|
-          transformed[mappings[key] || key] = value
+        map = transform_keys_to_strings(mappings)
+        opts = transform_keys_to_strings(options)
+        opts.reduce({}) do |transformed, (key, value)|
+          transformed[map[key]] = value if map[key]
           transformed
         end
       end

data/lib/mongo/protocol/delete.rb

@@ -43,8 +43,9 @@ module Mongo
       def initialize(database, collection, selector, options = {})
         @database = database
         @namespace = "#{database}.#{collection}"
-        @selector  = selector
-        @flags     = options[:flags] || []
+        @selector = selector
+        @flags = options[:flags] || []
+        @upconverter = Upconverter.new(collection, selector, options)
       end
 
       # Return the event payload for monitoring.
@@ -56,11 +57,18 @@ module Mongo
       #
       # @since 2.1.0
       def payload
-        { command_name: 'delete', database_name: @database, command: selector, request_id: request_id }
+        {
+          command_name: 'delete',
+          database_name: @database,
+          command: upconverter.command,
+          request_id: request_id
+        }
       end
 
       private
 
+      attr_reader :upconverter
+
       # The operation code required to specify a Delete message.
       # @return [Fixnum] the operation code.
       def op_code
@@ -84,6 +92,63 @@ module Mongo
       # @!attribute
       # @return [Hash] The selector for this Delete message.
       field :selector, Document
+
+      # Converts legacy delete messages to the appropriare OP_COMMAND style
+      # message.
+      #
+      # @since 2.1.0
+      class Upconverter
+
+        # @return [ String ] collection The name of the collection.
+        attr_reader :collection
+
+        # @return [ BSON::Document, Hash ] filter The query filter or command.
+        attr_reader :filter
+
+        # @return [ Hash ] options The options.
+        attr_reader :options
+
+        # Instantiate the upconverter.
+        #
+        # @example Instantiate the upconverter.
+        #   Upconverter.new('users', { name: 'test' })
+        #
+        # @param [ String ] collection The name of the collection.
+        # @param [ BSON::Document, Hash ] filter The filter or command.
+        #
+        # @since 2.1.0
+        def initialize(collection, filter, options)
+          @collection = collection
+          @filter = filter
+          @options = options
+        end
+
+        # Get the upconverted command.
+        #
+        # @example Get the command.
+        #   upconverter.command
+        #
+        # @return [ BSON::Document ] The upconverted command.
+        #
+        # @since 2.1.0
+        def command
+          BSON::Document.new(
+            delete: collection,
+            deletes: [ BSON::Document.new(q: filter, limit: limit) ],
+            ordered: true
+          )
+        end
+
+        private
+
+        def limit
+          if options.key?(:flags)
+            options[:flags].include?(:single_remove) ? 1 : 0
+          else
+            0
+          end
+        end
+      end
     end
   end
 end

data/lib/mongo/protocol/get_more.rb

@@ -41,6 +41,7 @@ module Mongo
         @namespace = "#{database}.#{collection}"
         @number_to_return = number_to_return
         @cursor_id = cursor_id
+        @upconverter = Upconverter.new(collection, cursor_id, number_to_return)
       end
 
       # Return the event payload for monitoring.
@@ -53,9 +54,9 @@ module Mongo
       # @since 2.1.0
       def payload
         {
-          command_name: 'getmore',
+          command_name: 'getMore',
           database_name: @database,
-          command: { cursor_id: cursor_id, number_to_return: number_to_return },
+          command: upconverter.command,
           request_id: request_id
         }
       end
@@ -74,6 +75,8 @@ module Mongo
 
       private
 
+      attr_reader :upconverter
+
       # The operation code required to specify a GetMore message.
       # @return [Fixnum] the operation code.
       def op_code
@@ -94,6 +97,55 @@ module Mongo
       # @!attribute
       # @return [Fixnum] The cursor id to get more documents from.
       field :cursor_id, Int64
+
+      # Converts legacy getmore messages to the appropriare OP_COMMAND style
+      # message.
+      #
+      # @since 2.1.0
+      class Upconverter
+
+        # @return [ String ] collection The name of the collection.
+        attr_reader :collection
+
+        # @return [ Integer ] cursor_id The cursor id.
+        attr_reader :cursor_id
+
+        # @return [ Integer ] number_to_return The number of docs to return.
+        attr_reader :number_to_return
+
+        # Instantiate the upconverter.
+        #
+        # @example Instantiate the upconverter.
+        #   Upconverter.new('users', 1, 1)
+        #
+        # @param [ String ] collection The name of the collection.
+        # @param [ Integer ] cursor_id The cursor id.
+        # @param [ Integer ] number_to_return The number of documents to
+        #   return.
+        #
+        # @since 2.1.0
+        def initialize(collection, cursor_id, number_to_return)
+          @collection = collection
+          @cursor_id = cursor_id
+          @number_to_return = number_to_return
+        end
+
+        # Get the upconverted command.
+        #
+        # @example Get the command.
+        #   upconverter.command
+        #
+        # @return [ BSON::Document ] The upconverted command.
+        #
+        # @since 2.1.0
+        def command
+          BSON::Document.new(
+            getMore: cursor_id,
+            batchSize: number_to_return,
+            collection: collection
+          )
+        end
+      end
     end
   end
 end

data/lib/mongo/protocol/insert.rb

@@ -53,6 +53,7 @@ module Mongo
         @namespace = "#{database}.#{collection}"
         @documents = documents
         @flags = options[:flags] || []
+        @upconverter = Upconverter.new(collection, documents, options)
       end
 
       # Return the event payload for monitoring.
@@ -64,11 +65,18 @@ module Mongo
       #
       # @since 2.1.0
       def payload
-        { command_name: 'insert', database_name: @database, command: documents, request_id: request_id }
+        {
+          command_name: 'insert',
+          database_name: @database,
+          command: upconverter.command,
+          request_id: request_id
+        }
       end
 
       private
 
+      attr_reader :upconverter
+
       # The operation code required to specify an Insert message.
       # @return [Fixnum] the operation code.
       def op_code
@@ -89,6 +97,56 @@ module Mongo
       # @!attribute
       # @return [Array<Hash>] The documents to insert.
       field :documents, Document, true
+
+      # Converts legacy insert messages to the appropriare OP_COMMAND style
+      # message.
+      #
+      # @since 2.1.0
+      class Upconverter
+
+        # @return [ String ] collection The name of the collection.
+        attr_reader :collection
+
+        # @return [ Array<BSON::Document> ] documents The documents to insert.
+        attr_reader :documents
+
+        # @return [ Hash ] options The options.
+        attr_reader :options
+
+        # Instantiate the upconverter.
+        #
+        # @example Instantiate the upconverter.
+        #   Upconverter.new('users', documents)
+        #
+        # @param [ String ] collection The name of the collection.
+        # @param [ Array<BSON::Document> ] documents The documents.
+        # @param [ Hash ] options The options.
+        #
+        # @since 2.1.0
+        def initialize(collection, documents, options)
+          @collection = collection
+          @documents = documents
+          @options = options
+        end
+
+        # Get the upconverted command.
+        #
+        # @example Get the command.
+        #   upconverter.command
+        #
+        # @return [ BSON::Document ] The upconverted command.
+        #
+        # @since 2.1.0
+        def command
+          document = BSON::Document.new(
+            insert: collection,
+            documents: documents,
+            ordered: options.fetch(:ordered, true)
+          )
+          document.merge!(writeConcern: options[:write_concern].options) if options[:write_concern]
+          document
+        end
+      end
     end
   end
 end

data/lib/mongo/protocol/kill_cursors.rb

@@ -28,11 +28,14 @@ module Mongo
       # @example Kill the cursor on the server with id 1.
       #   KillCursors.new([1])
       #
-      # @param cursor_ids [Array<Fixnum>] The cursor ids to kill.
-      # @param options [Hash] The additional kill cursors options.
-      def initialize(cursor_ids, options = {})
+      # @param [ Mongo::Database ] collection The collection.
+      # @param [ Mongo::Database ] database The database.
+      # @param [ Array<Fixnum> ] cursor_ids The cursor ids to kill.
+      def initialize(collection, database, cursor_ids)
+        @database = database
         @cursor_ids = cursor_ids
         @id_count   = @cursor_ids.size
+        @upconverter = Upconverter.new(collection, cursor_ids)
       end
 
       # Return the event payload for monitoring.
@@ -44,11 +47,18 @@ module Mongo
       #
       # @since 2.1.0
       def payload
-        { command_name: 'killcursors', command: { cursor_ids: cursor_ids }, request_id: request_id }
+        {
+          command_name: 'killCursors',
+          database_name: @database,
+          command: upconverter.command,
+          request_id: request_id
+        }
       end
 
       private
 
+      attr_reader :upconverter
+
       # The operation code required to specify +KillCursors+ message.
       # @return [Fixnum] the operation code.
       def op_code
@@ -65,6 +75,45 @@ module Mongo
       # @!attribute
       # @return [Array<Fixnum>] Cursors to kill.
       field :cursor_ids, Int64, true
+
+      # Converts legacy insert messages to the appropriare OP_COMMAND style
+      # message.
+      #
+      # @since 2.1.0
+      class Upconverter
+
+        # @return [ String ] collection The name of the collection.
+        attr_reader :collection
+
+        # @return [ Array<Integer> ] cursor_ids The cursor ids.
+        attr_reader :cursor_ids
+
+        # Instantiate the upconverter.
+        #
+        # @example Instantiate the upconverter.
+        #   Upconverter.new('users', [ 1, 2, 3 ])
+        #
+        # @param [ String ] collection The name of the collection.
+        # @param [ Array<Integer> ] cursor_ids The cursor ids.
+        #
+        # @since 2.1.0
+        def initialize(collection, cursor_ids)
+          @collection = collection
+          @cursor_ids = cursor_ids
+        end
+
+        # Get the upconverted command.
+        #
+        # @example Get the command.
+        #   upconverter.command
+        #
+        # @return [ BSON::Document ] The upconverted command.
+        #
+        # @since 2.1.0
+        def command
+          BSON::Document.new(killCursors: collection, cursors: cursor_ids)
+        end
+      end
     end
   end
 end