mongodb-mongo 0.1.3 → 0.1.4

data/README.rdoc

@@ -75,7 +75,7 @@ how to interpret them. You can tell the Ruby Mongo driver how to create
 primary keys by passing in the :pk option to the Mongo#db method.
 
   include XGen::Mongo::Driver
-  db = Mongo.new.db('dbname', :pk => MyPKFactory)
+  db = Mongo.new.db('dbname', :pk => MyPKFactory.new)
 
 A primary key factory object must respond to :create_pk, which should take a
 hash and return a hash which merges the original hash with any primary key
@@ -94,7 +94,7 @@ Here is a sample primary key factory, taken from the tests:
     end
   end
 
-A database's PK factory object may be changed, but this is not recommended.
+A database's PK factory object may be set after you obtain it, but only once.
 The only reason it is changeable is so that libraries such as MongoRecord that
 use this driver can set the PK factory after obtaining the database but before
 using it for the first time.

data/lib/mongo/mongo.rb

@@ -61,19 +61,12 @@ module XGen
         # Returns a hash containing database names as keys and disk space for
         # each as values.
         def database_info
-          admin_db = nil
-          begin
-            admin_db = db('admin')
-            doc = admin_db.db_command(:listDatabases => 1)
-            raise "error retrieving database info" unless admin_db.ok?(doc)
-            h = {}
-            doc['databases'].each { |db|
-              h[db['name']] = db['sizeOnDisk'].to_i
-            }
-            h
-          ensure
-            admin_db.close
-          end
+          doc = single_db_command('admin', :listDatabases => 1)
+          h = {}
+          doc['databases'].each { |db|
+            h[db['name']] = db['sizeOnDisk'].to_i
+          }
+          h
         end
 
         # Returns an array of database names.
@@ -91,6 +84,28 @@ module XGen
           raise "not implemented"
         end
 
+        # Drops the database +name+.
+        def drop_database(name)
+          single_db_command(name, :dropDatabase => 1)
+        end
+
+        protected
+
+        # Send cmd (a hash, possibly ordered) to the admin database and return
+        # the answer. Raises an error unless the return is "ok" (DB#ok?
+        # returns +true+).
+        def single_db_command(db_name, cmd)
+          db = nil
+          begin
+            db = db(db_name)
+            doc = db.db_command(cmd)
+            raise "error retrieving database info" unless db.ok?(doc)
+            doc
+          ensure
+            db.close
+          end
+        end
+
       end
     end
   end

data/lib/mongo/util/bson.rb

@@ -46,6 +46,8 @@ class BSON
   NUMBER_INT = 16
   MAXKEY = 127
 
+  BYTE_TYPE = 2
+
   if RUBY_VERSION >= '1.9'
     def self.to_utf8(str)
       str.encode("utf-8")
@@ -258,6 +260,8 @@ class BSON
   end
 
   def deserialize_binary_data(buf)
+    buf.get_int                 # length + 4; ignored
+    buf.get                     # byte type; ignored
     len = buf.get_int
     bytes = buf.get(len)
     str = ''
@@ -282,7 +286,7 @@ class BSON
   def serialize_binary_element(buf, key, val)
     buf.put(BINARY)
     self.class.serialize_cstr(buf, key)
-    buf.put_int(val.length)
+
     bytes = if RUBY_VERSION >= '1.9'
               val.bytes.to_a
             else
@@ -290,6 +294,11 @@ class BSON
               val.each_byte { |byte| a << byte }
               a
             end
+
+    num_bytes = bytes.length
+    buf.put_int(num_bytes + 4)
+    buf.put(BYTE_TYPE)
+    buf.put_int(num_bytes)
     buf.put_array(bytes)
   end
 

data/mongo-ruby-driver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.1.3'
+  s.version = '0.1.4'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
   s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
                   'tests/test_db_api.rb',
                   'tests/test_db_connection.rb',
                   'tests/test_message.rb',
+                  'tests/test_mongo.rb',
                   'tests/test_objectid.rb',
                   'tests/test_ordered_hash.rb',
                   'tests/test_round_trip.rb']

data/tests/test_mongo.rb

@@ -0,0 +1,44 @@
+$LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
+require 'mongo'
+require 'test/unit'
+
+# NOTE: assumes Mongo is running
+class MongoTest < Test::Unit::TestCase
+
+  include XGen::Mongo::Driver
+
+  def setup
+    @host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
+    @port = ENV['MONGO_RUBY_DRIVER_PORT'] || Mongo::DEFAULT_PORT
+    @mongo = Mongo.new(@host, @port)
+  end
+
+  def test_database_info
+    info = @mongo.database_info
+    assert_not_nil info
+    assert_kind_of Hash, info
+    assert_not_nil info['admin']
+    assert info['admin'] > 0
+  end
+
+  def test_database_names
+    names = @mongo.database_names
+    assert_not_nil names
+    assert_kind_of Array, names
+    assert names.length >= 1
+    assert names.include?('admin')
+  end
+
+  def test_drop_database
+    db = @mongo.db('will-be-deleted')
+    coll = db.collection('temp')
+    coll.clear
+    coll.insert(:name => 'temp')
+    assert_equal 1, coll.count()
+    assert @mongo.database_names.include?('will-be-deleted')
+
+    @mongo.drop_database('will-be-deleted')
+    assert !@mongo.database_names.include?('will-be-deleted')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jim Menard
@@ -95,6 +95,7 @@ test_files:
 - tests/test_db_api.rb
 - tests/test_db_connection.rb
 - tests/test_message.rb
+- tests/test_mongo.rb
 - tests/test_objectid.rb
 - tests/test_ordered_hash.rb
 - tests/test_round_trip.rb