mongo 2.3.1 → 2.4.0.rc0

data/lib/mongo/cursor/builder/get_more_command.rb

@@ -25,8 +25,7 @@ module Mongo
         # @return [ Cursor ] cursor The cursor.
         attr_reader :cursor
 
-        def_delegators :@cursor, :collection_name, :database, :view
-        def_delegators :view, :batch_size
+        def_delegators :@cursor, :batch_size, :collection_name, :database, :view
 
         # Create the new builder.
         #
@@ -56,7 +55,7 @@ module Mongo
 
         def get_more_command
           command = { :getMore => cursor.id, :collection => collection_name }
-          command[:batchSize] = batch_size.abs if batch_size && batch_size != 0
+          command[:batchSize] = batch_size if batch_size
           # If the max_await_time_ms option is set, then we set maxTimeMS on
           # the get more command.
           if view.respond_to?(:max_await_time_ms)

data/lib/mongo/database.rb

@@ -68,6 +68,10 @@ module Mongo
                    :read_preference,
                    :write_concern
 
+    # @return [ Mongo::Server ] Get the primary server from the cluster.
+    def_delegators :cluster,
+                   :next_primary
+
     # Check equality of the database object against another. Will simply check
     # if the names are the same.
     #
@@ -153,7 +157,6 @@ module Mongo
       Operation::Commands::Command.new({
         :selector => operation,
         :db_name => name,
-        :options => { :limit => -1 },
         :read => preference
       }).execute(server)
     end
@@ -167,7 +170,12 @@ module Mongo
     #
     # @since 2.0.0
     def drop
-      command(:dropDatabase => 1)
+      operation = { :dropDatabase => 1 }
+      Operation::Commands::DropDatabase.new({
+                                             selector: operation,
+                                             db_name: name,
+                                             write_concern: write_concern
+                                            }).execute(next_primary)
     end
 
     # Instantiate a new database object.

data/lib/mongo/error.rb

@@ -83,6 +83,7 @@ require 'mongo/error/invalid_database_name'
 require 'mongo/error/invalid_document'
 require 'mongo/error/invalid_file'
 require 'mongo/error/invalid_file_revision'
+require 'mongo/error/invalid_application_name'
 require 'mongo/error/invalid_nonce'
 require 'mongo/error/invalid_replacement_document'
 require 'mongo/error/invalid_server_preference'
@@ -101,4 +102,5 @@ require 'mongo/error/unchangeable_collection_option'
 require 'mongo/error/unexpected_chunk_length'
 require 'mongo/error/unexpected_response'
 require 'mongo/error/missing_file_chunk'
+require 'mongo/error/unsupported_collation'
 require 'mongo/error/unsupported_features'

data/lib/mongo/error/invalid_application_name.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2016 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
+
+    # This exception is raised when the metadata document sent to the server
+    #   at the time of a connection handshake is invalid.
+    #
+    # @since 2.4.0
+    class InvalidApplicationName < Error
+
+      # Instantiate the new exception.
+      #
+      # @example Create the exception.
+      #   InvalidApplicationName.new(app_name, 128)
+      #
+      # @param [ String ] app_name The application name option.
+      # @param [ Integer ] max_size The max byte size of the application name.
+      #
+      # @since 2.4.0
+      def initialize(app_name, max_size)
+        super("The provided application name '#{app_name}' cannot exceed #{max_size} bytes.")
+      end
+    end
+  end
+end

data/lib/mongo/error/invalid_server_preference.rb

@@ -20,16 +20,37 @@ module Mongo
     # @since 2.0.0
     class InvalidServerPreference < Error
 
+      # Error message when tags are specified for a read preference that cannot support them.
+      #
+      # @since 2.4.0
+      NO_TAG_SUPPORT = 'This read preference cannot be combined with tags.'.freeze
+
+      # Error message when a max staleness is specified for a read preference that cannot support it.
+      #
+      # @since 2.4.0
+      NO_MAX_STALENESS_SUPPORT = 'max_staleness cannot be set for this read preference.'.freeze
+
+      # Error message for when the max staleness is not at least twice the heartbeat frequency.
+      #
+      # @since 2.4.0
+      INVALID_MAX_STALENESS = "max_staleness must be at least twice the client's heartbeat frequency.".freeze
+
+      # Error message when max staleness cannot be used because one or more servers has version < 3.4.
+      #
+      # @since 2.4.0
+      NO_MAX_STALENESS_WITH_LEGACY_SERVER = 'max_staleness can only be set for a cluster in which ' +
+                                              'each server is at least version 3.4.'.freeze
+
       # Instantiate the new exception.
       #
       # @example Instantiate the exception.
