mongo 2.0.0.beta → 2.0.0.rc

data/lib/mongo/bulk_write/replacable.rb

@@ -0,0 +1,57 @@
+# 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 BulkWrite
+
+    # Defines behavior for validating and combining replace bulk write operations.
+    #
+    # @since 2.0.0.
+    module Replacable
+
+      private
+
+      def replacement_doc?(doc)
+        doc.respond_to?(:keys) && doc.keys.all?{|key| key !~ /^\$/}
+      end
+
+      def validate_replace_op!(r, type)
+        unless r[:find] && r[:replacement] && replacement_doc?(r[:replacement])
+          raise Error::InvalidBulkOperation.new(type, r)
+        end
+      end
+
+      def replace_ops(ops, type)
+        ops.collect do |r|
+          validate_replace_op!(r, type)
+          { q: r[:find],
+            u: r[:replacement],
+            multi: false,
+            upsert: r.fetch(:upsert, false)
+          }
+        end
+      end
+
+      def replace_one(op, server)
+        Operation::Write::BulkUpdate.new(
+          :updates => replace_ops(op[:replace_one], __method__),
+          :db_name => database.name,
+          :coll_name => @collection.name,
+          :write_concern => write_concern,
+          :ordered => ordered?
+        ).execute(server.context)
+      end
+    end
+  end
+end

data/lib/mongo/bulk_write/unordered_bulk_write.rb

@@ -0,0 +1,46 @@
+# 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 BulkWrite
+
+    class UnorderedBulkWrite
+
+      include BulkWritable
+
+      private
+
+      def ordered?
+        false
+      end
+
+      def merged_ops
+        merge_consecutive_ops(merge_ops_by_type)
+      end
+
+      def process(result, indexes)
+        combine_results(result, indexes)
+      end
+
+      def finalize
+        @results.tap do |results|
+          if results[:write_errors] || results[:write_concern_errors]
+            raise Error::BulkWriteError.new(results)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/bulk_write/updatable.rb

@@ -0,0 +1,68 @@
+# 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 BulkWrite
+
+    # Defines behavior for validating and combining update bulk write operations.
+    #
+    # @since 2.0.0.
+    module Updatable
+
+      private
+
+      def update_doc?(doc)
+        !doc.empty? &&
+          doc.respond_to?(:keys) &&
+          doc.keys.first.to_s =~ /^\$/
+      end
+
+      def validate_update_op!(type, u)
+        unless u[:find] && u[:update] && update_doc?(u[:update])
+          raise Error::InvalidBulkOperation.new(type, u)
+        end
+      end
+
+      def updates(ops, type)
+        multi = type == :update_many
+        ops.collect do |u|
+          validate_update_op!(type, u)
+          { q: u[:find],
+            u: u[:update],
+            multi: multi,
+            upsert: u.fetch(:upsert, false)
+          }
+        end
+      end
+
+      def update(ops, type, server)
+        Operation::Write::BulkUpdate.new(
+          :updates => updates(ops, type),
+          :db_name => database.name,
+          :coll_name => @collection.name,
+          :write_concern => write_concern,
+          :ordered => ordered?
+        ).execute(server.context)
+      end
+
+      def update_one(op, server)
+        update(op[:update_one], __method__, server)
+      end
+
+      def update_many(op, server)
+        update(op[:update_many], __method__, server)
+      end
+    end
+  end
+end

data/lib/mongo/client.rb

@@ -98,8 +98,10 @@ module Mongo
     # @option options [ Hash ] :auth_mech_properties
     # @option options [ Float ] :heartbeat_frequency The number of seconds for
     #   the server monitor to refresh it's description via ismaster.
-    # @option options [ Integer ] :local_threshold
-    # @option options [ Integer ] :server_selection_timeout
+    # @option options [ Integer ] :local_threshold The local threshold boundary
+    #   in seconds for selecting a near server for an operation.
+    # @option options [ Integer ] :server_selection_timeout The timeout in seconds
+    #   for selecting a server for an operation.
     # @option options [ String ] :password The user's password.
     # @option options [ Integer ] :max_pool_size The maximum size of the
     #   connection pool.
@@ -117,6 +119,17 @@ module Mongo
     # @option options [ Symbol ] :replica_set The name of the replica set to
     #   connect to. Servers not in this replica set will be ignored.
     # @option options [ true, false ] :ssl Whether to use SSL.
