mongo 1.1.2 → 1.1.3

data/test/replica_sets/query_test.rb

@@ -5,7 +5,7 @@ require './test/test_helper'
 
 # NOTE: This test expects a replica set of three nodes to be running
 # on the local host.
-class ReplicaPairQueryTest < Test::Unit::TestCase
+class ReplicaSetQueryTest < Test::Unit::TestCase
   include Mongo
 
   def setup

data/test/rs.rb

@@ -0,0 +1,20 @@
+require 'mongo'
+
+START_PORT = 27017
+N = 4
+
+N.times do |n|
+  system("rm -rf /data/rs#{n}")
+  system("mkdir -p /data/rs#{n}")
+  system("mongod --replSet replica-set-foo --logpath '#{n}.log' --dbpath /data/rs#{n} --port #{START_PORT + n} --fork")
+end
+
+con =<<DOC
+  config = {_id: 'replica-set-foo',
+    members: [{_id: 0, host:'localhost:27017'},
+      {_id:1, host:'localhost:27018'},
+      {_id: 2, host: 'localhost:27019', arbiterOnly: true},
+      {_id: 3, host: 'localhost:27020'}]}"
+DOC
+
+puts con

data/test/safe_test.rb

@@ -2,7 +2,7 @@ require './test/test_helper'
 include Mongo
 
 class SafeTest < Test::Unit::TestCase
-  context "Safe tests: " do
+  context "Safe mode propogation: " do
     setup do
       @con = standard_connection(:safe => {:w => 1})
       @db  = @con[MONGO_TEST_DB]
@@ -39,4 +39,30 @@ class SafeTest < Test::Unit::TestCase
       @col.update({:a => 2}, {:a => 1}, :safe => false)
     end
   end
+
+  context "Safe error objects" do
+    setup do
+      @con = standard_connection
+      @db  = @con[MONGO_TEST_DB]
+      @col = @db['test']
+      @col.remove
+      @col.insert({:a => 1})
+      @col.insert({:a => 1})
+      @col.insert({:a => 1})
+    end
+
+    should "return object on update" do
+      response = @col.update({:a => 1}, {"$set" => {:a => 2}},
+                             :multi => true, :safe => true)
+
+      assert response['updatedExisting']
+      assert_equal 3, response['n']
+    end
+
+    should "return object on remove" do
+      response = @col.remove({}, :safe => true)
+      assert_equal 3, response['n']
+    end
+  end
+
 end

data/test/unit/collection_test.rb

@@ -81,5 +81,54 @@ class CollectionTest < Test::Unit::TestCase
       @logger.stubs(:debug)
       @coll.update({}, {:title => 'Moby Dick'}, :safe => true)
     end
+    
+    should "not call insert for each ensure_index call" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @coll = @db.collection('books')
+      @coll.expects(:generate_indexes).once
+      
+      @coll.ensure_index [["x", Mongo::DESCENDING]]
+      @coll.ensure_index [["x", Mongo::DESCENDING]]
+      
+    end
+    should "call generate_indexes for a new direction on the same field for ensure_index" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @coll = @db.collection('books')
+      @coll.expects(:generate_indexes).twice
+      
+      @coll.ensure_index [["x", Mongo::DESCENDING]]
+      @coll.ensure_index [["x", Mongo::ASCENDING]]
+      
+    end
+    
+    should "call generate_indexes twice because the cache time is 0 seconds" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @db.cache_time = 0
+      @coll = @db.collection('books')
+      @coll.expects(:generate_indexes).twice
+      
+
+      @coll.ensure_index [["x", Mongo::DESCENDING]]
+      @coll.ensure_index [["x", Mongo::DESCENDING]]
+      
+    end
+    
+    should "call generate_indexes for each key when calling ensure_indexes" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @db.cache_time = 300
+      @coll = @db.collection('books')
+      @coll.expects(:generate_indexes).once.with do |a, b, c|
+        a == {"x"=>-1, "y"=>-1}
+      end
+      
+      @coll.ensure_index [["x", Mongo::DESCENDING], ["y", Mongo::DESCENDING]]
+    end
+
+    
+    
   end
 end

data/test/unit/connection_test.rb

@@ -4,7 +4,7 @@ include Mongo
 class ConnectionTest < Test::Unit::TestCase
   context "Initialization: " do
     setup do
-      def new_mock_socket
+      def new_mock_socket(host='localhost', port=27017)
         socket = Object.new
         socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
         socket.stubs(:close)
@@ -28,12 +28,12 @@ class ConnectionTest < Test::Unit::TestCase
       end
 
       should "set localhost and port to master" do
-        assert_equal 'localhost', @conn.host
-        assert_equal 27017, @conn.port
+        assert_equal 'localhost', @conn.primary_pool.host
+        assert_equal 27017, @conn.primary_pool.port
       end
 
       should "set connection pool to 1" do
