mongo 2.0.5 → 2.0.6

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

@@ -33,16 +33,17 @@ module Mongo
       #     :ordered => false
       #   })
       #
-      # @param [ Hash ] spec The specifications for the insert.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the insert.
       #
-      # @option spec :documents [ Array ] The documents to insert.
-      # @option spec :db_name [ String ] The name of the database.
-      # @option spec :coll_name [ String ] The name of the collection.
-      # @option spec :write_concern [ Mongo::WriteConcern ] The write concern.
-      # @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 :documents [ Array ] The documents to insert.
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :coll_name [ String ] The name of the collection.
+      #   option spec :write_concern [ Mongo::WriteConcern ] The write concern.
+      #   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 BulkInsert

data/lib/mongo/operation/write/bulk/bulk_insert/result.rb

@@ -37,7 +37,7 @@ module Mongo
           #   Result.new(replies, inserted_ids)
           #
           # @param [ Protocol::Reply ] replies The wire protocol replies.
-          # @params [ Array<Object> ] ids The ids of the inserted documents.
+          # @param [ Array<Object> ] ids The ids of the inserted documents.
           #
           # @since 2.0.0
           def initialize(replies, ids)
@@ -88,7 +88,7 @@ module Mongo
           #   Result.new(replies, inserted_ids)
           #
           # @param [ Protocol::Reply ] replies The wire protocol replies.
-          # @params [ Array<Object> ] ids The ids of the inserted documents.
+          # @param [ Array<Object> ] ids The ids of the inserted documents.
           #
           # @since 2.0.0
           def initialize(replies, ids)

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

@@ -39,18 +39,19 @@ module Mongo
       #     :ordered => false
       #   })
       #
-      # @param [ Hash ] spec The specifications for the update.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the update.
       #
-      # @option spec :updates [ Array ] The update documents.
-      # @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 :write_concern [ Mongo::WriteConcern ] The write concern.
-      # @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 :updates [ Array ] The update documents.
+      #   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 :write_concern [ Mongo::WriteConcern ] The write concern.
+      #   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 BulkUpdate

data/lib/mongo/operation/write/create_index.rb

@@ -30,14 +30,15 @@ module Mongo
       #     :index_name => 'name_1_age_-1'
       #   })
       #
-      # @param [ Hash ] spec The specifications for the insert.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the insert.
       #
-      # @option spec :index [ Hash ] The index spec to create.
-      # @option spec :db_name [ String ] The name of the database.
-      # @option spec :coll_name [ String ] The name of the collection.
-      # @option spec :index_name [ String ] The name of the index.
-      # @option spec :options [ Hash ] Options for the command, if it ends up being a
-      #   write command.
+      #   option spec :index [ Hash ] The index spec to create.
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :coll_name [ String ] The name of the collection.
+      #   option spec :index_name [ String ] The name of the index.
+      #   option spec :options [ Hash ] Options for the command, if it ends up being a
+      #     write command.
       #
       # @since 2.0.0
       class CreateIndex

data/lib/mongo/operation/write/create_user.rb

@@ -22,10 +22,11 @@ module Mongo
       # @example Initialize the operation.
       #   Write::CreateUser.new(:db_name => 'test', :user => user)
       #
-      # @param [ Hash ] spec The specifications for the create.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the create.
       #
-      # @option spec :user [ Auth::User ] The user to create.
-      # @option spec :db_name [ String ] The name of the database.
+      #   option spec :user [ Auth::User ] The user to create.
+      #   option spec :db_name [ String ] The name of the database.
       #
       # @since 2.0.0
       class CreateUser

data/lib/mongo/operation/write/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 :delete [ Hash ] The delete document.
-      # @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 :delete [ Hash ] The delete document.
+      #   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 Delete

data/lib/mongo/operation/write/drop_index.rb

@@ -25,12 +25,13 @@ module Mongo
       #     :index_name => 'name_1_age_-1'
       #   })
       #
-      # @param [ Hash ] spec The specifications for the drop.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the drop.
       #
-      # @option spec :index [ Hash ] The index spec to create.
-      # @option spec :db_name [ String ] The name of the database.
-      # @option spec :coll_name [ String ] The name of the collection.
-      # @option spec :index_name [ String ] The name of the index.
+      #   option spec :index [ Hash ] The index spec to create.
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :coll_name [ String ] The name of the collection.
+      #   option spec :index_name [ String ] The name of the index.
       #
       # @since 2.0.0
       class DropIndex

data/lib/mongo/operation/write/insert.rb

@@ -31,14 +31,15 @@ module Mongo
       #     :write_concern => write_concern
       #   })
       #
