mongo 0.18.3 → 0.19

data/test/{test_objectid.rb → objectid_test.rb}

@@ -48,13 +48,8 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal 24, $1.length
   end
 
-  def test_to_s_legacy
-    s = @o.to_s_legacy
-    assert_equal 24, s.length
-    s =~ /^([0-9a-f]+)$/
-    assert_equal 24, $1.length
-
-    assert_not_equal s, @o.to_s
+  def test_inspect
+    assert_equal "ObjectID('#{@o.to_s}')", @o.inspect
   end
 
   def test_save_and_restore
@@ -85,20 +80,6 @@ class ObjectIDTest < Test::Unit::TestCase
     end
   end
 
-  def test_from_string_legacy
-    hex_str = @o.to_s_legacy
-    o2 = ObjectID.from_string_legacy(hex_str)
-    assert_equal hex_str, o2.to_s_legacy
-    assert_equal @o, o2
-    assert_equal @o.to_s, o2.to_s
-  end
-
-  def test_illegal_from_string_legacy
-    assert_raise InvalidObjectID do 
-      ObjectID.from_string_legacy("")
-    end
-  end
-
   def test_legal
     assert !ObjectID.legal?(nil)
     assert !ObjectID.legal?("fred")
@@ -121,18 +102,6 @@ class ObjectIDTest < Test::Unit::TestCase
     assert_equal [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b], o.to_a
   end
 
-  def test_legacy_byte_order
-    hex_str = '000102030405060708090A0B'
-    o = ObjectID.from_string_legacy(hex_str)
-    assert_equal [0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0b, 0x0a, 0x09, 0x08], o.to_a
-  end
-
-  def test_legacy_string_convert
-    l = @o.to_s_legacy
-    s = @o.to_s
-    assert_equal s, ObjectID.legacy_string_convert(l)
-  end
-
   def test_generation_time
     time = Time.now
     id   = ObjectID.new

data/test/{test_ordered_hash.rb → ordered_hash_test.rb}

@@ -76,6 +76,10 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_keys, @oh.keys
   end
 
+  def test_to_a_order_preserved
+    assert_equal @ordered_keys, @oh.to_a.map {|m| m.first}
+  end
+
   def test_order_preserved_after_replace
     @oh['a'] = 42
     assert_equal @ordered_keys, @oh.keys

data/test/test_helper.rb

@@ -10,8 +10,8 @@ begin
   rescue LoadError
     puts <<MSG
 
-This test suite now requires shoulda and mocha.
-You can install these gems as follows:
+This test suite requires shoulda and mocha.
+You can install them as follows:
   gem install shoulda
   gem install mocha
 

data/test/unit/collection_test.rb

@@ -1,6 +1,6 @@
 require 'test/test_helper'
 
-class ConnectionTest < Test::Unit::TestCase
+class CollectionTest < Test::Unit::TestCase
 
   context "Basic operations: " do
     setup do
@@ -27,6 +27,17 @@ class ConnectionTest < Test::Unit::TestCase
       @coll.insert({:title => 'Moby Dick'})
     end
 
+    should "not log binary data" do
+      @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
+      @db   = @conn['testing']
+      @coll = @db.collection('books')
+      data = Mongo::Binary.new(("BINARY " * 1000).unpack("c*"))
+      @conn.expects(:send_message).with do |op, msg, log|
+        op == 2002 && log.include?("Mongo::Binary")
+      end
+      @coll.insert({:data => data})
+    end
+
     should "send safe update message" do
       @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
       @db   = @conn['testing']
@@ -48,5 +59,3 @@ class ConnectionTest < Test::Unit::TestCase
     end
   end
 end
-
-

data/test/unit/connection_test.rb

@@ -1,18 +1,19 @@
 require 'test/test_helper'
+include Mongo
 
 class ConnectionTest < Test::Unit::TestCase
-
-  def new_mock_socket
-    socket = Object.new
-    socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-    socket
-  end
-
-  def new_mock_db
-    db = Object.new
-  end
-
   context "Initialization: " do
+    setup do
+      def new_mock_socket
+        socket = Object.new
+        socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        socket
+      end
+
+      def new_mock_db
+        db = Object.new
+      end
+    end
 
     context "given a single node" do
       setup do
@@ -38,22 +39,82 @@ class ConnectionTest < Test::Unit::TestCase
         assert !@conn.slave_ok?
       end
     end
-  end
 