-      #   Mongo::ServerSelector::InvalidServerPreference.new
+      #   Mongo::Error::InvalidServerPreference.new
       #
       # @param [ String ] name The preference name.
       #
       # @since 2.0.0
-      def initialize(name)
-        super("This server preference #{name} cannot be combined with tags.")
+      def initialize(message)
+        super(message)
       end
     end
   end

data/lib/mongo/error/unsupported_collation.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2014-2016 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
+
+    # Raised if a collation is specified for an operation but the server selected does not
+    # support collations.
+    #
+    # @since 2.4.0
+    class UnsupportedCollation < Error
+
+      # The default error message describing that collations is not supported.
+      #
+      # @return [ String ] A default message describing that collations is not supported by the server.
+      #
+      # @since 2.4.0
+      DEFAULT_MESSAGE = "Collations is not a supported feature of the server handling this operation. " +
+          "Operation results may be unexpected."
+
+      # The error message describing that collations cannot be used when write concern is unacknowledged.
+      #
+      # @return [ String ] A message describing that collations cannot be used when write concern is unacknowledged.
+      #
+      # @since 2.4.0
+      UNACKNOWLEDGED_WRITES_MESSAGE = "A collation cannot be specified when using unacknowledged writes. " +
+        "Either remove the collation option or use acknowledged writes (w >= 1)."
+
+      # Create the new exception.
+      #
+      # @example Create the new exception.
+      #   Mongo::Error::UnsupportedCollation.new
+      #
+      # @since 2.4.0
+      def initialize(message = nil)
+        super(message || DEFAULT_MESSAGE)
+      end
+    end
+  end
+end

data/lib/mongo/index/view.rb

@@ -29,7 +29,7 @@ module Mongo
       #   when sending the listIndexes command.
       attr_reader :batch_size
 
-      def_delegators :@collection, :cluster, :database, :read_preference
+      def_delegators :@collection, :cluster, :database, :read_preference, :write_concern
       def_delegators :cluster, :next_primary
 
       # The index key field.
@@ -64,7 +64,8 @@ module Mongo
         :text_version => :textIndexVersion,
         :unique => :unique,
         :version => :v,
-        :weights => :weights
+        :weights => :weights,
+        :collation => :collation
       }.freeze
 
       # Drop an index by its name.
@@ -147,11 +148,15 @@ module Mongo
       #
       # @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,
-        ).execute(next_primary)
+        server = next_primary
+        spec = {
+                indexes: normalize_models(models.flatten, server),
+                db_name: database.name,
+                coll_name: collection.name
+               }
+
+        spec[:write_concern] = write_concern if server.features.collation_enabled?
+        Operation::Write::CreateIndex.new(spec).execute(server)
       end
 
       # Convenience method for getting index information by a specific name or
@@ -213,11 +218,14 @@ module Mongo
       private
 
       def drop_by_name(name)
-        Operation::Write::DropIndex.new(
-          db_name: database.name,
-          coll_name: collection.name,
-          index_name: name
-        ).execute(next_primary)
+        spec = {
+                 db_name: database.name,
+                 coll_name: collection.name,
+                 index_name: name
+               }
+        server = next_primary
+        spec[:write_concern] = write_concern if server.features.collation_enabled?
+        Operation::Write::DropIndex.new(spec).execute(server)
       end
 
       def index_name(spec)
@@ -243,8 +251,8 @@ module Mongo
         Options::Mapper.transform_keys_to_strings(spec)
       end
 
-      def normalize_models(models)
-        with_generated_names(models).map do |model|
+      def normalize_models(models, server)
+        with_generated_names(models, server).map do |model|
           Options::Mapper.transform(model, OPTIONS)
         end
       end
@@ -253,13 +261,18 @@ module Mongo
         initial_query_op.execute(server)
       end
 
-      def with_generated_names(models)
+      def with_generated_names(models, server)
         models.dup.each do |model|
+          validate_collation!(model, server)
           unless model[:name]
             model[:name] = index_name(model[:key])
           end
         end
       end
+
+      def validate_collation!(model, server)
+        raise Error::UnsupportedCollation.new if model[:collation] && !server.features.collation_enabled?
+      end
     end
   end
 end

data/lib/mongo/operation.rb