-      # @param [ Hash ] spec The specifications for the insert.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the insert.
       #
-      # @option spec :documents [ Array ] The documents to insert.
-      # @option spec :db_name [ String ] The name of the database.
-      # @option spec :coll_name [ String ] The name of the collection.
-      # @option spec :write_concern [ Mongo::WriteConcern ] The write concern.
-      # @option spec :options [ Hash ] Options for the command, if it ends up being a
-      #   write command.
+      #   option spec :documents [ Array ] The documents to insert.
+      #   option spec :db_name [ String ] The name of the database.
+      #   option spec :coll_name [ String ] The name of the collection.
+      #   option spec :write_concern [ Mongo::WriteConcern ] The write concern.
+      #   option spec :options [ Hash ] Options for the command, if it ends up being a
+      #     write command.
       #
       # @since 2.0.0
       class Insert

data/lib/mongo/operation/write/insert/result.rb

@@ -36,7 +36,7 @@ module Mongo
           #   Result.new(replies, inserted_ids)
           #
           # @param [ Protocol::Reply ] replies The wire protocol replies.
-          # @params [ Array<Object> ] ids The ids of the inserted documents.
+          # @param [ Array<Object> ] ids The ids of the inserted documents.
           #
           # @since 2.0.0
           def initialize(replies, ids)

data/lib/mongo/operation/write/remove_user.rb

@@ -21,10 +21,11 @@ module Mongo
       # @example Create the remove user operation.
       #   Write::RemoveUser.new(:db_name => 'test', :name => name)
       #
-      # @param [ Hash ] spec The specifications for the remove.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the remove.
       #
-      # @option spec :name [ String ] The user name.
-      # @option spec :db_name [ String ] The name of the database.
+      #   option spec :name [ String ] The user name.
+      #   option spec :db_name [ String ] The name of the database.
       #
       # @since 2.0.0
       class RemoveUser

data/lib/mongo/operation/write/update.rb

@@ -37,16 +37,17 @@ module Mongo
       #     :write_concern => write_concern
       #   })
       #
-      # @param [ Hash ] spec The specifications for the update.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the update.
       #
-      # @option spec :update [ Hash ] The update document.
-      # @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 :write_concern [ Mongo::WriteConcern ] The write concern.
-      # @option spec :options [ Hash ] Options for the command, if it ends up being a
-      #   write command.
+      #   option spec :update [ Hash ] The update document.
+      #   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 :write_concern [ Mongo::WriteConcern ] The write concern.
+      #   option spec :options [ Hash ] Options for the command, if it ends up being a
+      #     write command.
       #
       # @since 2.0.0
       class Update

data/lib/mongo/operation/write/update_user.rb

@@ -22,10 +22,11 @@ module Mongo
       # @example Initialize the operation.
       #   Write::UpdateUser.new(:db_name => 'test', :user => user)
       #
-      # @param [ Hash ] spec The specifications for the update.
+      # Initialization:
+      #   param [ Hash ] spec The specifications for the update.
       #
-      # @option spec :user [ Auth::User ] The user to update.
-      # @option spec :db_name [ String ] The name of the database.
+      #   option spec :user [ Auth::User ] The user to update.
+      #   option spec :db_name [ String ] The name of the database.
       #
       # @since 2.0.0
       class UpdateUser

data/lib/mongo/server.rb

@@ -31,6 +31,9 @@ module Mongo
     # @return [ String ] The configured address for the server.
     attr_reader :address
 
+    # @return [ Cluster ] cluster The server cluster.
+    attr_reader :cluster
+
     # @return [ Monitor ] monitor The server monitor.
     attr_reader :monitor
 
@@ -105,15 +108,17 @@ module Mongo
     # subscribe to the appropriate events.
     #
     # @example Initialize the server.
-    #   Mongo::Server.new('127.0.0.1:27017', listeners)
+    #   Mongo::Server.new('127.0.0.1:27017', cluster, listeners)
     #
     # @param [ Address ] address The host:port address to connect to.
+    # @param [ Cluster ] cluster  The cluster the server belongs to.
     # @param [ Event::Listeners ] event_listeners The event listeners.
     # @param [ Hash ] options The server options.
     #
     # @since 2.0.0
-    def initialize(address, event_listeners, options = {})
+    def initialize(address, cluster, event_listeners, options = {})
       @address = address
+      @cluster = cluster
       @options = options.freeze
       @monitor = Monitor.new(address, event_listeners, options)
       monitor.scan!
@@ -123,7 +128,7 @@ module Mongo
     # Get a pretty printed server inspection.
     #
     # @example Get the server inspection.
