mongo 0.19.3 → 0.20

data/test/db_connection_test.rb

@@ -8,7 +8,7 @@ class DBConnectionTest < Test::Unit::TestCase
   def test_no_exceptions
     host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
     port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
-    db = Connection.new(host, port).db('ruby-mongo-demo')
+    db = Connection.new(host, port).db(MONGO_TEST_DB)
     coll = db.collection('test')
     coll.remove
     db.error

data/test/db_test.rb

@@ -5,7 +5,7 @@ require 'logger'
 
 class TestPKFactory
   def create_pk(row)
-    row['_id'] ||= Mongo::ObjectID.new
+    row['_id'] ||= BSON::ObjectID.new
     row
   end
 end
@@ -18,8 +18,9 @@ class DBTest < Test::Unit::TestCase
   @@host  = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
   @@port  = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
   @@conn  = Connection.new(@@host, @@port)
-  @@db    = @@conn.db('ruby-mongo-test')
+  @@db    = @@conn.db(MONGO_TEST_DB)
   @@users = @@db.collection('system.users')
+  @@version = @@conn.server_version
 
   def test_close
     @@conn.close
@@ -30,7 +31,7 @@ class DBTest < Test::Unit::TestCase
     rescue => ex
       assert_match /NilClass/, ex.to_s
     ensure
-      @@db = Connection.new(@@host, @@port).db('ruby-mongo-test')
+      @@db = Connection.new(@@host, @@port).db(MONGO_TEST_DB)
       @@users = @@db.collection('system.users')
     end
   end
@@ -48,7 +49,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_full_coll_name
     coll = @@db.collection('test')
-    assert_equal 'ruby-mongo-test.test', @@db.full_collection_name(coll.name)
+    assert_equal "#{MONGO_TEST_DB}.test", @@db.full_collection_name(coll.name)
   end
 
   def test_collection_names
@@ -78,19 +79,19 @@ class DBTest < Test::Unit::TestCase
   def test_pair
     @@conn.close
     @@users = nil
-    @@conn  = Connection.new({:left => "this-should-fail", :right => [@@host, @@port]})
-    @@db    = @@conn['ruby-mongo-test']
+    @@conn  = Connection.paired([["this-should-fail", 27017], [@@host, @@port]])
+    @@db    = @@conn[MONGO_TEST_DB]
     assert @@conn.connected?
   ensure
     unless @@conn.connected?
-      @@conn = Connection.new(@@host, @@port) 
-      @@db   = @@conn.db('ruby-mongo-test')
+      @@conn = Connection.new(@@host, @@port)
+      @@db   = @@conn.db(MONGO_TEST_DB)
     end
     @@users = @@db.collection('system.users')
   end
 
   def test_pk_factory
-    db = Connection.new(@@host, @@port).db('ruby-mongo-test', :pk => TestPKFactory.new)
+    db = Connection.new(@@host, @@port).db(MONGO_TEST_DB, :pk => TestPKFactory.new)
     coll = db.collection('test')
     coll.remove
 
@@ -101,7 +102,7 @@ class DBTest < Test::Unit::TestCase
     assert_not_nil oid
     assert_equal insert_id, oid
 
-    oid = ObjectID.new
+    oid = BSON::ObjectID.new
     data = {'_id' => oid, 'name' => 'Barney', 'age' => 41}
     coll.insert(data)
     row = coll.find_one({'name' => data['name']})
@@ -114,7 +115,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_pk_factory_reset
     conn = Connection.new(@@host, @@port)
-    db   = conn.db('ruby-mongo-test')
+    db   = conn.db(MONGO_TEST_DB)
     db.pk_factory = Object.new # first time
     begin
       db.pk_factory = Object.new
@@ -202,7 +203,7 @@ class DBTest < Test::Unit::TestCase
 
   def test_text_port_number_raises_no_errors
     conn = Connection.new(@@host, @@port.to_s)
-    db   = conn['ruby-mongo-test']
+    db   = conn[MONGO_TEST_DB]
     assert db.collection('users').remove
   end
 
@@ -220,9 +221,18 @@ class DBTest < Test::Unit::TestCase
     assert !@@db.remove_user("joe")
   end
 
+
+  if @@version >= "1.3.5"
+    def test_db_stats
+      stats = @@db.stats
+      assert stats.has_key?('collections')
+      assert stats.has_key?('dataSize')
+    end
+  end
+
   context "database profiling" do
     setup do
