minor: test and doc fixes

lib/mongo.rb

@@ -82,7 +82,7 @@ if !defined?(RUBY_ENGINE) || (RUBY_ENGINE == 'ruby' && RUBY_VERSION < '1.9.0')
     require 'system_timer'
     Mongo::TimeoutHandler = SystemTimer
   rescue LoadError
-    warn "Could not load SystemTimer gem. Falling back to timeout.rb." +
+    warn "Could not load SystemTimer gem. Falling back to timeout.rb. " +
          "SystemTimer is STRONGLY recommended for timeouts in Ruby 1.8.7. " +
          "See http://ph7spot.com/musings/system-timer for details."
     require 'timeout'

lib/mongo/gridfs/grid_io.rb

@@ -17,10 +17,6 @@
 # ++
 
 require 'digest/md5'
-begin
-require 'mime/types'
-rescue LoadError
-end
 
 module Mongo
 

test/connection_test.rb

@@ -159,7 +159,7 @@ class TestConnection < Test::Unit::TestCase
     @conn.lock!
     assert @conn.locked?
     assert_equal 1, @conn['admin']['$cmd.sys.inprog'].find_one['fsyncLock'], "Not fsync-locked"
-    assert_match /unlock/, @conn.unlock!['info']
+    assert_match(/unlock/, @conn.unlock!['info'])
     unlocked = false
     counter  = 0
     while counter < 5

test/conversions_test.rb

@@ -1,7 +1,6 @@
 require './test/test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'
-require 'bson/ordered_hash'
 
 class ConversionsTest < Test::Unit::TestCase
   include Mongo::Conversions

test/grid_file_system_test.rb

@@ -1,5 +1,4 @@
 require './test/test_helper'
-include Mongo
 
 class GridFileSystemTest < Test::Unit::TestCase
   context "GridFileSystem:" do

test/grid_io_test.rb

@@ -1,5 +1,4 @@
 require './test/test_helper'
-include Mongo
 
 class GridIOTest < Test::Unit::TestCase
 

test/support_test.rb

@@ -1,7 +1,6 @@
 require './test/test_helper'
 
 class SupportTest < Test::Unit::TestCase
-  include Mongo
 
   def test_command_response_succeeds
     assert Support.ok?('ok' => 1)

test/test_helper.rb

@@ -1,5 +1,5 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems' if ENV['C_EXT']
+require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
 require 'mongo'
 require 'test/unit'
 
@@ -12,9 +12,9 @@ def silently
 end
 
 begin
-  require 'rubygems'
+  require 'rubygems' if RUBY_VERSION < "1.9.0" && !ENV['C_EXT']
   silently { require 'shoulda' }
-  require 'mocha'
+  silently { require 'mocha' }
 rescue LoadError
   puts <<MSG