mongodb-mongo_ext 0.13 → 0.14.1

data/ext/cbson/cbson.c

@@ -50,6 +50,13 @@ static VALUE RegexpOfHolding;
 static VALUE OrderedHash;
 static VALUE InvalidName;
 
+#if HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define STR_NEW(p,n) rb_enc_str_new((p), (n), rb_utf8_encoding())
+#else
+#define STR_NEW(p,n) rb_str_new((p), (n))
+#endif
+
 // this sucks. but for some reason these moved around between 1.8 and 1.9
 #ifdef ONIGURUMA_H
 #define IGNORECASE ONIG_OPTION_IGNORECASE
@@ -154,7 +161,7 @@ static void buffer_write_bytes(bson_buffer* buffer, const char* bytes, int size)
 }
 
 static VALUE pack_extra(bson_buffer* buffer, VALUE check_keys) {
-    return rb_ary_new3(2, INT2NUM((int)buffer), check_keys);
+    return rb_ary_new3(2, LL2NUM((long long)buffer), check_keys);
 }
 
 static void write_name_and_type(bson_buffer* buffer, VALUE name, char type) {
@@ -164,7 +171,7 @@ static void write_name_and_type(bson_buffer* buffer, VALUE name, char type) {
 }
 
 static int write_element_allow_id(VALUE key, VALUE value, VALUE extra, int allow_id) {
-    bson_buffer* buffer = (bson_buffer*)NUM2INT(rb_ary_entry(extra, 0));
+    bson_buffer* buffer = (bson_buffer*)NUM2LL(rb_ary_entry(extra, 0));
     VALUE check_keys = rb_ary_entry(extra, 1);
 
     if (TYPE(key) == T_SYMBOL) {
@@ -495,7 +502,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             int value_length;
             *position += 4;
             value_length = strlen(buffer + *position);
-            value = rb_str_new(buffer+ *position, value_length);
+            value = STR_NEW(buffer + *position, value_length);
             *position += value_length + 1;
             break;
         }
@@ -509,7 +516,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
                 int collection_length = strlen(buffer + offset);
                 char id_type;
 
-                argv[0] = rb_str_new(buffer + offset, collection_length);
+                argv[0] = STR_NEW(buffer + offset, collection_length);
                 offset += collection_length + 1;
                 id_type = buffer[offset];
                 offset += 5;
@@ -599,7 +606,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
     case 11:
         {
             int pattern_length = strlen(buffer + *position);
-            VALUE pattern = rb_str_new(buffer + *position, pattern_length);
+            VALUE pattern = STR_NEW(buffer + *position, pattern_length);
             int flags_length, flags = 0, i = 0;
             char extra[10];
             VALUE argv[3];
@@ -635,7 +642,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             VALUE collection, str, oid, id, argv[2];
             *position += 4;
             collection_length = strlen(buffer + *position);
-            collection = rb_str_new(buffer + *position, collection_length);
+            collection = STR_NEW(buffer + *position, collection_length);
             *position += collection_length + 1;
 
             str = rb_str_new(buffer + *position, 12);
@@ -662,7 +669,7 @@ static VALUE get_value(const char* buffer, int* position, int type) {
             VALUE code, scope, argv[2];
             *position += 8;
             code_length = strlen(buffer + *position);
-            code = rb_str_new(buffer + *position, code_length);
+            code = STR_NEW(buffer + *position, code_length);
             *position += code_length + 1;
 
             memcpy(&scope_size, buffer + *position, 4);
@@ -715,7 +722,7 @@ static VALUE elements_to_hash(const char* buffer, int max) {
     while (position < max) {
         int type = (int)buffer[position++];
         int name_length = strlen(buffer + position);
-        VALUE name = rb_str_new(buffer + position, name_length);
+        VALUE name = STR_NEW(buffer + position, name_length);
         VALUE value;
         position += name_length + 1;
         value = get_value(buffer, &position, type);

data/ext/cbson/extconf.rb

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

data/mongo-extensions.gemspec

@@ -8,13 +8,12 @@ TEST_FILES = []
 Gem::Specification.new do |s|
   s.name = 'mongo_ext'
 
-  s.version = '0.13'
+  s.version = '0.14.1'
   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.'
 
   s.require_paths = ['ext']
-
   s.files = PACKAGE_FILES
   s.test_files = TEST_FILES
 

metadata

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