-      @db  = @@conn['ruby-mongo-test-admin-functions']
+      @db  = @@conn[MONGO_TEST_DB]
       @coll = @db['test']
       @coll.remove
       @r1 = @coll.insert('a' => 1) # collection not created until it's used

data/test/grid_file_system_test.rb

@@ -6,7 +6,7 @@ class GridFileSystemTest < Test::Unit::TestCase
     setup do
       @con = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
         ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
-      @db = @con.db('mongo-ruby-test')
+      @db = @con.db(MONGO_TEST_DB)
     end
 
     teardown do
@@ -30,6 +30,14 @@ class GridFileSystemTest < Test::Unit::TestCase
         assert_equal data.length, @chunks_data.length
       end
 
+      should "have a unique index on chunks" do
+        assert @db['fs.chunks'].index_information['files_id_1_n_1']['unique']
+      end
+
+      should "have an index on filename" do
+        assert @db['fs.files'].index_information['filename_1_uploadDate_-1']
+      end
+
       should "return an empty string if length is zero" do
         data = @grid.open('sample.file', 'r') { |f| f.read(0) }
         assert_equal '', data
@@ -75,9 +83,15 @@ class GridFileSystemTest < Test::Unit::TestCase
        assert_equal data.length, @data.length
      end
 
+     should "raise exception if file not found" do
+       assert_raise GridFileNotFound do
+         @grid.open('io', 'r') { |f| f.write('hello') }
+       end
+     end
+
      should "raise exception if not opened for write" do
        assert_raise GridError do
-         @grid.open('io', 'r') { |f| f.write('hello') }
+         @grid.open('sample', 'r') { |f| f.write('hello') }
        end
      end
 
@@ -109,9 +123,9 @@ class GridFileSystemTest < Test::Unit::TestCase
        context "and on a second overwrite" do
          setup do
            sleep(2)
-           new_data = "NEW" * 1000
+           @new_data = "NEW" * 1000
            @grid.open('sample', 'w') do |f|
-             f.write new_data
+             f.write @new_data
            end
 
            @ids = @db['fs.files'].find({'filename' => 'sample'}).map {|file| file['_id']}
@@ -127,6 +141,18 @@ class GridFileSystemTest < Test::Unit::TestCase
            assert_equal 0, @db['fs.files'].find({'filename' => 'sample'}).count
            assert_equal 0, @db['fs.chunks'].find({'files_id' => {'$in' => @ids}}).count
          end
+
+         should "delete old versions on write with :delete_old is passed in" do
+           @grid.open('sample', 'w', :delete_old => true) do |f|
+             f.write @new_data
+           end
+           @new_ids = @db['fs.files'].find({'filename' => 'sample'}).map {|file| file['_id']}
+           assert_equal 1, @new_ids.length
+           id = @new_ids.first
+           assert !@ids.include?(id)
+           assert_equal 1, @db['fs.files'].find({'filename' => 'sample'}).count
+           assert_equal 1, @db['fs.chunks'].find({'files_id' => id}).count
+         end
        end
      end
    end

data/test/grid_io_test.rb

@@ -6,7 +6,7 @@ class GridIOTest < Test::Unit::TestCase
   context "GridIO" do
     setup do
       @db ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
+        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB)
       @files  = @db.collection('fs.files')
       @chunks = @db.collection('fs.chunks')
       @chunks.create_index([['files_id', Mongo::ASCENDING], ['n', Mongo::ASCENDING]])
@@ -49,6 +49,19 @@ class GridIOTest < Test::Unit::TestCase
         assert file.close
         assert_equal file.server_md5, file.client_md5
       end
+
+      should "raise an exception when check fails" do
+        io = File.open(File.join(File.dirname(__FILE__), 'data', 'sample_file.pdf'), 'r')
+        db = mock()
+        db.stubs(:command).returns({'md5' => '12345'})
+        @files.expects(:db).returns(db)
+        file = GridIO.new(@files, @chunks, 'bigfile', 'w', :safe => true)
+        file.write(io)
+        assert_raise GridMD5Failure do
+          assert file.close
+        end
+        assert_not_equal file.server_md5, file.client_md5
+      end
     end
 
     context "Content types" do

data/test/grid_test.rb

@@ -5,7 +5,7 @@ class GridTest < Test::Unit::TestCase
   context "Tests:" do
     setup do
       @db ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
-        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db('ruby-mongo-test')
+        ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT).db(MONGO_TEST_DB)
       @files  = @db.collection('test-fs.files')
       @chunks = @db.collection('test-fs.chunks')
     end