+    # @option options [ String ] :ssl_cert The certificate file used to identify
+    #   the connection against MongoDB.
+    # @option options [ String ] :ssl_key The private keyfile used to identify the
+    #   connection against MongoDB. Note that even if the key is stored in the same
+    #   file as the certificate, both need to be explicitly specified.
+    # @option options [ String ] :ssl_key_pass_phrase A passphrase for the private key.
+    # @option options [ true, false ] :ssl_verify Whether or not to do peer certification
+    #   validation.
+    # @option options [ String ] :ssl_ca_cert The file containing a set of concatenated
+    #   certification authority certifications used to validate certs passed from the
+    #   other end of the connection. Required for :ssl_verify.
     # @option options [ Float ] :socket_timeout The timeout, in seconds, to
     #   execute operations on a socket.
     # @option options [ String ] :user The user name.

data/lib/mongo/cluster/topology/replica_set.rb

@@ -54,7 +54,7 @@ module Mongo
         #
         # @param [ Server::Description ] description The description of the
         #   elected primary.
-        # @param [ Array<Server> ] server The list of known servers to the
+        # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
         # @return [ ReplicaSet ] The topology.

data/lib/mongo/cluster/topology/sharded.rb

@@ -45,7 +45,7 @@ module Mongo
         #
         # @param [ Server::Description ] description The description of the
         #   elected primary.
-        # @param [ Array<Server> ] server The list of known servers to the
+        # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
         # @return [ Sharded ] The topology.

data/lib/mongo/cluster/topology/standalone.rb

@@ -45,7 +45,7 @@ module Mongo
         #
         # @param [ Server::Description ] description The description of the
         #   elected primary.
-        # @param [ Array<Server> ] server The list of known servers to the
+        # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
         # @return [ Standalone ] The topology.

data/lib/mongo/cluster/topology/unknown.rb

@@ -49,7 +49,7 @@ module Mongo
         #
         # @param [ Server::Description ] description The description of the
         #   elected primary.
-        # @param [ Array<Server> ] server The list of known servers to the
+        # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
         # @return [ Sharded, ReplicaSet ] The new topology.

data/lib/mongo/collection.rb

@@ -203,7 +203,7 @@ module Mongo
     #
     # @since 2.0.0
     def bulk_write(operations, options)
-      BulkWrite.new(operations, options, self).execute
+      BulkWrite.get(self, operations, options).execute
     end
 
     # Get the fully qualified namespace of the collection.

data/lib/mongo/collection/view/aggregation.rb

@@ -96,7 +96,7 @@ module Mongo
         def send_initial_query(server)
           begin
             initial_query_op.execute(server.context)
-          rescue Mongo::Operation::Aggregate::NeedPrimaryServer
+          rescue Mongo::Error::NeedPrimaryServer
             warn 'Rerouting the Aggregation operation to the primary server.'
             server = ServerSelector.get(mode: :primary).select_server(cluster)
             initial_query_op.execute(server.context)

data/lib/mongo/collection/view/readable.rb

@@ -271,7 +271,7 @@ module Mongo
         # @example Set the number to skip.
         #   view.skip(10)
         #
-        # @param [ Integer ] skip Number of docs to skip.
+        # @param [ Integer ] number Number of docs to skip.
         #
         # @return [ Integer, View ] Either the skip value or a
         #   new +View+.

data/lib/mongo/collection/view/writable.rb

@@ -45,7 +45,7 @@ module Mongo
         # @example Find a document and replace it, returning the new document.
         #   view.find_one_and_replace({ name: 'test' }, :return_document => :after)
         #
-        # @param [ BSON::Document ] document The updates.
+        # @param [ BSON::Document ] replacement The updates.
         # @param [ Hash ] opts The options.
         #
         # @option opts [ Symbol ] :return_document Either :before or :after.
@@ -85,24 +85,24 @@ module Mongo
         # Remove documents from the collection.
         #
         # @example Remove multiple documents from the collection.
-        #   collection_view.remove_many
+        #   collection_view.delete_many
         #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def remove_many
+        def delete_many
           remove(0)
         end
 
         # Remove a document from the collection.
         #
         # @example Remove a single document from the collection.
