bson_ext 1.6.2 → 1.6.4

data/Rakefile

@@ -7,19 +7,32 @@ end
 require 'fileutils'
 require 'rake/testtask'
 require 'rake'
+require 'rake/extensiontask'
+require 'rake/javaextensiontask'
 
 begin
   require 'git'
-  rescue LoadError
-end
-
-begin
+  require 'devkit'
   require 'ci/reporter/rake/test_unit'
   rescue LoadError
 end
 
 ENV['TEST_MODE'] = 'TRUE'
 
+Rake::ExtensionTask.new('cbson') do |ext|
+  ext.lib_dir = "lib/bson_ext"
+end
+
+#Rake::JavaExtensionTask.new('jbson') do |ext| # not yet functional
+#  ext.ext_dir = 'ext/src/org/jbson'
+#end
+
+desc "Compiles and tests MongoDB Ruby driver w/ C extensions."
+task :c do
+  Rake::Task['compile:cbson'].invoke
+  Rake::Task['test:c'].invoke
+end
+
 task :java do
   Rake::Task['build:java'].invoke
   Rake::Task['test:ruby'].invoke

data/bson_ext.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.extensions << 'ext/cbson/extconf.rb'
 
-  s.author = 'Mike Dirolf'
+  s.authors = ['Mike Dirolf', 'Kyle Banker', 'Tyler Brock', 'Gary Murakami']
   s.email = 'mongodb-dev@googlegroups.com'
   s.homepage = 'http://www.mongodb.org'
   s.add_dependency('bson', "~> #{BSON::VERSION}")

data/ext/cbson/bson_buffer.h

@@ -32,6 +32,7 @@ bson_buffer_t bson_buffer_new(void);
 /* Set the max size for this buffer.
  * Note: this is not a hard limit. */
 void bson_buffer_set_max_size(bson_buffer_t buffer, int max_size);
+int bson_buffer_get_max_size(bson_buffer_t buffer);
 
 /* Free the memory allocated for `buffer`.
  * Return non-zero on failure. */

data/ext/cbson/cbson.c

@@ -21,6 +21,7 @@
  */
 
 #include "ruby.h"
+#include "version.h"
 
 /* Ensure compatibility with early releases of Ruby 1.8.5 */
 #ifndef RSTRING_PTR
@@ -108,10 +109,8 @@ static int max_bson_size;
         }                                                               \
         _str;                                                           \
     })
-#define TO_UTF8(string) rb_str_export_to_enc((string), rb_utf8_encoding())
 #else
 #define STR_NEW(p,n) rb_str_new((p), (n))
-#define TO_UTF8(string) (string)
 #endif
 
 static void write_utf8(bson_buffer_t buffer, VALUE string, char check_null) {
@@ -124,8 +123,7 @@ static void write_utf8(bson_buffer_t buffer, VALUE string, char check_null) {
         bson_buffer_free(buffer);
         rb_raise(InvalidStringEncoding, "String not valid UTF-8");
     }
-    string = TO_UTF8(string);
-    SAFE_WRITE(buffer, RSTRING_PTR(string), RSTRING_LEN(string));
+    SAFE_WRITE(buffer, RSTRING_PTR(string), (int)RSTRING_LEN(string));
 }
 
 // this sucks. but for some reason these moved around between 1.8 and 1.9
@@ -435,10 +433,14 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 break;
             }
             if (strcmp(cls, "BSON::Timestamp") == 0) {
+                unsigned int seconds;
+                unsigned int increment;
+                
                 write_name_and_type(buffer, key, 0x11);
-                unsigned int seconds = NUM2UINT(
+
+                seconds = NUM2UINT(
                     rb_funcall(value, rb_intern("seconds"), 0));
-                unsigned int increment = NUM2UINT(
+                increment = NUM2UINT(
                     rb_funcall(value, rb_intern("increment"), 0));
 
                 SAFE_WRITE(buffer, (const char*)&increment, 4);
@@ -742,10 +744,23 @@ static VALUE get_value(const char* buffer, int* position, int type) {
         }
     case 9:
         {
-            long long millis;
+            int64_t millis;
             memcpy(&millis, buffer + *position, 8);
 
-            value = rb_time_new(millis / 1000, (millis % 1000) * 1000);
+            // Support 64-bit time values in 32 bit environments in Ruby > 1.9
+            // Note: rb_time_num_new is not available pre Ruby 1.9
+            #if RUBY_API_VERSION_CODE >= 10900
+                #define add(x,y) (rb_funcall((x), '+', 1, (y)))
+                #define mul(x,y) (rb_funcall((x), '*', 1, (y)))
+                #define quo(x,y) (rb_funcall((x), rb_intern("quo"), 1, (y)))
+                VALUE d, timev;
+                d = LL2NUM(1000LL);
+                timev = add(LL2NUM(millis / 1000), quo(LL2NUM(millis % 1000), d));
+                value = rb_time_num_new(timev, Qnil);
+            #else
+                value = rb_time_new(millis / 1000, (millis % 1000) * 1000);
+            #endif
+
             value = rb_funcall(value, utc_method, 0);
             *position += 8;
             break;

data/ext/cbson/encoding_helpers.c

@@ -87,7 +87,7 @@ static unsigned char isLegalUTF8(const unsigned char* source, int length) {
     return 1;
 }
 
-result_t check_string(const unsigned char* string, const int length,
+result_t check_string(const unsigned char* string, const long length,
                       const char check_utf8, const char check_null) {
     int position = 0;
     /* By default we go character by character. Will be different for checking

data/ext/cbson/encoding_helpers.h

@@ -23,7 +23,7 @@ typedef enum {
     HAS_NULL
 } result_t;
 
-result_t check_string(const unsigned char* string, const int length,
+result_t check_string(const unsigned char* string, const long length,
                       const char check_utf8, const char check_null);
 
 #endif

data/ext/cbson/version.h

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

metadata

@@ -1,15 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bson_ext
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
   prerelease: 
 platform: ruby
 authors:
 - Mike Dirolf
+- Kyle Banker
+- Tyler Brock
+- Gary Murakami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -18,7 +21,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +29,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
 description: C extensions to accelerate the Ruby BSON serialization. For more information
   about BSON, see http://bsonspec.org.  For information about MongoDB, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
@@ -64,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: C extensions for Ruby BSON.