oj 3.7.4 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63afe8de8789be3dcae927133f970ce4c1ebcf2a95e559fd74d001002f21a976
-  data.tar.gz: 241ad4cdb767fbaa9b39eb3772748db8217d0a3bf9545300ff63d16722abf826
+  metadata.gz: 9deb076071bb73df196bc549faa4fc56d42eb8417b70c6a6d050ec086b04a89a
+  data.tar.gz: 0d6f76b98e0e44d639a32b48959ac8aec6316e9b7726190056adc1022b8dac00
 SHA512:
-  metadata.gz: c8b9183590f1ca6673d53c5e885afa958164ea0b7ad1e6ade77d5527ecad0d56ea2e9738daa85707c1f2d5fedb7c23779bc4b932a4345ca9f63e8e6520e579b5
-  data.tar.gz: 3a51f9db59bdf848f16eed3ddc24ebe1c9d96d408fd0ec11f513c335c85deb79cf2c6b2c7f587f2acc9f9fa77510f51094331fba1150993b6d396b8f4774336e
+  metadata.gz: 0f856c84593191e1eddb72f85187c68c961f248d7e6ecac817f8fbfbba5d6bfbcf46a2691d6eacd307f51ed91a8a8bf637d97f76ab428d11e72b8760c59a35cc
+  data.tar.gz: 18498cc7854a8aace3beaab7d603361acd43545c8dbb8e73dddccee0ebe96aff9d47ca6635b9a7198e37288aa62366f1d81364a4e4be88117866543c773c40ee

data/README.md