-        #   collection_view.remove_one
+        #   collection_view.delete_one
         #
         # @return [ Result ] The response from the database.
         #
         # @since 2.0.0
-        def remove_one
+        def delete_one
           remove(1)
         end
 

data/lib/mongo/cursor.rb

@@ -71,8 +71,6 @@ module Mongo
     #     ...
     #   end
     #
-    # @yield param [Hash] Each matching document.
-    #
     # @return [ Enumerator ] The enumerator.
     #
     # @since 2.0.0

data/lib/mongo/error.rb

@@ -40,7 +40,7 @@ module Mongo
 
     # The constant for the writeErrors array.
     #
-    # @sicne 2.0.0
+    # @since 2.0.0
     WRITE_ERRORS = 'writeErrors'.freeze
 
     # The constant for write concern errors.
@@ -61,10 +61,10 @@ module Mongo
 end
 
 require 'mongo/error/parser'
-require 'mongo/error/bulk_write_failure'
+require 'mongo/error/bulk_write_error'
 require 'mongo/error/operation_failure'
-require 'mongo/error/empty_batch'
 require 'mongo/error/invalid_bulk_operation'
+require 'mongo/error/invalid_bulk_operation_type'
 require 'mongo/error/invalid_collection_name'
 require 'mongo/error/invalid_database_name'
 require 'mongo/error/invalid_document'
@@ -75,6 +75,7 @@ require 'mongo/error/invalid_signature'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
+require 'mongo/error/multi_index_drop'
 require 'mongo/error/need_primary_server'
 require 'mongo/error/socket_error'
 require 'mongo/error/socket_timeout_error'

data/lib/mongo/error/{bulk_write_failure.rb → bulk_write_error.rb}

@@ -19,7 +19,7 @@ module Mongo
     # operation.
     #
     # @since 2.0.0
-    class BulkWriteFailure < Error
+    class BulkWriteError < Error
 
       # @return [ BSON::Document ] result The error result.
       attr_reader :result
@@ -29,7 +29,7 @@ module Mongo
       # @example Instantiate the exception.
       #   Mongo::Error::BulkWriteFailure.new(response)
       #
-      # @params [ Hash ] result A processed response from the server
+      # @param [ Hash ] result A processed response from the server
       #   reporting results of the operation.
       #
       # @since 2.0.0

data/lib/mongo/error/invalid_bulk_operation.rb

@@ -28,8 +28,8 @@ module Mongo
       # @param [ String ] name The attempted operation name.
       #
       # @since 2.0.0
-      def initialize(name)
-        super("Invalid operation type: #{name}.")
+      def initialize(type, operation)
+        super("Invalid document format for bulk #{type} operation: #{operation}.")
       end
     end
   end

data/lib/mongo/error/invalid_bulk_operation_type.rb

@@ -0,0 +1,36 @@
+# 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
+  class Error
+
+    # Exception raised if an non-existent operation type is used.
+    #
+    # @since 2.0.0
+    class InvalidBulkOperationType < Error
+
+      # Instantiate the new exception.
+      #
+      # @example Instantiate the exception.
+      #   Mongo::Error::InvalidBulkOperationType.new(type)
+      #
+      # @param [ String ] type The attempted operation type.
+      #
+      # @since 2.0.0
+      def initialize(type)
+        super("Invalid bulk operation type: #{type}.")
+      end
+    end
+  end
+end

data/lib/mongo/error/{empty_batch.rb → multi_index_drop.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.
@@ -15,24 +15,19 @@
 module Mongo
   class Error
 
-    # Exception raised for bulk operations that are empty.
+    # Exception raised if '*' is passed to drop_one on indexes.
     #
     # @since 2.0.0
-    class EmptyBatch < Error
-
-      # The error message.
-      #
-      # @since 2.0.0
-      MESSAGE = 'No operations to execute'.freeze
+    class MultiIndexDrop < Error
 
       # Instantiate the new exception.
       #
       # @example Instantiate the exception.
-      #   Mongo::Error::EmptyBatch.new
+      #   Mongo::Error::MultiIndexDrop.new
       #
       # @since 2.0.0
       def initialize
-        super(MESSAGE)
+        super("Passing '*' to #drop_one would cause all indexes to be dropped. Please use #drop_all")
       end
     end
   end