mongo 1.7.1 → 1.8.0

data/lib/mongo/legacy.rb

@@ -0,0 +1,82 @@
+# encoding: UTF-8
+
+# --
+# Copyright (C) 2008-2012 10gen 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 LegacyWriteConcern
+    @legacy_write_concern = true
+
+    def safe=(value)
+      @write_concern = value
+    end
+
+    def safe
+      if @write_concern[:w] == 0
+        return false
+      elsif @write_concern[:w] == 1
+        return true
+      else
+        return @write_concern
+      end
+    end
+
+    def self.from_uri(uri = ENV['MONGODB_URI'], extra_opts={})
+      parser = URIParser.new uri
+      parser.connection(extra_opts, true)
+    end
+  end
+end
+
+module Mongo
+  # @deprecated Use Mongo::MongoClient instead. Support will be removed after v2.0
+  class Connection < MongoClient
+    include Mongo::LegacyWriteConcern
+
+    def initialize(host=nil, port=nil, opts={})
+      write_concern_from_legacy(opts)
+      super
+    end
+  end
+
+  # @deprecated Use Mongo::MongoReplicaSetClient instead. Support will be removed after v2.0
+  class ReplSetConnection < MongoReplicaSetClient
+    include Mongo::LegacyWriteConcern
+
+    def initialize(*args)
+      if args.last.is_a?(Hash)
+        opts = args.pop
+        write_concern_from_legacy(opts)
+        args.push(opts)
+      end
+      super
+    end
+  end
+
+  # @deprecated Use Mongo::MongoShardedClient instead. Support will be removed after v2.0
+  class ShardedConnection < MongoShardedClient
+    include Mongo::LegacyWriteConcern
+
+    def initialize(*args)
+      if args.last.is_a?(Hash)
+        opts = args.pop
+        write_concern_from_legacy(opts)
+        args.push(opts)
+      end
+      super
+    end
+  end
+end