-  context "with a nonstandard port" do 
-    setup do 
-      TCPSocket.stubs(:new).returns(new_mock_socket)
-      @conn = Connection.new('255.255.255.255', 2500, :connect => false)
-      admin_db = new_mock_db
-      admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
-      @conn.expects(:[]).with('admin').returns(admin_db)
-      @conn.connect_to_master
+    context "initializing a paired connection" do
+      should "require left and right nodes" do
+        assert_raise MongoArgumentError do
+          Connection.paired(['localhost', 27018], :connect => false)
+        end
+
+        assert_raise MongoArgumentError do
+          Connection.paired(['localhost', 27018], :connect => false)
+        end
+      end
+
+      should "store both nodes" do
+        @conn = Connection.paired([['localhost', 27017], ['localhost', 27018]], :connect => false)
+
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['localhost', 27018], @conn.nodes[1]
+      end
     end
 
-    should "set localhost and port correctly" do
-      assert_equal '255.255.255.255', @conn.host
-      assert_equal 2500, @conn.port
+    context "initializing with a mongodb uri" do
+      should "parse a simple uri" do
+        @conn = Connection.from_uri("mongodb://localhost", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+      end
+
+      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
+
+      should "attempt to connect" do
+        TCPSocket.stubs(:new).returns(new_mock_socket)
+        @conn = Connection.from_uri("mongodb://localhost", :connect => false)
+
+        admin_db = new_mock_db
+        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+        @conn.expects(:[]).with('admin').returns(admin_db)
+        @conn.expects(:apply_saved_authentication)
+        @conn.connect_to_master
+      end
+
+      should "raise an error on invalid uris" do
+        assert_raise MongoArgumentError do
+          Connection.from_uri("mongo://localhost", :connect => false)
+        end
+
+        assert_raise MongoArgumentError do
+          Connection.from_uri("mongodb://localhost:abc", :connect => false)
+        end
+
+        assert_raise MongoArgumentError do
+          Connection.from_uri("mongodb://localhost:27017, my.db.com:27018, ", :connect => false)
+        end
+      end
+
+      should "require all of username, password, and database if any one is specified" do
+        assert_raise MongoArgumentError do
+          Connection.from_uri("mongodb://localhost/db", :connect => false)
+        end
+
+        assert_raise MongoArgumentError do
+          Connection.from_uri("mongodb://kyle:password@localhost", :connect => false)
+        end
+      end
     end
   end
 end
-

data/test/unit/cursor_test.rb

@@ -1,7 +1,6 @@
 require 'test/test_helper'
 
-class TestCursor < Test::Unit::TestCase
-
+class CursorTest < Test::Unit::TestCase
   context "Cursor options" do
     setup do
       @connection = stub(:class => Connection)

data/test/unit/db_test.rb

@@ -1,97 +1,98 @@
 require 'test/test_helper'
 
 class DBTest < Test::Unit::TestCase
-
-  def insert_message(db, documents)
-    documents = [documents] unless documents.is_a?(Array)
-    message = ByteBuffer.new
-    message.put_int(0)
-    BSON.serialize_cstr(message, "#{db.name}.test")
-    documents.each { |doc| message.put_array(BSON.new.serialize(doc, true).to_a) }
-    message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
-  end
-
-  context "DB commands" do
+  context "DBTest: " do
     setup do
-      @conn = stub()
-      @db   = DB.new("testing", @conn)
-      @collection = mock()
-      @db.stubs(:system_command_collection).returns(@collection)
+      def insert_message(db, documents)
+        documents = [documents] unless documents.is_a?(Array)
+        message = ByteBuffer.new
+        message.put_int(0)
+        BSON.serialize_cstr(message, "#{db.name}.test")
+        documents.each { |doc| message.put_array(BSON.new.serialize(doc, true).to_a) }
+        message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
+      end
     end
 
-    should "raise an error if given a hash with more than one key" do
-      assert_raise MongoArgumentError do
-        @db.command(:buildinfo => 1, :somekey => 1)
+    context "DB commands" do
+      setup do
+        @conn = stub()
+        @db   = DB.new("testing", @conn)
+        @collection = mock()
+        @db.stubs(:system_command_collection).returns(@collection)
       end
-    end
 
-    should "raise an error if the selector is omitted" do
-      assert_raise MongoArgumentError do
-        @db.command({}, true)
+      should "raise an error if given a hash with more than one key" do
+        assert_raise MongoArgumentError do
+          @db.command(:buildinfo => 1, :somekey => 1)
+        end
       end
-    end
 
-    should "create the proper cursor" do
-      @cursor = mock(:next_document => {"ok" => 1})
-      Cursor.expects(:new).with(@collection, :admin => true,
-        :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
-      command = {:buildinfo => 1}
-      @db.command(command, true)
-    end
+      should "raise an error if the selector is omitted" do
+        assert_raise MongoArgumentError do
+          @db.command({}, true)
+        end
+      end
 
-    should "raise an error when the command fails" do
-      @cursor = mock(:next_document => {"ok" => 0})
-      Cursor.expects(:new).with(@collection, :admin => true,
-        :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
-      assert_raise OperationFailure do
+      should "create the proper cursor" do
+        @cursor = mock(:next_document => {"ok" => 1})
+        Cursor.expects(:new).with(@collection, :admin => true,
+          :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
         command = {:buildinfo => 1}
-        @db.command(command, true, true)
+        @db.command(command, true)
       end
-    end
 
-    should "raise an error if logging out fails" do
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.logout
+      should "raise an error when the command fails" do
+        @cursor = mock(:next_document => {"ok" => 0})
+        Cursor.expects(:new).with(@collection, :admin => true,
+          :limit => -1, :selector => {:buildinfo => 1}, :socket => nil).returns(@cursor)
+        assert_raise OperationFailure do
+          command = {:buildinfo => 1}
+          @db.command(command, true, true)
+        end
       end
-    end
 
-    should "raise an error if collection creation fails" do
-      @db.expects(:collection_names).returns([])
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.create_collection("foo")
+      should "raise an error if logging out fails" do
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.logout
+        end
       end
-    end
 
-    should "raise an error if getlasterror fails" do
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.error
+      should "raise an error if collection creation fails" do
+        @db.expects(:collection_names).returns([])
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.create_collection("foo")
+        end
       end
-    end
 
-    should "raise an error if rename fails" do
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.rename_collection("foo", "bar")
+      should "raise an error if getlasterror fails" do
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.error
+        end
       end
-    end
 
-    should "raise an error if drop_index fails" do
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.drop_index("foo", "bar")
+      should "raise an error if rename fails" do
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.rename_collection("foo", "bar")
+        end
       end
-    end
 
-    should "raise an error if set_profiling_level fails" do
-      @db.expects(:command).returns({})
-      assert_raise MongoDBError do
-        @db.profiling_level = :slow_only
+      should "raise an error if drop_index fails" do
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.drop_index("foo", "bar")
+        end
+      end
+
+      should "raise an error if set_profiling_level fails" do
+        @db.expects(:command).returns({})
+        assert_raise MongoDBError do
+          @db.profiling_level = :slow_only
+        end
       end
     end
   end
 end
-
-

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  version: 0.18.3
+  version: "0.19"
 platform: ruby
 authors: 
 - Jim Menard
 - Mike Dirolf
+- Kyle Banker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -27,13 +28,15 @@ files:
 - Rakefile
 - mongo-ruby-driver.gemspec
 - LICENSE.txt
-- lib/mongo/admin.rb
 - lib/mongo/collection.rb
 - lib/mongo/connection.rb
 - lib/mongo/cursor.rb
 - lib/mongo/db.rb
 - lib/mongo/exceptions.rb
 - lib/mongo/gridfs/chunk.rb
+- lib/mongo/gridfs/grid.rb
+- lib/mongo/gridfs/grid_file_system.rb
+- lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_store.rb
 - lib/mongo/gridfs.rb
 - lib/mongo/types/binary.rb
@@ -49,7 +52,6 @@ files:
 - lib/mongo/util/ordered_hash.rb
 - lib/mongo/util/server_version.rb
 - lib/mongo/util/support.rb
-- lib/mongo/util/xml_to_ruby.rb
 - lib/mongo.rb
 - examples/admin.rb
 - examples/capped.rb
@@ -63,8 +65,6 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
-- bin/objectid_benchmark.rb
-- bin/perf.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -96,29 +96,33 @@ signing_key:
 specification_version: 3
 summary: Ruby driver for the MongoDB
 test_files: 
+- test/auxillary/authentication_test.rb
+- test/auxillary/autoreconnect_test.rb
+- test/binary_test.rb
+- test/bson_test.rb
+- test/byte_buffer_test.rb
+- test/chunk_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_store_test.rb
+- test/grid_test.rb
+- test/objectid_test.rb
+- test/ordered_hash_test.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
-- test/test_chunk.rb
-- test/test_collection.rb
-- test/test_connection.rb
-- test/test_conversions.rb
-- test/test_cursor.rb
-- test/test_db.rb
-- test/test_db_api.rb
-- test/test_db_connection.rb
-- test/test_grid_store.rb
+- test/slave_connection_test.rb
 - test/test_helper.rb
-- test/test_objectid.rb
-- test/test_ordered_hash.rb
-- test/test_round_trip.rb
-- test/test_slave_connection.rb
-- test/test_threading.rb
 - test/threading/test_threading_large_pool.rb
+- test/threading_test.rb
 - test/unit/collection_test.rb
 - test/unit/connection_test.rb
 - test/unit/cursor_test.rb