mongo 2.1.2 → 2.2.0.rc0

data/lib/mongo/operation/commands/users_info.rb

@@ -12,42 +12,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/commands/users_info/result'
-
 module Mongo
   module Operation
+    module Commands
 
-    # A MongoDB operation to get info of a particular user in a database.
-    #
-    # @example Create the users info operation.
-    #   Read::UsersInfo.new(:name => 'emily', :db_name => 'test-db')
-    #
-    # Initialization:
-    #   param [ Hash ] spec The specifications for the users info operation.
-    #
-    #   option spec :user_name [ String ] The name of the user.
-    #   option spec :db_name [ String ] The name of the database where the user exists.
-    #   option spec :options [ Hash ] Options for the operation.
-    #
-    # @since 2.1.0
-    class UsersInfo
-      include Executable
-      include Specifiable
-      include Limited
+      # A MongoDB operation to get info of a particular user in a database.
+      #
+      # @example Create the users info operation.
+      #   Read::UsersInfo.new(:name => 'emily', :db_name => 'test-db')
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the users info operation.
+      #
+      #   option spec :user_name [ String ] The name of the user.
+      #   option spec :db_name [ String ] The name of the database where the user exists.
+      #   option spec :options [ Hash ] Options for the operation.
+      #
+      # @since 2.1.0
+      class UsersInfo < Command
 
-      private
+        private
 
-      def selector
-        { :usersInfo => user_name }
-      end
+        def selector
+          { :usersInfo => user_name }
+        end
 
-      def query_coll
-        Database::COMMAND
-      end
-
-      def message(context)
-        Protocol::Query.new(db_name, query_coll, selector, options)
+        def message(context)
+          Protocol::Query.new(db_name, query_coll, selector, options)
+        end
       end
     end
   end
 end
+
+require 'mongo/operation/commands/users_info/result'

data/lib/mongo/operation/commands/users_info/result.rb

@@ -14,21 +14,23 @@
 
 module Mongo
   module Operation
-    class UsersInfo
+    module Commands
+      class UsersInfo
 
-      # Defines custom behaviour of results when using the
-      # usersInfo command.
-      #
-      # @since 2.1.0
-      class Result < Operation::Result
-
-        # The field name for the users document in a usersInfo result.
+        # Defines custom behaviour of results when using the
+        # usersInfo command.
         #
         # @since 2.1.0
-        USERS = 'users'.freeze
+        class Result < Operation::Result
+
+          # The field name for the users document in a usersInfo result.
+          #
+          # @since 2.1.0
+          USERS = 'users'.freeze
 
-        def documents
-          reply.documents.first[USERS]
+          def documents
+            reply.documents.first[USERS]
+          end
         end
       end
     end

data/lib/mongo/operation/object_id_generator.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 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
+
+    # The default generator of ids for documents.
+    #
+    # @since 2.2.0
+    class ObjectIdGenerator
+
+      # Generate a nwe id.
+      #
+      # @example Generate the id.
+      #   object_id_generator.generate
+      #
+      # @return [ BSON::ObjectId ] The new id.
+      #
+      # @since 2.2.0
+      def generate
+        BSON::ObjectId.new
+      end
+    end
+  end
+end

data/lib/mongo/operation/result.rb

@@ -22,6 +22,31 @@ module Mongo
       extend Forwardable
       include Enumerable
 
+      # The field name for the cursor document in an aggregation.
+      #
+      # @since 2.2.0
+      CURSOR = 'cursor'.freeze
+
+      # The cursor id field in the cursor document.
+      #
+      # @since 2.2.0
+      CURSOR_ID = 'id'.freeze
+
+      # The field name for the first batch of a cursor.
+      #
+      # @since 2.2.0
+      FIRST_BATCH = 'firstBatch'.freeze
+
+      # The field name for the next batch of a cursor.
+      #
+      # @since 2.2.0
+      NEXT_BATCH = 'nextBatch'.freeze
+
+      # The namespace field in the cursor document.
+      #
+      # @since 2.2.0
+      NAMESPACE = 'ns'.freeze
+
       # The number of documents updated in the write.
       #
       # @since 2.0.0
@@ -32,6 +57,11 @@ module Mongo
       # @since 2.0.0
       OK = 'ok'.freeze
 
+      # The result field constant.
+      #
+      # @since 2.2.0
+      RESULT = 'result'.freeze
+
       # @return [ Array<Protocol::Reply> ] replies The wrapped wire protocol replies.
       attr_reader :replies
 

data/lib/mongo/operation/specifiable.rb

@@ -86,6 +86,11 @@ module Mongo
       # @since 2.0.0
       OPTIONS = :options.freeze
 
+      # The read concern option.
+      #
+      # @since 2.2.0
+      READ_CONCERN = :read_concern.freeze
+
       # The field for a selector.
       #
       # @since 2.0.0
@@ -126,6 +131,11 @@ module Mongo
       # @since 2.0.0
       READ = :read.freeze
 
+      # Whether to bypass document level validation.
+      #
+      # @since 2.2.0
+      BYPASS_DOC_VALIDATION = :bypass_document_validation.freeze
+
       # @return [ Hash ] spec The specification for the operation.
       attr_reader :spec
 