@@ -27,6 +27,10 @@ class GridTest < Test::Unit::TestCase
         assert_equal @data, data
       end
 
+      should "have a unique index on chunks" do
+        assert @chunks.index_information['files_id_1_n_1']['unique']
+      end
+
       should "store the filename" do
         file = @grid.get(@id)
         assert_equal 'sample', file.filename
@@ -39,13 +43,66 @@ class GridTest < Test::Unit::TestCase
 
       should "delete the file and any chunks" do
         @grid.delete(@id)
-        assert_raise GridError do
+        assert_raise GridFileNotFound do
           @grid.get(@id)
         end
         assert_equal nil, @db['test-fs']['chunks'].find_one({:files_id => @id})
       end
     end
 
+    context "Filename not required" do
+      setup do
+        @data = "GRIDDATA" * 50000
+        @grid = Grid.new(@db, 'test-fs')
+        @metadata = {'app' => 'photos'}
+      end
+
+      should "store the file with the old filename api" do
+        id = @grid.put(@data, 'sample', :metadata => @metadata)
+        file = @grid.get(id)
+        assert_equal 'sample', file.filename
+        assert_equal @metadata, file.metadata
+      end
+
+      should "store without a filename" do
+        id = @grid.put(@data, :metadata => @metadata)
+        file = @grid.get(id)
+        assert_nil file.filename
+        file_doc = @files.find_one({'_id' => id})
+        assert !file_doc.has_key?('filename')
+        assert_equal @metadata, file.metadata
+      end
+
+      should "store with filename and metadata with the new api" do
+        id = @grid.put(@data, :filename => 'sample', :metadata => @metadata)
+        file = @grid.get(id)
+        assert_equal 'sample', file.filename
+        assert_equal @metadata, file.metadata
+      end
+    end
+
+    context "Writing arbitrary data fields" do
+      setup do
+        @data = "GRIDDATA" * 50000
+        @grid = Grid.new(@db, 'test-fs')
+      end
+
+      should "write random keys to the files collection" do
+        id = @grid.put(@data, :phrases => ["blimey", "ahoy!"])
+        file = @grid.get(id)
+
+        assert_equal ["blimey", "ahoy!"], file['phrases']
+      end
+
+      should "ignore special keys" do
+        id = @grid.put(@data, :file_length => 100, :phrase => "blimey")
+        file = @grid.get(id)
+
+        assert_equal "blimey", file['phrase']
+        assert_equal 400_000, file.file_length
+      end
+    end
+
     context "Storing data with a length of zero" do
       setup do
         @grid = Grid.new(@db, 'test-fs')
@@ -74,7 +131,6 @@ class GridTest < Test::Unit::TestCase
             read_data << chunk
           end
           assert_equal data.length, read_data.length
-          assert_equal data, read_data, "Unequal!"
         end
 
         @grid = Grid.new(@db, 'test-fs')

data/test/test_helper.rb

@@ -19,11 +19,14 @@ MSG
     exit
 end
 
-require 'mongo_ext/cbson' if ENV['C_EXT']
+require 'bson_ext/cbson' if ENV['C_EXT']
+
+MONGO_TEST_DB = 'mongo-ruby-test'
 
 # NOTE: most tests assume that MongoDB is running.
 class Test::Unit::TestCase
   include Mongo
+  include BSON
 
   # Generic code for rescuing connection failures and retrying operations.
   # This could be combined with some timeout functionality.

data/test/threading/test_threading_large_pool.rb

@@ -6,7 +6,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 60).db('ruby-mongo-test')
+  @@db = Connection.new('localhost', 27017, :pool_size => 50, :timeout => 60).db(MONGO_TEST_DB)
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data

data/test/threading_test.rb

@@ -4,7 +4,7 @@ class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 30).db('ruby-mongo-test')
+  @@db = Connection.new('localhost', 27017, :pool_size => 1, :timeout => 30).db(MONGO_TEST_DB)
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data

data/test/unit/collection_test.rb

@@ -41,9 +41,9 @@ class CollectionTest < Test::Unit::TestCase
       @conn = Connection.new('localhost', 27017, :logger => @logger, :connect => false)
       @db   = @conn['testing']
       @coll = @db.collection('books')
-      data = Mongo::Binary.new(("BINARY " * 1000).unpack("c*"))
+      data = BSON::Binary.new(("BINARY " * 1000).unpack("c*"))
       @conn.expects(:send_message).with do |op, msg, log|
