mongodb-mongo 0.3.0 → 0.3.1

data/README.rdoc

@@ -133,17 +133,16 @@ The tests assume that the Mongo database is running on the default port.
 
 The project mongo-qa (http://github.com/mongodb/mongo-qa) contains many more
 Mongo driver tests that are language independent. To run thoses tests as part
-of the "rake test" task, run
+of the "rake test" task, download the code "next to" this directory. So, after
+installing the mongo-qa code you would have these two directories next to each
+other:
 
-  $ rake mongo_qa
+  $ ls
+  mongo-qa
+  mongo-ruby-driver
   $ rake test
 
-The mongo_qa task uses the "git clone" command to make a copy of that project
-in a directory named mongo-qa. If the directory already exists, then the
-mongo_qa task uses "git pull" to updated the code that's there. The Ruby
-driver tests will then use some of the data files from that project when it
-runs BSON tests. You can delete this directory at any time if you don't want
-to run those tests any more.
+The tests run just fine if the mongo-qa directory is not there.
 
 Additionally, the script bin/validate is used by the mongo-qa project's
 validator script.

data/Rakefile

@@ -11,17 +11,6 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['tests/test*.rb']
 end
 
-desc "Clone or pull (update) the mongo-qa project used for testing"
-task :mongo_qa do
-  if File.exist?('mongo-qa')
-    Dir.chdir('mongo-qa') do
-      system('git pull')
-    end
-  else
-    system('git clone git://github.com/mongodb/mongo-qa.git')
-  end
-end
-
 desc "Generate documentation"
 task :rdoc do
   FileUtils.rm_rf('html')

data/lib/mongo/util/bson.rb

@@ -80,9 +80,9 @@ class BSON
     @buf.put_int(0)
 
     # Write key/value pairs. Always write _id first if it exists.
-    oid = obj.delete('_id') || obj.delete(:_id)
+    oid = obj['_id'] || obj[:_id]
     serialize_key_value('_id', oid) if oid
-    obj.each {|k, v| serialize_key_value(k, v) }
+    obj.each {|k, v| serialize_key_value(k, v) unless k == '_id' || k == :_id }
 
     serialize_eoo_element(@buf)
     @buf.put_int(@buf.size, 0)

data/mongo-ruby-driver.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.3.0'
+  s.version = '0.3.1'
   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.'

data/tests/test_bson.rb

@@ -155,4 +155,18 @@ class BSONTest < Test::Unit::TestCase
     assert_equal '_id', roundtrip.keys.first
   end
 
+  def test_do_not_change_original_object
+    val = OrderedHash.new
+    val['not_id'] = 1
+    val['_id'] = 2
+    assert val.keys.include?('_id')
+    @b.serialize(val)
+    assert val.keys.include?('_id')
+
+    val = {'a' => 'foo', 'b' => 'bar', :_id => 42, 'z' => 'hello'}
+    assert val.keys.include?(:_id)
+    @b.serialize(val)
+    assert val.keys.include?(:_id)
+  end
+
 end

data/tests/test_mongo.rb

@@ -14,31 +14,41 @@ class MongoTest < Test::Unit::TestCase
   end
 
   def test_database_info
+    @mongo.drop_database('ruby-mongo-info-test')
+    @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)
+
     info = @mongo.database_info
     assert_not_nil info
     assert_kind_of Hash, info
-    assert_not_nil info['admin']
-    assert info['admin'] > 0
+    assert_not_nil info['ruby-mongo-info-test']
+    assert info['ruby-mongo-info-test'] > 0
+
+    @mongo.drop_database('ruby-mongo-info-test')
   end
 
   def test_database_names
+    @mongo.drop_database('ruby-mongo-info-test')
+    @mongo.db('ruby-mongo-info-test').collection('info-test').insert('a' => 1)
+
     names = @mongo.database_names
     assert_not_nil names
     assert_kind_of Array, names
     assert names.length >= 1
-    assert names.include?('admin')
+    assert names.include?('ruby-mongo-info-test')
+
+    @mongo.drop_database('ruby-mongo-info-test')
   end
 
   def test_drop_database
-    db = @mongo.db('will-be-deleted')
+    db = @mongo.db('ruby-mongo-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')
+    assert @mongo.database_names.include?('ruby-mongo-will-be-deleted')
 
-    @mongo.drop_database('will-be-deleted')
-    assert !@mongo.database_names.include?('will-be-deleted')
+    @mongo.drop_database('ruby-mongo-will-be-deleted')
+    assert !@mongo.database_names.include?('ruby-mongo-will-be-deleted')
   end
 
   def test_pair

data/tests/test_round_trip.rb

@@ -8,9 +8,9 @@ require 'test/unit'
 # OrderedHash and then test both Ruby-to-BSON and BSON-to-Ruby translations.
 #
 # There is a whole other project that includes similar tests
-# (http://github.com/mongodb/mongo-qa). If the directory ../mongo-qa exists,
-# then we find the BSON test files there and use those, too. Use the Rake task
-# "mongo_qa" to obtain those tests.
+# (http://github.com/mongodb/mongo-qa). If the directory ../../mongo-qa
+# exists, (that is, the top-level dir of mongo-qa is next to the top-level dir
+# of this project), then we find the BSON test files there and use those, too.
 class RoundTripTest < Test::Unit::TestCase
 
   include XGen::Mongo::Driver
@@ -47,7 +47,7 @@ EOS
   # Dynamically generate one test for each test file. This way, if one test
   # fails the others will still run.
   create_test_for_round_trip_files_in_dir(File.join(HERE, 'data'))
-  mongo_qa_dir = File.join(HERE, '..', 'mongo-qa/modules/bson_tests/tests')
+  mongo_qa_dir = File.join(HERE, '../..', 'mongo-qa/modules/bson_tests/tests')
   if File.exist?(mongo_qa_dir)
     %w(basic_types complex single_types).each { |subdir_name|
       create_test_for_round_trip_files_in_dir(File.join(mongo_qa_dir, subdir_name))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jim Menard