RUBY-650 catch adding multiple options

Author: TylerBrock

lib/mongo/cursor.rb

@@ -386,7 +386,7 @@ def query_opts
     def add_option(opt)
       check_modifiable
 
-      if (opt == OP_QUERY_EXHAUST) && (@limit != 0)
+      if exhaust?(opt) && (@limit != 0)
         raise MongoArgumentError, "Exhaust option is incompatible with limit."
       end
 
@@ -633,8 +633,8 @@ def close_cursor_if_query_complete
     # Check whether the exhaust option is set
     #
     # @return [true, false] The state of the exhaust flag.
-    def exhaust?
-      !(@options & OP_QUERY_EXHAUST).zero?
+    def exhaust?(opts = options)
+      !(opts & OP_QUERY_EXHAUST).zero?
     end
 
     def check_modifiable

test/functional/cursor_test.rb

@@ -96,6 +96,10 @@ def test_exhaust_after_limit_error
     assert_raise MongoArgumentError do
       c.add_option(OP_QUERY_EXHAUST)
     end
+
+    assert_raise MongoArgumentError do
+      c.add_option(OP_QUERY_EXHAUST + OP_QUERY_SLAVE_OK)
+    end
   end
 
   def test_limit_after_exhaust_error