@@ -18,6 +18,7 @@ require 'mongo/operation/specifiable'
 require 'mongo/operation/limited'
 require 'mongo/operation/object_id_generator'
 require 'mongo/operation/read_preference'
+require 'mongo/operation/takes_write_concern'
 require 'mongo/operation/read'
 require 'mongo/operation/write'
 require 'mongo/operation/commands'
@@ -50,5 +51,10 @@ module Mongo
     #
     # @since 2.1.0
     UPSERT = 'upsert'.freeze
+
+    # The collation field constant.
+    #
+    # @since 2.4.0
+    COLLATION = 'collation'.freeze
   end
 end

data/lib/mongo/operation/commands.rb

@@ -19,6 +19,9 @@ require 'mongo/operation/commands/parallel_scan'
 require 'mongo/operation/commands/aggregate'
 require 'mongo/operation/commands/map_reduce'
 require 'mongo/operation/commands/collections_info'
+require 'mongo/operation/commands/create'
+require 'mongo/operation/commands/drop'
+require 'mongo/operation/commands/drop_database'
 require 'mongo/operation/commands/indexes'
 require 'mongo/operation/commands/list_collections'
 require 'mongo/operation/commands/list_indexes'

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

@@ -40,21 +40,21 @@ module Mongo
       #
       # @since 2.0.0
       class Aggregate < Command
+        include TakesWriteConcern
 
         private
 
-        def filter_selector(server)
-          return selector if server.features.write_command_enabled?
-          selector.reject{ |option, value| option.to_s == 'cursor' }
+        def filter_cursor_from_selector(sel, server)
+          return sel if server.features.write_command_enabled?
+          sel.reject{ |option, value| option.to_s == 'cursor' }
         end
 
-        def update_selector(server)
-          if server.mongos? && read_pref = read.to_mongos
-            sel = selector[:$query] ? filter_selector(server) : { :$query => filter_selector(server) }
-            sel.merge(:$readPreference => read_pref)
-          else
-            filter_selector(server)
-          end
+        def message(server)
+          sel = update_selector_for_read_pref(selector, server)
+          sel = filter_cursor_from_selector(sel, server)
+          sel = update_selector_for_write_concern(sel, server)
+          opts = update_options_for_slave_ok(options, server)
+          Protocol::Query.new(db_name, query_coll, sel, opts)
         end
       end
     end

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

@@ -0,0 +1,45 @@
+# Copyright (C) 2014-2016 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 Commands
+
+      # A MongoDB create collection operation.
+      #
+      # @example Instantiate the operation.
+      #   Commands::Create.new(selector: { create: 'test' }, :db_name => 'test')
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
+      #
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :selector [ Hash ] The create collection selector.
+      #   option spec :write_concern [ String ] The write concern to use.
+      #     Only applied for server version >= 3.4.
+      #
+      # @since 2.4.0
+      class Create < Command
+        include TakesWriteConcern
+
+        private
+
+        def message(server)
+          sel = update_selector_for_write_concern(selector, server)
+          Protocol::Query.new(db_name, query_coll, sel, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# Copyright (C) 2014-2016 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 Commands
+
+      # A MongoDB drop collection operation.
+      #
+      # @example Instantiate the operation.
+      #   Commands::Drop.new(selector: { drop: 'test' }, :db_name => 'test')
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
+      #
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :selector [ Hash ] The drop collection selector.
+      #   option spec :write_concern [ String ] The write concern to use.
+      #     Only applied for server version >= 3.4.
+      #
+      # @since 2.4.0
+      class Drop < Command
+        include TakesWriteConcern
+
+        private
+
+        def message(server)
+          sel = update_selector_for_write_concern(selector, server)
+          Protocol::Query.new(db_name, query_coll, sel, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# Copyright (C) 2014-2016 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 Commands
+
+      # A MongoDB drop database operation.
+      #
+      # @example Instantiate the operation.
+      #   Commands::Drop.new(selector: { dropDatabase: 'test' }, :db_name => 'test')
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
+      #
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :selector [ Hash ] The drop database selector.
+      #   option spec :write_concern [ String ] The write concern to use.
+      #     Only applied for server version >= 3.4.
+      #
+      # @since 2.4.0
+      class DropDatabase < Command
+        include TakesWriteConcern
+
+        private
+
+        def message(server)
+          sel = update_selector_for_write_concern(selector, server)
+          Protocol::Query.new(db_name, query_coll, sel, options)
+        end
+      end
+    end
+  end
+end