bson_ext 1.0.9 → 1.1

data/Rakefile

@@ -13,6 +13,29 @@ require 'rbconfig'
 include Config
 ENV['TEST_MODE'] = 'TRUE'
 
+task :java do
+  Rake::Task['build:java'].invoke
+  Rake::Task['test:ruby'].invoke
+end
+
+namespace :build do
+  desc "Build the java extensions."
+  task :java do
+    puts "Building Java extensions..."
+    java_dir  = File.join(File.dirname(__FILE__), 'ext', 'java')
+    jar_dir   = File.join(java_dir, 'jar')
+
+    jruby_jar = File.join(jar_dir, 'jruby.jar')
+    mongo_jar = File.join(jar_dir, 'mongo.jar')
+    bson_jar = File.join(jar_dir, 'bson.jar')
+
+    src_base   = File.join(java_dir, 'src')
+
+    system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}")
+    system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}")
+  end
+end
+
 desc "Test the MongoDB Ruby driver."
 task :test do
   puts "\nThis option has changed."

data/ext/cbson/cbson.c

@@ -75,7 +75,6 @@ static ID lt_operator;
 static ID gt_operator;
 
 static VALUE Binary;
-static VALUE ObjectID;
 static VALUE ObjectId;
 static VALUE DBRef;
 static VALUE Code;
@@ -324,37 +323,14 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
         }
     case T_STRING:
         {
-            if (strcmp(rb_obj_classname(value),
-                  "BSON::Code") == 0) {
-                buffer_position length_location, start_position, total_length;
-                int length;
-                write_name_and_type(buffer, key, 0x0F);
-
-                start_position = buffer_get_position(buffer);
-                length_location = buffer_save_space(buffer, 4);
-                if (length_location == -1) {
-                    rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
-                }
-
-                length = RSTRING_LEN(value) + 1;
-                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, Qfalse);
-
-                total_length = buffer_get_position(buffer) - start_position;
-                SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&total_length, 4);
-                break;
-            } else {
-                int length;
-                write_name_and_type(buffer, key, 0x02);
-                value = TO_UTF8(value);
-                length = RSTRING_LEN(value) + 1;
-                SAFE_WRITE(buffer, (char*)&length, 4);
-                write_utf8(buffer, value, 0);
-                SAFE_WRITE(buffer, &zero, 1);
-                break;
-            }
+            int length;
+            write_name_and_type(buffer, key, 0x02);
+            value = TO_UTF8(value);
+            length = RSTRING_LEN(value) + 1;
+            SAFE_WRITE(buffer, (char*)&length, 4);
+            write_utf8(buffer, value, 0);
+            SAFE_WRITE(buffer, &zero, 1);
+            break;
         }
     case T_SYMBOL:
         {
@@ -388,7 +364,7 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 SAFE_WRITE(buffer, RSTRING_PTR(string_data), length);
                 break;
             }
-            if ((strcmp(cls, "BSON::ObjectId") == 0) || (strcmp(cls, "BSON::ObjectID") == 0)) {
+            if (strcmp(cls, "BSON::ObjectId") == 0) {
                 VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
                 int i;
                 write_name_and_type(buffer, key, 0x07);
@@ -422,6 +398,28 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&obj_length, 4);
                 break;
             }
+            if (strcmp(cls, "BSON::Code") == 0) {
+                buffer_position length_location, start_position, total_length;
+                int length;
+                write_name_and_type(buffer, key, 0x0F);
+
+                start_position = buffer_get_position(buffer);
+                length_location = buffer_save_space(buffer, 4);
+                if (length_location == -1) {
+                    rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
+                }
+
+                VALUE code_str = rb_funcall(value, rb_intern("code"), 0);
+                length = RSTRING_LEN(code_str) + 1;
+                SAFE_WRITE(buffer, (char*)&length, 4);
+                SAFE_WRITE(buffer, RSTRING_PTR(code_str), length - 1);
+                SAFE_WRITE(buffer, &zero, 1);
+                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);
+                break;
+            }
             if (strcmp(cls, "BSON::MaxKey") == 0) {
                 write_name_and_type(buffer, key, 0x7f);
                 break;
@@ -918,8 +916,6 @@ void Init_cbson() {
     bson = rb_const_get(rb_cObject, rb_intern("BSON"));
     rb_require("bson/types/binary");
     Binary = rb_const_get(bson, rb_intern("Binary"));
-    rb_require("bson/types/objectid");
-    ObjectID = rb_const_get(bson, rb_intern("ObjectID"));
     rb_require("bson/types/object_id");
     ObjectId = rb_const_get(bson, rb_intern("ObjectId"));
     rb_require("bson/types/dbref");
@@ -948,7 +944,6 @@ void Init_cbson() {
     Digest = rb_const_get(rb_cObject, rb_intern("Digest"));
     DigestMD5 = rb_const_get(Digest, rb_intern("MD5"));
 
-    rb_define_method(ObjectID, "generate", objectid_generate, 0);
     rb_define_method(ObjectId, "generate", objectid_generate, 0);
 
     if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {

data/ext/cbson/version.h

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

metadata

@@ -1,21 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: bson_ext
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
-  - 1
-  - 0
-  - 9
-  version: 1.0.9
+    - 1
+    - 1
+  version: "1.1"
 platform: ruby
 authors: 
-- Mike Dirolf
+  - Mike Dirolf
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,21 +22,20 @@ email: mongodb-dev@googlegroups.com
 executables: []
 
 extensions: 
-- ext/cbson/extconf.rb
+  - ext/cbson/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- Rakefile
-- bson_ext.gemspec
-- ext/cbson/extconf.rb
-- ext/lib/bson_ext.rb
-- ext/cbson/buffer.c
-- ext/cbson/cbson.c
-- ext/cbson/encoding_helpers.c
-- ext/cbson/buffer.h
-- ext/cbson/encoding_helpers.h
-- ext/cbson/version.h
-has_rdoc: false
+  - Rakefile
+  - bson_ext.gemspec
+  - ext/cbson/extconf.rb
+  - ext/cbson/buffer.c
+  - ext/cbson/cbson.c
+  - ext/cbson/encoding_helpers.c
+  - ext/cbson/buffer.h
+  - ext/cbson/encoding_helpers.h
+  - ext/cbson/version.h
+has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
 
@@ -46,29 +43,25 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- ext
+  - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: C extensions for Ruby BSON.

data/ext/lib/bson_ext.rb

@@ -1 +0,0 @@
-puts "hello world"