@@ -1,6 +1,6 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg?logo=travis)](http://travis-ci.org/ohler55/oj?branch=master) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 
@@ -42,7 +42,7 @@ gem 'oj'
 
 ## Support
 
-[Get supported Oj with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[Get supported Oj with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme) Security updates are [supported](https://tidelift.com/security).
 
 ## Further Reading
 
@@ -65,7 +65,7 @@ See [{file:CHANGELOG.md}](CHANGELOG.md)
 
 ## Links
 
- - *Documentation*: http://www.ohler.com/oj/doc, http://rubydoc.info/gems/oj
+- *Documentation*: http://www.ohler.com/oj/doc, http://rubydoc.info/gems/oj
 
 - *GitHub* *repo*: https://github.com/ohler55/oj
 
@@ -93,4 +93,12 @@ Follow [@peterohler on Twitter](http://twitter.com/peterohler) for announcements
 
  - *OjC, a C JSON parser*: https://www.ohler.com/ojc also at https://github.com/ohler55/ojc
 
- - *Piper Push Cache, push JSON to browsers*: http://www.piperpushcache.com
+ - *Agoo, a high performance Ruby web server supporting GraphQL on GitHub*: https://github.com/ohler55/agoo
+
+ - *Agoo-C, a high performance C web server supporting GraphQL on GitHub*: https://github.com/ohler55/agoo-c
+
+#### Contributing
+
++ Provide a Pull Request off the `develop` branch.
++ Report a bug
++ Suggest an idea

data/ext/oj/buf.h

@@ -1,39 +1,11 @@
-/* buf.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_BUF_H__
-#define __OJ_BUF_H__
+#ifndef OJ_BUF_H
+#define OJ_BUF_H
 
 #include "ruby.h"
 
-typedef struct _Buf {
+typedef struct _buf {
     char	*head;
     char	*end;
     char	*tail;
@@ -78,7 +50,7 @@ buf_append_string(Buf buf, const char *s, size_t slen) {
     memcpy(buf->tail, s, slen);
     buf->tail += slen;
 }
-    
+
 inline static void
 buf_append(Buf buf, char c) {
     if (buf->end <= buf->tail) {
@@ -100,4 +72,4 @@ buf_append(Buf buf, char c) {
     //*buf->tail = '\0'; // for debugging
 }
 
-#endif /* __OJ_BUF_H__ */
+#endif /* OJ_BUF_H */

data/ext/oj/cache8.c

@@ -14,11 +14,11 @@
 #define DEPTH		16
 
 typedef union {
-    struct _Cache8	*child;
+    struct _cache8	*child;
     slot_t		value;
 } Bucket;
 
-struct _Cache8 {
+struct _cache8 {
     Bucket	buckets[SLOT_CNT];
 };
 
@@ -30,7 +30,7 @@ oj_cache8_new(Cache8 *cache) {
     Bucket	*b;
     int		i;
     
-    *cache = ALLOC(struct _Cache8);
+    *cache = ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
 	b->value = 0;
     }

data/ext/oj/cache8.h

@@ -1,40 +1,12 @@
-/* cache8.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_CACHE8_H__
-#define __OJ_CACHE8_H__
+#ifndef OJ_CACHE8_H
+#define OJ_CACHE8_H
 
 #include "ruby.h"
 #include "stdint.h"
 
-typedef struct _Cache8	*Cache8;
+typedef struct _cache8	*Cache8;
 typedef uint64_t	slot_t;
 typedef uint64_t	sid_t;
 
@@ -45,4 +17,4 @@ extern slot_t	oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot);
 
 extern void	oj_cache8_print(Cache8 cache);
 
-#endif /* __OJ_CACHE8_H__ */
+#endif /* OJ_CACHE8_H */

data/ext/oj/circarray.c

@@ -1,21 +1,18 @@
-/* circarray.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include "circarray.h"
 
 CircArray
 oj_circ_array_new() {
     CircArray	ca;
-    
-    if (0 == (ca = ALLOC(struct _CircArray))) {
+
+    if (0 == (ca = ALLOC(struct _circArray))) {
 	rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;
     ca->size = sizeof(ca->obj_array) / sizeof(VALUE);
     ca->cnt = 0;
-    
+
     return ca;
 }
 
@@ -40,7 +37,7 @@ oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
 		    rb_raise(rb_eNoMemError, "not enough memory\n");
 		}
 		memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
-	    } else { 
+	    } else {
 		REALLOC_N(ca->objs, VALUE, cnt);
 	    }
 	    ca->size = cnt;
@@ -65,4 +62,3 @@ oj_circ_array_get(CircArray ca, unsigned long id) {
     }
     return obj;
 }
-

data/ext/oj/circarray.h

@@ -1,14 +1,11 @@
-/* circarray.h
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_CIRCARRAY_H__
-#define __OJ_CIRCARRAY_H__
+#ifndef OJ_CIRCARRAY_H
+#define OJ_CIRCARRAY_H
 
 #include "ruby.h"
 
-typedef struct _CircArray {
+typedef struct _circArray {
     VALUE		obj_array[1024];
     VALUE		*objs;
     unsigned long	size; // allocated size or initial array size
@@ -20,4 +17,4 @@ extern void		oj_circ_array_free(CircArray ca);
 extern void		oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id);
 extern VALUE		oj_circ_array_get(CircArray ca, unsigned long id);
 
-#endif /* __OJ_CIRCARRAY_H__ */
+#endif /* OJ_CIRCARRAY_H */

data/ext/oj/code.c

@@ -1,7 +1,4 @@
-/* code.c
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
 #include "code.h"
 #include "dump.h"
@@ -140,7 +137,7 @@ oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
     size_t	len = strlen(classname);
     size_t	size = d2 * out->indent + 10 + len + out->opts->create_id_len + sep_len;
     bool	no_comma = true;
-    
+
     assure_size(out, size);
     *out->cur++ = '{';
 
@@ -201,7 +198,7 @@ oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
 		char	*b = buf + sizeof(buf) - 1;
 		int	neg = 0;
 		long	num = attrs->num;
-	    
+
 		if (0 > num) {
 		    neg = 1;
 		    num = -num;

data/ext/oj/code.h

@@ -1,10 +1,7 @@
-/* code.h
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_CODE_H__
-#define __OJ_CODE_H__
+#ifndef OJ_CODE_H
+#define OJ_CODE_H
 
 #include <ruby.h>
 
@@ -13,7 +10,7 @@
 typedef void	(*EncodeFunc)(VALUE obj, int depth, Out out);
 typedef VALUE	(*DecodeFunc)(VALUE clas, VALUE args);
 
-typedef struct _Code {
+typedef struct _code {
     const char	*name;
     VALUE	clas;
     EncodeFunc	encode;
@@ -22,7 +19,7 @@ typedef struct _Code {
 } *Code;
 
 // Used by encode functions.
-typedef struct _Attr {
+typedef struct _attr {
     const char	*name;
     int		len;
     VALUE	value;
@@ -37,6 +34,6 @@ extern bool	oj_code_has(Code codes, VALUE clas, bool encode);
 
 extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class);
 
-extern struct _Code	oj_compat_codes[];
+extern struct _code	oj_compat_codes[];
 
-#endif /* __OJ_CODE_H__ */
+#endif /* OJ_CODE_H */

data/ext/oj/compat.c

@@ -1,7 +1,4 @@
-/* compat.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdio.h>
 
@@ -65,7 +62,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 static VALUE
 start_hash(ParseInfo pi) {
     volatile VALUE	h;
-    
+
     if (Qnil != pi->options.hash_class) {
 	h = rb_class_new_instance(0, NULL, pi->options.hash_class);
     } else {
@@ -78,7 +75,7 @@ start_hash(ParseInfo pi) {
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(struct _parseInfo *pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (0 != parent->classname) {
@@ -87,7 +84,7 @@ end_hash(struct _ParseInfo *pi) {
 	clas = oj_name2class(pi, parent->classname, parent->clen, 0, rb_eArgError);
 	if (Qundef != clas) { // else an error
 	    ID	creatable = rb_intern("json_creatable?");
-	    
+
 	    if (!rb_respond_to(clas, creatable) || Qtrue == rb_funcall(clas, creatable, 0)) {
 		parent->val = rb_funcall(clas, oj_json_create_id, 1, parent->val);
 	    }
@@ -144,9 +141,9 @@ add_num(ParseInfo pi, NumInfo ni) {
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_hash_alt && rb_cHash != rb_obj_class(parent->val)) {
 	// The rb_hash_set would still work but the unit tests for the
 	// json gem require the less efficient []= method be called to set
@@ -192,7 +189,7 @@ static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_array_alt && rb_cArray != rb_obj_class(parent->val)) {
 	// The rb_ary_push would still work but the unit tests for the json
 	// gem require the less efficient << method be called to push the
@@ -242,7 +239,7 @@ oj_set_compat_callbacks(ParseInfo pi) {
 
 VALUE
 oj_compat_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -263,7 +260,7 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_compat_load(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -274,7 +271,7 @@ oj_compat_load(int argc, VALUE *argv, VALUE self) {
     pi.options.nilnil = Yes;
     pi.options.empty_string = Yes;
     oj_set_compat_callbacks(&pi);
-    
+
     if (T_STRING == rb_type(*argv)) {
 	return oj_pi_parse(argc, argv, &pi, 0, 0, false);
     } else {
@@ -284,7 +281,7 @@ oj_compat_load(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;

data/ext/oj/custom.c

@@ -1,8 +1,6 @@
-/* custom.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "code.h"
@@ -15,13 +13,14 @@
 #include "parse.h"
 #include "resolve.h"
 #include "trace.h"
+#include "util.h"
 
 extern void	oj_set_obj_ivar(Val parent, Val kval, VALUE value);
 extern VALUE	oj_parse_xml_time(const char *str, int len); // from object.c
 
 static void
 dump_obj_str(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "s", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -30,6 +29,13 @@ dump_obj_str(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
+static void
+dump_obj_as_str(VALUE obj, int depth, Out out) {
+    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+    const char		*str = rb_string_value_ptr((VALUE*)&rstr);
+
+    oj_dump_cstr(str, RSTRING_LEN(rstr), 0, 0, out);
+}
 
 static void
 bigdecimal_dump(VALUE obj, int depth, Out out) {
@@ -55,19 +61,23 @@ static ID	imag_id = 0;
 
 static void
 complex_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
-	{ "real", 4, Qnil },
-	{ "imag", 4, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == real_id) {
-	real_id = rb_intern("real");
-	imag_id = rb_intern("imag");
-    }
-    attrs[0].value = rb_funcall(obj, real_id, 0);
-    attrs[1].value = rb_funcall(obj, imag_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "real", 4, Qnil },
+	    { "imag", 4, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == real_id) {
+	    real_id = rb_intern("real");
+	    imag_id = rb_intern("imag");
+	}
+	attrs[0].value = rb_funcall(obj, real_id, 0);
+	attrs[1].value = rb_funcall(obj, imag_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -82,7 +92,7 @@ complex_load(VALUE clas, VALUE args) {
 static void
 time_dump(VALUE obj, int depth, Out out) {
     if (Yes == out->opts->create_ok) {
-	struct _Attr	attrs[] = {
+	struct _attr	attrs[] = {
 	    { "time", 4, Qundef, 0, Qundef },
 	    { NULL, 0, Qnil },
 	};
@@ -103,7 +113,7 @@ time_dump(VALUE obj, int depth, Out out) {
 static void
 date_dump(VALUE obj, int depth, Out out) {
     if (Yes == out->opts->create_ok) {
-	struct _Attr	attrs[] = {
+	struct _attr	attrs[] = {
 	    { "s", 1, Qnil },
 	    { NULL, 0, Qnil },
 	};
@@ -113,7 +123,7 @@ date_dump(VALUE obj, int depth, Out out) {
     } else {
 	volatile VALUE	v;
 	volatile VALUE	ov;
-	
+
 	switch (out->opts->time_format) {
 	case RubyTime:
 	case XmlTime:
@@ -148,7 +158,7 @@ date_dump(VALUE obj, int depth, Out out) {
 static VALUE
 date_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(oj_date_class, rb_intern("parse"), 1, v);
     }
@@ -158,7 +168,7 @@ date_load(VALUE clas, VALUE args) {
 static VALUE
 datetime_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(oj_datetime_class, rb_intern("parse"), 1, v);
     }
@@ -169,7 +179,7 @@ static ID	table_id = 0;
 
 static void
 openstruct_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "table", 5, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -191,23 +201,27 @@ openstruct_load(VALUE clas, VALUE args) {
 
 static void
 range_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
-	{ "begin", 5, Qnil },
-	{ "end", 3, Qnil },
-	{ "exclude", 7, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
-    attrs[1].value = rb_funcall(obj, oj_end_id, 0);
-    attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "begin", 5, Qnil },
+	    { "end", 3, Qnil },
+	    { "exclude", 7, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
+	attrs[1].value = rb_funcall(obj, oj_end_id, 0);
+	attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
 range_load(VALUE clas, VALUE args) {
     VALUE	nargs[3];
-    
+
     nargs[0] = rb_hash_aref(args, rb_id2str(oj_begin_id));
     nargs[1] = rb_hash_aref(args, rb_id2str(oj_end_id));
     nargs[2] = rb_hash_aref(args, rb_id2str(oj_exclude_end_id));
@@ -220,19 +234,23 @@ static ID	denominator_id = 0;
 
 static void
 rational_dump(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
-	{ "numerator", 9, Qnil },
-	{ "denominator", 11, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == numerator_id) {
-	numerator_id = rb_intern("numerator");
-	denominator_id = rb_intern("denominator");
-    }
-    attrs[0].value = rb_funcall(obj, numerator_id, 0);
-    attrs[1].value = rb_funcall(obj, denominator_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "numerator", 9, Qnil },
+	    { "denominator", 11, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == numerator_id) {
+	    numerator_id = rb_intern("numerator");
+	    denominator_id = rb_intern("denominator");
+	}
+	attrs[0].value = rb_funcall(obj, numerator_id, 0);
+	attrs[1].value = rb_funcall(obj, denominator_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -248,7 +266,7 @@ rational_load(VALUE clas, VALUE args) {
 static VALUE
 regexp_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(rb_cRegexp, oj_new_id, 1, v);
     }
@@ -262,7 +280,7 @@ time_load(VALUE clas, VALUE args) {
     return args;
 }
 
-static struct _Code	codes[] = {
+static struct _code	codes[] = {
     { "BigDecimal", Qnil, bigdecimal_dump, NULL, true },
     { "Complex", Qnil, complex_dump, complex_load, true },
     { "Date", Qnil, date_dump, date_load, true },
@@ -276,7 +294,8 @@ static struct _Code	codes[] = {
 };
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (oj_dump_ignore(out->opts, value)) {
@@ -421,7 +440,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	v = rb_funcall(obj, *odd->attrs, 0);
 	if (Qundef == v || T_STRING != rb_type(v)) {
 	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.\n");
-	} else {	    
+	} else {
 	    const char	*s = rb_string_value_ptr((VALUE*)&v);
 	    int		len = (int)RSTRING_LEN(v);
 	    const char	*name = rb_id2name(*odd->attrs);
@@ -457,9 +476,11 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		char	*n;
 		char	*end;
 		ID	i;
-	    
+
 		if (sizeof(nbuf) <= nlen) {
-		    n2 = strdup(name);
+		    if (NULL == (n2 = strdup(name))) {
+			rb_raise(rb_eNoMemError, "for attribute name.");
+		    }
 		} else {
 		    strcpy(n2, name);
 		}
@@ -493,7 +514,10 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 // Return class if still needs dumping.
 static VALUE
 dump_common(VALUE obj, int depth, Out out) {
-    if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
+
+    if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
+	oj_dump_raw_json(obj, depth, out);
+    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
 	const char	*s;
 	int		len;
@@ -566,7 +590,8 @@ dump_common(VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size;
     const char	*attr;
@@ -583,6 +608,8 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     // the key name is NULL. Not an empty string but NULL.
     if (NULL == attr) {
 	attr = "";
+    } else if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+	return ST_CONTINUE;
     }
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
@@ -604,7 +631,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     oj_dump_custom_val(value, depth, out, true);
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -776,7 +803,7 @@ static void
 dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     long	id = oj_check_circular(obj, out);
     VALUE	clas;
-    
+
     if (0 > id) {
 	oj_dump_nil(Qnil, depth, out, false);
     } else if (Qnil != (clas = dump_common(obj, depth, out))) {
@@ -789,7 +816,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	size_t		size = d2 * out->indent + d3 * out->indent + 3;
 	const char	*name;
 	int		cnt;
-	size_t		len;	
+	size_t		len;
 
 	assure_size(out, size);
 	if (clas == rb_cRange) {
@@ -867,7 +894,11 @@ dump_data(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_regexp(VALUE obj, int depth, Out out, bool as_ok) {
-    dump_obj_str(obj, depth, out);
+    if (NULL != out->opts->create_id) {
+	dump_obj_str(obj, depth, out);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static void
@@ -997,7 +1028,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 }
 
 static void
-end_hash(struct _ParseInfo *pi) {
+end_hash(struct _parseInfo *pi) {
     Val	parent = stack_peek(&pi->stack);
 
     if (Qundef != parent->clas && parent->clas != rb_obj_class(parent->val)) {
@@ -1030,7 +1061,7 @@ calc_hash_key(ParseInfo pi, Val parent) {
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val kval, NumInfo ni) {
+hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
 
@@ -1039,7 +1070,7 @@ hash_set_num(struct _ParseInfo *pi, Val kval, NumInfo ni) {
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_HASH:
-	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 == strncmp("time", parent->key, 4)) {
+	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 != ni->div && 0 == strncmp("time", parent->key, 4)) {
 	    int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 	    if (ni->neg) {
@@ -1055,17 +1086,19 @@ hash_set_num(struct _ParseInfo *pi, Val kval, NumInfo ni) {
 		// offset and then a conversion to UTC keeps makes the time
 		// match the expected value.
 		parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
-	    } else if (ni->hasExp) {
-		time_t	t = (time_t)(ni->i + ni->exp);
-		struct tm	*st = gmtime(&t);
-		VALUE	args[8];
-
-		args[0] = LONG2NUM(1900 + st->tm_year);
-		args[1] = LONG2NUM(1 + st->tm_mon);
-		args[2] = LONG2NUM(st->tm_mday);
-		args[3] = LONG2NUM(st->tm_hour);
-		args[4] = LONG2NUM(st->tm_min);
-		args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
+	    } else if (ni->has_exp) {
+		int64_t			t = (int64_t)(ni->i + ni->exp);
+		struct _timeInfo	ti;
+		VALUE			args[8];
+
+		sec_as_time(t, &ti);
+
+		args[0] = LONG2NUM(ti.year);
+		args[1] = LONG2NUM(ti.mon);
+		args[2] = LONG2NUM(ti.day);
+		args[3] = LONG2NUM(ti.hour);
+		args[4] = LONG2NUM(ti.min);
+		args[5] = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
 		args[6] = LONG2NUM(ni->exp);
 		parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
 	    } else {
@@ -1107,7 +1140,7 @@ static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     rb_ary_push(parent->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);
@@ -1146,7 +1179,7 @@ oj_set_custom_callbacks(ParseInfo pi) {
 
 VALUE
 oj_custom_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -1166,7 +1199,7 @@ oj_custom_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_custom_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;