mongo 2.1.2 → 2.2.0.rc0

data/lib/mongo/database.rb

@@ -149,8 +149,8 @@ module Mongo
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
       preference = ServerSelector.get(client.options.merge(opts[:read])) if opts[:read]
-      server = preference ? preference.select_server(cluster) : cluster.next_primary
-      Operation::Command.new({
+      server = preference ? preference.select_server(cluster, false) : cluster.next_primary(false)
+      Operation::Commands::Command.new({
         :selector => operation,
         :db_name => name,
         :options => { :limit => -1 },

data/lib/mongo/database/view.rb

@@ -50,11 +50,15 @@ module Mongo
       # @since 2.0.0
       def collection_names(options = {})
         @batch_size = options[:batch_size]
-        server = next_primary
+        server = next_primary(false)
         @limit = -1 if server.features.list_collections_enabled?
         collections_info(server).collect do |info|
-          server.features.list_collections_enabled? ?
-            info[Database::NAME] : info[Database::NAME].sub("#{@database.name}.", '')
+          if server.features.list_collections_enabled?
+            info[Database::NAME]
+          else
+            (info[Database::NAME] &&
+              info[Database::NAME].sub("#{@database.name}.", ''))
+          end
         end
       end
 
@@ -67,7 +71,7 @@ module Mongo
       #
       # @since 2.0.5
       def list_collections
-        collections_info(next_primary)
+        collections_info(next_primary(false))
       end
 
       # Create the new database view.
@@ -103,7 +107,7 @@ module Mongo
       end
 
       def initial_query_op
-        Operation::CollectionsInfo.new(collections_info_spec)
+        Operation::Commands::CollectionsInfo.new(collections_info_spec)
       end
 
       def send_initial_query(server)

data/lib/mongo/dbref.rb

@@ -84,8 +84,8 @@ module Mongo
     # @return [ String ] The raw BSON.
     #
     # @since 2.1.0
-    def to_bson(encoded = ''.force_encoding(BSON::BINARY))
-      as_json.to_bson(encoded)
+    def to_bson(buffer = BSON::ByteBuffer.new)
+      as_json.to_bson(buffer)
     end
 
     module ClassMethods
@@ -99,7 +99,7 @@ module Mongo
       # @see http://bsonspec.org/#/specification
       #
       # @since 2.0.0
-      def from_bson(bson)
+      def from_bson(buffer)
         decoded = super
         if ref = decoded[COLLECTION]
           decoded = DBRef.new(ref, decoded[ID], decoded[DATABASE])

data/lib/mongo/error.rb

@@ -84,6 +84,7 @@ require 'mongo/error/invalid_server_preference'
 require 'mongo/error/invalid_signature'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
+require 'mongo/error/invalid_write_concern'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
 require 'mongo/error/multi_index_drop'

data/lib/mongo/error/invalid_write_concern.rb

@@ -0,0 +1,35 @@
+# 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
+
+    # Raised when an invalid write concern is provided.
+    #
+    # @since 2.2.0
+    class InvalidWriteConcern < Error
+
+      # Instantiate the new exception.
+      #
+      # @example Instantiate the exception.
+      #   Mongo::Error::InvalidWriteConcern.new
+      #
+      # @since 2.2.0
+      def initialize
+        super('Invalid write concern options. If w is an Integer, it must be greater than or equal to 0. ' +
+              'If w is 0, it cannot be combined with a true value for fsync or j (journal).')
+      end
+    end
+  end
+end

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

@@ -133,8 +133,8 @@ module Mongo
         # @return [ String ] The raw BSON data.
         #
         # @since 2.0.0
-        def to_bson(encoded = ''.force_encoding(BSON::BINARY))
-          document.to_bson(encoded)
+        def to_bson(buffer = BSON::ByteBuffer.new)
+          document.to_bson(buffer)
         end
 
         class << self

data/lib/mongo/index/view.rb

@@ -56,6 +56,7 @@ module Mongo
         :max => :max,
         :min => :min,
         :name => :name,
+        :partial_filter_expression => :partialFilterExpression,
         :sparse => :sparse,
         :sphere_version => :'2dsphereIndexVersion',
         :storage_engine => :storageEngine,
@@ -114,6 +115,8 @@ module Mongo
       #   a geo index.
       # @option options [ Integer ] :min (nil) Specify the min latitude and longitude for
       #   a geo index.
+      # @option options [ Hash ] :partial_filter_expression  Specify a filter for a partial
+      #   index.
       #
       # @note Note that the options listed may be subset of those available.
       # See the MongoDB documentation for a full list of supported options by server version.
@@ -179,7 +182,7 @@ module Mongo
       #
       # @since 2.0.0
       def each(&block)
-        server = next_primary
+        server = next_primary(false)
         cursor = Cursor.new(self, send_initial_query(server), server).to_enum
         cursor.each do |doc|
           yield doc
@@ -229,7 +232,7 @@ module Mongo
       end
 
       def initial_query_op
-        Operation::Indexes.new(indexes_spec)
+        Operation::Commands::Indexes.new(indexes_spec)
       end
 
       def limit; -1; end

data/lib/mongo/operation.rb

@@ -16,6 +16,7 @@ require 'mongo/operation/result'
 require 'mongo/operation/executable'
 require 'mongo/operation/specifiable'
 require 'mongo/operation/limited'
+require 'mongo/operation/object_id_generator'
 require 'mongo/operation/read_preference'
 require 'mongo/operation/read'
 require 'mongo/operation/write'

data/lib/mongo/operation/commands.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 require 'mongo/operation/commands/command'
+require 'mongo/operation/commands/find'
+require 'mongo/operation/commands/get_more'
 require 'mongo/operation/commands/parallel_scan'
 require 'mongo/operation/commands/aggregate'
 require 'mongo/operation/commands/map_reduce'

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

@@ -12,59 +12,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/operation/commands/aggregate/result'
-
 module Mongo
   module Operation
+    module Commands
 
-    # A MongoDB aggregate operation.
-    #
-    # @note An aggregate operation can behave like a read and return a 
-    #   result set, or can behave like a write operation and
-    #   output results to a user-specified collection.
-    #
-    # @example Create the aggregate operation.
-    #   Aggregate.new({
-    #     :selector => {
-    #       :aggregate => 'test_coll', :pipeline => [{ '$out' => 'test-out' }]
-    #     },
-    #     :db_name => 'test_db'
-    #   })
-    #
-    # Initialization:
-    #   param [ Hash ] spec The specifications for the operation.
-    #
-    #   option spec :selector [ Hash ] The aggregate selector.
-    #   option spec :db_name [ String ] The name of the database on which
-    #     the operation should be executed.
-    #   option spec :options [ Hash ] Options for the aggregate command.
-    #
-    # @since 2.0.0
-    class Aggregate
-      include Specifiable
-      include Limited
-      include Executable
-      include ReadPreference
+      # A MongoDB aggregate operation.
+      #
+      # @note An aggregate operation can behave like a read and return a 
+      #   result set, or can behave like a write operation and
+      #   output results to a user-specified collection.
+      #
+      # @example Create the aggregate operation.
+      #   Aggregate.new({
+      #     :selector => {
+      #       :aggregate => 'test_coll', :pipeline => [{ '$out' => 'test-out' }]
+      #     },
+      #     :db_name => 'test_db'
+      #   })
+      #
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
+      #
+      #   option spec :selector [ Hash ] The aggregate selector.
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the operation should be executed.
+      #   option spec :options [ Hash ] Options for the aggregate command.
+      #
+      # @since 2.0.0
+      class Aggregate < Command
 
-      private
-
-      def query_coll
-        Database::COMMAND
-      end
+        private
 
-      def filter_selector(context)
-        return selector if context.features.write_command_enabled?
-        selector.reject{ |option, value| option.to_s == 'cursor' }
-      end
+        def filter_selector(context)
+          return selector if context.features.write_command_enabled?
+          selector.reject{ |option, value| option.to_s == 'cursor' }
+        end
 
-      def update_selector(context)
-        if context.mongos? && read_pref = read.to_mongos
-          sel = selector[:$query] ? filter_selector(context) : { :$query => filter_selector(context) }
-          sel.merge(:$readPreference => read_pref)
-        else
-          filter_selector(context)
+        def update_selector(context)
+          if context.mongos? && read_pref = read.to_mongos
+            sel = selector[:$query] ? filter_selector(context) : { :$query => filter_selector(context) }
+            sel.merge(:$readPreference => read_pref)
+          else
+            filter_selector(context)
+          end
         end
       end
     end
   end
 end
+
+require 'mongo/operation/commands/aggregate/result'

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

@@ -14,88 +14,74 @@
 
 module Mongo
   module Operation
-    class Aggregate
+    module Commands
 
-      # Defines custom behaviour of results in an aggregation context.
+      # Aggregate result wrapper.
       #
       # @since 2.0.0
-      class Result < Operation::Result
+      class Aggregate
 
-        # The field name for the cursor document in an aggregation.
+        # Defines custom behaviour of results in an aggregation context.
         #
         # @since 2.0.0
-        CURSOR = 'cursor'.freeze
+        class Result < Operation::Result
 
-        # The cursor id field in the cursor document.
-        #
-        # @since 2.0.0
-        CURSOR_ID = 'id'.freeze
-
-        # The field name for the aggregation explain information.
-        #
-        # @since 2.0.5
-        EXPLAIN = 'stages'.freeze
-
-        # The legacy field name for the aggregation explain information.
-        #
-        # @since 2.0.5
-        EXPLAIN_LEGACY = 'serverPipeline'.freeze
+          # The field name for the aggregation explain information.
+          #
+          # @since 2.0.5
+          EXPLAIN = 'stages'.freeze
 
-        # The field name for the first batch of a cursor.
-        #
-        # @since 2.0.0
-        FIRST_BATCH = 'firstBatch'.freeze
-
-        # The field name for a result without a cursor.
-        #
-        # @since 2.0.0
-        RESULT = 'result'.freeze
+          # The legacy field name for the aggregation explain information.
+          #
+          # @since 2.0.5
+          EXPLAIN_LEGACY = 'serverPipeline'.freeze
 
-        # Get the cursor id for the result.
-        #
-        # @example Get the cursor id.
-        #   result.cursor_id
-        #
-        # @note Even though the wire protocol has a cursor_id field for all
-        #   messages of type reply, it is always zero when using the
-        #   aggregation framework and must be retrieved from the cursor
-        #   document itself. Wahnsinn!
-        #
-        # @return [ Integer ] The cursor id.
-        #
-        # @since 2.0.0
-        def cursor_id
-          cursor_document ? cursor_document[CURSOR_ID] : super
-        end
+          # Get the cursor id for the result.
+          #
+          # @example Get the cursor id.
+          #   result.cursor_id
+          #
+          # @note Even though the wire protocol has a cursor_id field for all
+          #   messages of type reply, it is always zero when using the
+          #   aggregation framework and must be retrieved from the cursor
+          #   document itself. Wahnsinn!
+          #
+          # @return [ Integer ] The cursor id.
+          #
+          # @since 2.0.0
+          def cursor_id
+            cursor_document ? cursor_document[CURSOR_ID] : super
+          end
 
-        # Get the documents for the aggregation result. This is either the
-        # first document's 'result' field, or if a cursor option was selected
-        # it is the 'firstBatch' field in the 'cursor' field of the first
-        # document returned.
-        #
-        # @example Get the documents.
-        #   result.documents
-        #
-        # @return [ Array<BSON::Document> ] The documents.
-        #
-        # @since 2.0.0
-        def documents
-          reply.documents[0][RESULT] || explain_document ||
-              cursor_document[FIRST_BATCH]
-        end
+          # Get the documents for the aggregation result. This is either the
+          # first document's 'result' field, or if a cursor option was selected
+          # it is the 'firstBatch' field in the 'cursor' field of the first
+          # document returned.
+          #
+          # @example Get the documents.
+          #   result.documents
+          #
+          # @return [ Array<BSON::Document> ] The documents.
+          #
+          # @since 2.0.0
+          def documents
+            reply.documents[0][RESULT] || explain_document ||
+                cursor_document[FIRST_BATCH]
+          end
 
-        private
+          private
 
-        def explain_document
-          first_document[EXPLAIN] || first_document[EXPLAIN_LEGACY]
-        end
+          def explain_document
+            first_document[EXPLAIN] || first_document[EXPLAIN_LEGACY]
+          end
 
-        def cursor_document
-          @cursor_document ||= reply.documents[0][CURSOR]
-        end
+          def cursor_document
+            @cursor_document ||= reply.documents[0][CURSOR]
+          end
 
-        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/collections_info.rb

@@ -16,52 +16,54 @@ require 'mongo/operation/commands/collections_info/result'
 
 module Mongo
   module Operation
+    module Commands
 
-    # A MongoDB operation to get a list of collection names in a database.
-    #
-    # @example Create the collection names operation.
-    #   Read::CollectionNames.new(:db_name => 'test-db')
-    #
-    # Initialization:
-    #   param [ Hash ] spec The specifications for the collection names operation.
-    #
-    #   option spec :db_name [ String ] The name of the database whose collection
-    #     names is requested.
-    #   option spec :options [ Hash ] Options for the operation.
-    #
-    # @since 2.0.0
-    class CollectionsInfo
-      include Specifiable
-      include ReadPreference
-      include Executable
-
-      # Execute the operation.
-      # The context gets a connection on which the operation
-      # is sent in the block.
+      # A MongoDB operation to get a list of collection names in a database.
+      #
+      # @example Create the collection names operation.
+      #   Read::CollectionNames.new(:db_name => 'test-db')
       #
-      # @param [ Mongo::Server::Context ] context The context for this operation.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the collection names operation.
       #
-      # @return [ Result ] The operation response, if there is one.
+      #   option spec :db_name [ String ] The name of the database whose collection
+      #     names is requested.
+      #   option spec :options [ Hash ] Options for the operation.
       #
       # @since 2.0.0
-      def execute(context)
-        if context.features.list_collections_enabled?
-          ListCollections.new(spec).execute(context)
-        else
-          context.with_connection do |connection|
-            Result.new(connection.dispatch([ message(context) ])).validate!
+      class CollectionsInfo
+        include Specifiable
+        include ReadPreference
+        include Executable
+
+        # 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.0.0
+        def execute(context)
+          if context.features.list_collections_enabled?
+            ListCollections.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
-        { :name => { '$not' => /system\.|\$/ } }
-      end
+        def selector
+          { :name => { '$not' => /system\.|\$/ } }
+        end
 
-      def query_coll
-        Database::NAMESPACES
+        def query_coll
+          Database::NAMESPACES
+        end
       end
     end
   end