From 9e223f4510fb4030a21e9e01c97c8e94f084fcec Mon Sep 17 00:00:00 2001 From: Kyle Banker Date: Wed, 4 Aug 2010 16:26:29 -0400 Subject: [PATCH] remove old DB#command arguments --- lib/mongo/db.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/mongo/db.rb b/lib/mongo/db.rb index 9ed9e0c..3b436cc 100644 --- a/lib/mongo/db.rb +++ b/lib/mongo/db.rb @@ -122,7 +122,7 @@ module Mongo } ) end - + # Removes stored Javascript function from the database. Returns # false if the function does not exist # @@ -136,7 +136,7 @@ module Mongo return false end end - + # Adds a user to this database for use with authentication. If the user already # exists in the system, the password will be updated. # @@ -390,7 +390,7 @@ module Mongo # @param [String] to new collection name. # # @return [True] returns +true+ on success. - # + # # @raise MongoDBError if there's an error renaming the collection. def rename_collection(from, to) oh = BSON::OrderedHash.new @@ -462,9 +462,6 @@ module Mongo # key, specifying the command to be performed. In Ruby 1.9, OrderedHash isn't necessary since # hashes are ordered by default. # - # @param [Boolean] admin If +true+, the command will be executed on the admin - # collection. DEPRECATED. - # # @option opts [Boolean] :check_response (true) If +true+, raises an exception if the # command fails. # @option opts [Socket] :sock a socket to use for sending the command. This is mainly for internal use. @@ -472,8 +469,8 @@ module Mongo # @return [Hash] # # @core commands command_instance-method - def command(selector, opts={}, old_check_response=false, old_sock=nil) - check_response = opts[:check_response].nil? ? true : opts[:check_response] + def command(selector, opts={}) + check_response = opts.fetch(:check_response, true) sock = opts[:sock] raise MongoArgumentError, "command must be given a selector" unless selector.is_a?(Hash) && !selector.empty? if selector.keys.length > 1 && RUBY_VERSION < '1.9' && selector.class != BSON::OrderedHash