mongodb-mongo_ext 0.4.1 → 0.11

data/ext/cbson/cbson.c

@@ -21,8 +21,21 @@
  */
 
 #include "ruby.h"
+
+#if HAVE_RUBY_ST_H
+#include "ruby/st.h"
+#endif
+#if HAVE_ST_H
 #include "st.h"
+#endif
+
+#if HAVE_RUBY_REGEX_H
+#include "ruby/regex.h"
+#endif
+#if HAVE_REGEX_H
 #include "regex.h"
+#endif
+
 #include <assert.h>
 #include <math.h>
 
@@ -181,25 +194,24 @@ static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow
 
     switch(TYPE(value)) {
     case T_BIGNUM:
-        {
-            VALUE as_f;
-            int int_value;
-            if (rb_funcall(value, rb_intern(">"), 1, INT2NUM(2147483647)) == Qtrue ||
-                rb_funcall(value, rb_intern("<"), 1, INT2NUM(-2147483648)) == Qtrue) {
-                rb_raise(rb_eRangeError, "MongoDB can only handle 4-byte ints"
-                         " - try converting to a double before saving");
-            }
-            write_name_and_type(buffer, key, 0x10);
-            as_f = rb_funcall(value, rb_intern("to_f"), 0);
-            int_value = NUM2LL(as_f);
-            buffer_write_bytes(buffer, (char*)&int_value, 4);
-            break;
-        }
     case T_FIXNUM:
         {
-            int int_value = FIX2INT(value);
-            write_name_and_type(buffer, key, 0x10);
-            buffer_write_bytes(buffer, (char*)&int_value, 4);
+            if (rb_funcall(value, rb_intern(">"), 1, LL2NUM(9223372036854775807LL)) == Qtrue ||
+                rb_funcall(value, rb_intern("<"), 1, LL2NUM(-9223372036854775808LL)) == Qtrue) {
+                rb_raise(rb_eRangeError, "MongoDB can only handle 8-byte ints");
+            }
+            if (rb_funcall(value, rb_intern(">"), 1, INT2NUM(2147483647L)) == Qtrue ||
+                rb_funcall(value, rb_intern("<"), 1, INT2NUM(-2147483648L)) == Qtrue) {
+                long long ll_value;
+                write_name_and_type(buffer, key, 0x12);
+                ll_value = NUM2LL(value);
+                buffer_write_bytes(buffer, (char*)&ll_value, 8);
+            } else {
+                int int_value;
+                write_name_and_type(buffer, key, 0x10);
+                int_value = NUM2LL(value);
+                buffer_write_bytes(buffer, (char*)&int_value, 4);
+            }
             break;
         }
     case T_TRUE:
@@ -680,6 +692,14 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             *position += 8;
             break;
         }
+    case 18:
+        {
+            long long ll;
+            memcpy(&ll, buffer + *position, 8);
+            value = LL2NUM(ll);
+            *position += 8;
+            break;
+        }
     default:
         {
             rb_raise(rb_eTypeError, "no c decoder for this type yet (%d)", type);

data/ext/cbson/extconf.rb

@@ -1,6 +1,7 @@
 require 'mkmf'
 
-find_header("st.h")
-find_header("regex.h")
+have_header("ruby/st.h") || have_header("st.h")
+have_header("ruby/regex.h") || have_header("regex.h")
+
 dir_config('cbson')
 create_makefile('mongo_ext/cbson')

data/mongo-extensions.gemspec

@@ -7,7 +7,8 @@ TEST_FILES = []
 
 Gem::Specification.new do |s|
   s.name = 'mongo_ext'
-  s.version = '0.4.1'
+
+  s.version = '0.11'
   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.4.1
+  version: "0.11"
 platform: ruby
 authors: 
 - Mike Dirolf