mongo 1.0 → 1.1.5

data/test/unit/repl_set_connection_test.rb

@@ -0,0 +1,82 @@
+require './test/test_helper'
+include Mongo
+
+class ReplSetConnectionTest < Test::Unit::TestCase
+  context "Initialization: " do
+    setup do
+      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)
+        socket
+      end
+
+      def new_mock_db
+        db = Object.new
+      end
+    end
+
+    context "connecting to a replica set" do
+      setup do
+        TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))
+        @conn = ReplSetConnection.new(['localhost', 27017], :connect => false, :read_secondary => true)
+
+        admin_db = new_mock_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
+        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
+
+    context "connecting to a replica set and providing seed nodes" do
+      setup do
+        TCPSocket.stubs(:new).returns(new_mock_socket)
+        @conn = ReplSetConnection.new(['localhost', 27017], ['localhost', 27019], :connect => false)
+
+        admin_db = new_mock_db
+        @hosts = ['localhost:27017', 'localhost:27018', 'localhost:27019']
+        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
+        @conn.stubs(:[]).with('admin').returns(admin_db)
+        @conn.connect
+      end
+    end
+
+    context "initializing with a mongodb uri" do
+
+      should "parse a uri specifying multiple nodes" do
+        @conn = Connection.from_uri("mongodb://localhost:27017,mydb.com:27018", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['mydb.com', 27018], @conn.nodes[1]
+      end
+
+      should "parse a uri specifying multiple nodes with auth" do
+        @conn = Connection.from_uri("mongodb://kyle:s3cr3t@localhost:27017/app,mickey:m0u5e@mydb.com:27018/dsny", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['mydb.com', 27018], @conn.nodes[1]
+        auth_hash = {'username' => 'kyle', 'password' => 's3cr3t', 'db_name' => 'app'}
+        assert_equal auth_hash, @conn.auths[0]
+        auth_hash = {'username' => 'mickey', 'password' => 'm0u5e', 'db_name' => 'dsny'}
+        assert_equal auth_hash, @conn.auths[1]
+      end
+    end
+  end
+end

data/test/unit/safe_test.rb

@@ -0,0 +1,125 @@
+require File.expand_path('./test/test_helper.rb')
+
+class SafeTest < Test::Unit::TestCase
+
+  context "Safe mode on connection: " do
+    setup do
+      @safe_value = {:w => 7}
+      @con = Mongo::Connection.new('localhost', 27017, :safe => @safe_value, :connect => false)
+    end
+
+    should "propogate to DB" do
+      db = @con['foo']
+      assert_equal @safe_value, db.safe
+
+
+      db = @con.db('foo')
+      assert_equal @safe_value, db.safe
+
+      db = DB.new('foo', @con)
+      assert_equal @safe_value, db.safe
+    end
+
+    should "allow db override" do
+      db = DB.new('foo', @con, :safe => false)
+      assert_equal false, db.safe
+
+      db = @con.db('foo', :safe => false)
+      assert_equal false, db.safe
+    end
+
+    context "on DB: " do
+      setup do
+        @db = @con['foo']
+      end
+
+      should "propogate to collection" do
+        col = @db.collection('bar')
+        assert_equal @safe_value, col.safe
+
+        col = @db['bar']
+        assert_equal @safe_value, col.safe
+
+        col = Collection.new(@db, 'bar')
+        assert_equal @safe_value, col.safe
+      end
+
+      should "allow override on collection" do
+        col = @db.collection('bar', :safe => false)
+        assert_equal false, col.safe
+
+        col = Collection.new(@db, 'bar', :safe => false)
+        assert_equal false, col.safe
+      end
+    end
+
+    context "on operations supporting safe mode" do
+      setup do
+        @col = @con['foo']['bar']
+      end
+
+      should "use default value on insert" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == @safe_value
+        end
+
+        @col.insert({:a => 1})
+      end
+
+      should "allow override alternate value on insert" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == {:w => 100}
+        end
+
+        @col.insert({:a => 1}, :safe => {:w => 100})
+      end
+
+      should "allow override to disable on insert" do
+        @con.expects(:send_message)
+        @col.insert({:a => 1}, :safe => false)
+      end
+
+      should "use default value on update" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == @safe_value
+        end
+
+        @col.update({:a => 1}, {:a => 2})
+      end
+
+      should "allow override alternate value on update" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == {:w => 100}
+        end
+
+        @col.update({:a => 1}, {:a => 2}, :safe => {:w => 100})
+      end
+
+      should "allow override to disable on update" do
+        @con.expects(:send_message)
+        @col.update({:a => 1}, {:a => 2}, :safe => false)
+      end
+
+      should "use default value on remove" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == @safe_value
+        end
+
+        @col.remove
+      end
+
+      should "allow override alternate value on remove" do
+        @con.expects(:send_message_with_safe_check).with do |op, msg, log, n, safe|
+          safe == {:w => 100}
+        end
+
+        @col.remove({}, :safe => {:w => 100})
+      end
+
+      should "allow override to disable on remove" do
+        @con.expects(:send_message)
+        @col.remove({}, :safe => false)
+      end
+    end
+  end
+end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Jim Menard
@@ -15,61 +17,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 1
+        - 5
+        version: 1.1.5
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
-executables: []
-
+executables: 
+- mongo_console
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 files: 
-- README.rdoc
+- README.md
 - Rakefile
-- mongo-ruby-driver.gemspec
+- 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/repl_set_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/support.rb
+- lib/mongo/util/pool.rb
 - lib/mongo/util/core_ext.rb
 - lib/mongo/util/server_version.rb
-- lib/mongo/util/support.rb
-- examples/admin.rb
-- examples/capped.rb
-- examples/cursor.rb
-- examples/gridfs.rb
-- examples/index_test.rb
-- examples/info.rb
-- examples/queries.rb
-- examples/simple.rb
-- examples/strict.rb
-- examples/types.rb
-- bin/bson_benchmark.rb
-- bin/fail_if_no_c.rb
+- lib/mongo/util/uri_parser.rb
+- 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/grid_file_system_test.rb
+- test/unit/db_test.rb
+- test/unit/repl_set_connection_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/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/1.4_features.rb
+- test/conversions_test.rb
+- test/connection_test.rb
+- test/cursor_message_test.rb
+- test/tools/test.rb
+- test/tools/repl_set_manager.rb
+- test/cursor_fail_test.rb
+- test/threading/threading_with_large_pool_test.rb
+- test/test_helper.rb
+- test/grid_io_test.rb
+- test/bson/byte_buffer_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/bson/hash_with_indifferent_access_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
+- test/db_connection_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/replica_sets/pooled_insert_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/insert_test.rb
+- test/replica_sets/connect_test.rb
+- test/safe_test.rb
+- test/support_test.rb
+- test/threading_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -77,54 +131,81 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.md
 - --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
-- test/auxillary/1.4_features.rb
-- test/auxillary/authentication_test.rb
-- test/auxillary/autoreconnect_test.rb
+- test/grid_file_system_test.rb
+- test/unit/db_test.rb
+- test/unit/repl_set_connection_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/connection_test.rb
-- test/conversions_test.rb
 - test/cursor_test.rb
-- test/db_api_test.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/count_test.rb
-- test/replica/insert_test.rb
-- test/replica/pooled_insert_test.rb
-- test/replica/query_test.rb
-- test/slave_connection_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/1.4_features.rb
+- test/conversions_test.rb
+- test/connection_test.rb
+- test/cursor_message_test.rb
+- test/tools/test.rb
+- test/tools/repl_set_manager.rb
+- test/cursor_fail_test.rb
+- test/threading/threading_with_large_pool_test.rb
 - test/test_helper.rb
-- test/threading/test_threading_large_pool.rb
+- test/grid_io_test.rb
+- test/bson/byte_buffer_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/bson/hash_with_indifferent_access_test.rb
+- test/support/keys.rb
+- test/support/hash_with_indifferent_access.rb
+- test/db_connection_test.rb
+- test/replica_sets/rs_test_helper.rb
+- test/replica_sets/pooled_insert_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/insert_test.rb
+- test/replica_sets/connect_test.rb
+- test/safe_test.rb
+- test/support_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

data/bin/bson_benchmark.rb

@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
-require 'mongo'
-
-include Mongo
-
-TRIALS = 100000
-
-def encode(doc)
-  t0 = Time.new
-  b = Mongo::BSON_CODER.new
-  TRIALS.times { |i|
-    b = Mongo::BSON_CODER.new
-    b.serialize doc
-  }
-  print "took: #{Time.now.to_f - t0.to_f}\n"
-  return b
-end
-
-def decode(bson)
-  t0 = Time.new
-  doc = nil
-  TRIALS.times { |i|
-    doc = bson.deserialize
-  }
-  print "took: #{Time.now.to_f - t0.to_f}\n"
-  return doc
-end
-
-TEST_CASES = [{},
-              {
-                "hello" => "world"
-              },
-              {
-                "hello" => "world",
-                "mike" => "something",
-                "here's" => "another"
-              },
-              {
-                "int" => 200,
-                "bool" => true,
-                "an int" => 20,
-                "a bool" => false
-              },
-              {
-                "this" => 5,
-                "is" => {"a" => true},
-                "big" => [true, 5.5],
-                "object" => nil
-              }]
-
-TEST_CASES.each { |doc|
-  print "case #{doc.inspect}\n"
-  print "enc bson\n"
-  enc_bson = encode(doc)
-  print "dec bson\n"
-  raise "FAIL" unless doc == decode(enc_bson)
-}

data/bin/fail_if_no_c.rb

@@ -1,11 +0,0 @@
-# Fail if the C extension module isn't installed.
-#
-# Only really intended to be used by internal build scripts.
-
-require 'rubygems'
-require 'mongo'
-begin
-  require 'bson_ext/cbson'
-rescue LoadError
-  Process.exit 1
-end

data/examples/admin.rb

@@ -1,43 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'mongo'
-require 'pp'
-
-include Mongo
-
-host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-
-puts "Connecting to #{host}:#{port}"
-con  = Mongo::Connection.new(host, port)
-db   = con.db('ruby-mongo-examples')
-coll = db.create_collection('test')
-
-# Erase all records from collection, if any
-coll.remove
-
-admin = con['admin']
-
-# Profiling level set/get
-puts "Profiling level: #{admin.profiling_level}"
-
-# Start profiling everything
-admin.profiling_level = :all
-
-# Read records, creating a profiling event
-coll.find().to_a
-
-# Stop profiling
-admin.profiling_level = :off
-
-# Print all profiling info
-pp admin.profiling_info
-
-# Validate returns a hash if all is well and
-# raises an exception if there is a problem.
-info = db.validate_collection(coll.name)
-puts "valid = #{info['ok']}"
-puts info['result']
-
-# Destroy the collection
-coll.drop

data/examples/capped.rb

@@ -1,22 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-
-include Mongo
-
-host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-
-puts "Connecting to #{host}:#{port}"
-db = Connection.new(host, port).db('ruby-mongo-examples')
-db.drop_collection('test')
-
-# A capped collection has a max size and, optionally, a max number of records.
-# Old records get pushed out by new ones once the size or max num records is reached.
-coll = db.create_collection('test', :capped => true, :size => 1024, :max => 12)
-
-100.times { |i| coll.insert('a' => i+1) }
-
-# We will only see the last 12 records
-coll.find().each { |row| p row }
-
-coll.drop

data/examples/cursor.rb

@@ -1,48 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'mongo'
-require 'pp'
-
-include Mongo
-
-host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
-port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-
-puts "Connecting to #{host}:#{port}"
-db = Connection.new(host, port).db('ruby-mongo-examples')
-coll = db.collection('test')
-
-# Erase all records from collection, if any
-coll.remove
-
-# Insert 3 records
-3.times { |i| coll.insert({'a' => i+1}) }
-
-# Cursors don't run their queries until you actually attempt to retrieve data
-# from them.
-
-# Find returns a Cursor, which is Enumerable. You can iterate:
-coll.find().each { |row| pp row }
-
-# You can turn it into an array:
-array = coll.find().to_a
-
-# You can iterate after turning it into an array (the cursor will iterate over
-# the copy of the array that it saves internally.)
-cursor = coll.find()
-array = cursor.to_a
-cursor.each { |row| pp row }
-
-# You can get the next object
-first_object = coll.find().next_document
-
-# next_document returns nil if there are no more objects that match
-cursor = coll.find()
-obj = cursor.next_document
-while obj
-  pp obj
-  obj = cursor.next_document
-end
-
-# Destroy the collection
-coll.drop