bson_ext 1.2.4 → 1.3.0.rc0

data/Rakefile

@@ -77,41 +77,49 @@ namespace :test do
   Rake::TestTask.new(:rs) do |t|
     t.test_files = FileList['test/replica_sets/*_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:unit) do |t|
     t.test_files = FileList['test/unit/*_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:functional) do |t|
     t.test_files = FileList['test/*_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:pooled_threading) do |t|
     t.test_files = FileList['test/threading/*_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:auto_reconnect) do |t|
     t.test_files = FileList['test/auxillary/autoreconnect_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:authentication) do |t|
     t.test_files = FileList['test/auxillary/authentication_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:new_features) do |t|
     t.test_files = FileList['test/auxillary/1.4_features.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   Rake::TestTask.new(:bson) do |t|
     t.test_files = FileList['test/bson/*_test.rb']
     t.verbose    = true
+    t.ruby_opts << '-w'
   end
 
   task :drop_databases do |t|
@@ -138,7 +146,7 @@ task :ydoc do
   require File.join(File.dirname(__FILE__), 'lib', 'mongo')
   out = File.join('ydoc', Mongo::VERSION)
   FileUtils.rm_rf('ydoc')
-  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md"
+  system "yardoc lib/**/*.rb lib/mongo/**/*.rb lib/bson/**/*.rb -e yard/yard_ext.rb -p yard/templates -o #{out} --title MongoRuby-#{Mongo::VERSION} --files docs/TUTORIAL.md,docs/GridFS.md,docs/FAQ.md,docs/REPLICA_SETS.md,docs/WRITE_CONCERN.md,docs/HISTORY.md,docs/CREDITS.md,docs/1.0_UPGRADE.md,docs/RELEASES.md"
 end
 
 namespace :bamboo do

data/bson_ext.gemspec

@@ -1,6 +1,6 @@
 require './lib/bson'
 VERSION_HEADER = File.open(File.join(File.dirname(__FILE__), 'ext', 'cbson', 'version.h'), "r")
-VERSION        = VERSION_HEADER.read.scan(/VERSION\s+"(\d+\.\d+(\.[\w\d]+\w*)?)\"/)[0][0]
+VERSION        = VERSION_HEADER.read.scan(/VERSION "(\d[^"]+)"/)[0][0]
 Gem::Specification.new do |s|
   s.name = 'bson_ext'
 

data/ext/cbson/cbson.c

@@ -86,6 +86,7 @@ static VALUE DBRef;
 static VALUE Code;
 static VALUE MinKey;
 static VALUE MaxKey;
+static VALUE Timestamp;
 static VALUE Regexp;
 static VALUE OrderedHash;
 static VALUE InvalidKeyName;
@@ -107,21 +108,12 @@ static int max_bson_size;
         }                                                               \
         _str;                                                           \
     })
-/* MUST call TO_UTF8 before calling write_utf8. */
 #define TO_UTF8(string) rb_str_export_to_enc((string), rb_utf8_encoding())
-static void write_utf8(buffer_t buffer, VALUE string, char check_null) {
-    result_t status = check_string(RSTRING_PTR(string), RSTRING_LENINT(string),
-                                   0, check_null);
-    if (status == HAS_NULL) {
-        buffer_free(buffer);
-        rb_raise(InvalidDocument, "Key names / regex patterns must not contain the NULL byte");
-    }
-    SAFE_WRITE(buffer, RSTRING_PTR(string), RSTRING_LENINT(string));
-}
 #else
 #define STR_NEW(p,n) rb_str_new((p), (n))
-/* MUST call TO_UTF8 before calling write_utf8. */
 #define TO_UTF8(string) (string)
+#endif
+
 static void write_utf8(buffer_t buffer, VALUE string, char check_null) {
     result_t status = check_string(RSTRING_PTR(string), RSTRING_LEN(string),
                                    1, check_null);
@@ -132,9 +124,9 @@ static void write_utf8(buffer_t buffer, VALUE string, char check_null) {
         buffer_free(buffer);
         rb_raise(InvalidStringEncoding, "String not valid UTF-8");
     }
+    string = TO_UTF8(string);
     SAFE_WRITE(buffer, RSTRING_PTR(string), RSTRING_LEN(string));
 }
-#endif
 
 // this sucks. but for some reason these moved around between 1.8 and 1.9
 #ifdef ONIGURUMA_H
@@ -211,7 +203,6 @@ static VALUE pack_extra(buffer_t buffer, VALUE check_keys) {
 
 static void write_name_and_type(buffer_t buffer, VALUE name, char type) {
     SAFE_WRITE(buffer, &type, 1);
-    name = TO_UTF8(name);
     write_utf8(buffer, name, 1);
     SAFE_WRITE(buffer, &zero, 1);
 }
@@ -340,7 +331,6 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
         {
             int length;
             write_name_and_type(buffer, key, 0x02);
-            value = TO_UTF8(value);
             length = RSTRING_LENINT(value) + 1;
             SAFE_WRITE(buffer, (char*)&length, 4);
             write_utf8(buffer, value, 0);
@@ -444,6 +434,17 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 write_name_and_type(buffer, key, 0xff);
                 break;
             }
+            if (strcmp(cls, "BSON::Timestamp") == 0) {
+                write_name_and_type(buffer, key, 0x11);
+                int seconds = FIX2INT(
+                    rb_funcall(value, rb_intern("seconds"), 0));
+                int increment = FIX2INT(
+                    rb_funcall(value, rb_intern("increment"), 0));
+
+                SAFE_WRITE(buffer, (const char*)&increment, 4);
+                SAFE_WRITE(buffer, (const char*)&seconds, 4);
+                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);
@@ -485,7 +486,6 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
 
             write_name_and_type(buffer, key, 0x0B);
 
-            pattern = TO_UTF8(pattern);
             write_utf8(buffer, pattern, 1);
             SAFE_WRITE(buffer, &zero, 1);
 
@@ -825,11 +825,13 @@ static VALUE get_value(const char* buffer, int* position, int type) {
         }
     case 17:
         {
-            int i;
-            int j;
-            memcpy(&i, buffer + *position, 4);
-            memcpy(&j, buffer + *position + 4, 4);
-            value = rb_ary_new3(2, LL2NUM(i), LL2NUM(j));
+            int sec, inc;
+            VALUE argv[2];
+            memcpy(&inc, buffer + *position, 4);
+            memcpy(&sec, buffer + *position + 4, 4);
+            argv[0] = INT2FIX(sec);
+            argv[1] = INT2FIX(inc);
+            value = rb_class_new_instance(2, argv, Timestamp);
             *position += 8;
             break;
         }
@@ -881,7 +883,7 @@ static VALUE method_deserialize(VALUE self, VALUE bson) {
     return elements_to_hash(buffer, remaining);
 }
 
-static VALUE objectid_generate(VALUE self)
+static VALUE objectid_generate(int argc, VALUE* args, VALUE self)
 {
     VALUE oid;
     unsigned char oid_bytes[12];
@@ -889,7 +891,11 @@ static VALUE objectid_generate(VALUE self)
     unsigned short pid;
     int i;
 
-    t = htonl((int)time(NULL));
+    if(argc == 0 || (argc == 1 && *args == Qnil)) {
+        t = htonl((int)time(NULL));
+    } else {
+        t = htonl(FIX2INT(rb_funcall(*args, rb_intern("to_i"), 0)));
+    }
     MEMCPY(&oid_bytes, &t, unsigned char, 4);
 
     MEMCPY(&oid_bytes[4], hostname_digest, unsigned char, 3);
@@ -948,6 +954,8 @@ void Init_cbson() {
     rb_require("bson/types/min_max_keys");
     MinKey = rb_const_get(bson, rb_intern("MinKey"));
     MaxKey = rb_const_get(bson, rb_intern("MaxKey"));
+    rb_require("bson/types/timestamp");
+    Timestamp = rb_const_get(bson, rb_intern("Timestamp"));
     Regexp = rb_const_get(rb_cObject, rb_intern("Regexp"));
     rb_require("bson/exceptions");
     InvalidKeyName = rb_const_get(bson, rb_intern("InvalidKeyName"));
@@ -969,7 +977,7 @@ 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, -1);
 
     if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {
         rb_raise(rb_eRuntimeError, "failed to get hostname");

data/ext/cbson/version.h

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "1.2.4"
+#define VERSION "1.3.0.rc0"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: bson_ext
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
+  prerelease: 6
+  version: 1.3.0.rc0
 platform: ruby
 authors: 
 - Mike Dirolf
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +32,7 @@ files:
 - ext/cbson/buffer.h
 - ext/cbson/encoding_helpers.h
 - ext/cbson/version.h
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.mongodb.org
 licenses: []
 
@@ -51,23 +46,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: C extensions for Ruby BSON.