mongo 0.17.1 → 0.18

data/test/unit/cursor_test.rb

@@ -4,7 +4,8 @@ class TestCursor < Test::Unit::TestCase
 
   context "Cursor options" do 
     setup do 
-      @db         = stub(:name => "testing", :slave_ok? => false)    
+      @connection = stub(:class => Connection)
+      @db         = stub(:name => "testing", :slave_ok? => false, :connection => @connection)    
       @collection = stub(:db => @db, :name => "items")
       @cursor     = Cursor.new(@collection)
     end
@@ -64,39 +65,10 @@ class TestCursor < Test::Unit::TestCase
     end
   end
 
-  context "Query options" do 
-    should "test timeout true and slave_ok false" do 
-      @db = stub(:slave_ok? => false, :name => "testing")
-      @collection = stub(:db => @db, :name => "items")
-      @cursor     = Cursor.new(@collection, :timeout => true)
-      assert_equal 0, @cursor.query_opts
-    end
-
-    should "test timeout false and slave_ok false" do 
-      @db = stub(:slave_ok? => false, :name => "testing")
-      @collection = stub(:db => @db, :name => "items")
-      @cursor     = Cursor.new(@collection, :timeout => false)
-      assert_equal 16, @cursor.query_opts
-    end
-
-    should "set timeout true and slave_ok true" do 
-      @db = stub(:slave_ok? => true, :name => "testing")
-      @collection = stub(:db => @db, :name => "items")
-      @cursor = Cursor.new(@collection, :timeout => true)
-      assert_equal 4, @cursor.query_opts
-    end
-
-    should "set timeout false and slave_ok true" do 
-      @db = stub(:slave_ok? => true, :name => "testing")
-      @collection = stub(:db => @db, :name => "items")
-      @cursor = Cursor.new(@collection, :timeout => false)
-      assert_equal 20, @cursor.query_opts
-    end
-  end
-
   context "Query fields" do 
     setup do 
-      @db = stub(:slave_ok? => true, :name => "testing")
+      @connection = stub(:class => Collection)
+      @db = stub(:slave_ok? => true, :name => "testing", :connection => @connection)
       @collection = stub(:db => @db, :name => "items")
     end
 

data/test/unit/db_test.rb

@@ -2,16 +2,6 @@ require 'test/test_helper'
 
 class DBTest < Test::Unit::TestCase
 
-  class MockDB < DB
-    attr_accessor :socket
-
-    def connect_to_master
-      true
-    end
-
-    public :add_message_headers
-  end
-
   def insert_message(db, documents)
     documents = [documents] unless documents.is_a?(Array)
     message = ByteBuffer.new
@@ -23,7 +13,8 @@ class DBTest < Test::Unit::TestCase
 
   context "DB commands" do 
     setup do 
-      @db = MockDB.new("testing", ['localhost', 27017])
+      @conn = stub()
+      @db   = DB.new("testing", @conn)
       @collection = mock()
       @db.stubs(:system_command_collection).returns(@collection)
     end
@@ -43,7 +34,7 @@ class DBTest < Test::Unit::TestCase
     should "create the proper cursor" do 
       @cursor = mock(:next_object => {"ok" => 1})
       Cursor.expects(:new).with(@collection, :admin => true,
-        :limit => -1, :selector => {:buildinfo => 1}).returns(@cursor)
+        :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
       command = {:buildinfo => 1}
       @db.command(command, true)
     end
@@ -51,32 +42,13 @@ class DBTest < Test::Unit::TestCase
     should "raise an error when the command fails" do 
       @cursor = mock(:next_object => {"ok" => 0})
       Cursor.expects(:new).with(@collection, :admin => true,
-        :limit => -1, :selector => {:buildinfo => 1}).returns(@cursor)
+        :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
       assert_raise OperationFailure do 
         command = {:buildinfo => 1}
         @db.command(command, true, true)
       end
     end
   end
-
-  context "safe messages" do
-    setup do
-      @db = MockDB.new("testing", ['localhost', 27017])
-      @collection = mock()
-      @db.stubs(:system_command_collection).returns(@collection)
-    end
-
-    should "receive getlasterror message" do
-      @socket = mock()
-      @socket.stubs(:close)
-      @socket.expects(:flush)
-      @socket.expects(:print).with { |message| message.include?('getlasterror') }
-      @db.socket = @socket
-      @db.stubs(:receive)
-      message = insert_message(@db, {:a => 1})
-      @db.send_message_with_safe_check(Mongo::Constants::OP_QUERY, message)
-    end
-  end
 end
 
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.17.1
+  version: "0.18"
 platform: ruby
 authors: 
 - Jim Menard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2009-11-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -97,6 +97,10 @@ specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
 - test/mongo-qa/_common.rb
+- test/replica/count_test.rb
+- test/replica/insert_test.rb
+- test/replica/pooled_insert_test.rb
+- test/replica/query_test.rb
 - test/test_admin.rb
 - test/test_bson.rb
 - test/test_byte_buffer.rb
@@ -115,6 +119,8 @@ test_files:
 - test/test_round_trip.rb
 - test/test_slave_connection.rb
 - test/test_threading.rb
+- test/threading/test_threading_large_pool.rb
 - test/unit/collection_test.rb
+- test/unit/connection_test.rb
 - test/unit/cursor_test.rb
 - test/unit/db_test.rb