mongo_ext 0.15.1 → 0.16

data/Rakefile

@@ -14,9 +14,23 @@ include Config
 gem_command = "gem"
 gem_command = "gem1.9" if $0.match(/1\.9$/) # use gem1.9 if we used rake1.9
 
-# NOTE: some of the tests assume Mongo is running
-Rake::TestTask.new do |t|
-  t.test_files = FileList['test/test*.rb']
+# NOTE: the functional tests assume MongoDB is running.
+desc "Test the MongoDB Ruby driver."
+task :test do
+  Rake::Task['test:unit'].invoke
+  Rake::Task['test:functional'].invoke
+end
+
+namespace :test do 
+  Rake::TestTask.new(:unit) do |t|
+    t.test_files = FileList['test/unit/*_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:functional) do |t|
+    t.test_files = FileList['test/test*.rb']
+    t.verbose    = true
+  end
 end
 
 desc "Generate documentation"

data/ext/cbson/cbson.c

@@ -438,15 +438,14 @@ static void write_doc(bson_buffer* buffer, VALUE hash, VALUE check_keys) {
     int length_location = buffer_save_bytes(buffer, 4);
     int length;
 
-    VALUE key = rb_str_new2("_id");
-    if (rb_funcall(hash, rb_intern("has_key?"), 1, key) == Qtrue) {
-        VALUE id = rb_hash_aref(hash, key);
-        write_element_allow_id(key, id, pack_extra(buffer, check_keys), 1);
-    }
-    key = ID2SYM(rb_intern("_id"));
-    if (rb_funcall(hash, rb_intern("has_key?"), 1, key) == Qtrue) {
-        VALUE id = rb_hash_aref(hash, key);
-        write_element_allow_id(key, id, pack_extra(buffer, check_keys), 1);
+    VALUE id_str = rb_str_new2("_id");
+    VALUE id_sym = ID2SYM(rb_intern("_id"));
+    if (rb_funcall(hash, rb_intern("has_key?"), 1, id_str) == Qtrue) {
+        VALUE id = rb_hash_aref(hash, id_str);
+        write_element_allow_id(id_str, id, pack_extra(buffer, check_keys), 1);
+    } else if (rb_funcall(hash, rb_intern("has_key?"), 1, id_sym) == Qtrue) {
+        VALUE id = rb_hash_aref(hash, id_sym);
+        write_element_allow_id(id_sym, id, pack_extra(buffer, check_keys), 1);
     }
 
     // we have to check for an OrderedHash and handle that specially

data/mongo-extensions.gemspec

@@ -1,21 +1,17 @@
-# We need to list all of the included files because we aren't allowed to use
-# Dir[...] in the github sandbox.
-PACKAGE_FILES = ['Rakefile', 'mongo-extensions.gemspec',
-                 'ext/cbson/cbson.c',
-                 'ext/cbson/extconf.rb']
-TEST_FILES = []
+require 'lib/mongo'
 
 Gem::Specification.new do |s|
   s.name = 'mongo_ext'
 
-  s.version = '0.15.1'
+  s.version = Mongo::VERSION
   s.platform = Gem::Platform::RUBY
   s.summary = 'C extensions for the MongoDB Ruby driver'
   s.description = 'C extensions to accelerate the MongoDB Ruby driver. For more information about Mongo, see http://www.mongodb.org.'
 
   s.require_paths = ['ext']
-  s.files = PACKAGE_FILES
-  s.test_files = TEST_FILES
+  s.files = ['Rakefile', 'mongo-extensions.gemspec']
+  s.files += Dir['ext/**/*.rb'] + Dir['ext/**/*.c']
+  s.test_files = []
 
   s.has_rdoc = false
   s.extensions << 'ext/cbson/extconf.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_ext
 version: !ruby/object:Gem::Version 
-  version: 0.15.1
+  version: "0.16"
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,8 +24,8 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - mongo-extensions.gemspec
-- ext/cbson/cbson.c
 - ext/cbson/extconf.rb
+- ext/cbson/cbson.c
 has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []