bson_ext 1.0.4 → 1.0.5

data/Rakefile

@@ -58,23 +58,48 @@ namespace :test do
     t.verbose    = true
   end
 
-  Rake::TestTask.new(:pair_count) do |t|
-    t.test_files = FileList['test/replica/count_test.rb']
+  Rake::TestTask.new(:replica_pair_count) do |t|
+    t.test_files = FileList['test/replica_pairs/count_test.rb']
     t.verbose    = true
   end
 
-  Rake::TestTask.new(:pair_insert) do |t|
-    t.test_files = FileList['test/replica/insert_test.rb']
+  Rake::TestTask.new(:replica_pair_insert) do |t|
+    t.test_files = FileList['test/replica_pairs/insert_test.rb']
     t.verbose    = true
   end
 
-  Rake::TestTask.new(:pooled_pair_insert) do |t|
-    t.test_files = FileList['test/replica/pooled_insert_test.rb']
+  Rake::TestTask.new(:pooled_replica_pair_insert) do |t|
+    t.test_files = FileList['test/replica_pairs/pooled_insert_test.rb']
     t.verbose    = true
   end
 
-  Rake::TestTask.new(:pair_query) do |t|
-    t.test_files = FileList['test/replica/query_test.rb']
+  Rake::TestTask.new(:replica_pair_query) do |t|
+    t.test_files = FileList['test/replica_pairs/query_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:replica_set_count) do |t|
+    t.test_files = FileList['test/replica_sets/count_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:replica_set_insert) do |t|
+    t.test_files = FileList['test/replica_sets/insert_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:pooled_replica_set_insert) do |t|
+    t.test_files = FileList['test/replica_sets/pooled_insert_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:replica_set_query) do |t|
+    t.test_files = FileList['test/replica_sets/query_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:replica_set_ack) do |t|
+    t.test_files = FileList['test/replica_sets/replication_ack_test.rb']
     t.verbose    = true
   end
 

data/bson_ext.gemspec

@@ -1,4 +1,4 @@
-require 'lib/bson'
+require './lib/bson'
 VERSION_HEADER = File.open(File.join(File.dirname(__FILE__), 'ext', 'cbson', 'version.h'), "r")
 VERSION        = VERSION_HEADER.read.scan(/VERSION\s+"(\d+\.\d+(\.\d+\w*)?)\"/)[0][0]
 Gem::Specification.new do |s|

data/ext/cbson/cbson.c

@@ -73,8 +73,8 @@
 #define MAX_HOSTNAME_LENGTH 256
 
 static VALUE Binary;
-static VALUE Time;
 static VALUE ObjectID;
+static VALUE ObjectId;
 static VALUE DBRef;
 static VALUE Code;
 static VALUE MinKey;
@@ -379,7 +379,7 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 SAFE_WRITE(buffer, RSTRING_PTR(string_data), length);
                 break;
             }
-            if (strcmp(cls, "BSON::ObjectID") == 0) {
+            if ((strcmp(cls, "BSON::ObjectId") == 0) || (strcmp(cls, "BSON::ObjectID") == 0)) {
                 VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
                 int i;
                 write_name_and_type(buffer, key, 0x07);
@@ -561,8 +561,12 @@ static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys, VALUE move_
 
             write_function(key, value, pack_extra(buffer, check_keys));
         }
-    } else {
+    } else if (strcmp(rb_obj_classname(hash), "Hash") == 0) {
         rb_hash_foreach(hash, write_function, pack_extra(buffer, check_keys));
+    } else {
+        buffer_free(buffer);
+        char* cls = rb_obj_classname(hash);
+        rb_raise(InvalidDocument, "BSON.serialize takes a Hash but got a %s", cls);
     }
 
     // write null byte and fill in length
@@ -691,7 +695,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
         {
             VALUE str = rb_str_new(buffer + *position, 12);
             VALUE oid = rb_funcall(str, rb_intern("unpack"), 1, rb_str_new2("C*"));
-            value = rb_class_new_instance(1, &oid, ObjectID);
+            value = rb_class_new_instance(1, &oid, ObjectId);
             *position += 12;
             break;
         }
@@ -703,12 +707,9 @@ static VALUE get_value(const char* buffer, int* position, int type) {
     case 9:
         {
             long long millis;
-            VALUE seconds, microseconds;
             memcpy(&millis, buffer + *position, 8);
-            seconds = LL2NUM(millis / 1000);
-            microseconds = INT2NUM((millis % 1000) * 1000);
 
-            value = rb_funcall(Time, rb_intern("at"), 2, seconds, microseconds);
+            value = rb_time_new(millis / 1000, (millis % 1000) * 1000);
             value = rb_funcall(value, rb_intern("utc"), 0);
             *position += 8;
             break;
@@ -756,7 +757,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
 
             str = rb_str_new(buffer + *position, 12);
             oid = rb_funcall(str, rb_intern("unpack"), 1, rb_str_new2("C*"));
-            id = rb_class_new_instance(1, &oid, ObjectID);
+            id = rb_class_new_instance(1, &oid, ObjectId);
             *position += 12;
 
             argv[0] = collection;
@@ -909,13 +910,14 @@ static VALUE objectid_generate(VALUE self)
 
 void Init_cbson() {
     VALUE bson, CBson, Digest, ext_version;
-    Time = rb_const_get(rb_cObject, rb_intern("Time"));
 
     bson = rb_const_get(rb_cObject, rb_intern("BSON"));
     rb_require("bson/types/binary");
     Binary = rb_const_get(bson, rb_intern("Binary"));
     rb_require("bson/types/objectid");
     ObjectID = rb_const_get(bson, rb_intern("ObjectID"));
+    rb_require("bson/types/object_id");
+    ObjectId = rb_const_get(bson, rb_intern("ObjectId"));
     rb_require("bson/types/dbref");
     DBRef = rb_const_get(bson, rb_intern("DBRef"));
     rb_require("bson/types/code");
@@ -942,6 +944,7 @@ void Init_cbson() {
     DigestMD5 = rb_const_get(Digest, rb_intern("MD5"));
 
     rb_define_method(ObjectID, "generate", objectid_generate, 0);
+    rb_define_method(ObjectId, "generate", objectid_generate, 0);
 
     rb_define_method(rb_cArray, "fast_pack", fast_pack, 0);
 }

data/ext/cbson/version.h

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "1.0.4"
+#define VERSION "1.0.5"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bson_ext
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -04:00
+date: 2010-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -47,23 +48,27 @@ rdoc_options: []
 require_paths: 
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: C extensions for Ruby BSON.