mongo 2.1.0.beta → 2.2.0

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

@@ -30,7 +30,6 @@ module Mongo
         # @since 2.0.0
         class DropIndex
           include Specifiable
-          include Executable
           include Writable
 
           private

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

@@ -30,7 +30,6 @@ module Mongo
         # @since 2.0.0
         class Insert
           include Specifiable
-          include Executable
           include Writable
 
           private
@@ -43,9 +42,11 @@ module Mongo
           def selector
             { insert: coll_name,
               documents: documents,
-              writeConcern: write_concern.options,
               ordered: ordered?
-            }
+            }.tap do |cmd|
+              cmd.merge!(writeConcern: write_concern.options) if write_concern
+              cmd.merge!(:bypassDocumentValidation => true) if bypass_document_validation
+            end
           end
         end
       end

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

@@ -22,7 +22,6 @@ module Mongo
         # @since 2.0.0
         class RemoveUser
           include Specifiable
-          include Executable
           include Writable
 
           private

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

@@ -31,13 +31,13 @@ module Mongo
         #     :db_name => 'test',
         #     :coll_name => 'test_coll',
         #     :write_concern => write_concern,
-        #     :ordered => true
+        #     :ordered => true,
+        #     :bypass_document_validation => true
         #   })
         #
         # @since 2.0.0
         class Update
           include Specifiable
-          include Executable
           include Writable
 
           private
@@ -48,9 +48,11 @@ module Mongo
           def selector
             { update: coll_name,
               updates: updates,
-              writeConcern: write_concern.options,
               ordered: ordered?
-            }
+            }.tap do |cmd|
+              cmd.merge!(writeConcern: write_concern.options) if write_concern
+              cmd.merge!(:bypassDocumentValidation => true) if bypass_document_validation
+            end
           end
         end
       end

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

@@ -23,7 +23,6 @@ module Mongo
         # @since 2.0.0
         class UpdateUser
           include Specifiable
-          include Executable
           include Writable
 
           private

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

@@ -17,35 +17,30 @@ module Mongo
     module Write
       module Command
 
-        # Provides common behavior for all write commands.
+        # Provides common behavior for write commands.
+        # Assigns an operation id when executed.
         #
         # @since 2.0.0
         module Writable
           include Limited
 
-          private
-
-          # Whether this operation may be executed on a secondary server.
+          # Execute the operation.
+          # The context gets a connection on which the operation
+          # is sent in the block.
           #
-          # @return [ false ] A write command may not be executed on a secondary.
-          def secondary_ok?
-            false
-          end
-
-          # Whether the batch writes should be applied in the same order the
-          # items appear, ie. sequentially. 
-          # If ordered is false, the server applies the batch items in no particular
-          # order, and possibly in parallel. Execution halts after the first error.
-          # The default value is true, which means the batch items are applied
-          # sequentially.
+          # @param [ Mongo::Server::Context ] context The context for this operation.
           #
-          # @return [ true, false ] Whether batch items are applied sequentially. 
+          # @return [ Result ] The operation response, if there is one.
           #
           # @since 2.0.0
-          def ordered?
-            @spec.fetch(:ordered, true)
+          def execute(context)
+            context.with_connection do |connection|
+              connection.dispatch([ message ], operation_id)
+            end
           end
 
+          private
+
           # The wire protocol message for this write operation.
           #
           # @return [ Mongo::Protocol::Query ] Wire protocol message.

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

@@ -42,37 +42,14 @@ module Mongo
       #
       # @since 2.0.0
       class CreateIndex
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
 
-        # Execute the ensure index operation.
-        #
-        # @example Execute the operation.
-        #   operation.execute(context)
-        #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
-        #
-        # @return [ Result ] The result of the operation.
-        #
-        # @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::CreateIndex.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::CreateIndex.new(spec)
         end
 
         def index_documents

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

@@ -30,40 +30,14 @@ module Mongo
       #
       # @since 2.0.0
       class CreateUser
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
 
-        # Execute the operation.
-        #
-        # @note Creating 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::CreateUser.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::CreateUser.new(spec)
         end
 
         def message

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

@@ -48,44 +48,21 @@ module Mongo
       #
       # @since 2.0.0
       class Delete
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
 
-        # Execute the delete operation.
-        #
-        # @example Execute the operation.
-        #   operation.execute(context)
-        #
-        # @param [ Mongo::Server::Context ] context The context for this operation.
-        #
-        # @return [ Result ] The 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)
+        def write_command_op
           s = spec.merge(:deletes => [ delete ])
           s.delete(:delete)
-          Result.new(Command::Delete.new(s).execute(context)).validate!
-        end
-
-        def execute_message(context)
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message, gle ].compact)).validate!
-          end
+          Command::Delete.new(s)
         end
 
         def message
-          selector = delete[:q]
-          opts     = ( delete[:limit] || 0 ) <= 0 ? {} : { :flags => [ :single_remove ] }
+          selector = delete[Operation::Q]
+          opts     = (delete[Operation::LIMIT] || 0) <= 0 ? {} : { :flags => [ :single_remove ] }
           Protocol::Delete.new(db_name, coll_name, selector, opts)
         end
       end

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

