mongo 2.0.5 → 2.0.6

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

@@ -72,6 +72,7 @@ module Mongo
         # @since 2.0.0
         def initialize(options, seeds = [])
           @options = options
+          @seeds = seeds
         end
 
         # An unknown topology is not a replica set.
@@ -139,6 +140,67 @@ module Mongo
         # @since 2.0.0
         def unknown?; true; end
 
+        # Whether a server description's hosts may be added to the cluster.
+        #
+        # @example Check if a description's hosts may be added to the cluster.
+        #   topology.add_hosts?(description, servers)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Array<Mongo::Server> ] servers The cluster servers.
+        #
+        # @return [ true, false ] Whether a description's hosts may be added.
+        #
+        # @since 2.0.6
+        def add_hosts?(description, servers)
+          !(description.unknown? || description.ghost?)
+        end
+
+        # Whether a description can be used to remove hosts from the cluster.
+        #
+        # @example Check if a description can be used to remove hosts from the cluster.
+        #   topology.remove_hosts?(description)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        #
+        # @return [ true, false ] Whether hosts may be removed from the cluster.
+        #
+        # @since 2.0.6
+        def remove_hosts?(description)
+          description.standalone?
+        end
+
+        # Whether a specific server in the cluster can be removed, given a description.
+        #
+        # @example Check if a specific server can be removed from the cluster.
+        #   topology.remove_server?(description, server)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Mongo::Serve ] server The server in question.
+        #
+        # @return [ true, false ] Whether the server can be removed from the cluster.
+        #
+        # @since 2.0.6
+        def remove_server?(description, server)
+          description.standalone? && description.is_server?(server)
+        end
+
+        # Notify the topology that a standalone was discovered.
+        #
+        # @example Notify the topology that a standalone was discovered.
+        #   topology.standalone_discovered
+        #
+        # @return [ Topology::Unknown, Topology::Single ] Either self or a
+        #   new Single topology.
+        #
+        # @since 2.0.6
+        def standalone_discovered
+          if @seeds.size == 1
+            Single.new(options, @seeds)
+          else
+            self
+          end
+        end
+
         private
 
         def initialize_replica_set(description, servers)

data/lib/mongo/error/invalid_bulk_operation.rb

@@ -25,7 +25,8 @@ module Mongo
       # @example Instantiate the exception.
       #   Mongo::Error::InvalidBulkOperation.new(name)
       #
-      # @param [ String ] name The attempted operation name.
+      # @param [ String ] type The bulk operation type.
+      # @param [ Hash ] operation The bulk operation.
       #
       # @since 2.0.0
       def initialize(type, operation)

data/lib/mongo/event.rb

@@ -16,25 +16,25 @@ require 'mongo/event/listeners'
 require 'mongo/event/publisher'
 require 'mongo/event/subscriber'
 require 'mongo/event/primary_elected'
-require 'mongo/event/server_added'
-require 'mongo/event/server_removed'
+require 'mongo/event/description_changed'
+require 'mongo/event/standalone_discovered'
 
 module Mongo
   module Event
 
-    # When a server is elected primary.
+    # When a standalone is discovered.
     #
-    # @since 2.0.0
-    PRIMARY_ELECTED = 'primary_elected'.freeze
+    # @since 2.0.6
+    STANDALONE_DISCOVERED = 'standalone_discovered'.freeze
 
-    # When a server is to be added to a cluster.
+    # When a server is elected primary.
     #
     # @since 2.0.0
-    SERVER_ADDED = 'server_added'.freeze
+    PRIMARY_ELECTED = 'primary_elected'.freeze
 
     # When a server is to be removed from a cluster.
     #
-    # @since 2.0.0
-    SERVER_REMOVED = 'server_removed'.freeze
+    # @since 2.0.6
+    DESCRIPTION_CHANGED = 'description_changed'.freeze
   end
 end

data/lib/mongo/event/{server_added.rb → description_changed.rb}

@@ -16,10 +16,10 @@
 module Mongo
   module Event
 
-    # This handles host added events for server descriptions.
+    # This handles a change in description.
     #
-    # @since 2.0.0
-    class ServerAdded
+    # @since 2.0.6
+    class DescriptionChanged
 
       # @return [ Mongo::Cluster ] cluster The event publisher.
       attr_reader :cluster
@@ -45,8 +45,9 @@ module Mongo
       # @param [ Address ] address The added host.
       #
       # @since 2.0.0
-      def handle(address)
-        cluster.add(address)
+      def handle(updated)
+        cluster.add_hosts(updated)
+        cluster.remove_hosts(updated)
       end
     end
   end

data/lib/mongo/event/{server_removed.rb → standalone_discovered.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,38 +15,38 @@
 module Mongo
   module Event
 
-    # This handles host removed events for server descriptions.
+    # This handles when a standalone is discovered.
     #
-    # @since 2.0.0
-    class ServerRemoved
-      include Loggable
+    # @since 2.0.6
+    class StandaloneDiscovered
 
       # @return [ Mongo::Cluster ] cluster The event publisher.
       attr_reader :cluster
 
-      # Initialize the new host removed event handler.
+      # Initialize the new standalone discovered event handler.
       #
       # @example Create the new handler.
-      #   ServerRemoved.new(cluster)
+      #   StandaloneDiscovered.new(cluster)
       #
       # @param [ Mongo::Cluster ] cluster The cluster to publish from.
       #
-      # @since 2.0.0
+      # @since 2.0.6
       def initialize(cluster)
         @cluster = cluster
       end
 
-      # This event publishes an event to remove from the cluster and logs the
-      # configuration change.
+      # This event tells the cluster to notify its topology that a standalone
+      # was discovered.
       #
       # @example Handle the event.
-      #   server_removed.handle('127.0.0.1:27018')
+      #   standalone_discovered.handle(description)
       #
-      # @param [ Address ] address The removed host.
+      # @param [ Server::Description ] description The description of the
+      #   server.
       #
-      # @since 2.0.0
-      def handle(address)
-        cluster.remove(address)
+      # @since 2.0.6
+      def handle(description)
+        cluster.standalone_discovered
       end
     end
   end

data/lib/mongo/operation/aggregate.rb

@@ -31,12 +31,13 @@ module Mongo
     #     :db_name => 'test_db'
     #   })
     #
-    # @param [ Hash ] spec The specifications for the operation.
+    # 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.
+    #   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

data/lib/mongo/operation/command.rb

@@ -20,14 +20,13 @@ module Mongo
     # @example Create the command operation.
     #   Mongo::Operation::Command.new({ :selector => { :isMaster => 1 } })
     #
-    # @note A command is actually a query on the virtual '$cmd' collection.
+    # Initialization:
+    #   param [ Hash ] spec The specifications for the command.
     #
-    # @param [ Hash ] spec The specifications for the command.
-    #
-    # @option spec :selector [ Hash ] The command selector.
-    # @option spec :db_name [ String ] The name of the database on which
+    #   option spec :selector [ Hash ] The command selector.
+    #   option spec :db_name [ String ] The name of the database on which
     #   the command should be executed.
-    # @option spec :options [ Hash ] Options for the command.
+    #   option spec :options [ Hash ] Options for the command.
     #
     # @since 2.0.0
     class Command

data/lib/mongo/operation/kill_cursors.rb

@@ -20,9 +20,10 @@ module Mongo
     # @example Create the kill cursors operation.
     #   Mongo::Operation::KillCursor.new({ :cursor_ids => [1, 2] })
     #
-    # @param [ Hash ] spec The specifications for the operation.
+    # Initialization:
+    #   param [ Hash ] spec The specifications for the operation.
     #
-    # @option spec :cursor_ids [ Array ] The ids of cursors to kill.
+    #   option spec :cursor_ids [ Array ] The ids of cursors to kill.
     #
     # @since 2.0.0
     class KillCursors

data/lib/mongo/operation/map_reduce.rb

@@ -33,12 +33,13 @@ module Mongo
     #     :db_name  => 'test_db'
     #   })
     #
-    # @param [ Hash ] spec The specifications for the operation.
+    # Initialization:
+    #   param [ Hash ] spec The specifications for the operation.
     #
-    # @option spec :selector [ Hash ] The map reduce 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 map reduce command.
+    #   option spec :selector [ Hash ] The map reduce 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 map reduce command.
     #
     # @since 2.0.0
     class MapReduce

data/lib/mongo/operation/read/collections_info.rb

@@ -21,11 +21,12 @@ module Mongo
       # @example Create the collection names operation.
       #   Read::CollectionNames.new(:db_name => 'test-db')
       #
-      # @param [ Hash ] spec The specifications for the collection names operation.
+      # 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.
+      #   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

data/lib/mongo/operation/read/get_more.rb

@@ -26,14 +26,15 @@ module Mongo
       #     :coll_name => 'test_coll'
       #   })
       #
-      # @param [ Hash ] spec The specifications for the operation.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the operation.
       #
-      # @option spec :to_return [ Integer ] The number of results to return.
-      # @option spec :cursor_id [ Integer ] The id of the cursor.
-      # @option spec :db_name [ String ] The name of the database on which
-      #   the operation should be executed.
-      # @option spec :coll_name [ String ] The name of the collection on which
-      #   the operation should be executed.
+      #   option spec :to_return [ Integer ] The number of results to return.
+      #   option spec :cursor_id [ Integer ] The id of the cursor.
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the operation should be executed.
+      #   option spec :coll_name [ String ] The name of the collection on which
+      #     the operation should be executed.
       #
       # @since 2.0.0
       class GetMore

data/lib/mongo/operation/read/indexes.rb

@@ -23,10 +23,11 @@ module Mongo
       # @example Instantiate the operation.
       #   Read::Indexes.new(:db_name => 'test', :coll_name => 'test_coll')
       #
-      # @param [ Hash ] spec The specifications for the insert.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the insert.
       #
-      # @option spec :db_name [ String ] The name of the database.
-      # @option spec :coll_name [ String ] The name of the collection.
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :coll_name [ String ] The name of the collection.
       #
       # @since 2.0.0
       class Indexes

data/lib/mongo/operation/read/list_collections.rb

@@ -25,11 +25,12 @@ module Mongo
       #
       # @note A command is actually a query on the virtual '$cmd' collection.
       #
-      # @param [ Hash ] spec The specifications for the command.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the command.
       #
-      # @option spec :db_name [ String ] The name of the database whose list of
-      #   collection names is requested.
-      # @option spec :options [ Hash ] Options for the command.
+      #   option spec :db_name [ String ] The name of the database whose list of
+      #     collection names is requested.
+      #   option spec :options [ Hash ] Options for the command.
       #
       # @since 2.0.0
       class ListCollections

data/lib/mongo/operation/read/list_indexes.rb

@@ -25,13 +25,14 @@ module Mongo
       #
       # @note A command is actually a query on the virtual '$cmd' collection.
       #
-      # @param [ Hash ] spec The specifications for the command.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the command.
       #
-      # @option spec :coll_name [ Hash ] The name of the collection whose index
-      #   info is requested.
-      # @option spec :db_name [ String ] The name of the database on which
-      #   the command should be executed.
-      # @option spec :options [ Hash ] Options for the command.
+      #   option spec :coll_name [ Hash ] The name of the collection whose index
+      #     info is requested.
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the command should be executed.
+      #   option spec :options [ Hash ] Options for the command.
       #
       # @since 2.0.0
       class ListIndexes

data/lib/mongo/operation/read/query.rb

@@ -26,14 +26,15 @@ module Mongo
       #     :options => { :limit => 2 }
       #   })
       #
-      # @param [ Hash ] spec The specifications for the query.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the query.
       #
-      # @option spec :selector [ Hash ] The query selector.
-      # @option spec :db_name [ String ] The name of the database on which
-      #   the query should be run.
-      # @option spec :coll_name [ String ] The name of the collection on which
-      #   the query should be run.
-      # @option spec :options [ Hash ] Options for the query.
+      #   option spec :selector [ Hash ] The query selector.
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the query should be run.
+      #   option spec :coll_name [ String ] The name of the collection on which
+      #     the query should be run.
+      #   option spec :options [ Hash ] Options for the query.
       #
       # @since 2.0.0
       class Query

data/lib/mongo/operation/read_preferrable.rb

@@ -22,7 +22,7 @@ module Mongo
 
       # The constant for slave ok flags.
       #
-      # @since 2.0.5
+      # @since 2.0.6
       SLAVE_OK = :slave_ok
 
       private
@@ -36,8 +36,12 @@ module Mongo
         end
       end
 
+      def slave_ok?(context)
+        (context.cluster.single? && !context.mongos?) || read.slave_ok?
+      end
+
       def update_options(context)
-        if context.slave_ok? || (!context.mongos? && read.slave_ok?)
+        if slave_ok?(context)
           options.dup.tap do |opts|
             (opts[:flags] ||= []) << SLAVE_OK
           end

data/lib/mongo/operation/write/bulk/bulk_delete.rb

@@ -31,19 +31,20 @@ module Mongo
       #     :write_concern => write_concern
       #   })
       #
-      # @param [ Hash ] spec The specifications for the delete.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the delete.
       #
-      # @option spec :deletes [ Array ] The delete documents.
-      # @option spec :db_name [ String ] The name of the database on which
-      #   the delete should be executed.
-      # @option spec :coll_name [ String ] The name of the collection on which
-      #   the delete should be executed.
-      # @option spec :write_concern [ Mongo::WriteConcern ] The write concern
-      #   for this operation.
-      # @option spec :ordered [ true, false ] Whether the operations should be
-      #   executed in order.
-      # @option spec :options [Hash] Options for the command, if it ends up being a
-      #   write command.
+      #   option spec :deletes [ Array ] The delete documents.
+      #   option spec :db_name [ String ] The name of the database on which
+      #     the delete should be executed.
+      #   option spec :coll_name [ String ] The name of the collection on which
+      #     the delete should be executed.
+      #   option spec :write_concern [ Mongo::WriteConcern ] The write concern
+      #     for this operation.
+      #   option spec :ordered [ true, false ] Whether the operations should be
+      #     executed in order.
+      #   option spec :options [Hash] Options for the command, if it ends up being a
+      #     write command.
       #
       # @since 2.0.0
       class BulkDelete