mongodb-mongo_ext 0.11.1 → 0.13

data/Rakefile

@@ -12,11 +12,11 @@ require 'rbconfig'
 include Config
 
 gem_command = "gem"
-gem_command = "gem1.9" if CONFIG["MAJOR"] == "1" && CONFIG["MINOR"] == "9"
+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['tests/test*.rb']
+  t.test_files = FileList['test/test*.rb']
 end
 
 desc "Generate documentation"

data/ext/cbson/cbson.c

@@ -42,13 +42,13 @@
 #define INITIAL_BUFFER_SIZE 256
 
 static VALUE Binary;
-static VALUE Undefined;
 static VALUE Time;
 static VALUE ObjectID;
 static VALUE DBRef;
 static VALUE Code;
 static VALUE RegexpOfHolding;
 static VALUE OrderedHash;
+static VALUE InvalidName;
 
 // this sucks. but for some reason these moved around between 1.8 and 1.9
 #ifdef ONIGURUMA_H
@@ -183,11 +183,11 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     if (check_keys == Qtrue) {
         int i;
         if (RSTRING_LEN(key) > 0 && RSTRING_PTR(key)[0] == '$') {
-            rb_raise(rb_eRuntimeError, "key must not start with '$'");
+            rb_raise(InvalidName, "key must not start with '$'");
         }
         for (i = 0; i < RSTRING_LEN(key); i++) {
             if (RSTRING_PTR(key)[i] == '.') {
-                rb_raise(rb_eRuntimeError, "key must not contain '.'");
+                rb_raise(InvalidName, "key must not contain '.'");
             }
         }
     }
@@ -275,7 +275,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     case T_STRING:
         {
             if (strcmp(rb_class2name(RBASIC(value)->klass),
-                       "XGen::Mongo::Driver::Code") == 0) {
+                       "Mongo::Code") == 0) {
                 int start_position, length_location, length, total_length;
                 write_name_and_type(buffer, key, 0x0F);
 
@@ -314,7 +314,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
         {
             // TODO there has to be a better way to do these checks...
             const char* cls = rb_class2name(RBASIC(value)->klass);
-            if (strcmp(cls, "XGen::Mongo::Driver::Binary") == 0 ||
+            if (strcmp(cls, "Mongo::Binary") == 0 ||
                 strcmp(cls, "ByteBuffer") == 0) {
                 const char subtype = strcmp(cls, "ByteBuffer") ?
                     (const char)FIX2INT(rb_funcall(value, rb_intern("subtype"), 0)) : 2;
@@ -333,7 +333,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 buffer_write_bytes(buffer, RSTRING_PTR(string_data), length);
                 break;
             }
-            if (strcmp(cls, "XGen::Mongo::Driver::ObjectID") == 0) {
+            if (strcmp(cls, "Mongo::ObjectID") == 0) {
                 VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
                 int i;
                 write_name_and_type(buffer, key, 0x07);
@@ -343,7 +343,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 }
                 break;
             }
-            if (strcmp(cls, "XGen::Mongo::Driver::DBRef") == 0) {
+            if (strcmp(cls, "Mongo::DBRef") == 0) {
                 int start_position, length_location, obj_length;
                 VALUE ns, oid;
                 write_name_and_type(buffer, key, 0x03);
@@ -364,8 +364,8 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 memcpy(buffer->buffer + length_location, &obj_length, 4);
                 break;
             }
-            if (strcmp(cls, "XGen::Mongo::Driver::Undefined") == 0) {
-                write_name_and_type(buffer, key, 0x06);
+            if (strcmp(cls, "Mongo::Undefined") == 0) {
+                write_name_and_type(buffer, key, 0x0A); // just use nil type
                 break;
             }
         }
@@ -562,7 +562,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
         }
     case 6:
         {
-            value = rb_class_new_instance(0, NULL, Undefined);
+            value = Qnil;
             break;
         }
     case 7:
@@ -736,25 +736,22 @@ static VALUE method_deserialize(VALUE self, VALUE bson) {
 }
 
 void Init_cbson() {
-    VALUE driver, CBson;
+    VALUE mongo, CBson;
     Time = rb_const_get(rb_cObject, rb_intern("Time"));
 
-    driver = rb_const_get(rb_const_get(rb_const_get(rb_cObject,
-                                                    rb_intern("XGen")),
-                                       rb_intern("Mongo")),
-                          rb_intern("Driver"));
+    mongo = rb_const_get(rb_cObject, rb_intern("Mongo"));
     rb_require("mongo/types/binary");
-    Binary = rb_const_get(driver, rb_intern("Binary"));
-    rb_require("mongo/types/undefined");
-    Undefined = rb_const_get(driver, rb_intern("Undefined"));
+    Binary = rb_const_get(mongo, rb_intern("Binary"));
     rb_require("mongo/types/objectid");
-    ObjectID = rb_const_get(driver, rb_intern("ObjectID"));
+    ObjectID = rb_const_get(mongo, rb_intern("ObjectID"));
     rb_require("mongo/types/dbref");
-    DBRef = rb_const_get(driver, rb_intern("DBRef"));
+    DBRef = rb_const_get(mongo, rb_intern("DBRef"));
     rb_require("mongo/types/code");
-    Code = rb_const_get(driver, rb_intern("Code"));
+    Code = rb_const_get(mongo, rb_intern("Code"));
     rb_require("mongo/types/regexp_of_holding");
-    RegexpOfHolding = rb_const_get(driver, rb_intern("RegexpOfHolding"));
+    RegexpOfHolding = rb_const_get(mongo, rb_intern("RegexpOfHolding"));
+    rb_require("mongo/errors");
+    InvalidName = rb_const_get(mongo, rb_intern("InvalidName"));
     rb_require("mongo/util/ordered_hash");
     OrderedHash = rb_const_get(rb_cObject, rb_intern("OrderedHash"));
 

data/mongo-extensions.gemspec

@@ -8,7 +8,7 @@ TEST_FILES = []
 Gem::Specification.new do |s|
   s.name = 'mongo_ext'
 
-  s.version = '0.11.1'
+  s.version = '0.13'
   s.platform = Gem::Platform::RUBY
   s.summary = 'C extensions for the MongoDB Ruby driver'
   s.description = 'C extensions to accelerate the MondoDB Ruby driver. For more information about Mongo, see http://www.mongodb.org.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo_ext
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: "0.13"
 platform: ruby
 authors: 
 - Mike Dirolf