@@ -317,6 +327,30 @@ module Mongo
         spec[OPTIONS] || {}
       end
 
+      # Get the read concern from the spec.
+      #
+      # @example Get the read concern.
+      #   specifiable.read_concern
+      #
+      # @return [ Hash ] The read concern.
+      #
+      # @since 2.2.0
+      def read_concern
+        spec[READ_CONCERN]
+      end
+
+      # Whether or not to bypass document level validation.
+      #
+      # @example Get the bypass_document_validation option.
+      #   specifiable.bypass_documentation_validation.
+      #
+      # @return [ true, false ] Whether to bypass document level validation.
+      #
+      # @since 2.2.0
+      def bypass_document_validation
+        spec[BYPASS_DOC_VALIDATION]
+      end
+
       # The selector for from the specification.
       #
       # @example Get a selector specification.
@@ -396,7 +430,7 @@ module Mongo
       #
       # @since 2.0.0
       def write_concern
-        @spec[WRITE_CONCERN] || WriteConcern.get(WriteConcern::DEFAULT)
+        @spec[WRITE_CONCERN]
       end
 
       # The read preference for this operation.

data/lib/mongo/operation/write/bulk/bulkable.rb

@@ -63,9 +63,10 @@ module Mongo
           end
 
           def gle
-            gle_message = ( ordered? && write_concern.get_last_error.nil? ) ?
-                Mongo::WriteConcern.get(:w => 1).get_last_error :
-                write_concern.get_last_error
+            wc = write_concern ||  WriteConcern.get(WriteConcern::DEFAULT)
+            gle_message = ( ordered? && wc.get_last_error.nil? ) ?
+                Mongo::WriteConcern.get(Mongo::WriteConcern::DEFAULT).get_last_error :
+                wc.get_last_error
             if gle_message
               Protocol::Query.new(
                   db_name,

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

@@ -18,16 +18,10 @@ module Mongo
       module Bulk
         class Delete
 
-          # Defines custom behaviour of results when deleting.
+          # Defines common r_removed aggreation behaviour.
           #
-          # @since 2.0.0
-          class Result < Operation::Result
-            include Mergable
-
-            # The aggregate number of deleted docs reported in the replies.
-            #
-            # @since 2.0.0
-            REMOVED = 'nRemoved'.freeze
+          # @since 2.2.0
+          module Aggregatable
 
             # Gets the number of documents deleted.
             #
@@ -40,32 +34,31 @@ module Mongo
             def n_removed
               return 0 unless acknowledged?
               @replies.reduce(0) do |n, reply|
-                n += reply.documents.first[N]
+                n += reply.documents.first[Result::N]
               end
             end
           end
 
           # Defines custom behaviour of results when deleting.
-          # For server versions < 2.5.5 (that don't use write commands).
           #
           # @since 2.0.0
-          class LegacyResult < Operation::Result
-            include LegacyMergable
+          class Result < Operation::Result
+            include Mergable
+            include Aggregatable
 
-            # Gets the number of documents deleted.
-            #
-            # @example Get the deleted count.
-            #   result.n_removed
-            #
-            # @return [ Integer ] The number of documents deleted.
+            # The aggregate number of deleted docs reported in the replies.
             #
             # @since 2.0.0
-            def n_removed
-              return 0 unless acknowledged?
-              @replies.reduce(0) do |n, reply|
-                n += reply.documents.first[N]
-              end
-            end
+            REMOVED = 'nRemoved'.freeze
+          end
+
+          # Defines custom behaviour of results when deleting.
+          # For server versions < 2.5.5 (that don't use write commands).
+          #
+          # @since 2.0.0
+          class LegacyResult < Operation::Result
+            include LegacyMergable
+            include Aggregatable
           end
         end
       end

data/lib/mongo/operation/write/bulk/legacy_mergable.rb

@@ -42,7 +42,7 @@ module Mongo
                             'code' => reply.documents.first[Error::CODE] }
               end
               errors
-            end
+            end if @replies
           end
 
           # Aggregate the write concern errors returned from this result.
@@ -71,7 +71,7 @@ module Mongo
                             'code' => code } if error_string
               end
               errors
-            end
+            end if @replies
           end
 
           private

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

@@ -43,9 +43,10 @@ module Mongo
           def selector
             { delete: coll_name,
               deletes: deletes,
-              writeConcern: write_concern.options,
               ordered: ordered?
-            }
+            }.tap do |cmd|
+              cmd.merge!(writeConcern: write_concern.options) if write_concern
+            end
           end
         end
       end

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

@@ -42,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/update.rb

@@ -31,7 +31,8 @@ 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
@@ -47,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/gle.rb

@@ -33,7 +33,8 @@ module Mongo
         end
 
         def gle
-          if gle_message = write_concern.get_last_error
+          wc = write_concern ||  WriteConcern.get(WriteConcern::DEFAULT)
+          if gle_message = wc.get_last_error
             Protocol::Query.new(
                 db_name,
                 Database::COMMAND,

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

@@ -22,6 +22,23 @@ module Mongo
       # @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)
@@ -35,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
@@ -43,4 +60,4 @@ module Mongo
       end
     end
   end
-end
+end