mongo_ext 0.18.3 → 0.19

data/Rakefile

@@ -47,7 +47,7 @@ namespace :test do
   end
 
   Rake::TestTask.new(:functional) do |t|
-    t.test_files = FileList['test/test*.rb']
+    t.test_files = FileList['test/*_test.rb']
     t.verbose    = true
   end
 
@@ -76,6 +76,16 @@ namespace :test do
     t.verbose    = true
   end
 
+  Rake::TestTask.new(:auto_reconnect) do |t|
+    t.test_files = FileList['test/auxillary/autoreconnect_test.rb']
+    t.verbose    = true
+  end
+
+  Rake::TestTask.new(:authentication) do |t|
+    t.test_files = FileList['test/auxillary/authentication_test.rb']
+    t.verbose    = true
+  end
+
   task :drop_databases do |t|
     puts "Dropping test database..."
     require File.join(File.dirname(__FILE__), 'lib', 'mongo')
@@ -96,10 +106,10 @@ end
 
 desc "Generate YARD documentation"
 task :ydoc do
-  version = eval(File.read("mongo-ruby-driver.gemspec")).version
-  out = File.join('ydoc', version.to_s)
+  require File.join(File.dirname(__FILE__), 'lib', 'mongo')
+  out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -o #{out} --title MongoRuby-#{version}"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -e docs/yard_ext.rb -p docs/templates -o #{out} --title MongoRuby-#{Mongo::VERSION}"
 end
 
 desc "Publish documentation to mongo.rubyforge.org"

data/ext/cbson/buffer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/ext/cbson/buffer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/ext/cbson/cbson.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ static VALUE DBRef;
 static VALUE Code;
 static VALUE MinKey;
 static VALUE MaxKey;
+static VALUE Regexp;
 static VALUE RegexpOfHolding;
 static VALUE OrderedHash;
 static VALUE InvalidName;
@@ -139,8 +140,9 @@ static int cmp_char(const void* a, const void* b) {
     return *(char*)a - *(char*)b;
 }
 
-static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys);
-static int write_element(VALUE key, VALUE value, VALUE extra);
+static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys, VALUE move_id);
+static int write_element_with_id(VALUE key, VALUE value, VALUE extra);
+static int write_element_without_id(VALUE key, VALUE value, VALUE extra);
 static VALUE elements_to_hash(const char* buffer, int max);
 
 static VALUE pack_extra(buffer_t buffer, VALUE check_keys) {
@@ -154,7 +156,7 @@ static void write_name_and_type(buffer_t buffer, VALUE name, char type) {
     SAFE_WRITE(buffer, &zero, 1);
 }
 
-static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow_id) {
+static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
     buffer_t buffer = (buffer_t)NUM2LL(rb_ary_entry(extra, 0));
     VALUE check_keys = rb_ary_entry(extra, 1);
 
@@ -168,7 +170,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
         rb_raise(rb_eTypeError, "keys must be strings or symbols");
     }
 
-    if (!allow_id && strcmp("_id", RSTRING_PTR(key)) == 0) {
+    if (allow_id == 0 && strcmp("_id", RSTRING_PTR(key)) == 0) {
         return ST_CONTINUE;
     }
 
@@ -236,7 +238,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     case T_HASH:
         {
             write_name_and_type(buffer, key, 0x03);
-            write_doc(buffer, value, check_keys);
+            write_doc(buffer, value, check_keys, Qfalse);
             break;
         }
     case T_ARRAY:
@@ -261,7 +263,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 VALUE key;
                 INT2STRING(&name, i);
                 key = rb_str_new2(name);
-                write_element(key, values[i], pack_extra(buffer, check_keys));
+                write_element_with_id(key, values[i], pack_extra(buffer, check_keys));
                 free(name);
             }
 
@@ -289,7 +291,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 SAFE_WRITE(buffer, (char*)&length, 4);
                 SAFE_WRITE(buffer, RSTRING_PTR(value), length - 1);
                 SAFE_WRITE(buffer, &zero, 1);
-                write_doc(buffer, rb_funcall(value, rb_intern("scope"), 0), Qfalse);
+                write_doc(buffer, rb_funcall(value, rb_intern("scope"), 0), Qfalse, Qfalse);
 
                 total_length = buffer_get_position(buffer) - start_position;
                 SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&total_length, 4);
@@ -361,9 +363,9 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 }
 
                 ns = rb_funcall(value, rb_intern("namespace"), 0);
-                write_element(rb_str_new2("$ref"), ns, pack_extra(buffer, Qfalse));
+                write_element_with_id(rb_str_new2("$ref"), ns, pack_extra(buffer, Qfalse));
                 oid = rb_funcall(value, rb_intern("object_id"), 0);
-                write_element(rb_str_new2("$id"), oid, pack_extra(buffer, Qfalse));
+                write_element_with_id(rb_str_new2("$id"), oid, pack_extra(buffer, Qfalse));
 
                 // write null byte and fill in length
                 SAFE_WRITE(buffer, &zero, 1);
@@ -459,14 +461,20 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     return ST_CONTINUE;
 }
 