data/lib/mongo/{connection.rb → mongo_client.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,30 +19,44 @@
 require 'set'
 require 'socket'
 require 'thread'
+
 module Mongo
 
   # Instantiates and manages self.connections to MongoDB.
-  class Connection
+  class MongoClient
     include Mongo::Logging
     include Mongo::Networking
+    include Mongo::WriteConcern
 
-    TCPSocket = Mongo::TCPSocket
-    Mutex = ::Mutex
-    ConditionVariable = ::ConditionVariable
-
-    Thread.abort_on_exception = true
+    TCPSocket          = Mongo::TCPSocket
+    Mutex              = ::Mutex
+    ConditionVariable  = ::ConditionVariable
 
-    DEFAULT_HOST = 'localhost'
-    DEFAULT_PORT = 27017
-    DEFAULT_DB_NAME = 'test'
-    GENERIC_OPTS = [:ssl, :auths, :pool_size, :pool_timeout, :timeout, :op_timeout, :connect_timeout, :safe, :logger, :connect]
-    CONNECTION_OPTS = [:slave_ok]
+    DEFAULT_HOST       = 'localhost'
+    DEFAULT_PORT       = 27017
+    DEFAULT_DB_NAME    = 'test'
+    GENERIC_OPTS       = [:ssl, :auths, :logger, :connect]
+    TIMEOUT_OPTS       = [:timeout, :op_timeout, :connect_timeout]
+    POOL_OPTS          = [:pool_size, :pool_timeout]
+    WRITE_CONCERN_OPTS = [:w, :j, :fsync, :wtimeout]
+    CLIENT_ONLY_OPTS   = [:slave_ok]
 
     mongo_thread_local_accessor :connections
 
-    attr_reader :logger, :size, :auths, :primary, :safe, :host_to_try,
-      :pool_size, :connect_timeout, :pool_timeout,
-      :primary_pool, :socket_class, :op_timeout, :tag_sets, :acceptable_latency
+    attr_reader :logger,
+                :size,
+                :auths,
+                :primary,
+                :write_concern,
+                :host_to_try,
+                :pool_size,
+                :connect_timeout,
+                :pool_timeout,
+                :primary_pool,
+                :socket_class,
+                :op_timeout,
+                :tag_sets,
+                :acceptable_latency
 
     # Create a connection to single MongoDB instance.
     #
@@ -51,20 +65,20 @@ module Mongo
     # You may specify whether connection to slave is permitted.
     # In all cases, the default host is "localhost" and the default port is 27017.
     #
-    # If you're connecting to a replica set, you'll need to use ReplSetConnection.new instead.
+    # If you're connecting to a replica set, you'll need to use MongoReplicaSetClient.new instead.
     #
     # Once connected to a replica set, you can find out which nodes are primary, secondary, and
-    # arbiters with the corresponding accessors: Connection#primary, Connection#secondaries, and
-    # Connection#arbiters. This is useful if your application needs to connect manually to nodes other
+    # arbiters with the corresponding accessors: MongoClient#primary, MongoClient#secondaries, and
+    # MongoClient#arbiters. This is useful if your application needs to connect manually to nodes other
     # than the primary.
     #
     # @param [String, Hash] host
     # @param [Integer] port specify a port number here if only one host is being specified.
     #
-    # @option opts [Boolean, Hash] :safe (false) Set the default safe-mode options
-    #   propogated to DB objects instantiated off of this Connection. This
-    #   default can be overridden upon instantiation of any DB by explicity setting a :safe value
-    #   on initialization.
+    # @option opts [Hash] :w (1), :j (false), :wtimeout (false), :fsync (false) Set the default write concern
+    #   options propagated to DB objects instantiated off of this MongoClient.
+    #   This default can be overridden upon instantiation of any DB by explicitly setting an options hash
+    #   on initialization.  It can also be overridden at instantiation of a collection or at the time of a write operation.
     # @option opts [Boolean] :slave_ok (false) Must be set to +true+ when connecting
     #   to a single, slave node.
     # @option opts [Logger, #debug] :logger (nil) A Logger instance for debugging driver ops. Note that
@@ -81,16 +95,16 @@ module Mongo
     # @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL.
     #
     # @example localhost, 27017 (or <code>ENV["MONGODB_URI"]</code> if available)
-    #   Mongo::Connection.new
+    #   MongoClient.new
     #
     # @example localhost, 27017
-    #   Mongo::Connection.new("localhost")
+    #   MongoClient.new("localhost")
     #
     # @example localhost, 3000, max 5 self.connections, with max 5 seconds of wait time.
-    #   Mongo::Connection.new("localhost", 3000, :pool_size => 5, :timeout => 5)
+    #   MongoClient.new("localhost", 3000, :pool_size => 5, :timeout => 5)
     #
     # @example localhost, 3000, where this node may be a slave
-    #   Mongo::Connection.new("localhost", 3000, :slave_ok => true)
+    #   MongoClient.new("localhost", 3000, :slave_ok => true)
     #
     # @see http://api.mongodb.org/ruby/current/file.REPLICA_SETS.html Replica sets in Ruby
     #
@@ -104,25 +118,27 @@ module Mongo
       if host.nil? and ENV.has_key?('MONGODB_URI')
         parser = URIParser.new ENV['MONGODB_URI']
         if parser.replicaset?
-          raise MongoArgumentError, "Mongo::Connection.new called with no arguments, but ENV['MONGODB_URI'] implies a replica set."
+          raise MongoArgumentError, "Mongo::MongoClient.new called with no arguments, but ENV['MONGODB_URI'] implies a replica set."
         end
-        opts = parser.connection_options.merge! opts
+        opts.merge!(parser.connection_options)
         @host_to_try = [parser.host, parser.port]
-      elsif host.is_a?(String)
+      elsif host.is_a?(String) && (port || DEFAULT_PORT).respond_to?(:to_i)
         @host_to_try = [host, (port || DEFAULT_PORT).to_i]
+      elsif host || port
+        raise MongoArgumentError, "Mongo::MongoClient.new host or port argument error, host:#{host.inspect}, port:#{port.inspect}"
       else
         @host_to_try = [DEFAULT_HOST, DEFAULT_PORT]
       end
 
       # Host and port of current master.
       @host = @port = nil
-      
+
       # Default maximum BSON object size
       @max_bson_size = Mongo::DEFAULT_MAX_BSON_SIZE
-      
+
       # Lock for request ids.
       @id_lock = Mutex.new
-      
+
       # Connection pool for primay node
       @primary      = nil
       @primary_pool = nil
@@ -140,11 +156,11 @@ module Mongo
     # Initialize a connection to a MongoDB replica set using an array of seed nodes.
     #
     # The seed nodes specified will be used on the initial connection to the replica set, but note
-    # that this list of nodes will be replced by the list of canonical nodes returned by running the
+    # that this list of nodes will be replaced by the list of canonical nodes returned by running the
     # is_master command on the replica set.
     #
     # @param nodes [Array] An array of arrays, each of which specifies a host and port.
-    # @param opts [Hash] Any of the available options that can be passed to Connection.new.
+    # @param opts [Hash] Any of the available options that can be passed to MongoClient.new.
     #
     # @option opts [String] :rs_name (nil) The name of the replica set to connect to. An exception will be
     #   raised if unable to connect to a replica set with this name.
@@ -152,31 +168,32 @@ module Mongo
     #   to send reads to.
     #
     # @example
-    #   Mongo::Connection.multi([["db1.example.com", 27017], ["db2.example.com", 27017]])
+    #   Mongo::MongoClient.multi([["db1.example.com", 27017], ["db2.example.com", 27017]])
     #
     # @example This connection will read from a random secondary node.
-    #   Mongo::Connection.multi([["db1.example.com", 27017], ["db2.example.com", 27017], ["db3.example.com", 27017]],
+    #   Mongo::MongoClient.multi([["db1.example.com", 27017], ["db2.example.com", 27017], ["db3.example.com", 27017]],
     #                   :read_secondary => true)
     #
-    # @return [Mongo::Connection]
+    # @return [Mongo::MongoClient]
     #
     # @deprecated
     def self.multi(nodes, opts={})
-      warn "Connection.multi is now deprecated and will be removed in v2.0. Please use ReplSetConnection.new instead."
+      warn "MongoClient.multi is now deprecated and will be removed in v2.0. Please use MongoReplicaSetClient.new instead."
 
-      ReplSetConnection.new(*(nodes+[opts]))
+      MongoReplicaSetClient.new(*(nodes+[opts]))
     end
 
     # Initialize a connection to MongoDB using the MongoDB URI spec.
     #
-    # Since Connection.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset), you may use this when the type of your connection varies by environment and should be determined solely from <code>ENV["MONGODB_URI"]</code>.
+    # Since MongoClient.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset), 
+    # you may use this when the type of your connection varies by environment and should be determined solely from <code>ENV["MONGODB_URI"]</code>.
     #
     # @param uri [String]
     #   A string of the format mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]
     #
-    # @param opts Any of the options available for Connection.new
+    # @param opts Any of the options available for MongoClient.new
     #
-    # @return [Mongo::Connection, Mongo::ReplSetConnection]
+    # @return [Mongo::MongoClient, Mongo::MongoReplicaSetClient]
     def self.from_uri(uri = ENV['MONGODB_URI'], extra_opts={})
       parser = URIParser.new uri
       parser.connection(extra_opts)
@@ -223,7 +240,7 @@ module Mongo
 
     # Apply each of the saved database authentications.
     #
-    # @return [Boolean] returns true if authentications exist and succeeed, false
+    # @return [Boolean] returns true if authentications exist and succeeds, false
     #   if none exists.
     #
     # @raise [AuthenticationError] raises an exception if any one
@@ -239,11 +256,11 @@ module Mongo
 
     # Save an authentication to this connection. When connecting,
     # the connection will attempt to re-authenticate on every db
-    # specificed in the list of auths. This method is called automatically
+    # specified in the list of auths. This method is called automatically
     # by DB#authenticate.
     #
     # Note: this method will not actually issue an authentication command. To do that,
-    # either run Connection#apply_saved_authentication or DB#authenticate.
+    # either run MongoClient#apply_saved_authentication or DB#authenticate.
     #
     # @param [String] db_name
     # @param [String] username
@@ -274,7 +291,7 @@ module Mongo
       end
     end
 
-    # Remove all authenication information stored in this connection.
+    # Remove all authentication information stored in this connection.
     #
     # @return [true] this operation return true because it always succeeds.
     def clear_auths
@@ -506,21 +523,21 @@ module Mongo
     end
 
     # Checkout a socket for reading (i.e., a secondary node).
-    # Note: this is overridden in ReplSetConnection.
+    # Note: this is overridden in MongoReplicaSetClient.
     def checkout_reader(mode=:primary, tag_sets={}, acceptable_latency=15)
       connect unless connected?
       @primary_pool.checkout
     end
 
     # Checkout a socket for writing (i.e., a primary node).
-    # Note: this is overridden in ReplSetConnection.
+    # Note: this is overridden in MongoReplicaSetClient.
     def checkout_writer
       connect unless connected?
       @primary_pool.checkout
     end
 
     # Check a socket back into its pool.
-    # Note: this is overridden in ReplSetConnection.
+    # Note: this is overridden in MongoReplicaSetClient.
     def checkin(socket)
       if @primary_pool && socket && socket.pool
         socket.pool.checkin(socket)
@@ -530,7 +547,11 @@ module Mongo
     protected
 
     def valid_opts
-      GENERIC_OPTS + CONNECTION_OPTS
+      GENERIC_OPTS +
+      CLIENT_ONLY_OPTS +
+      POOL_OPTS +
+      WRITE_CONCERN_OPTS +
+      TIMEOUT_OPTS
     end
 
     def check_opts(opts)
@@ -544,10 +565,10 @@ module Mongo
     # Parse option hash
     def setup(opts)
       # slave_ok can be true only if one node is specified
-      @slave_ok = opts[:slave_ok]
-      
+      @slave_ok = opts.delete(:slave_ok)
+
       # Determine whether to use SSL.
-      @ssl = opts.fetch(:ssl, false)
+      @ssl = opts.delete(:ssl)
       if @ssl
         @socket_class = Mongo::SSLSocket
       else
@@ -555,27 +576,27 @@ module Mongo
       end
 
       # Authentication objects
-      @auths = opts.fetch(:auths, [])
+      @auths = opts.delete(:auths) || []
 
       # Pool size and timeout.
-      @pool_size = opts[:pool_size] || 1
+      @pool_size = opts.delete(:pool_size) || 1
       if opts[:timeout]
         warn "The :timeout option has been deprecated " +
           "and will be removed in the 2.0 release. Use :pool_timeout instead."
       end
-      @pool_timeout = opts[:pool_timeout] || opts[:timeout] || 5.0
+      @pool_timeout = opts.delete(:pool_timeout) || opts.delete(:timeout) || 5.0
 
       # Timeout on socket read operation.
-      @op_timeout = opts[:op_timeout] || nil
+      @op_timeout = opts.delete(:op_timeout) || nil
 
       # Timeout on socket connect.
-      @connect_timeout = opts[:connect_timeout] || nil
-
-      # Global safe option. This is false by default.
-      @safe = opts[:safe] || false
+      @connect_timeout = opts.delete(:connect_timeout) || nil
 
       @logger = opts.fetch(:logger, nil)
 
+      # Connection level write concern options.
+      @write_concern = get_write_concern(opts)
+
       if @logger
         write_logging_startup_message
       end

data/lib/mongo/{repl_set_connection.rb → mongo_replica_set_client.rb}

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 # --
-# Copyright (C) 2008-2011 10gen Inc.
+# Copyright (C) 2008-2012 10gen Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,29 +19,43 @@
 module Mongo
 
   # Instantiates and manages connections to a MongoDB replica set.
-  class ReplSetConnection < Connection
-
-    REPL_SET_OPTS = [:read, :refresh_mode, :refresh_interval, :read_secondary, 
-      :rs_name, :name, :tag_sets, :secondary_acceptable_latency_ms]
-
-    attr_reader :replica_set_name, :seeds, :refresh_interval, :refresh_mode,
-      :refresh_version, :manager, :tag_sets, :acceptable_latency
+  class MongoReplicaSetClient < MongoClient
+
+    REPL_SET_OPTS = [
+      :read,
+      :refresh_mode,
+      :refresh_interval,
+      :read_secondary,
+      :rs_name,
+      :name,
+      :tag_sets,
+      :secondary_acceptable_latency_ms
+    ]
+
+    attr_reader :replica_set_name,
+                :seeds,
+                :refresh_interval,
+                :refresh_mode,
+                :refresh_version,
+                :manager,
+                :tag_sets,
+                :acceptable_latency
 
     # Create a connection to a MongoDB replica set.
     #
     # If no args are provided, it will check <code>ENV["MONGODB_URI"]</code>.
     #
     # Once connected to a replica set, you can find out which nodes are primary, secondary, and
-    # arbiters with the corresponding accessors: Connection#primary, Connection#secondaries, and
-    # Connection#arbiters. This is useful if your application needs to connect manually to nodes other
+    # arbiters with the corresponding accessors: MongoClient#primary, MongoClient#secondaries, and
+    # MongoClient#arbiters. This is useful if your application needs to connect manually to nodes other
     # than the primary.
     #
     # @overload initialize(seeds=ENV["MONGODB_URI"], opts={})
     #   @param [Array<String>, Array<Array(String, Integer)>] seeds
     #
-    #   @option opts [Boolean, Hash] :safe (false) Set the default safe-mode options
-    #     propagated to DB objects instantiated off of this Connection. This
-    #     default can be overridden upon instantiation of any DB by explicitly setting a :safe value
+    #   @option opts [Hash] :w (1), :j (false), :wtimeout (false), :fsync (false) Set the default write concern
+    #     propagated to DB objects instantiated off of this MongoReplicaSetClient. This
+    #     default can be overridden upon instantiation of any DB by explicitly setting write concern values
     #     on initialization.
     #   @option opts [:primary, :primary_preferred, :secondary, :secondary_preferred, :nearest] :read_preference (:primary)
     #     A "read preference" determines the candidate replica set members to which a query or command can be sent.
@@ -75,18 +89,18 @@ module Mongo
     #     will always trigger a complete refresh. This option is useful when you want to add new nodes
     #     or remove replica set nodes not currently in use by the driver.
     #   @option opts [Integer] :refresh_interval (90) If :refresh_mode is enabled, this is the number of seconds
-    #     between calls to check the replica set's state. 
+    #     between calls to check the replica set's state.
     #   @note the number of seed nodes does not have to be equal to the number of replica set members.
     #     The purpose of seed nodes is to permit the driver to find at least one replica set member even if a member is down.
     #
     # @example Connect to a replica set and provide two seed nodes.
-    #   Mongo::ReplSetConnection.new(['localhost:30000', 'localhost:30001'])
+    #   MongoReplicaSetClient.new(['localhost:30000', 'localhost:30001'])
     #
     # @example Connect to a replica set providing two seed nodes and ensuring a connection to the replica set named 'prod':
-    #   Mongo::ReplSetConnection.new(['localhost:30000', 'localhost:30001'], :name => 'prod')
+    #   MongoReplicaSetClient.new(['localhost:30000', 'localhost:30001'], :name => 'prod')
     #
     # @example Connect to a replica set providing two seed nodes and allowing reads from a secondary node:
-    #   Mongo::ReplSetConnection.new(['localhost:30000', 'localhost:30001'], :read => :secondary)
+    #   MongoReplicaSetClient.new(['localhost:30000', 'localhost:30001'], :read => :secondary)
     #
     # @see http://api.mongodb.org/ruby/current/file.REPLICA_SETS.html Replica sets in Ruby
     #
@@ -96,23 +110,24 @@ module Mongo
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       nodes = args
+      nodes = nodes.flatten(1) if nodes.first.is_a?(Array) && nodes.first.first.is_a?(Array)
 
       if nodes.empty? and ENV.has_key?('MONGODB_URI')
         parser = URIParser.new ENV['MONGODB_URI']
         if parser.direct?
-          raise MongoArgumentError, "Mongo::ReplSetConnection.new called with no arguments, but ENV['MONGODB_URI'] implies a direct connection."
+          raise MongoArgumentError, "Mongo::MongoReplicaSetClient.new called with no arguments, but ENV['MONGODB_URI'] implies a direct connection."
         end
         opts = parser.connection_options.merge! opts
         nodes = [parser.nodes]
       end
 
       unless nodes.length > 0
-        raise MongoArgumentError, "A ReplSetConnection requires at least one seed node."
+        raise MongoArgumentError, "A MongoReplicaSetClient requires at least one seed node."
       end
 
       # This is temporary until support for the old format is dropped
       if nodes.first.last.is_a?(Integer)
-        warn "Initiating a ReplSetConnection with seeds passed as individual [host, port] array arguments is deprecated."
+        warn "Initiating a MongoReplicaSetClient with seeds passed as individual [host, port] array arguments is deprecated."
         warn "Please specify hosts as an array of 'host:port' strings; the old format will be removed in v2.0"
         @seeds = nodes
       else
@@ -149,11 +164,11 @@ module Mongo
     end
 
     def valid_opts
-      GENERIC_OPTS + REPL_SET_OPTS
+      super + REPL_SET_OPTS - CLIENT_ONLY_OPTS
     end
 
     def inspect
-      "<Mongo::ReplSetConnection:0x#{self.object_id.to_s(16)} @seeds=#{@seeds.inspect} " +
+      "<Mongo::MongoReplicaSetClient:0x#{self.object_id.to_s(16)} @seeds=#{@seeds.inspect} " +
         "@connected=#{@connected}>"
     end
 
@@ -184,7 +199,7 @@ module Mongo
     # Determine whether a replica set refresh is
     # required. If so, run a hard refresh. You can
     # force a hard refresh by running
-    # ReplSetConnection#hard_refresh!
+    # MongoReplicaSetClient#hard_refresh!
     #
     # @return [Boolean] +true+ unless a hard refresh
     #   is run and the refresh lock can't be acquired.
@@ -233,7 +248,7 @@ module Mongo
 
     # @deprecated
     def connecting?
-      warn "ReplSetConnection#connecting? is deprecated and will be removed in v2.0."
+      warn "MongoReplicaSetClient#connecting? is deprecated and will be removed in v2.0."
       false
     end
 
@@ -252,8 +267,8 @@ module Mongo
     end
 
     def nodes
-      warn "ReplSetConnection#nodes is DEPRECATED and will be removed in v2.0. " +
-        "Please use ReplSetConnection#seeds instead."
+      warn "MongoReplicaSetClient#nodes is DEPRECATED and will be removed in v2.0. " +
+        "Please use MongoReplicaSetClient#seeds instead."
       @seeds
     end
 
@@ -291,8 +306,8 @@ module Mongo
     # @deprecated
     def reset_connection
       close
-      warn "ReplSetConnection#reset_connection is now deprecated and will be removed in v2.0. " +
-        "Use ReplSetConnection#close instead."
+      warn "MongoReplicaSetClient#reset_connection is now deprecated and will be removed in v2.0. " +
+        "Use MongoReplicaSetClient#close instead."
     end
 
     # Returns +true+ if it's okay to read from a secondary node.
@@ -335,7 +350,7 @@ module Mongo
       end
       socket
     end
-    
+
     def checkout_reader(mode=@read, tag_sets=@tag_sets, acceptable_latency=@acceptable_latency)
       checkout do
         pool = read_pool(mode, tag_sets, acceptable_latency)
@@ -436,8 +451,8 @@ module Mongo
     # Parse option hash
     def setup(opts)
       # Refresh
-      @refresh_mode = opts.fetch(:refresh_mode, false)
-      @refresh_interval = opts.fetch(:refresh_interval, 90)
+      @refresh_mode = opts.delete(:refresh_mode) || false
+      @refresh_interval = opts.delete(:refresh_interval) || 90
 
       if @refresh_mode && @refresh_interval < 60
         @refresh_interval = 60 unless ENV['TEST_MODE'] = 'TRUE'
@@ -455,30 +470,30 @@ module Mongo
       if opts[:read_secondary]
         warn ":read_secondary options has now been deprecated and will " +
           "be removed in driver v2.0. Use the :read option instead."
-        @read_secondary = opts.fetch(:read_secondary, false)
+        @read_secondary = opts.delete(:read_secondary) || false
         @read = :secondary_preferred
       else
-        @read = opts.fetch(:read, :primary)
+        @read = opts.delete(:read) || :primary
         Mongo::Support.validate_read_preference(@read)
       end
 
-      @tag_sets = opts.fetch(:tag_sets, [])
-      @acceptable_latency = opts.fetch(:secondary_acceptable_latency_ms, 15)
+      @tag_sets = opts.delete(:tag_sets) || []
+      @acceptable_latency = opts.delete(:secondary_acceptable_latency_ms) || 15
 
       # Replica set name
       if opts[:rs_name]
         warn ":rs_name option has been deprecated and will be removed in v2.0. " +
           "Please use :name instead."
-        @replica_set_name = opts[:rs_name]
+        @replica_set_name = opts.delete(:rs_name)
       else
-        @replica_set_name = opts[:name]
+        @replica_set_name = opts.delete(:name)
       end
 
-      opts[:connect_timeout] = opts[:connect_timeout] || 30
+      opts[:connect_timeout] = opts.delete(:connect_timeout) || 30
 
       super opts
     end
-    
+
     def prune_managers
       @old_managers.each do |manager|
         if manager != @manager