bson_ext 1.8.2 → 1.8.3.rc0

data/LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2008-2010 10gen, Inc.
+   Copyright (C) 2008-2013 10gen, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.8.3.rc0

data/bson_ext.gemspec

@@ -3,13 +3,16 @@ Gem::Specification.new do |s|
 
   s.version           = File.read(File.join(File.dirname(__FILE__), 'VERSION'))
   s.platform          = Gem::Platform::RUBY
-  s.authors           = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black']
+  s.authors           = ['Tyler Brock', 'Gary Murakami', 'Emily Stolfo', 'Brandon Black', 'Durran Jordan']
   s.email             = 'mongodb-dev@googlegroups.com'
   s.homepage          = 'http://www.mongodb.org'
   s.summary           = 'C extensions for Ruby BSON.'
   s.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.'
   s.rubyforge_project = 'bson_ext'
 
+  s.signing_key       = 'gem-private_key.pem'
+  s.cert_chain        = ['gem-public_cert.pem']
+
   s.files             = ['bson_ext.gemspec', 'LICENSE', 'VERSION']
   s.files             += Dir['ext/**/*.rb'] + Dir['ext/**/*.c'] + Dir['ext/**/*.h']
 

data/ext/cbson/bson_buffer.c

@@ -1,19 +1,3 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #include <stdlib.h>
 #include <string.h>
 

data/ext/cbson/bson_buffer.h

@@ -1,19 +1,3 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #ifndef _BSON_BUFFER_H
 #define _BSON_BUFFER_H
 

data/ext/cbson/cbson.c

