Fixes for 1.9.1 compatibility.

This commit is contained in:
Kyle Banker 2009-11-24 16:13:14 -05:00
parent 072b025cdc
commit cdb60b378f
4 changed files with 34 additions and 14 deletions

View File

@ -19,6 +19,7 @@ desc "Test the MongoDB Ruby driver."
task :test do
Rake::Task['test:unit'].invoke
Rake::Task['test:functional'].invoke
Rake::Task['test:pooled_threading'].invoke
end
namespace :test do
@ -32,6 +33,11 @@ namespace :test do
t.verbose = true
end
Rake::TestTask.new(:pooled_threading) do |t|
t.test_files = FileList['test/threading/*.rb']
t.verbose = true
end
Rake::TestTask.new(:pair_count) do |t|
t.test_files = FileList['test/replica/count_test.rb']
t.verbose = true

View File

@ -383,7 +383,7 @@ module Mongo
next if @checked_out.size < @sockets.size
# Otherwise, wait.
if @queue.wait(@timeout)
if wait
next
else
@ -399,6 +399,20 @@ module Mongo
end # synchronize
end
if RUBY_VERSION >= '1.9'
# Ruby 1.9's Condition Variables don't support timeouts yet;
# until they do, we'll make do with this hack.
def wait
Timeout.timeout(@timeout) do
@queue.wait
end
end
else
def wait
@queue.wait(@timeout)
end
end
def receive(sock)
receive_header(sock)
number_received, cursor_id = receive_response_header(sock)

View File

@ -305,7 +305,7 @@ module Mongo
sel = {:ns => full_collection_name(collection_name)}
info = {}
Cursor.new(Collection.new(self, SYSTEM_INDEX_COLLECTION), :selector => sel).each { |index|
info[index['name']] = index['key'].map
info[index['name']] = index['key'].map {|k| k}
}
info
end