-    #   server.inspec
+    #   server.inspect
     #
     # @return [ String ] The nice inspection string.
     #
@@ -159,17 +164,5 @@ module Mongo
         tags[k] && tags[k] == tag_set[k]
       end
     end
-
-    # Whether the slaveOk bit must be set for all queries sent to the server.
-    #
-    # @example Does the slaveOk bit need to be set for all queries sent to the server.
-    #   server.slave_ok?
-    #
-    # @return [ true, false ] If the slaveOk bit needs to be set for all queries.
-    #
-    # @since 2.0.0
-    def slave_ok?
-      options[:slave_ok]
-    end
   end
 end

data/lib/mongo/server/context.rb

@@ -27,14 +27,14 @@ module Mongo
 
       # Delegate state checks to the server.
       def_delegators :@server,
+                     :cluster,
                      :features,
                      :max_wire_version,
                      :max_write_batch_size,
                      :mongos?,
                      :primary?,
                      :secondary?,
-                     :standalone?,
-                     :slave_ok?
+                     :standalone?
 
       # Instantiate a server context.
       #

data/lib/mongo/server/description.rb

@@ -124,6 +124,11 @@ module Mongo
       # @since 2.0.0
       TAGS = 'tags'.freeze
 
+      # Fields to exclude when comparing two descriptions.
+      #
+      # @since 2.0.6
+      EXCLUDE_FOR_COMPARISON = [ 'localTime' ]
+
       # @return [ Address ] address The server's address.
       attr_reader :address
 
@@ -157,7 +162,7 @@ module Mongo
       #
       # @since 2.0.0
       def arbiters
-        config[ARBITERS] || []
+        @arbiters ||= (config[ARBITERS] || []).map { |s| s.downcase }
       end
 
       # Is the server a ghost in a replica set?
@@ -193,7 +198,7 @@ module Mongo
       #
       # @since 2.0.0
       def hosts
-        config[HOSTS] || []
+        @hosts ||= (config[HOSTS] || []).map { |s| s.downcase }
       end
 
       # Instantiate the new server description from the result of the ismaster
@@ -344,7 +349,7 @@ module Mongo
       #
       # @since 2.0.0
       def passives
-        config[PASSIVES] || []
+        @passives ||= (config[PASSIVES] || []).map { |s| s.downcase }
       end
 
       # Will return true if the server is a primary.
@@ -445,6 +450,63 @@ module Mongo
       def wire_versions
         min_wire_version..max_wire_version
       end
+
+      # Is this description from the given server.
+      #
+      # @example Check if the description is from a given server.
+      #   description.is_server?(server)
+      #
+      # @return [ true, false ] If the description is from the server.
+      #
+      # @since 2.0.6
+      def is_server?(server)
+        address == server.address
+      end
+
+      # Is a server included in this description's list of servers.
+      #
+      # @example Check if a server is in the description list of servers.
+      #   description.lists_server?(server)
+      #
+      # @return [ true, false ] If a server is in the description's list
+      #   of servers.
+      #
+      # @since 2.0.6
+      def lists_server?(server)
+        servers.include?(server.address.to_s)
+      end
+
+      # Does this description correspond to a replica set member.
+      #
+      # @example Check if the description is from a replica set member.
+      #   description.replica_set_member?
+      #
+      # @return [ true, false ] If the description is from a replica set
+      #   member.
+      #
+      # @since 2.0.6
+      def replica_set_member?
+        !(standalone? || mongos?)
+      end
+
+      # Check equality of two descriptions.
+      #
+      # @example Check description equality.
+      #   description == other
+      #
+      # @param [ Object ] other The other description.
+      #
+      # @return [ true, false ] Whether the objects are equal.
+      #
+      # @since 2.0.6
+      def ==(other)
+        return false if self.class != other.class
+        return true if config == other.config
+        !config.keys.empty? && config.keys.all? do |k|
+          config[k] == other.config[k] || EXCLUDE_FOR_COMPARISON.include?(k)
+        end
+      end
+      alias_method :eql?, :==
     end
   end
 end

data/lib/mongo/server/description/features.rb

@@ -75,7 +75,8 @@ module Mongo
         private
 
         def check_driver_support!
-          if DRIVER_WIRE_VERSIONS.max < server_wire_versions.max
+          if DRIVER_WIRE_VERSIONS.max < server_wire_versions.min ||
+             DRIVER_WIRE_VERSIONS.min > server_wire_versions.max
             raise Error::UnsupportedFeatures.new(server_wire_versions)
           end
         end