@@ -1,19 +1,3 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /*
  * This file contains C implementations of some of the functions needed by the
  * bson module. If possible, these implementations should be used to speed up
@@ -93,6 +77,7 @@ static VALUE OrderedHash;
 static VALUE InvalidKeyName;
 static VALUE InvalidStringEncoding;
 static VALUE InvalidDocument;
+static VALUE InvalidObjectId;
 static VALUE DigestMD5;
 static VALUE RB_HASH;
 
@@ -114,7 +99,7 @@ static int max_bson_size;
 #endif
 
 static void write_utf8(bson_buffer_t buffer, VALUE string, char check_null) {
-    result_t status = check_string(RSTRING_PTR(string), RSTRING_LEN(string),
+    result_t status = check_string((unsigned char*)RSTRING_PTR(string), RSTRING_LEN(string),
                                    1, check_null);
     if (status == HAS_NULL) {
         bson_buffer_free(buffer);
@@ -298,7 +283,6 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
         {
             bson_buffer_position length_location, start_position, obj_length;
             int items, i;
-            VALUE* values;
 
             write_name_and_type(buffer, key, 0x04);
             start_position = bson_buffer_get_position(buffer);
@@ -435,7 +419,7 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
             if (strcmp(cls, "BSON::Timestamp") == 0) {
                 unsigned int seconds;
                 unsigned int increment;
-                
+
                 write_name_and_type(buffer, key, 0x11);
 
                 seconds = NUM2UINT(
@@ -620,7 +604,7 @@ static void write_doc(bson_buffer_t buffer, VALUE hash, VALUE check_keys, VALUE
     if (length > bson_buffer_get_max_size(buffer)) {
       bson_buffer_free(buffer);
       rb_raise(InvalidDocument,
-          "Document too large: This BSON documents is limited to %d bytes.",
+          "Document too large: This BSON document is limited to %d bytes.",
           bson_buffer_get_max_size(buffer));
       return;
     }
@@ -924,6 +908,85 @@ static VALUE method_deserialize(VALUE self, VALUE bson) {
     return elements_to_hash(buffer, remaining);
 }
 
+static int legal_objectid_str(VALUE str) {
+    int i;
+
+    if (TYPE(str) != T_STRING) {
+        return 0;
+    }
+
+    if (RSTRING_LEN(str) != 24) {
+        return 0;
+    }
+
+    for(i = 0; i < 24; i++) {
+        char c = RSTRING_PTR(str)[i];
+
+        if (!((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))) {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+static VALUE objectid_legal(VALUE self, VALUE str)
+{
+    if (legal_objectid_str(str))
+        return Qtrue;
+    return Qfalse;
+}
+
+static char hexbyte( char hex ) {
+    if (hex >= '0' && hex <= '9')
+        return (hex - '0');
+    else if (hex >= 'A' && hex <= 'F')
+        return (hex - 'A' + 10);
+    else if (hex >= 'a' && hex <= 'f')
+        return (hex - 'a' + 10);
+    else
+        return 0x0;
+}
+
+static VALUE objectid_from_string(VALUE self, VALUE str)
+{
+    VALUE oid;
+    int i;
+
+    if (!legal_objectid_str(str)) {
+        rb_raise(InvalidObjectId, "illegal ObjectId format: %s", RSTRING_PTR(str));
+    }
+
+    oid = rb_ary_new2(12);
+
+    for(i = 0; i < 12; i++) {
+        rb_ary_store(oid, i, INT2FIX( (unsigned)(hexbyte( RSTRING_PTR(str)[2*i] ) << 4 ) | hexbyte( RSTRING_PTR(str)[2*i + 1] )));
+    }
+
+    return rb_class_new_instance(1, &oid, ObjectId);
+}
+
+static VALUE objectid_to_s(VALUE self)
+{
+    VALUE data;
+    char cstr[25];
+    VALUE rstr;
+    VALUE *data_arr;
+
+    data = rb_iv_get(self, "@data");
+    data_arr = RARRAY_PTR(data);
+
+    sprintf(cstr, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+        (unsigned)NUM2INT(data_arr[0]), (unsigned)NUM2INT(data_arr[1]), (unsigned)NUM2INT(data_arr[2]), (unsigned)NUM2INT(data_arr[3]),
+        (unsigned)NUM2INT(data_arr[4]), (unsigned)NUM2INT(data_arr[5]), (unsigned)NUM2INT(data_arr[6]), (unsigned)NUM2INT(data_arr[7]),
+        (unsigned)NUM2INT(data_arr[8]), (unsigned)NUM2INT(data_arr[9]), (unsigned)NUM2INT(data_arr[10]), (unsigned)NUM2INT(data_arr[11]));
+
+    rstr = rb_str_new(cstr, 24);
+
+    return rstr;
+}
+
+
 static VALUE objectid_generate(int argc, VALUE* args, VALUE self)
 {
     VALUE oid;
@@ -1002,6 +1065,7 @@ void Init_cbson() {
     InvalidKeyName = rb_const_get(bson, rb_intern("InvalidKeyName"));
     InvalidStringEncoding = rb_const_get(bson, rb_intern("InvalidStringEncoding"));
     InvalidDocument = rb_const_get(bson, rb_intern("InvalidDocument"));
+    InvalidObjectId = rb_const_get(bson, rb_intern("InvalidObjectId"));
     rb_require("bson/ordered_hash");
     OrderedHash = rb_const_get(bson, rb_intern("OrderedHash"));
     RB_HASH = rb_const_get(bson, rb_intern("Hash"));
@@ -1018,6 +1082,9 @@ void Init_cbson() {
     Digest = rb_const_get(rb_cObject, rb_intern("Digest"));
     DigestMD5 = rb_const_get(Digest, rb_intern("MD5"));
 
+    rb_define_singleton_method(ObjectId, "legal?", objectid_legal, 1);
+    rb_define_singleton_method(ObjectId, "from_string", objectid_from_string, 1);
+    rb_define_method(ObjectId, "to_s", objectid_to_s, 0);
     rb_define_method(ObjectId, "generate", objectid_generate, -1);
 
     if (gethostname(hostname, MAX_HOSTNAME_LENGTH) != 0) {

data/ext/cbson/encoding_helpers.c

@@ -1,19 +1,3 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #include "encoding_helpers.h"
 
 /*

data/ext/cbson/encoding_helpers.h

@@ -1,19 +1,3 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #ifndef ENCODING_HELPERS_H
 #define ENCODING_HELPERS_H
 

data/ext/cbson/version.h

@@ -1,17 +1 @@
-/*
- * Copyright 2009-2010 10gen, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define VERSION "1.8.2"
+#define VERSION "1.8.3.rc0"

metadata

@@ -1,18 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: bson_ext
 version: !ruby/object:Gem::Version
-  version: 1.8.2
-  prerelease: 
+  version: 1.8.3.rc0
+  prerelease: 6
 platform: ruby
 authors:
 - Tyler Brock
 - Gary Murakami
 - Emily Stolfo
 - Brandon Black
+- Durran Jordan
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURPRENDQWlDZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJDTVJRd0VnWURWUVFEREF0a2Nt
+  bDIKWlhJdGNuVmllVEVWTUJNR0NnbVNKb21UOGl4a0FSa1dCVEV3WjJWdU1S
+  TXdFUVlLQ1pJbWlaUHlMR1FCR1JZRApZMjl0TUI0WERURXpNREl3TVRFME1U
+  RXpOMW9YRFRFME1ESXdNVEUwTVRFek4xb3dRakVVTUJJR0ExVUVBd3dMClpI
+  SnBkbVZ5TFhKMVlua3hGVEFUQmdvSmtpYUprL0lzWkFFWkZnVXhNR2RsYmpF
+  VE1CRUdDZ21TSm9tVDhpeGsKQVJrV0EyTnZiVENDQVNJd0RRWUpLb1pJaHZj
+  TkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFORmRTQWE4ZlJtMQpiQU05emE2
+  WjBmQUg0ZzAyYnFNMU5Hbnc4ekpRckUvUEZyRmZZNklGQ1QyQXNMZk93cjFt
+  YVZtN2lVMStrZFZJCklRK2lJLzkrRStBckorcmJHVjNkRFBRK1NMbDNtTFQr
+  dlhqZmpjeE1xSTJJVzZVdVZ0dDJVM1J4ZDRRVTBrZFQKSnhtY1BZczVmRE42
+  QmdZYzZYWGdVankzbStLd2hhMnBHY3RkY2lVT3dFZk9aNFJtTlJsRVpLQ01M
+  UkhkRlA4ago0V1RuSlNHZlhEaXVvWElDSmI1eU9QT1pQdWFhcFBTTlhwOTNR
+  a1Vkc3FkS0MzMkkrS01wS0tZR0JRNnlpc2ZBCjVNeVZQUEN6TFIxbFA1cVhW
+  R0pQbk9xVUFrdkVVZkNhaGc3RVA5dEkyMHF4aVhyUjZUU0VyYVloSUZYTDBF
+  R1kKdThLQWNQSG01S2tDQXdFQUFhTTVNRGN3Q1FZRFZSMFRCQUl3QURBZEJn
+  TlZIUTRFRmdRVVczZFpzWDcwbWxTTQpDaVByWnhBR0ExdndmTmN3Q3dZRFZS
+  MFBCQVFEQWdTd01BMEdDU3FHU0liM0RRRUJCUVVBQTRJQkFRQ0lhL1k2CnhT
+  N1lXQnhrbjlXUDBFTW5KM3BZOXZlZjlEVG1MU2kvMmp6OFB6d2xLUTg5ek5U
+  cnFTVUQ4TG9RWm1CcUNKQnQKZEtTUS9SVW5hSEp1eGg4SFd2V3ViUDhFQllU
+  dWYrSTFERm5SdjY0OElGM01SMXRDUXVtVkwwWGNZTXZaY3hCagphL3ArOERv
+  bVdUUXFVZE5iTm9HeXd3anRWQldmRGR3RlY4UG8xWGNOL0F0cElMT0pRZDlK
+  NzdJTklHR0NIeFpvCjZTT0hIYU5rbmxFOUgwdzZxMFNWeFpLWkk4LysyYzQ0
+  N1YwTnJISXcxUWhlMHRBR0o5VjF1M2t5OGd5eGUwU00KOHY3ekxGMlhsaVli
+  ZnVyWUl3a2NYczh5UG44Z2dBcEJJeTliWDZWSnhScy9sMitVdnF6YUhJRmFG
+  eS9GOC9HUApSTlR1WHNWRzVOREFDbzdRCi0tLS0tRU5EIENFUlRJRklDQVRF
+  LS0tLS0K
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -21,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3.rc0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3.rc0
 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
@@ -60,18 +89,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -591947596938711831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: bson_ext
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: C extensions for Ruby BSON.