mongo 2.0.2 → 2.0.3

data/lib/mongo/auth/scram/conversation.rb

@@ -111,7 +111,7 @@ module Mongo
         def continue(reply)
           validate_first_message!(reply)
           Protocol::Query.new(
-            Database::ADMIN,
+            user.auth_source,
             Database::COMMAND,
             CLIENT_CONTINUE_MESSAGE.merge(payload: client_final_message, conversationId: id),
             limit: -1
@@ -133,7 +133,7 @@ module Mongo
         def finalize(reply)
           validate_final_message!(reply)
           Protocol::Query.new(
-            Database::ADMIN,
+            user.auth_source,
             Database::COMMAND,
             CLIENT_CONTINUE_MESSAGE.merge(payload: client_empty_message, conversationId: id),
             limit: -1
@@ -151,7 +151,7 @@ module Mongo
         # @since 2.0.0
         def start
           Protocol::Query.new(
-            Database::ADMIN,
+            user.auth_source,
             Database::COMMAND,
             CLIENT_FIRST_MESSAGE.merge(payload: client_first_message, mechanism: SCRAM::MECHANISM),
             limit: -1

data/lib/mongo/auth/user.rb

@@ -134,8 +134,8 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(options)
-        @auth_source = options[:auth_source] || options[:database] || Database::ADMIN
         @database = options[:database] || Database::ADMIN
+        @auth_source = options[:auth_source] || @database
         @name = options[:user]
         @password = options[:password] || options[:pwd]
         @mechanism = options[:auth_mech] || :mongodb_cr

data/lib/mongo/auth/x509.rb

@@ -21,13 +21,27 @@ module Mongo
     #
     # @since 2.0.0
     class X509
-      include Executable
 
       # The authentication mechinism string.
       #
       # @since 2.0.0
       MECHANISM = 'MONGODB-X509'.freeze
 
+      # @return [ Mongo::Auth::User ] The user to authenticate.
+      attr_reader :user
+
+      # Instantiate a new authenticator.
+      #
+      # @example Create the authenticator.
+      #   Mongo::Auth::X509.new(user)
+      #
+      # @param [ Mongo::Auth::User ] user The user to authenticate.
+      #
+      # @since 2.0.0
+      def initialize(user)
+        @user = user
+      end
+
       # Log the user in on the given connection.
       #
       # @example Log the user in.

data/lib/mongo/cluster.rb

@@ -34,7 +34,7 @@ module Mongo
     # @return [ Object ] The cluster topology.
     attr_reader :topology
 
-    def_delegators :topology, :replica_set?, :replica_set_name, :sharded?, :standalone?, :unknown?
+    def_delegators :topology, :replica_set?, :replica_set_name, :sharded?, :single?, :unknown?
 
     # Determine if this cluster of servers is equal to another object. Checks the
     # servers currently in the cluster, not what was configured.
@@ -66,12 +66,15 @@ module Mongo
     # @since 2.0.0
     def add(host)
       address = Address.new(host)
-      unless addresses.include?(address)
-        log_debug([ "Adding #{address.to_s} to the cluster." ])
-        addresses.push(address)
-        server = Server.new(address, event_listeners, options)
-        @servers.push(server)
-        server
+      if !addresses.include?(address)
+        if addition_allowed?(address)
+          log_debug([ "Adding #{address.to_s} to the cluster." ])
+          addresses.push(address)
+          server = Server.new(address, event_listeners,
+                              options.merge(slave_ok: @slave_ok))
+          @servers.push(server)
+          server
+        end
       end
     end
 
@@ -90,6 +93,7 @@ module Mongo
       @event_listeners = Event::Listeners.new
       @options = options.freeze
       @topology = Topology.initial(seeds, options)
+      @slave_ok = @topology.single? unless options[:read]
 
       subscribe_to(Event::SERVER_ADDED, Event::ServerAdded.new(self))
       subscribe_to(Event::SERVER_REMOVED, Event::ServerRemoved.new(self))
@@ -179,7 +183,7 @@ module Mongo
     #
     # @since 2.0.0
     def servers
-      topology.servers(@servers)
+      topology.servers(@servers.compact).compact
     end
 
     # Create a cluster for the provided client, for use when we don't want the
@@ -199,5 +203,15 @@ module Mongo
       cluster = Cluster.new(client.cluster.addresses.map(&:to_s), client.options)
       client.instance_variable_set(:@cluster, cluster)
     end
+
+    private
+
+    def direct_connection?(address)
+      address.seed == @topology.seed
+    end
+
+    def addition_allowed?(address)
+      !@topology.single? || direct_connection?(address)
+    end
   end
 end

data/lib/mongo/cluster/topology.rb

@@ -14,7 +14,7 @@
 
 require 'mongo/cluster/topology/replica_set'
 require 'mongo/cluster/topology/sharded'
-require 'mongo/cluster/topology/standalone'
+require 'mongo/cluster/topology/single'
 require 'mongo/cluster/topology/unknown'
 
 module Mongo
@@ -32,7 +32,7 @@ module Mongo
       OPTIONS = {
         replica_set: ReplicaSet,
         sharded: Sharded,
-        direct: Standalone
+        direct: Single
       }
 
       # Get the initial cluster topology for the provided options.
@@ -40,19 +40,20 @@ module Mongo
       # @example Get the initial cluster topology.
       #   Topology.initial(topology: :replica_set)
       #
+      # @param [ Array<String> ] seeds The addresses of the configured servers.
       # @param [ Hash ] options The cluster options.
       #
-      # @return [ ReplicaSet, Sharded, Standalone ] The topology.
+      # @return [ ReplicaSet, Sharded, Single ] The topology.
       #
       # @since 2.0.0
       def initial(seeds, options)
         if options.has_key?(:connect)
-          return OPTIONS.fetch(options[:connect]).new(options)
+          return OPTIONS.fetch(options[:connect]).new(options, seeds)
         end
         if options.has_key?(:replica_set)
-          ReplicaSet.new(options)
+          ReplicaSet.new(options, seeds)
         else
-          seeds.size > 1 ? Unknown.new(options) : Standalone.new(options)
+          seeds.size > 1 ? Unknown.new(options, seeds) : Single.new(options, seeds)
         end
       end
     end

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

@@ -82,7 +82,7 @@ module Mongo
         # @param [ Hash ] options The options.
         #
         # @since 2.0.0
-        def initialize(options)
+        def initialize(options, seeds = [])
           @options = options
         end
 
@@ -135,15 +135,15 @@ module Mongo
         # @since 2.0.0
         def sharded?; false; end
 
-        # A replica set topology is not standalone.
+        # A replica set topology is not single.
         #
-        # @example Is the topology standalone?
-        #   ReplicaSet.standalone?
+        # @example Is the topology single?
+        #   ReplicaSet.single?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # A replica set topology is not unknown.
         #

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

@@ -59,7 +59,7 @@ module Mongo
         # @param [ Hash ] options The options.
         #
         # @since 2.0.0
-        def initialize(options)
+        def initialize(options, seeds = [])
           @options = options
         end
 
@@ -107,15 +107,15 @@ module Mongo
         # @since 2.0.0
         def sharded?; true; end
 
-        # A sharded topology is not standalone.
+        # A sharded topology is not single.
         #
-        # @example Is the topology standalone?
-        #   Sharded.standalone?
+        # @example Is the topology single?
+        #   Sharded.single?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # A sharded topology is not unknown.
         #

data/lib/mongo/cluster/topology/{standalone.rb → single.rb}

@@ -16,20 +16,23 @@ module Mongo
   class Cluster
     module Topology
 
-      # Defines behaviour for when a cluster is in standalone topology.
+      # Defines behaviour for when a cluster is in single topology.
       #
       # @since 2.0.0
-      class Standalone
+      class Single
+
+        # @return [ String ] seed The seed address.
+        attr_reader :seed
 
         # The display name for the topology.
         #
         # @since 2.0.0
-        NAME = 'Standalone'.freeze
+        NAME = 'Single'.freeze
 
         # Get the display name.
         #
         # @example Get the display name.
-        #   Standalone.display_name
+        #   Single.display_name
         #
         # @return [ String ] The display name.
         #
@@ -48,35 +51,36 @@ module Mongo
         # @param [ Array<Server> ] servers The list of known servers to the
         #   cluster.
         #
-        # @return [ Standalone ] The topology.
+        # @return [ Single ] The topology.
         def elect_primary(description, servers); self; end
 
         # Initialize the topology with the options.
         #
         # @example Initialize the topology.
-        #   Standalone.new(options)
+        #   Single.new(options)
         #
         # @param [ Hash ] options The options.
         #
         # @since 2.0.0
-        def initialize(options)
+        def initialize(options, seeds = [])
           @options = options
+          @seed = seeds.first
         end
 
-        # A standalone topology is not a replica set.
+        # A single topology is not a replica set.
         #
         # @example Is the topology a replica set?
-        #   Sharded.replica_set?
+        #   Single.replica_set?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
         def replica_set?; false; end
 
-        # Standalone topologies have no replica set name.
+        # Single topologies have no replica set name.
         #
         # @example Get the replica set name.
-        #   standalone.replica_set_name
+        #   single.replica_set_name
         #
         # @return [ nil ] Always nil.
         #
@@ -86,41 +90,41 @@ module Mongo
         # Select appropriate servers for this topology.
         #
         # @example Select the servers.
-        #   Standalone.servers(servers, 'test')
+        #   Single.servers(servers, 'test')
         #
         # @param [ Array<Server> ] servers The known servers.
         #
-        # @return [ Array<Server> ] The standalone servers.
+        # @return [ Array<Server> ] The single servers.
         #
         # @since 2.0.0
         def servers(servers, name = nil)
-          [ servers.detect{ |server| server.standalone? } ]
+          [ servers.detect { |server| !server.unknown? } ]
         end
 
-        # A standalone topology is not sharded.
+        # A single topology is not sharded.
         #
         # @example Is the topology sharded?
-        #   Standalone.sharded?
+        #   Single.sharded?
         #
         # @return [ false ] Always false.
         #
         # @since 2.0.0
         def sharded?; false; end
 
-        # A standalone topology is standalone.
+        # A single topology is single.
         #
-        # @example Is the topology standalone?
-        #   Standalone.standalone?
+        # @example Is the topology single?
+        #   Single.single?
         #
         # @return [ true ] Always true.
         #
         # @since 2.0.0
-        def standalone?; true; end
+        def single?; true; end
 
-        # An standalone topology is not unknown.
+        # An single topology is not unknown.
         #
         # @example Is the topology unknown?
-        #   Standalone.unknown?
+        #   Single.unknown?
         #
         # @return [ false ] Always false.
         #

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

@@ -70,7 +70,7 @@ module Mongo
         # @param [ Hash ] options The options.
         #
         # @since 2.0.0
-        def initialize(options)
+        def initialize(options, seeds = [])
           @options = options
         end
 
@@ -106,6 +106,7 @@ module Mongo
         #
         # @since 2.0.0
         def servers(servers)
+          []
         end
 
         # An unknown topology is not sharded.
@@ -118,15 +119,15 @@ module Mongo
         # @since 2.0.0
         def sharded?; false; end
 
-        # An unknown topology is not standalone.
+        # An unknown topology is not single.
         #
-        # @example Is the topology standalone?
-        #   Unknown.standalone?
+        # @example Is the topology single?
+        #   Unknown.single?
         #
         # @return [ true ] Always false.
         #
         # @since 2.0.0
-        def standalone?; false; end
+        def single?; false; end
 
         # An unknown topology is unknown.
         #

data/lib/mongo/collection.rb

@@ -84,6 +84,8 @@ module Mongo
     # Drop the collection. Will also drop all indexes associated with the
     # collection.
     #
+    # @note An error returned if the collection doesn't exist is suppressed.
+    #
     # @example Drop the collection.
     #   collection.drop
     #
@@ -92,6 +94,9 @@ module Mongo
     # @since 2.0.0
     def drop
       database.command(:drop => name)
+    rescue Error::OperationFailure => ex
+      raise ex unless ex.message =~ /ns not found/
+      false
     end
 
     # Find documents in the collection.
@@ -215,7 +220,7 @@ module Mongo
     #
     # @since 2.0.0
     def namespace
-      "#{name}.#{database.name}"
+      "#{database.name}.#{name}"
     end
   end
 end

data/lib/mongo/collection/view.rb

@@ -125,6 +125,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(collection, selector = {}, options = {})
+        validate_doc!(selector)
         @collection = collection
         @selector = selector.dup
         @options = options.dup

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

@@ -232,6 +232,7 @@ module Mongo
         #
         # @since 2.0.0
         def projection(document = nil)
+          validate_doc!(document) if document
           configure(:projection, document)
         end
 
@@ -357,6 +358,10 @@ module Mongo
         def to_return
           [ limit || batch_size, batch_size || limit ].min
         end
+
+        def validate_doc!(doc)
+          raise Error::InvalidDocument.new unless doc.respond_to?(:keys)
+        end
       end
     end
   end