-        op == 2002 && log.include?("Mongo::Binary")
+        op == 2002 && log.include?("BSON::Binary")
       end
       @coll.insert({:data => data})
     end

data/test/unit/cursor_test.rb

@@ -30,6 +30,13 @@ class CursorTest < Test::Unit::TestCase
       assert @cursor.fields == {:name => 1, :date => 1}
     end
 
+    should "set mix fields 0 and 1" do
+      assert_nil @cursor.fields
+
+      @cursor = Cursor.new(@collection, :fields => {:name => 1, :date => 0})
+      assert @cursor.fields == {:name => 1, :date => 0}
+    end
+
     should "set limit" do
       assert_equal 0, @cursor.limit
 

data/test/unit/db_test.rb

@@ -7,8 +7,8 @@ class DBTest < Test::Unit::TestCase
         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) }
+        Mongo::BSON_CODER..serialize_cstr(message, "#{db.name}.test")
+        documents.each { |doc| message.put_array(Mongo::BSON_CODER.new.serialize(doc, true).to_a) }
         message = db.add_message_headers(Mongo::Constants::OP_INSERT, message)
       end
     end
@@ -53,7 +53,7 @@ class DBTest < Test::Unit::TestCase
 
       should "raise an error if logging out fails" do
         @db.expects(:command).returns({})
-        assert_raise MongoDBError do
+        assert_raise Mongo::MongoDBError do
           @db.logout
         end
       end
@@ -61,35 +61,35 @@ class DBTest < Test::Unit::TestCase
       should "raise an error if collection creation fails" do
         @db.expects(:collection_names).returns([])
         @db.expects(:command).returns({})
-        assert_raise MongoDBError do
+        assert_raise Mongo::MongoDBError do
           @db.create_collection("foo")
         end
       end
 
       should "raise an error if getlasterror fails" do
         @db.expects(:command).returns({})
-        assert_raise MongoDBError do
+        assert_raise Mongo::MongoDBError do
           @db.error
         end
       end
 
       should "raise an error if rename fails" do
         @db.expects(:command).returns({})
-        assert_raise MongoDBError do
+        assert_raise Mongo::MongoDBError do
           @db.rename_collection("foo", "bar")
         end
       end
 
       should "raise an error if drop_index fails" do
         @db.expects(:command).returns({})
-        assert_raise MongoDBError do
+        assert_raise Mongo::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
+        assert_raise Mongo::MongoDBError do
           @db.profiling_level = :slow_only
         end
       end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 19
-  - 3
-  version: 0.19.3
+  version: "0.20"
 platform: ruby
 authors: 
 - Jim Menard
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -33,44 +28,19 @@ files:
 - Rakefile
 - mongo-ruby-driver.gemspec
 - LICENSE.txt
-- lib/bson/bson_c.rb
-- lib/bson/bson_ruby.rb
-- lib/bson/byte_buffer.rb
-- lib/bson/exceptions.rb
-- lib/bson/ordered_hash.rb
-- lib/bson/types/binary.rb
-- lib/bson/types/code.rb
-- lib/bson/types/dbref.rb
-- lib/bson/types/min_max_keys.rb
-- lib/bson/types/objectid.rb
-- lib/bson/types/regexp_of_holding.rb
-- lib/bson.rb
+- lib/mongo.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
-- lib/mongo/types/code.rb
-- lib/mongo/types/dbref.rb
-- lib/mongo/types/min_max_keys.rb
-- lib/mongo/types/objectid.rb
-- lib/mongo/types/regexp_of_holding.rb
-- lib/mongo/util/bson_c.rb
-- lib/mongo/util/bson_ruby.rb
-- lib/mongo/util/byte_buffer.rb
 - lib/mongo/util/conversions.rb
 - lib/mongo/util/core_ext.rb
-- lib/mongo/util/ordered_hash.rb
 - lib/mongo/util/server_version.rb
 - lib/mongo/util/support.rb
-- lib/mongo.rb
 - examples/admin.rb
 - examples/capped.rb
 - examples/cursor.rb
@@ -83,7 +53,6 @@ files:
 - examples/types.rb
 - bin/bson_benchmark.rb
 - bin/fail_if_no_c.rb
-- bin/gr.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
@@ -99,20 +68,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby driver for the MongoDB
@@ -120,10 +87,6 @@ test_files:
 - test/auxillary/1.4_features.rb
 - 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
@@ -133,10 +96,7 @@ test_files:
 - 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