-        assert_equal 1, @conn.size
+        assert_equal 1, @conn.primary_pool.size
       end
 
       should "default slave_ok to false" do
@@ -43,22 +43,32 @@ class ConnectionTest < Test::Unit::TestCase
 
     context "connecting to a replica set" do
       setup do
-        TCPSocket.stubs(:new).returns(new_mock_socket)
-        @conn = Connection.new('localhost', 27017, :connect => false)
+        TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))
+        @conn = Connection.multi([['localhost', 27017]], :connect => false, :read_secondary => true)
 
         admin_db = new_mock_db
-        @hosts = ['localhost:27018', 'localhost:27019']
-        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
-        @conn.expects(:[]).with('admin').returns(admin_db)
+        @hosts = ['localhost:27018', 'localhost:27019', 'localhost:27020']
+
+        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'arbiterOnly' => 1})
+
+        @conn.stubs(:[]).with('admin').returns(admin_db)
         @conn.connect
       end
 
       should "store the hosts returned from the ismaster command" do
-        @hosts.each do |host|
-          host, port = host.split(":")
-          port = port.to_i
-          assert @conn.nodes.include?([host, port]), "Connection doesn't include host #{host.inspect}."
-        end
+        assert_equal 'localhost', @conn.primary_pool.host
+        assert_equal 27017, @conn.primary_pool.port
+
+        assert_equal 'localhost', @conn.secondary_pools[0].host
+        assert_equal 27018, @conn.secondary_pools[0].port
+
+        assert_equal 'localhost', @conn.secondary_pools[1].host
+        assert_equal 27019, @conn.secondary_pools[1].port
+
+        assert_equal 2, @conn.secondary_pools.length
       end
     end
 
@@ -75,13 +85,6 @@ class ConnectionTest < Test::Unit::TestCase
       end
 
       should "not store any hosts redundantly" do
-        assert_equal 3, @conn.nodes.size
-
-        @hosts.each do |host|
-          host, port = host.split(":")
-          port = port.to_i
-          assert @conn.nodes.include?([host, port]), "Connection doesn't include host #{host.inspect}."
-        end
       end
     end
 

data/test/unit/pool_test.rb

@@ -0,0 +1,9 @@
+require './test/test_helper'
+include Mongo
+
+class PoolTest < Test::Unit::TestCase
+  context "Initialization: " do
+    should "do" do
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -04:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,73 +50,80 @@ files:
 - mongo.gemspec
 - LICENSE.txt
 - lib/mongo.rb
-- lib/mongo/collection.rb
-- lib/mongo/connection.rb
 - lib/mongo/cursor.rb
-- lib/mongo/db.rb
+- lib/mongo/collection.rb
 - lib/mongo/exceptions.rb
+- lib/mongo/connection.rb
+- lib/mongo/gridfs/grid_io.rb
+- lib/mongo/gridfs/grid_file_system.rb
 - lib/mongo/gridfs/grid.rb
 - lib/mongo/gridfs/grid_ext.rb
-- lib/mongo/gridfs/grid_file_system.rb
-- lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_io_fix.rb
 - lib/mongo/util/conversions.rb
-- lib/mongo/util/core_ext.rb
+- lib/mongo/util/support.rb
 - lib/mongo/util/pool.rb
+- lib/mongo/util/core_ext.rb
 - lib/mongo/util/server_version.rb
-- lib/mongo/util/support.rb
-- docs/1.0_UPGRADE.md
-- docs/CREDITS.md
+- lib/mongo/db.rb
 - docs/HISTORY.md
 - docs/TUTORIAL.md
+- docs/CREDITS.md
+- docs/FAQ.md
+- docs/REPLICA_SETS.md
+- docs/1.0_UPGRADE.md
+- docs/GridFS.md
+- docs/WRITE_CONCERN.md
 - bin/mongo_console
-- test/auxillary/1.4_features.rb
+- test/grid_file_system_test.rb
+- test/unit/db_test.rb
+- test/unit/collection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/grid_test.rb
+- test/unit/connection_test.rb
+- test/unit/pool_test.rb
+- test/unit/safe_test.rb
+- test/db_test.rb
+- test/collection_test.rb
+- test/rs.rb
+- test/cursor_test.rb
+- test/grid_test.rb
+- test/db_api_test.rb
+- test/auxillary/slave_connection_test.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
-- test/auxillary/slave_connection_test.rb
-- test/bson/binary_test.rb
-- test/bson/bson_test.rb
+- test/auxillary/1.4_features.rb
+- test/conversions_test.rb
+- test/connection_test.rb
+- test/cursor_message_test.rb
+- test/cursor_fail_test.rb
+- test/threading/test_threading_large_pool.rb
+- test/test_helper.rb
+- test/grid_io_test.rb
 - test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/bson/json_test.rb
+- test/bson/binary_test.rb
 - test/bson/object_id_test.rb
+- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/ordered_hash_test.rb
-- test/collection_test.rb
-- test/connection_test.rb
-- test/conversions_test.rb
-- test/cursor_fail_test.rb
-- test/cursor_message_test.rb
-- test/cursor_test.rb
-- test/db_api_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
 - test/db_connection_test.rb
-- test/db_test.rb
-- test/grid_file_system_test.rb
-- test/grid_io_test.rb
-- test/grid_test.rb
-- test/replica_pairs/count_test.rb
-- test/replica_pairs/insert_test.rb
-- test/replica_pairs/pooled_insert_test.rb
-- test/replica_pairs/query_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/node_type_test.rb
 - test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/query_test.rb
+- test/replica_sets/count_test.rb
 - test/replica_sets/replication_ack_test.rb
+- test/replica_sets/query_secondaries.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/node_type_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/connect_test.rb
 - test/safe_test.rb
-- test/support/hash_with_indifferent_access.rb
-- test/support/keys.rb
 - test/support_test.rb
-- test/test_helper.rb
-- test/threading/test_threading_large_pool.rb
+- test/replica_pairs/pooled_insert_test.rb
+- test/replica_pairs/count_test.rb
+- test/replica_pairs/query_test.rb
+- test/replica_pairs/insert_test.rb
 - test/threading_test.rb
-- test/unit/collection_test.rb
-- test/unit/connection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/db_test.rb
-- test/unit/grid_test.rb
-- test/unit/safe_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -154,50 +161,53 @@ signing_key:
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-- test/auxillary/1.4_features.rb
+- test/grid_file_system_test.rb
+- test/unit/db_test.rb
+- test/unit/collection_test.rb
+- test/unit/cursor_test.rb
+- test/unit/grid_test.rb
+- test/unit/connection_test.rb
+- test/unit/pool_test.rb
+- test/unit/safe_test.rb
+- test/db_test.rb
+- test/collection_test.rb
+- test/rs.rb
+- test/cursor_test.rb
+- test/grid_test.rb
+- test/db_api_test.rb
+- test/auxillary/slave_connection_test.rb
 - test/auxillary/authentication_test.rb
 - test/auxillary/autoreconnect_test.rb
-- test/auxillary/slave_connection_test.rb
-- test/bson/binary_test.rb
-- test/bson/bson_test.rb
+- test/auxillary/1.4_features.rb
+- test/conversions_test.rb
+- test/connection_test.rb
+- test/cursor_message_test.rb
+- test/cursor_fail_test.rb
+- test/threading/test_threading_large_pool.rb
+- test/test_helper.rb
+- test/grid_io_test.rb
 - test/bson/byte_buffer_test.rb
-- test/bson/hash_with_indifferent_access_test.rb
-- test/bson/json_test.rb
+- test/bson/binary_test.rb
 - test/bson/object_id_test.rb
+- test/bson/json_test.rb
+- test/bson/bson_test.rb
 - test/bson/ordered_hash_test.rb
-- test/collection_test.rb
-- test/connection_test.rb
-- test/conversions_test.rb
-- test/cursor_fail_test.rb
-- test/cursor_message_test.rb
-- test/cursor_test.rb
-- test/db_api_test.rb
+- test/bson/hash_with_indifferent_access_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
 - test/db_connection_test.rb
-- test/db_test.rb
-- test/grid_file_system_test.rb
-- test/grid_io_test.rb
-- test/grid_test.rb
-- test/replica_pairs/count_test.rb
-- test/replica_pairs/insert_test.rb
-- test/replica_pairs/pooled_insert_test.rb
-- test/replica_pairs/query_test.rb
-- test/replica_sets/connect_test.rb
-- test/replica_sets/count_test.rb
-- test/replica_sets/insert_test.rb
-- test/replica_sets/node_type_test.rb
 - test/replica_sets/pooled_insert_test.rb
-- test/replica_sets/query_test.rb
+- test/replica_sets/count_test.rb
 - test/replica_sets/replication_ack_test.rb
+- test/replica_sets/query_secondaries.rb
+- test/replica_sets/query_test.rb
+- test/replica_sets/node_type_test.rb
+- test/replica_sets/insert_test.rb
+- test/replica_sets/connect_test.rb
 - test/safe_test.rb
-- test/support/hash_with_indifferent_access.rb
-- test/support/keys.rb
 - test/support_test.rb
-- test/test_helper.rb
-- test/threading/test_threading_large_pool.rb
+- test/replica_pairs/pooled_insert_test.rb
+- test/replica_pairs/count_test.rb
+- test/replica_pairs/query_test.rb
+- test/replica_pairs/insert_test.rb
 - test/threading_test.rb
-- test/unit/collection_test.rb
-- test/unit/connection_test.rb
-- test/unit/cursor_test.rb
-- test/unit/db_test.rb
-- test/unit/grid_test.rb
-- test/unit/safe_test.rb