oj 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362c05976208620196631aa5d6cd69759c2eec9f
-  data.tar.gz: 95cd1d6833702d958b5b8eecfd5e3480e75e8736
+  metadata.gz: 59068b284af14e2585b85c69b1cc182f3dd0195d
+  data.tar.gz: 963f274f3d866a2230b674fbab5890a5d2b86dcd
 SHA512:
-  metadata.gz: 672874c0393c2e718c8cef9ddf2a479f730df35c08a39fa36da00c3a4bc8b7fa3d45ff5db41379525212c04d70ec2e805666ee55c1c6d5a06c81e3fbe682db63
-  data.tar.gz: 84c9d719920d5fe073a4980b43861d0315f84d8910d820598a3835e47fa6a1a7fc7074fb3d5049073c32bddefade970167990debdc7fd61f0faed3c97a9dc52f
+  metadata.gz: 32d43a8666dc8f16857a7ddee5ec4080a979c3cfc12d3834b3a832f40e323e742c4ecdac97f42400805983a2c448619a5f7a5e75f79221d8c0943551d0ec7591
+  data.tar.gz: 5113342958ca4a32bdd43af03ccba31c31c588967a40bd0e6cac1846e52db25a4a15231dcd16c82bb6c7507e2a9788fe4bff74b1ec56b957f55934e99e4e511a

data/README.md

@@ -20,6 +20,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+### Current Release 2.1.2
+
+ - Fixed support for Windows.
+
 ### Current Release 2.1.1
 
  - Fixed off by 1 error in buffer for escaped strings.

data/ext/oj/cache8.c

@@ -94,7 +94,11 @@ slot_print(Cache8 c, sid_t key, unsigned int depth) {
 	    k = (k8 << BITS) | i;
 	    /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
 	    if (DEPTH - 1 == depth) {
+#if IS_WINDOWS
+		printf("0x%016lx: %4lu\n", (long unsigned int)k, (long unsigned int)b->value);
+#else
 		printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
+#endif
 	    } else {
 		slot_print(b->child, k, depth + 1);
 	    }

data/ext/oj/compat.c

@@ -34,6 +34,7 @@
 #include "err.h"
 #include "parse.h"
 #include "resolve.h"
+#include "hash.h"
 
 static void
 hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_t len, const char *orig) {
@@ -44,7 +45,7 @@ hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_
 	pi->options.create_id_len == klen &&
 	0 == strncmp(pi->options.create_id, key, klen)) {
 	if (str < pi->json || pi->cur < str) {
-	    parent->classname = strndup(str, len);
+	    parent->classname = oj_strndup(str, len);
 	} else {
 	    parent->classname = str;
 	}

data/ext/oj/hash.c

@@ -116,7 +116,7 @@ hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value)
 	    bucket->next = b;
 	
 	}
-	bucket->key = strndup(key, len);
+	bucket->key = oj_strndup(key, len);
 	bucket->len = len;
 	bucket->val = def_value;
 	*slotp = &bucket->val;
@@ -147,3 +147,13 @@ ID
 oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
     return (ID)hash_get(&intern_hash, key, len, (VALUE**)slotp, 0);
 }
+
+char*
+oj_strndup(const char *s, size_t len) {
+    char	*d = ALLOC_N(char, len + 1);
+    
+    memcpy(d, s, len);
+    d[len] = '\0';
+
+    return d;
+}

data/ext/oj/hash.h

@@ -41,5 +41,6 @@ extern VALUE	oj_class_hash_get(const char *key, size_t len, VALUE **slotp);
 extern ID	oj_attr_hash_get(const char *key, size_t len, ID **slotp);
 
 extern void	oj_hash_print();
+extern char*	oj_strndup(const char *s, size_t len);
 
 #endif /* __OJ_HASH_H__ */

data/ext/oj/hash_test.c

@@ -28,8 +28,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _WIN32
 #include <sys/time.h>
 #include <time.h>
+#endif
 #include "hash.h"
 
 typedef struct _StrLen {
@@ -468,7 +470,11 @@ perf() {
 	}
     }
     dt = micro_time() - start;
+#if IS_WINDOWS
+    printf("%d iterations took %ld msecs\n", iter, (long)(dt / 1000));
+#else
     printf("%d iterations took %lld msecs\n", iter, dt / 1000);
+#endif
 }
 
 void

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -92,7 +92,9 @@ files:
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/oj
-licenses: []
+licenses:
+- MIT
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: