mongo 2.0.0.beta → 2.0.0.rc

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

@@ -0,0 +1,67 @@
+# 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
+
+      module BulkMergable
+
+        # Aggregate the write errors returned from this result.
+        #
+        # @example Aggregate the write errors.
+        #   result.aggregate_write_errors([0, 1, 2, 3])
+        #
+        # @param [ Array ] indexes The indexes of each operation as they
+        #   were listed in the Bulk API.
+        #
+        # @return [ Array ] The aggregate write errors.
+        #
+        # @since 2.0.0
+        def aggregate_write_errors(indexes)
+          @replies.reduce(nil) do |errors, reply|
+            if reply.documents.first['writeErrors']
+              write_errors = reply.documents.first['writeErrors'].collect do |we|
+                we.merge!('index' => indexes[we['index']])
+              end
+              (errors || []) << write_errors if write_errors
+            end
+          end
+        end
+
+        # Aggregate the write concern errors returned from this result.
+        #
+        # @example Aggregate the write concern errors.
+        #   result.aggregate_write_concern_errors([0, 1, 2, 3])
+        #
+        # @param [ Array ] indexes The indexes of each operation as they
+        #   were listed in the Bulk API.
+        #
+        # @return [ Array ] The aggregate write concern errors.
+        #
+        # @since 2.0.0
+        def aggregate_write_concern_errors(indexes)
+          @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
+            if write_concern_errors = reply.documents.first['writeConcernErrors']
+              (errors || []) << write_concern_errors.reduce(nil) do |errs, wce|
+                  wce.merge!('index' => indexes[wce['index']])
+                  (errs || []) << write_concern_error
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -56,14 +56,13 @@ module Mongo
       class BulkUpdate
         include Executable
         include Specifiable
-        include Batchable
 
         # Execute the update operation.
         #
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #
@@ -81,7 +80,7 @@ module Mongo
         # @example Set a write concern.
         #   new_op = operation.write_concern(:w => 2)
         #
-        # @params [ Hash ] The write concern.
+        # @param [ Hash ] wc The write concern.
         #
         # @since 2.0.0
         def write_concern(wc = nil)
@@ -92,19 +91,10 @@ module Mongo
           end
         end
 
-        # The index of each update as it was added onto the bulk object.
-        #
-        # @params [ Integer ] The index of each update.
-        #
-        # @since 2.0.0
-        def indexes
-          @spec[:indexes] || []
-        end
-
         private
 
         def execute_write_command(context)
-          Result.new(Command::Update.new(spec).execute(context)).set_indexes(indexes)
+          Result.new(Command::Update.new(spec).execute(context))
         end
 
         def execute_message(context)
@@ -112,13 +102,13 @@ module Mongo
             context.with_connection do |connection|
               result = LegacyResult.new(connection.dispatch([ m, gle ].compact))
               if stop_sending?(result)
-                return result.set_indexes(indexes)
+                return result
               else
                 result.reply
               end
             end
           end
-          LegacyResult.new(replies.compact.empty? ? nil : replies).set_indexes(indexes)
+          LegacyResult.new(replies.compact.empty? ? nil : replies)
         end
 
         def stop_sending?(result)
@@ -144,10 +134,6 @@ module Mongo
           end
         end
 
-        def batch_key
-          UPDATES
-        end
-
         def initialize_copy(original)
           @spec = original.spec.dup
           @spec[UPDATES] = original.spec[UPDATES].dup

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

@@ -17,6 +17,6 @@ require 'mongo/operation/write/command/delete'
 require 'mongo/operation/write/command/insert'
 require 'mongo/operation/write/command/update'
 require 'mongo/operation/write/command/drop_index'
-require 'mongo/operation/write/command/ensure_index'
+require 'mongo/operation/write/command/create_index'
 require 'mongo/operation/write/command/create_user'
 require 'mongo/operation/write/command/remove_user'

data/lib/mongo/operation/write/command/{ensure_index.rb → create_index.rb}

@@ -20,12 +20,10 @@ module Mongo
         # A MongoDB ensure index write command operation.
         #
         # @example Create an ensure index command operation.
-        #   Write::Command::EnsureIndex.new({
-        #     :index => { :foo => 1 },
+        #   Write::Command::CreateIndex.new({
+        #     :indexes => [{ :key => { :foo => 1 }, :name => 'foo_1', :unique => true }],
         #     :db_name => 'test',
-        #     :coll_name => 'test_coll',
-        #     :index_name => 'foo_1'
-        #     :options => { :unique => true }
+        #     :coll_name => 'test_coll'
         #   })
         #
         # @since 2.0.0
@@ -42,10 +40,7 @@ module Mongo
           #
           # @since 2.0.0
           def selector
-            {
-              :createIndexes => coll_name,
-              :indexes => [ options.merge(key: index, name: index_name) ],
-            }
+            { :createIndexes => coll_name, :indexes => indexes }
           end
         end
       end

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

@@ -42,10 +42,10 @@ module Mongo
           #
           # @since 2.0.0
           def selector
-            { :delete        => coll_name,
-              :deletes       => deletes,
-              :writeConcern  => write_concern.options,
-              :ordered       => ordered?
+            { delete: coll_name,
+              deletes: deletes,
+              writeConcern: write_concern.options,
+              ordered: ordered?
             }
           end
         end

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

@@ -41,7 +41,7 @@ module Mongo
           #
           # @since 2.0.0
           def selector
-            { :deleteIndexes => coll_name, :index => index_name }
+            { :dropIndexes => coll_name, :index => index_name }
           end
         end
       end

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

@@ -41,10 +41,10 @@ module Mongo
           #
           # @since 2.0.0
           def selector
-            { :insert        => coll_name,
-              :documents     => documents,
-              :writeConcern  => write_concern.options,
-              :ordered       => ordered?
+            { insert: coll_name,
+              documents: documents,
+              writeConcern: write_concern.options,
+              ordered: ordered?
             }
           end
         end

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

@@ -46,10 +46,10 @@ module Mongo
           #
           # @return [ Hash ] The selector describing this update operation.
           def selector
-            { :update        => coll_name,
-              :updates       => updates,
-              :writeConcern  => write_concern.options,
-              :ordered       => ordered?
+            { update: coll_name,
+              updates: updates,
+              writeConcern: write_concern.options,
+              ordered: ordered?
             }
           end
         end

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

@@ -17,13 +17,13 @@ module Mongo
   module Operation
     module Write
 
-      # A MongoDB ensure index operation.
+      # A MongoDB create index operation.
       #
       # @note If a server with version >= 2.5.5 is being used, a write command
       #   operation will be created and sent instead.
       #
-      # @example Create the ensure index operation.
-      #   Write::EnsureIndex.new({
+      # @example Create the create index operation.
+      #   Write::CreateIndex.new({
       #     :index => { :name => 1, :age => -1 },
       #     :db_name => 'test',
       #     :coll_name => 'test_coll',
@@ -40,7 +40,7 @@ module Mongo
       #   write command.
       #
       # @since 2.0.0
-      class EnsureIndex
+      class CreateIndex
         include Executable
         include Specifiable
 
@@ -49,7 +49,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The result of the operation.
         #
@@ -74,9 +74,14 @@ module Mongo
           end
         end
 
+        def index_documents
+          indexes.dup.each do |index|
+            index[:ns] = namespace
+          end
+        end
+
         def message
-          document = options.merge(ns: namespace, key: index, name: index_name)
-          Protocol::Insert.new(db_name, Index::COLLECTION, [ document ])
+          Protocol::Insert.new(db_name, Index::COLLECTION, index_documents)
         end
       end
     end

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

@@ -40,7 +40,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @param [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

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

@@ -53,7 +53,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The result.
         #

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

@@ -42,7 +42,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The result of the operation.
         #

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

@@ -48,7 +48,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

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

@@ -0,0 +1,83 @@
+# 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
+
+      module LegacyBulkMergable
+
+        # Aggregate the write errors returned from this result.
+        #
+        # @example Aggregate the write errors.
+        #   result.aggregate_write_errors([0, 1, 2, 3])
+        #
+        # @param [ Array ] indexes The indexes of each operation as they
+        #   were listed in the Bulk API.
+        #
+        # @return [ Array ] The aggregate write errors.
+        #
+        # @since 2.0.0
+        def aggregate_write_errors(indexes)
+          @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([0, 1, 2, 3])
+        #
+        # @param [ Array ] indexes The indexes of each operation as they
+        #   were listed in the Bulk API.
+        #
+        # @return [ Array ] The aggregate write concern errors.
+        #
+        # @since 2.0.0
+        def aggregate_write_concern_errors(indexes)
+          @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
+            if error = reply_write_errors?(reply)
+              errors ||= []
+              if note = reply.documents.first['wnote'] || reply.documents.first['jnote']
+                code = reply.documents.first['code'] || Error::BAD_VALUE
+                error_string = "#{code}: #{note}"
+              elsif error == 'timeout'
+                code = reply.documents.first['code'] || Error::UNKNOWN_ERROR
+                error_string = "#{code}: #{error}"
+              end
+              errors << { 'errmsg' => error_string,
+                          'index' => indexes[i],
+                          'code' => code } if error_string
+            end
+            errors
+          end
+        end
+
+        private
+
+        def reply_write_errors?(reply)
+          reply.documents.first[Error::ERROR] ||
+            reply.documents.first[Error::ERRMSG]
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

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

@@ -56,7 +56,7 @@ module Mongo
         # @example Execute the operation.
         #   operation.execute(context)
         #
-        # @params [ Mongo::Server::Context ] The context for this operation.
+        # @param [ Mongo::Server::Context ] context The context for this operation.
         #
         # @return [ Result ] The operation result.
         #

data/lib/mongo/{bulk.rb → options.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# 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.
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/bulk/bulk_write'
+require 'mongo/options/mapper'

data/lib/mongo/options/mapper.rb

@@ -0,0 +1,78 @@
+# 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 Options
+
+    # Utility class for various options mapping behaviour.
+    #
+    # @since 2.0.0
+    module Mapper
+      extend self
+
+      # Transforms the provided options to a new set of options given the
+      # provided mapping.
+      #
+      # @example Transform the options.
+      #   Mapper.transform({ name: 1 }, { :name => :nombre })
+      #
+      # @param [ Hash ] options The options to transform
+      # @param [ Hash ] mappings The key mappings.
+      #
+      # @return [ Hash ] The transformed options.
+      #
+      # @since 2.0.0
+      def transform(options, mappings)
+        options.reduce({}) do |transformed, (key, value)|
+          transformed[mappings[key] || key] = value
+          transformed
+        end
+      end
+
+      # Coverts all the keys of the options to strings.
+      #
+      # @example Convert all option keys to strings.
+      #   Mapper.transform({ :name => 1 })
+      #
+      # @param [ Hash ] options The options to transform.
+      #
+      # @return [ Hash ] The transformed options.
+      #
+      # @since 2.0.0
+      def transform_keys_to_strings(options)
+        options.reduce({}) do |transformed, (key, value)|
+          transformed[key.to_s] = value
+          transformed
+        end
+      end
+
+      # Coverts all the symbol values to strings.
+      #
+      # @example Convert all option symbol values to strings.
+      #   Mapper.transform({ :name => 1 })
+      #
+      # @param [ Hash ] options The options to transform.
+      #
+      # @return [ Hash ] The transformed options.
+      #
+      # @since 2.0.0
+      def transform_values_to_strings(options)
+        options.reduce({}) do |transformed, (key, value)|
+          transformed[key] = value.is_a?(Symbol) ? value.to_s : value
+          transformed
+        end
+      end
+    end
+  end
+end