@@ -35,7 +35,7 @@ module Mongo
       #
       # @since 2.0.0
       class DropIndex
-        include Executable
+        include WriteCommandEnabled
         include Specifiable
 
         # Execute the drop index operation.
@@ -54,8 +54,8 @@ module Mongo
 
         private
 
-        def execute_write_command(context)
-          Result.new(Command::DropIndex.new(spec).execute(context)).validate!
+        def write_command_op
+          Command::DropIndex.new(spec)
         end
       end
     end

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

@@ -0,0 +1,49 @@
+# 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 need to
+      # be followed by a GLE message.
+      #
+      # @since 2.1.0
+      module GLE
+
+        private
+
+        def execute_message(context)
+          context.with_connection do |connection|
+            result_class = self.class.const_defined?(:LegacyResult, false) ? self.class::LegacyResult :
+                self.class.const_defined?(:Result, false) ? self.class::Result : Result
+            result_class.new(connection.dispatch([ message, gle ].compact)).validate!
+          end
+        end
+
+        def gle
+          wc = write_concern ||  WriteConcern.get(WriteConcern::DEFAULT)
+          if gle_message = wc.get_last_error
+            Protocol::Query.new(
+                db_name,
+                Database::COMMAND,
+                gle_message,
+                options.merge(limit: -1)
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -15,8 +15,30 @@
 module Mongo
   module Operation
     module Write
+
+      # This module provides functionality to ensure that documents contain
+      # an id field. Used by insert operations (Bulk, legacy, write command inserts).
+      #
+      # @since 2.1.0
       module Idable
 
+        # The option for a custom id generator.
+        #
+        # @since 2.2.0
+        ID_GENERATOR = :id_generator.freeze
+
+        # Get the id generator.
+        #
+        # @example Get the id generator.
+        #   idable.id_generator
+        #
+        # @return [ IdGenerator ] The default or custom id generator.
+        #
+        # @since 2.2.0
+        def id_generator
+          @id_generator ||= (spec[ID_GENERATOR] || ObjectIdGenerator.new)
+        end
+
         private
 
         def id(doc)
@@ -30,7 +52,7 @@ module Mongo
         def ensure_ids(documents)
           @ids ||= []
           documents.collect do |doc|
-            doc_with_id = has_id?(doc) ? doc : doc.merge(_id: BSON::ObjectId.new)
+            doc_with_id = has_id?(doc) ? doc : doc.merge(_id: id_generator.generate)
             @ids << id(doc_with_id)
             doc_with_id
           end
@@ -38,4 +60,4 @@ module Mongo
       end
     end
   end
-end
+end

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

@@ -43,28 +43,11 @@ module Mongo
       #
       # @since 2.0.0
       class Insert
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
         include Idable
 
-        # Execute the insert 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.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)
@@ -78,11 +61,6 @@ module Mongo
           end
         end
 
-        def initialize_copy(original)
-          @spec = original.spec.dup
-          @spec[:documents] = original.spec[:documents].dup
-        end
-
         def message
           opts = !!options[:continue_on_error] ? { :flags => [:continue_on_error] } : {}
           Protocol::Insert.new(db_name, coll_name, ensure_ids(documents), opts)

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

@@ -29,37 +29,14 @@ module Mongo
       #
       # @since 2.0.0
       class RemoveUser
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
 
-        # Execute the remove user 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.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::RemoveUser.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::RemoveUser.new(spec)
         end
 
         def message

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

@@ -51,52 +51,29 @@ module Mongo
       #
       # @since 2.0.0
       class Update
-        include Executable
+        include GLE
+        include WriteCommandEnabled
         include Specifiable
 
-        # Execute the update 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.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)
+        def write_command_op
           s = spec.merge(:updates => [ update ])
           s.delete(:update)
-          Result.new(Command::Update.new(s).execute(context)).validate!
-        end
-
-        def execute_message(context)
-          context.with_connection do |connection|
-            LegacyResult.new(connection.dispatch([ message, gle ].compact)).validate!
-          end
-        end
-
-        def initialize_copy(original)
-          @spec = original.spec.dup
-          @spec[:updates] = original.spec[:updates].dup
+          Command::Update.new(s)
         end
 
         def message
           flags = []
-          flags << :multi_update if update[:multi]
-          flags << :upsert if update[:upsert]
-          Protocol::Update.new(db_name, coll_name, update[:q], update[:u],
-                               flags.empty? ? {} : { flags: flags })
+          flags << :multi_update if update[Operation::MULTI]
+          flags << :upsert if update[Operation::UPSERT]
+          Protocol::Update.new(
+            db_name,
+            coll_name,
+            update[Operation::Q],
+            update[Operation::U],
+            flags.empty? ? {} : { flags: flags }
+          )
         end
       end
     end

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 = self.class.const_defined?(:Result, false) ? self.class::Result : Result
+          result_class.new(write_command_op.execute(context)).validate!
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/write.rb

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/operation/write/write_command_enabled'
 require 'mongo/operation/write/idable'
+require 'mongo/operation/write/gle'
 require 'mongo/operation/write/bulk'
 require 'mongo/operation/write/delete'
 require 'mongo/operation/write/insert'