-static int write_element(VALUE key, VALUE value, VALUE extra) {
-    return write_element_allow_id(key, value, extra, 0);
+static int write_element_without_id(VALUE key, VALUE value, VALUE extra) {
+    return write_element(key, value, extra, 0);
 }
 
-static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys) {
+static int write_element_with_id(VALUE key, VALUE value, VALUE extra) {
+    return write_element(key, value, extra, 1);
+}
+
+static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys, VALUE move_id) {
     buffer_position start_position = buffer_get_position(buffer);
     buffer_position length_location = buffer_save_space(buffer, 4);
     buffer_position length;
+    int allow_id;
+    int (*write_function)(VALUE, VALUE, VALUE) = NULL;
     VALUE id_str = rb_str_new2("_id");
     VALUE id_sym = ID2SYM(rb_intern("_id"));
 
@@ -474,26 +482,47 @@ static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys) {
         rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
     }
 
-    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);
+    // write '_id' first if move_id is true. then don't allow an id to be written.
+    if(move_id == Qtrue) {
+        allow_id = 0;
+        if (rb_funcall(hash, rb_intern("has_key?"), 1, id_str) == Qtrue) {
+            VALUE id = rb_hash_aref(hash, id_str);
+            write_element_with_id(id_str, id, pack_extra(buffer, check_keys));
+        } else if (rb_funcall(hash, rb_intern("has_key?"), 1, id_sym) == Qtrue) {
+            VALUE id = rb_hash_aref(hash, id_sym);
+            write_element_with_id(id_sym, id, pack_extra(buffer, check_keys));
+        }
+    }
+    else {
+        allow_id = 1;
+        if (strcmp(rb_class2name(RBASIC(hash)->klass), "HashWithIndifferentAccess") != 0) {
+            if ((rb_funcall(hash, rb_intern("has_key?"), 1, id_str) == Qtrue) &&
+                   (rb_funcall(hash, rb_intern("has_key?"), 1, id_sym) == Qtrue)) {
+                      VALUE oid_sym = rb_hash_delete(hash, id_sym);
+                      rb_funcall(hash, rb_intern("[]="), 2, id_str, oid_sym);
+            }
+        }
+    }
+
+    if(allow_id == 1) {
+        write_function = write_element_with_id;
+    }
+    else {
+        write_function = write_element_without_id;
     }
 
     // we have to check for an OrderedHash and handle that specially
     if (strcmp(rb_class2name(RBASIC(hash)->klass), "OrderedHash") == 0) {
         VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
         int i;
-        for(i = 0; i < RARRAY_LEN(keys); i++) {
+                for(i = 0; i < RARRAY_LEN(keys); i++) {
             VALUE key = RARRAY_PTR(keys)[i];
             VALUE value = rb_hash_aref(hash, key);
 
-            write_element(key, value, pack_extra(buffer, check_keys));
+            write_function(key, value, pack_extra(buffer, check_keys));
         }
     } else {
-        rb_hash_foreach(hash, write_element, pack_extra(buffer, check_keys));
+        rb_hash_foreach(hash, write_function, pack_extra(buffer, check_keys));
     }
 
     // write null byte and fill in length
@@ -509,14 +538,14 @@ static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys) {
     SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&length, 4);
 }
 
-static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys) {
+static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys, VALUE move_id) {
     VALUE result;
     buffer_t buffer = buffer_new();
     if (buffer == NULL) {
         rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
     }
 
-    write_doc(buffer, doc, check_keys);
+    write_doc(buffer, doc, check_keys, move_id);
 
     result = rb_str_new(buffer_get_buffer(buffer), buffer_get_position(buffer));
     if (buffer_free(buffer) != 0) {
@@ -677,8 +706,13 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             }
             argv[0] = pattern;
             argv[1] = INT2FIX(flags);
-            argv[2] = rb_str_new2(extra);
-            value = rb_class_new_instance(3, argv, RegexpOfHolding);
+            if(extra[0] == 0) {
+                value = rb_class_new_instance(2, argv, Regexp);
+            }
+            else { // Deserializing a RegexpOfHolding
+                argv[2] = rb_str_new2(extra);
+                value = rb_class_new_instance(3, argv, RegexpOfHolding);
+            }
             *position += flags_length + 1;
             break;
         }
@@ -861,6 +895,7 @@ void Init_cbson() {
     MinKey = rb_const_get(mongo, rb_intern("MinKey"));
     MaxKey = rb_const_get(mongo, rb_intern("MaxKey"));
     rb_require("mongo/types/regexp_of_holding");
+    Regexp = rb_const_get(rb_cObject, rb_intern("Regexp"));
     RegexpOfHolding = rb_const_get(mongo, rb_intern("RegexpOfHolding"));
     rb_require("mongo/exceptions");
     InvalidName = rb_const_get(mongo, rb_intern("InvalidName"));
@@ -872,7 +907,7 @@ void Init_cbson() {
     CBson = rb_define_module("CBson");
     ext_version = rb_str_new2(VERSION);
     rb_define_const(CBson, "VERSION", ext_version);
-    rb_define_module_function(CBson, "serialize", method_serialize, 2);
+    rb_define_module_function(CBson, "serialize", method_serialize, 3);
     rb_define_module_function(CBson, "deserialize", method_deserialize, 1);
 
     rb_require("digest/md5");

data/ext/cbson/encoding_helpers.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/ext/cbson/encoding_helpers.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/ext/cbson/version.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 10gen, Inc.
+ * Copyright 2009-2010 10gen, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "0.18.3"
+#define VERSION "0.19"

data/mongo-extensions.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_ext
 version: !ruby/object:Gem::Version 
-  version: 0.18.3
+  version: "0.19"
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -05:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,7 @@ files:
 - ext/cbson/buffer.h
 - ext/cbson/encoding_helpers.h
 - ext/cbson/version.h
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []