mongo 2.1.2 → 2.2.0.rc0

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

@@ -14,107 +14,104 @@
 
 module Mongo
   module Operation
-    class MapReduce
+    module Commands
+      class MapReduce
 
-      # Defines custom behaviour of results for a map reduce operation.
-      #
-      # @since 2.0.0
-      class Result < Operation::Result
-
-        # The counts field for the map/reduce.
+        # Defines custom behaviour of results for a map reduce operation.
         #
         # @since 2.0.0
-        COUNTS = 'counts'.freeze
+        class Result < Operation::Result
 
-        # The result field for when output is a collection.
-        #
-        # @since 2.0.0
-        RESULT = 'result'.freeze
+          # The counts field for the map/reduce.
+          #
+          # @since 2.0.0
+          COUNTS = 'counts'.freeze
 
-        # The field name for a result without a cursor.
-        #
-        # @since 2.0.0
-        RESULTS = 'results'.freeze
+          # The field name for a result without a cursor.
+          #
+          # @since 2.0.0
+          RESULTS = 'results'.freeze
 
-        # The time the operation took constant.
-        #
-        # @since 2.0.0
-        TIME = 'timeMillis'.freeze
+          # The time the operation took constant.
+          #
+          # @since 2.0.0
+          TIME = 'timeMillis'.freeze
 
-        # Gets the map/reduce counts from the reply.
-        #
-        # @example Get the counts.
-        #   result.counts
-        #
-        # @return [ Hash ] A hash of the result counts.
-        #
-        # @since 2.0.0
-        def counts
-          reply.documents[0][COUNTS]
-        end
+          # Gets the map/reduce counts from the reply.
+          #
+          # @example Get the counts.
+          #   result.counts
+          #
+          # @return [ Hash ] A hash of the result counts.
+          #
+          # @since 2.0.0
+          def counts
+            reply.documents[0][COUNTS]
+          end
 
-        # Get the documents from the map/reduce.
-        #
-        # @example Get the documents.
-        #   result.documents
-        #
-        # @return [ Array<BSON::Document> ] The documents.
-        #
-        # @since 2.0.0
-        def documents
-          reply.documents[0][RESULTS] || reply.documents[0][RESULT]
-        end
+          # Get the documents from the map/reduce.
+          #
+          # @example Get the documents.
+          #   result.documents
+          #
+          # @return [ Array<BSON::Document> ] The documents.
+          #
+          # @since 2.0.0
+          def documents
+            reply.documents[0][RESULTS] || reply.documents[0][RESULT]
+          end
 
-        # If the result was a command then determine if it was considered a
-        # success.
-        #
-        # @note If the write was unacknowledged, then this will always return
-        #   true.
-        #
-        # @example Was the command successful?
-        #   result.successful?
-        #
-        # @return [ true, false ] If the command was successful.
-        #
-        # @since 2.0.0
-        def successful?
-          !documents.nil?
-        end
+          # If the result was a command then determine if it was considered a
+          # success.
+          #
+          # @note If the write was unacknowledged, then this will always return
+          #   true.
+          #
+          # @example Was the command successful?
+          #   result.successful?
+          #
+          # @return [ true, false ] If the command was successful.
+          #
+          # @since 2.0.0
+          def successful?
+            !documents.nil?
+          end
 
-        # Get the execution time of the map/reduce.
-        #
-        # @example Get the execution time.
-        #   result.time
-        #
-        # @return [ Integer ] The executiong time in milliseconds.
-        #
-        # @since 2.0.0
-        def time
-          reply.documents[0][TIME]
-        end
+          # Get the execution time of the map/reduce.
+          #
+          # @example Get the execution time.
+          #   result.time
+          #
+          # @return [ Integer ] The executiong time in milliseconds.
+          #
+          # @since 2.0.0
+          def time
+            reply.documents[0][TIME]
+          end
 
-        # Validate the result by checking for any errors.
-        #
-        # @note This only checks for errors with writes since authentication is
-        #   handled at the connection level and any authentication errors would
-        #   be raised there, before a Result is ever created.
-        #
-        # @example Validate the result.
-        #   result.validate!
-        #
-        # @raise [ Error::OperationFailure ] If an error is in the result.
-        #
-        # @return [ Result ] The result if verification passed.
-        #
-        # @since 2.0.0
-        def validate!
-          documents.nil? ? raise(Error::OperationFailure.new(parser.message)) : self
-        end
+          # Validate the result by checking for any errors.
+          #
+          # @note This only checks for errors with writes since authentication is
+          #   handled at the connection level and any authentication errors would
+          #   be raised there, before a Result is ever created.
+          #
+          # @example Validate the result.
+          #   result.validate!
+          #
+          # @raise [ Error::OperationFailure ] If an error is in the result.
+          #
+          # @return [ Result ] The result if verification passed.
+          #
+          # @since 2.0.0
+          def validate!
+            documents.nil? ? raise(Error::OperationFailure.new(parser.message)) : self
+          end
 
-        private
+          private
 
-        def first_document
-          @first_document ||= reply.documents[0]
+          def first_document
+            @first_document ||= reply.documents[0]
+          end
         end
       end
     end

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

@@ -12,45 +12,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/commands/parallel_scan/result'
-
 module Mongo
   module Operation
+    module Commands
 
-    # A MongoDB parallel scan operation.
-    #
-    # @example Create the parallel scan operation.
-    #   ParallelScan.new({
-    #     :db_name  => 'test_db',
-    #     :coll_name = > 'test_collection',
-    #     :cursor_count => 5
-    #   })
-    #
-    # Initialization:
-    #   param [ Hash ] spec The specifications for the operation.
-    #
-    #   option spec :db_name [ String ] The name of the database on which
-    #     the operation should be executed.
-    #   option spec :coll_name [ String ] The collection to scan.
-    #   option spec :cursor_count [ Integer ] The number of cursors to use.
-    #   option spec :options [ Hash ] Options for the command.
-    #
-    # @since 2.0.0
-    class ParallelScan
-      include Specifiable
-      include Limited
-      include ReadPreference
-      include Executable
-
-      private
+      # A MongoDB parallel scan operation.
+      #
+      # @example Create the parallel scan operation.
+      #   ParallelScan.new({
+      #     :db_name  => 'test_db',
+      #     :coll_name = > 'test_collection',
+      #     :cursor_count => 5
+      #   })
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
+      #
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the operation should be executed.
+      #   option spec :coll_name [ String ] The collection to scan.
+      #   option spec :cursor_count [ Integer ] The number of cursors to use.
+      #   option spec :options [ Hash ] Options for the command.
+      #
+      # @since 2.0.0
+      class ParallelScan < Command
 
-      def selector
-        { :parallelCollectionScan => coll_name, :numCursors => cursor_count }
-      end
+        private
 
-      def query_coll
-        Database::COMMAND
+        def selector
+          command = { :parallelCollectionScan => coll_name, :numCursors => cursor_count }
+          command[:readConcern] = read_concern if read_concern
+          command
+        end
       end
     end
   end
 end
+
+require 'mongo/operation/commands/parallel_scan/result'

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

@@ -15,56 +15,48 @@
 
 module Mongo
   module Operation
-    class ParallelScan
+    module Commands
+      class ParallelScan
 
-      # Defines custom behaviour of results in a parallel scan.
-      #
-      # @since 2.0.0
-      class Result < Operation::Result
-
-        # Get the name of the cursor field.
-        #
-        # @since 2.0.0
-        CURSOR = 'cursor'.freeze
-
-        # The name of the cursors field in the result.
+        # Defines custom behaviour of results in a parallel scan.
         #
         # @since 2.0.0
-        CURSORS = 'cursors'.freeze
+        class Result < Operation::Result
 
-        # Get the name of the id field.
-        #
-        # @since 2.0.0
-        ID = 'id'.freeze
+          # The name of the cursors field in the result.
+          #
+          # @since 2.0.0
+          CURSORS = 'cursors'.freeze
 
-        # Get all the cursor ids from the result.
-        #
-        # @example Get the cursor ids.
-        #   result.cursor_ids
-        #
-        # @return [ Array<Integer> ] The cursor ids.
-        #
-        # @since 2.0.0
-        def cursor_ids
-          documents.map{ |doc| doc[CURSOR][ID] }
-        end
+          # Get all the cursor ids from the result.
+          #
+          # @example Get the cursor ids.
+          #   result.cursor_ids
+          #
+          # @return [ Array<Integer> ] The cursor ids.
+          #
+          # @since 2.0.0
+          def cursor_ids
+            documents.map{ |doc| doc[CURSOR][CURSOR_ID] }
+          end
 
-        # Get the documents from parallel scan.
-        #
-        # @example Get the documents.
-        #   result.documents
-        #
-        # @return [ Array<BSON::Document> ] The documents.
-        #
-        # @since 2.0.0
-        def documents
-          reply.documents[0][CURSORS]
-        end
+          # Get the documents from parallel scan.
+          #
+          # @example Get the documents.
+          #   result.documents
+          #
+          # @return [ Array<BSON::Document> ] The documents.
+          #
+          # @since 2.0.0
+          def documents
+            reply.documents[0][CURSORS]
+          end
 
-        private
+          private
 
-        def first
-          @first ||= reply.documents[0] || {}
+          def first
+            @first ||= reply.documents[0] || {}
+          end
         end
       end
     end

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

@@ -14,55 +14,57 @@
 
 module Mongo
   module Operation
+    module Commands
 
-    # A MongoDB operation to get info of a particular user in a database.
-    #
-    # @example Create the user query operation.
-    #   Read::UserQuery.new(:name => 'emily', :db_name => 'test-db')
-    #
-    # Initialization:
-    #   param [ Hash ] spec The specifications for the user query 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 UserQuery
-      include Executable
-      include Specifiable
-
-      # Execute the operation.
-      # The context gets a connection on which the operation
-      # is sent in the block.
+      # A MongoDB operation to get info of a particular user in a database.
+      #
+      # @example Create the user query operation.
+      #   Read::UserQuery.new(:name => 'emily', :db_name => 'test-db')
       #
-      # @param [ Mongo::Server::Context ] context The context for this operation.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the user query operation.
       #
-      # @return [ Result ] The operation response, if there is one.
+      #   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
-      def execute(context)
-        if context.features.users_info_enabled?
-          UsersInfo.new(spec).execute(context)
-        else
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message(context) ])).validate!
+      class UserQuery
+        include Executable
+        include Specifiable
+
+        # Execute the operation.
+        # The context gets a connection on which the operation
+        # is sent in the block.
+        #
+        # @param [ Mongo::Server::Context ] context The context for this operation.
+        #
+        # @return [ Result ] The operation response, if there is one.
+        #
+        # @since 2.1.0
+        def execute(context)
+          if context.features.users_info_enabled?
+            UsersInfo.new(spec).execute(context)
+          else
+            context.with_connection do |connection|
+              Result.new(connection.dispatch([ message(context) ])).validate!
+            end
           end
         end
-      end
 
-      private
+        private
 
-      def selector
-        { :user => user_name }
-      end
+        def selector
+          { :user => user_name }
+        end
 
-      def query_coll
-        Auth::User::COLLECTION
-      end
+        def query_coll
+          Auth::User::COLLECTION
+        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