github-migration
/
mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: fixes

This commit is contained in:
Kyle Banker 2011-04-12 15:01:40 -04:00
parent af6552ed3c
commit 140dfa9f32
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mongo/collection.rb
View File

@ -147,16 +147,20 @@ module Mongo
# @option opts [Integer] :limit maximum number of documents to return # @option opts [Integer] :limit maximum number of documents to return
# @option opts [Array] :sort an array of [key, direction] pairs to sort by. Direction should # @option opts [Array] :sort an array of [key, direction] pairs to sort by. Direction should
# be specified as Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING (or :descending / :desc) # be specified as Mongo::ASCENDING (or :ascending / :asc) or Mongo::DESCENDING (or :descending / :desc)
# @option opts [String, Array, OrderedHash] :hint hint for query optimizer, usually not necessary if using MongoDB > 1.1 # @option opts [String, Array, OrderedHash] :hint hint for query optimizer, usually not necessary if
# using MongoDB > 1.1
# @option opts [Boolean] :snapshot (false) if true, snapshot mode will be used for this query. # @option opts [Boolean] :snapshot (false) if true, snapshot mode will be used for this query.
# Snapshot mode assures no duplicates are returned, or objects missed, which were preset at both the start and # Snapshot mode assures no duplicates are returned, or objects missed, which were preset at both the start and
# end of the query's execution. For details see http://www.mongodb.org/display/DOCS/How+to+do+Snapshotting+in+the+Mongo+Database # end of the query's execution.
# @option opts [Boolean] :batch_size (100) the number of documents to returned by the database per GETMORE operation. A value of 0 # For details see http://www.mongodb.org/display/DOCS/How+to+do+Snapshotting+in+the+Mongo+Database
# will let the database server decide how many results to returns. This option can be ignored for most use cases. # @option opts [Boolean] :batch_size (100) the number of documents to returned by the database per
# GETMORE operation. A value of 0 will let the database server decide how many results to returns.
# This option can be ignored for most use cases.
# @option opts [Boolean] :timeout (true) when +true+, the returned cursor will be subject to # @option opts [Boolean] :timeout (true) when +true+, the returned cursor will be subject to
# the normal cursor timeout behavior of the mongod process. When +false+, the returned cursor will never timeout. Note # the normal cursor timeout behavior of the mongod process. When +false+, the returned cursor will
# that disabling timeout will only work when #find is invoked with a block. This is to prevent any inadvertant failure to # never timeout. Note that disabling timeout will only work when #find is invoked with a block.
# close the cursor, as the cursor is explicitly closed when block code finishes. # This is to prevent any inadvertant failure to close the cursor, as the cursor is explicitly
# closed when block code finishes.
# @option opts [Block] :transformer (nil) a block for tranforming returned documents. # @option opts [Block] :transformer (nil) a block for tranforming returned documents.
# This is normally used by object mappers to convert each returned document to an instance of a class. # This is normally used by object mappers to convert each returned document to an instance of a class.
# #

2
test/replica_sets/connect_test.rb
View File

@ -28,7 +28,7 @@ class ConnectTest < Test::Unit::TestCase
end end
def test_connect def test_connect
@conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]], @conn = ReplSetConnection.new([RS.host, RS.ports[1]], [RS.host, RS.ports[0]],
[RS.host, RS.ports[2]], :name => RS.name) [RS.host, RS.ports[2]], :name => RS.name)
assert @conn.connected? assert @conn.connected?
assert @conn.read_primary? assert @conn.read_primary?