mongo_ext 0.18.2 → 0.18.3

data/Rakefile

@@ -28,6 +28,7 @@ namespace :test do
     Rake::Task['test:unit'].invoke
     Rake::Task['test:functional'].invoke
     Rake::Task['test:pooled_threading'].invoke
+    Rake::Task['test:drop_databases'].invoke
     ENV['C_EXT'] = nil
   end
 
@@ -37,6 +38,7 @@ namespace :test do
     Rake::Task['test:unit'].invoke
     Rake::Task['test:functional'].invoke
     Rake::Task['test:pooled_threading'].invoke
+    Rake::Task['test:drop_databases'].invoke
   end
 
   Rake::TestTask.new(:unit) do |t|
@@ -73,6 +75,15 @@ namespace :test do
     t.test_files = FileList['test/replica/query_test.rb']
     t.verbose    = true
   end
+
+  task :drop_databases do |t|
+    puts "Dropping test database..."
+    require File.join(File.dirname(__FILE__), 'lib', 'mongo')
+    include Mongo
+    con = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
+      ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
+    con.drop_database('ruby-mongo-test')
+  end
 end
 
 desc "Generate documentation"
@@ -83,6 +94,14 @@ task :rdoc do
   system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
 end
 
+desc "Generate YARD documentation"
+task :ydoc do
+  version = eval(File.read("mongo-ruby-driver.gemspec")).version
+  out = File.join('ydoc', version.to_s)
+  FileUtils.rm_rf('ydoc')
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb -o #{out} --title MongoRuby-#{version}"
+end
+
 desc "Publish documentation to mongo.rubyforge.org"
 task :publish => [:rdoc] do
   # Assumes docs are in ./html

data/ext/cbson/cbson.c

@@ -60,6 +60,8 @@ static VALUE Time;
 static VALUE ObjectID;
 static VALUE DBRef;
 static VALUE Code;
+static VALUE MinKey;
+static VALUE MaxKey;
 static VALUE RegexpOfHolding;
 static VALUE OrderedHash;
 static VALUE InvalidName;
@@ -189,7 +191,7 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
     case T_FIXNUM:
         {
             if (rb_funcall(value, rb_intern(">"), 1, LL2NUM(9223372036854775807LL)) == Qtrue ||
-                rb_funcall(value, rb_intern("<"), 1, LL2NUM(-9223372036854775808LL)) == Qtrue) {
+                rb_funcall(value, rb_intern("<"), 1, LL2NUM(-9223372036854775808ULL)) == Qtrue) {
                 buffer_free(buffer);
                 rb_raise(rb_eRangeError, "MongoDB can only handle 8-byte ints");
             }
@@ -272,7 +274,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),
-                       "Mongo::Code") == 0) {
+                  "Mongo::Code") == 0) {
                 buffer_position length_location, start_position, total_length;
                 int length;
                 write_name_and_type(buffer, key, 0x0F);
@@ -369,13 +371,30 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&obj_length, 4);
                 break;
             }
+            if (strcmp(cls, "Mongo::MaxKey") == 0) {
+                write_name_and_type(buffer, key, 0x7f);
+                break;
+            }
+            if (strcmp(cls, "Mongo::MinKey") == 0) {
+                write_name_and_type(buffer, key, 0xff);
+                break;
+            }
+            if (strcmp(cls, "DateTime") == 0 || strcmp(cls, "Date") == 0 || strcmp(cls, "ActiveSupport::TimeWithZone") == 0) {
+                buffer_free(buffer);
+                rb_raise(InvalidDocument, "%s is not currently supported; use a UTC Time instance instead.", cls);
+                break;
+            }
+            if(strcmp(cls, "Complex") == 0 || strcmp(cls, "Rational") == 0 || strcmp(cls, "BigDecimal") == 0) {
+                buffer_free(buffer);
+                rb_raise(InvalidDocument, "Cannot serialize the Numeric type %s as BSON; only Bignum, Fixnum, and Float are supported.", cls);
+                break;
+            }
             buffer_free(buffer);
-            rb_raise(InvalidDocument, "Unsupported type for BSON (%d)", TYPE(value));
+            rb_raise(InvalidDocument, "Cannot serialize an object of class %s into BSON.", cls);
             break;
         }
     case T_DATA:
         {
-            // TODO again, is this really the only way to do this?
             const char* cls = rb_class2name(RBASIC(value)->klass);
             if (strcmp(cls, "Time") == 0) {
                 double t = NUM2DBL(rb_funcall(value, rb_intern("to_f"), 0));
@@ -384,6 +403,14 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
                 SAFE_WRITE(buffer, (const char*)&time_since_epoch, 8);
                 break;
             }
+            if(strcmp(cls, "BigDecimal") == 0) {
+                buffer_free(buffer);
+                rb_raise(InvalidDocument, "Cannot serialize the Numeric type %s as BSON; only Bignum, Fixnum, and Float are supported.", cls);
+                break;
+            }
+            buffer_free(buffer);
+            rb_raise(InvalidDocument, "Cannot serialize an object of class %s into BSON.", cls);
+            break;
         }
     case T_REGEXP:
         {
@@ -423,8 +450,9 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
         }
     default:
         {
+            const char* cls = rb_class2name(RBASIC(value)->klass);
             buffer_free(buffer);
-            rb_raise(InvalidDocument, "Unsupported type for BSON (%d)", TYPE(value));
+            rb_raise(InvalidDocument, "Cannot serialize an object of class %s (type %d) into BSON.", cls, TYPE(value));
             break;
         }
     }
@@ -478,7 +506,7 @@ static void write_doc(buffer_t buffer, VALUE hash, VALUE check_keys) {
       rb_raise(InvalidDocument, "Document too large: BSON documents are limited to 4MB.");
       return;
     }
-    SAFE_WRITE_AT_POS(buffer, length_location, &length, 4);
+    SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&length, 4);
 }
 
 static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys) {
@@ -500,6 +528,11 @@ static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys) {
 static VALUE get_value(const char* buffer, int* position, int type) {
     VALUE value;
     switch (type) {
+    case -1:
+        {
+            value = rb_class_new_instance(0, NULL, MinKey);
+            break;
+        }
     case 1:
         {
             double d;
@@ -721,6 +754,11 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             *position += 8;
             break;
         }
+    case 127:
+        {
+            value = rb_class_new_instance(0, NULL, MaxKey);
+            break;
+        }
     default:
         {
             rb_raise(rb_eTypeError, "no c decoder for this type yet (%d)", type);
@@ -819,9 +857,12 @@ void Init_cbson() {
     DBRef = rb_const_get(mongo, rb_intern("DBRef"));
     rb_require("mongo/types/code");
     Code = rb_const_get(mongo, rb_intern("Code"));
+    rb_require("mongo/types/min_max_keys");
+    MinKey = rb_const_get(mongo, rb_intern("MinKey"));
+    MaxKey = rb_const_get(mongo, rb_intern("MaxKey"));
     rb_require("mongo/types/regexp_of_holding");
     RegexpOfHolding = rb_const_get(mongo, rb_intern("RegexpOfHolding"));
-    rb_require("mongo/errors");
+    rb_require("mongo/exceptions");
     InvalidName = rb_const_get(mongo, rb_intern("InvalidName"));
     InvalidStringEncoding = rb_const_get(mongo, rb_intern("InvalidStringEncoding"));
     InvalidDocument = rb_const_get(mongo, rb_intern("InvalidDocument"));

data/ext/cbson/version.h

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_ext
 version: !ruby/object:Gem::Version 
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: []