mongo 2.0.0.beta → 2.0.0.rc

data/lib/mongo/grid/file/metadata.rb

@@ -129,7 +129,7 @@ module Mongo
         #
         # @since 2.0.0
         def initialize(document)
-          @document = default_document.merge(normalize(document))
+          @document = default_document.merge(Options::Mapper.transform(document, MAPPINGS))
           @client_md5 = Digest::MD5.new
         end
 
@@ -202,13 +202,6 @@ module Mongo
 
         private
 
-        def normalize(document)
-          document.reduce(BSON::Document.new) do |doc, (key, value)|
-            doc[MAPPINGS[key] || key] = value
-            doc
-          end
-        end
-
         def default_document
           BSON::Document.new(
             :_id => BSON::ObjectId.new,

data/lib/mongo/grid/fs.rb

@@ -100,7 +100,7 @@ module Mongo
         @options = options
         @chunks_collection = database[chunks_name]
         @files_collection = database[files_name]
-        chunks_collection.indexes.create(INDEX_SPEC, :unique => true)
+        chunks_collection.indexes.create_one(INDEX_SPEC, :unique => true)
       end
 
       # Get the prefix for the GridFS
@@ -118,16 +118,16 @@ module Mongo
       # Remove a single file from the GridFS.
       #
       # @example Remove a file from the GridFS.
-      #   fs.remove_one(file)
+      #   fs.delete_one(file)
       #
       # @param [ Grid::File ] file The file to remove.
       #
       # @return [ Result ] The result of the remove.
       #
       # @since 2.0.0
-      def remove_one(file)
-        files_collection.find(:_id => file.id).remove_one
-        chunks_collection.find(:files_id => file.id).remove_many
+      def delete_one(file)
+        files_collection.find(:_id => file.id).delete_one
+        chunks_collection.find(:files_id => file.id).delete_many
       end
 
       private

data/lib/mongo/index/view.rb

@@ -42,25 +42,42 @@ module Mongo
       # @since 2.0.0
       NAME = 'name'.freeze
 
-      # Drop an index by its specification.
+      # The mappings of Ruby index options to server options.
       #
-      # @example Drop the index by spec.
-      #   view.drop(name: 1)
+      # @since 2.0.0
+      OPTIONS = {
+        :background => :background,
+        :bits => :bits,
+        :bucket_size => :bucketSize,
+        :default_language => :default_language,
+        :expire_after => :expireAfterSeconds,
+        :key => :key,
+        :language_override => :language_override,
+        :max => :max,
+        :min => :min,
+        :name => :name,
+        :sparse => :sparse,
+        :sphere_version => :'2dsphereIndexVersion',
+        :storage_engine => :storageEngine,
+        :text_version => :textIndexVersion,
+        :unique => :unique,
+        :version => :v,
+        :weights => :weights
+      }.freeze
+
+      # Drop an index by its name.
       #
       # @example Drop an index by its name.
-      #   view.drop('name_1')
+      #   view.drop_one('name_1')
       #
-      # @param [ Hash, String ] spec The index spec or name to drop.
+      # @param [ String ] name The name of the index.
       #
       # @return [ Result ] The response.
       #
       # @since 2.0.0
-      def drop(spec)
-        Operation::Write::DropIndex.new(
-          db_name: database.name,
-          coll_name: collection.name,
-          index_name: spec.is_a?(String) ? spec : index_name(spec)
-        ).execute(next_primary.context)
+      def drop_one(name)
+        raise Error::MultiIndexDrop.new if name == '*'
+        drop_by_name(name)
       end
 
       # Drop all indexes on the collection.
@@ -72,12 +89,15 @@ module Mongo
       #
       # @since 2.0.0
       def drop_all
-        drop('*')
+        drop_by_name('*')
       end
 
-      #  Creates an index on the collection.
+      # Creates an index on the collection.
+      #
+      # @example Create a unique index on the collection.
+      #   view.create_one({ name: 1 }, { unique: true })
       #
-      # @param [ Hash ] spec A hash of field name/direction pairs.
+      # @param [ Hash ] keys A hash of field name/direction pairs.
       # @param [ Hash ] options Options for this index.
       #
       # @option options [ true, false ] :unique (false) If true, this index will enforce
@@ -101,13 +121,32 @@ module Mongo
       # @return [ Result ] The response.
       #
       # @since 2.0.0
-      def create(spec, options = {})
-        Operation::Write::EnsureIndex.new(
-          index: spec,
+      def create_one(keys, options = {})
+        create_many({ key: keys }.merge(options))
+      end
+
+      # Creates multiple indexes on the collection.
+      #
+      # @example Create multiple indexes.
+      #   view.create_many([
+      #     { key: { name: 1 }, unique: true },
+      #     { key: { age: -1 }, background: true }
+      #   ])
+      #
+      # @note On MongoDB 3.0.0 and higher, the indexes will be created in
+      #   parallel on the server.
+      #
+      # @param [ Array<Hash> ] models The index specifications. Each model MUST
+      #   include a :key option.
+      #
+      # @return [ Result ] The result of the command.
+      #
+      # @since 2.0.0
+      def create_many(*models)
+        Operation::Write::CreateIndex.new(
+          indexes: normalize_models(models.flatten),
           db_name: database.name,
           coll_name: collection.name,
-          index_name: options[:name] || index_name(spec),
-          options: options
         ).execute(next_primary.context)
       end
 
@@ -117,17 +156,17 @@ module Mongo
       # @example Get index information by name.
       #   view.get('name_1')
       #
-      # @example Get index information by spec.
+      # @example Get index information by the keys.
       #   view.get(name: 1)
       #
-      # @param [ Hash, String ] spec The index name or spec.
+      # @param [ Hash, String ] keys_or_name The index name or spec.
       #
       # @return [ Hash ] The index information.
       #
       # @since 2.0.0
-      def get(spec)
+      def get(keys_or_name)
         find do |index|
-          (index[NAME] == spec) || (index[KEY] == normalize_keys(spec))
+          (index[NAME] == keys_or_name) || (index[KEY] == normalize_keys(keys_or_name))
         end
       end
 
@@ -169,8 +208,16 @@ module Mongo
 
       private
 
-      def limit
-        -1
+      def drop_by_name(name)
+        Operation::Write::DropIndex.new(
+          db_name: database.name,
+          coll_name: collection.name,
+          index_name: name
+        ).execute(next_primary.context)
+      end
+
+      def index_name(spec)
+        spec.to_a.join('_')
       end
 
       def indexes_spec
@@ -185,19 +232,28 @@ module Mongo
         Operation::Read::Indexes.new(indexes_spec)
       end
 
-      def send_initial_query(server)
-        initial_query_op.execute(server.context)
+      def limit; -1; end
+
+      def normalize_keys(spec)
+        return false if spec.is_a?(String)
+        Options::Mapper.transform_keys_to_strings(spec)
       end
 
-      def index_name(spec)
-        spec.to_a.join('_')
+      def normalize_models(models)
+        with_generated_names(models).map do |model|
+          Options::Mapper.transform(model, OPTIONS)
+        end
       end
 
-      def normalize_keys(spec)
-        return false if spec.is_a?(String)
-        spec.reduce({}) do |normalized, (key, value)|
-          normalized[key.to_s] = value
-          normalized
+      def send_initial_query(server)
+        initial_query_op.execute(server.context)
+      end
+
+      def with_generated_names(models)
+        models.dup.each do |model|
+          unless model[:name]
+            model[:name] = index_name(model[:key])
+          end
         end
       end
     end

data/lib/mongo/operation.rb

@@ -17,7 +17,6 @@ require 'mongo/operation/executable'
 require 'mongo/operation/specifiable'
 require 'mongo/operation/limited'
 require 'mongo/operation/read_preferrable'
-require 'mongo/operation/batchable'
 require 'mongo/operation/read'
 require 'mongo/operation/write'
 require 'mongo/operation/aggregate'

data/lib/mongo/operation/aggregate.rb

@@ -56,7 +56,7 @@ module Mongo
       # server is not primary, the operation will be rerouted to the primary
       # with a warning.
       #
-      # @params [ Mongo::Server::Context ] The context for this operation.
+      # @param [ Server::Context ] context The context for this operation.
       #
       # @return [ Result ] The operation response, if there is one.
       #
@@ -72,7 +72,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/aggregate/result.rb

@@ -78,6 +78,10 @@ module Mongo
         def cursor_document
           @cursor_document ||= reply.documents[0][CURSOR]
         end
+
+        def first_document
+          @first_document ||= reply.documents[0]
+        end
       end
     end
   end

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

@@ -21,8 +21,7 @@ module Mongo
         #
         # @since 2.0.0
         class Result < Operation::Result
-
-          attr_reader :indexes
+          include BulkMergable
 
           # The aggregate number of deleted docs reported in the replies.
           #
@@ -43,60 +42,6 @@ module Mongo
               n += reply.documents.first[N]
             end
           end
-
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.reduce(nil) do |errors, reply|
-              if write_errors = reply.documents.first['writeErrors']
-                errors ||= []
-                write_errors.each do |write_error|
-                  errors << write_error.merge('index' => indexes[write_error['index']])
-                end
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.reduce(nil) do |errors, reply|
-              if write_concern_errors = reply.documents.first['writeConcernErrors']
-                errors ||= []
-                write_concern_errors.each do |write_concern_error|
-                  errors << write_concern_error.merge('index' =>
-                                                      indexes[write_concern_error['index']])
-                end
-              end
-              errors
-            end
-          end
         end
 
         # Defines custom behaviour of results when deleting.
@@ -104,8 +49,7 @@ module Mongo
         #
         # @since 2.0.0
         class LegacyResult < Operation::Result
-
-          attr_reader :indexes
+          include LegacyBulkMergable
 
           # Gets the number of documents deleted.
           #
@@ -121,75 +65,6 @@ module Mongo
               n += reply.documents.first[N]
             end
           end
-
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              if reply_write_errors?(reply)
-                errors ||= []
-                errors << { 'errmsg' => reply.documents.first[Error::ERROR],
-                            'index' => indexes[i],
-                            'code' => reply.documents.first[Error::CODE] }
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              # @todo: only raise if error is timeout
-              if error = reply_write_errors?(reply)
-                errors ||= []
-                note = reply.documents.first['wnote'] || reply.documents.first['jnote']
-                if note
-                  code = reply.documents.first['code'] || Error::BAD_VALUE
-                  error_string = "#{code}: #{note}"
-                else
-                  code = reply.documents.first['code'] || Error::UNKNOWN_ERROR
-                  error_string = "#{code}: #{error}"
-                end
-                errors << { 'errmsg' => error_string,
-                            'index' => indexes[i],
-                            'code' => code }
-              end
-              errors
-            end
-          end
-
-          private
-
-          def reply_write_errors?(reply)
-            reply.documents.first[Error::ERROR] ||
-              reply.documents.first[Error::ERRMSG]
-          end
         end
       end
     end

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

@@ -21,8 +21,7 @@ module Mongo
         #
         # @since 2.0.0
         class Result < Operation::Result
-
-          attr_reader :indexes
+          include BulkMergable
 
           # Gets the number of documents inserted.
           #
@@ -35,65 +34,6 @@ module Mongo
           def n_inserted
             written_count
           end
-
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.reduce(nil) do |errors, reply|
-              if write_errors = reply.documents.first['writeErrors']
-                errors ||= []
-                write_errors.each do |write_error|
-                  errors << write_error.merge('index' => indexes[write_error['index']])
-                end
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              if write_concern_errors = reply.documents.first['writeConcernError']
-                errors ||= []
-                write_concern_errors.each do |write_concern_error|
-                  errors << write_concern_error.merge('index' =>
-                                                      indexes[write_concern_error['index']])
-                end
-              elsif reply.documents.first['errmsg']
-                errors ||= []
-                errors << { 'errmsg' => reply.documents.first['errmsg'],
-                            'index' => indexes[i],
-                            'code' => reply.documents.first['code'] }
-              end
-              errors
-            end
-          end
         end
 
         # Defines custom behaviour of results when inserting.
@@ -101,8 +41,7 @@ module Mongo
         #
         # @since 2.0.0
         class LegacyResult < Operation::Result
-
-          attr_reader :indexes
+          include LegacyBulkMergable
 
           # Gets the number of documents inserted.
           #
@@ -119,75 +58,6 @@ module Mongo
               n
             end
           end
-
-          # Set a list of indexes of the operations creating this result.
-          #
-          # @example Set the list of indexes.
-          #   result.set_indexes([1,2,3])
-          #
-          # @return [ self ] The result.
-          #
-          # @since 2.0.0
-          def set_indexes(indexes)
-            @indexes = indexes
-            self
-          end
-
-          # Aggregate the write errors returned from this result.
-          #
-          # @example Aggregate the write errors.
-          #   result.aggregate_write_errors
-          #
-          # @return [ Array ] The aggregate write errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              if reply_write_errors?(reply)
-                errors ||= []
-                errors << { 'errmsg' => reply.documents.first[Error::ERROR],
-                            'index' => indexes[i],
-                            'code' => reply.documents.first[Error::CODE] }
-              end
-              errors
-            end
-          end
-
-          # Aggregate the write concern errors returned from this result.
-          #
-          # @example Aggregate the write concern errors.
-          #   result.aggregate_write_concern_errors
-          #
-          # @return [ Array ] The aggregate write concern errors.
-          #
-          # @since 2.0.0
-          def aggregate_write_concern_errors
-            @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-              # @todo: only raise if error is timeout
-              if error = reply_write_errors?(reply)
-                errors ||= []
-                note = reply.documents.first['wnote'] || reply.documents.first['jnote']
-                if note
-                  code = reply.documents.first['code'] || "bad value constant"
-                  error_string = "#{code}: #{note}"
-                else
-                  code = reply.documents.first['code'] || "unknown error constant"
-                  error_string = "#{code}: #{error}"
-                end
-                errors << { 'errmsg' => error_string,
-                            'index' => indexes[i],
-                            'code' => code }
-              end
-              errors
-            end
-          end
-
-          private
-
-          def reply_write_errors?(reply)
-            reply.documents.first[Error::ERROR] ||
-              reply.documents.first[Error::ERRMSG]
-          end
         end
       end
     end