oj 2.0.0 → 3.0.0

data/ext/oj/dump_strict.c

@@ -0,0 +1,416 @@
+/* dump_strict.c
+ * Copyright (c) 2012, 2017, Peter Ohler
+ * All rights reserved.
+ */
+
+#include <stdlib.h>
+#include <time.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "dump.h"
+
+#if !HAS_ENCODING_SUPPORT || defined(RUBINIUS_RUBY)
+#define rb_eEncodingError	rb_eException
+#endif
+
+// Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
+#define OJ_INFINITY (1.0/0.0)
+
+// Extra padding at end of buffer.
+#define BUFFER_EXTRA 10
+
+typedef unsigned long	ulong;
+
+static const char	inf_val[] = INF_VAL;
+static const char	ninf_val[] = NINF_VAL;
+static const char	nan_val[] = NAN_VAL;
+
+static void
+raise_strict(VALUE obj) {
+    rb_raise(rb_eTypeError, "Failed to dump %s Object to JSON in strict mode.\n", rb_class2name(rb_obj_class(obj)));
+}
+
+// Removed dependencies on math due to problems with CentOS 5.4.
+static void
+dump_float(VALUE obj, int depth, Out out, bool as_ok) {
+    char	buf[64];
+    char	*b;
+    double	d = rb_num2dbl(obj);
+    int		cnt = 0;
+
+    if (0.0 == d) {
+	b = buf;
+	*b++ = '0';
+	*b++ = '.';
+	*b++ = '0';
+	*b++ = '\0';
+	cnt = 3;
+    } else {
+	NanDump	nd = out->opts->dump_opts.nan_dump;
+	    
+	if (AutoNan == nd) {
+	    nd = RaiseNan;
+	}
+	if (OJ_INFINITY == d) {
+	    switch (nd) {
+	    case RaiseNan:
+	    case WordNan:
+		raise_strict(obj);
+		break;
+	    case NullNan:
+		strcpy(buf, "null");
+		cnt = 4;
+		break;
+	    case HugeNan:
+	    default:
+		strcpy(buf, inf_val);
+		cnt = sizeof(inf_val) - 1;
+		break;
+	    }
+	} else if (-OJ_INFINITY == d) {
+	    switch (nd) {
+	    case RaiseNan:
+	    case WordNan:
+		raise_strict(obj);
+		break;
+	    case NullNan:
+		strcpy(buf, "null");
+		cnt = 4;
+		break;
+	    case HugeNan:
+	    default:
+		strcpy(buf, ninf_val);
+		cnt = sizeof(ninf_val) - 1;
+		break;
+	    }
+	} else if (isnan(d)) {
+	    switch (nd) {
+	    case RaiseNan:
+	    case WordNan:
+		raise_strict(obj);
+		break;
+	    case NullNan:
+		strcpy(buf, "null");
+		cnt = 4;
+		break;
+	    case HugeNan:
+	    default:
+		strcpy(buf, nan_val);
+		cnt = sizeof(nan_val) - 1;
+		break;
+	    }
+	} else if (d == (double)(long long int)d) {
+	    cnt = snprintf(buf, sizeof(buf), "%.1f", d);
+	} else if (0 == out->opts->float_prec) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	    cnt = RSTRING_LEN(rstr);
+	    if ((int)sizeof(buf) <= cnt) {
+		cnt = sizeof(buf) - 1;
+	    }
+	    strncpy(buf, rb_string_value_ptr((VALUE*)&rstr), cnt);
+	    buf[cnt] = '\0';
+	} else {
+	    cnt = snprintf(buf, sizeof(buf), out->opts->float_fmt, d);
+	}
+    }
+    assure_size(out, cnt);
+    for (b = buf; '\0' != *b; b++) {
+	*out->cur++ = *b;
+    }
+    *out->cur = '\0';
+}
+
+static void
+dump_array(VALUE a, int depth, Out out, bool as_ok) {
+    size_t	size;
+    int		i, cnt;
+    int		d2 = depth + 1;
+
+    if (Yes == out->opts->circular) {
+	if (0 > oj_check_circular(a, out)) {
+	    oj_dump_nil(Qnil, 0, out, false);
+	    return;
+	}
+    }
+    cnt = (int)RARRAY_LEN(a);
+    *out->cur++ = '[';
+    size = 2;
+    assure_size(out, size);
+    if (0 == cnt) {
+	*out->cur++ = ']';
+    } else {
+	if (out->opts->dump_opts.use) {
+	    size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 1;
+	} else {
+	    size = d2 * out->indent + 2;
+	}
+	cnt--;
+	for (i = 0; i <= cnt; i++) {
+	    assure_size(out, size);
+	    if (out->opts->dump_opts.use) {
+		if (0 < out->opts->dump_opts.array_size) {
+		    strcpy(out->cur, out->opts->dump_opts.array_nl);
+		    out->cur += out->opts->dump_opts.array_size;
+		}
+		if (0 < out->opts->dump_opts.indent_size) {
+		    int	i;
+		    for (i = d2; 0 < i; i--) {
+			strcpy(out->cur, out->opts->dump_opts.indent_str);
+			out->cur += out->opts->dump_opts.indent_size;
+		    }
+		}
+	    } else {
+		fill_indent(out, d2);
+	    }
+	    oj_dump_strict_val(rb_ary_entry(a, i), d2, out);
+	    if (i < cnt) {
+		*out->cur++ = ',';
+	    }
+	}
+	size = depth * out->indent + 1;
+	assure_size(out, size);
+	if (out->opts->dump_opts.use) {
+	    //printf("*** d2: %u  indent: %u '%s'\n", d2, out->opts->dump_opts->indent_size, out->opts->dump_opts->indent);
+	    if (0 < out->opts->dump_opts.array_size) {
+		strcpy(out->cur, out->opts->dump_opts.array_nl);
+		out->cur += out->opts->dump_opts.array_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+
+		for (i = depth; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	} else {
+	    fill_indent(out, depth);
+	}
+	*out->cur++ = ']';
+    }
+    *out->cur = '\0';
+}
+
+static int
+hash_cb(VALUE key, VALUE value, Out out) {
+    int		depth = out->depth;
+    long	size;
+    int		rtype = rb_type(key);
+    
+    if (rtype != T_STRING && rtype != T_SYMBOL) {
+	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
+    }
+    if (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
+    if (!out->opts->dump_opts.use) {
+	size = depth * out->indent + 1;
+	assure_size(out, size);
+	fill_indent(out, depth);
+	if (rtype == T_STRING) {
+	    oj_dump_str(key, 0, out, false);
+	} else {
+	    oj_dump_sym(key, 0, out, false);
+	}
+	*out->cur++ = ':';
+    } else {
+	size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
+	assure_size(out, size);
+	if (0 < out->opts->dump_opts.hash_size) {
+	    strcpy(out->cur, out->opts->dump_opts.hash_nl);
+	    out->cur += out->opts->dump_opts.hash_size;
+	}
+	if (0 < out->opts->dump_opts.indent_size) {
+	    int	i;
+	    for (i = depth; 0 < i; i--) {
+		strcpy(out->cur, out->opts->dump_opts.indent_str);
+		out->cur += out->opts->dump_opts.indent_size;
+	    }
+	}
+	if (rtype == T_STRING) {
+	    oj_dump_str(key, 0, out, false);
+	} else {
+	    oj_dump_sym(key, 0, out, false);
+	}
+	size = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
+	assure_size(out, size);
+	if (0 < out->opts->dump_opts.before_size) {
+	    strcpy(out->cur, out->opts->dump_opts.before_sep);
+	    out->cur += out->opts->dump_opts.before_size;
+	}
+	*out->cur++ = ':';
+	if (0 < out->opts->dump_opts.after_size) {
+	    strcpy(out->cur, out->opts->dump_opts.after_sep);
+	    out->cur += out->opts->dump_opts.after_size;
+	}
+    }
+    oj_dump_strict_val(value, depth, out);
+    out->depth = depth;
+    *out->cur++ = ',';
+
+    return ST_CONTINUE;
+}
+
+static void
+dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
+    int		cnt;
+    size_t	size;
+
+    if (Yes == out->opts->circular) {
+	if (0 > oj_check_circular(obj, out)) {
+	    oj_dump_nil(Qnil, 0, out, false);
+	    return;
+	}
+    }
+    cnt = (int)RHASH_SIZE(obj);
+    size = depth * out->indent + 2;
+    assure_size(out, 2);
+    *out->cur++ = '{';
+    if (0 == cnt) {
+	*out->cur++ = '}';
+    } else {
+	out->depth = depth + 1;
+	rb_hash_foreach(obj, hash_cb, (VALUE)out);
+	if (',' == *(out->cur - 1)) {
+	    out->cur--; // backup to overwrite last comma
+	}
+	if (!out->opts->dump_opts.use) {
+	    assure_size(out, size);
+	    fill_indent(out, depth);
+	} else {
+	    size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
+	    assure_size(out, size);
+	    if (0 < out->opts->dump_opts.hash_size) {
+		strcpy(out->cur, out->opts->dump_opts.hash_nl);
+		out->cur += out->opts->dump_opts.hash_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+
+		for (i = depth; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	}
+	*out->cur++ = '}';
+    }
+    *out->cur = '\0';
+}
+
+static void
+dump_data_strict(VALUE obj, int depth, Out out, bool as_ok) {
+    VALUE	clas = rb_obj_class(obj);
+
+    if (oj_bigdecimal_class == clas) {
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	oj_dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+    } else {
+	raise_strict(obj);
+    }
+}
+
+static void
+dump_data_null(VALUE obj, int depth, Out out, bool as_ok) {
+    VALUE	clas = rb_obj_class(obj);
+
+    if (oj_bigdecimal_class == clas) {
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	oj_dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+    } else {
+	oj_dump_nil(Qnil, depth, out, false);
+    }
+}
+
+static DumpFunc	strict_funcs[] = {
+    NULL,	 	// RUBY_T_NONE   = 0x00,
+    dump_data_strict,	// RUBY_T_OBJECT = 0x01,
+    NULL, 		// RUBY_T_CLASS  = 0x02,
+    NULL, 		// RUBY_T_MODULE = 0x03,
+    dump_float, 	// RUBY_T_FLOAT  = 0x04,
+    oj_dump_str, 	// RUBY_T_STRING = 0x05,
+    NULL, 		// RUBY_T_REGEXP = 0x06,
+    dump_array,		// RUBY_T_ARRAY  = 0x07,
+    dump_hash,	 	// RUBY_T_HASH   = 0x08,
+    NULL, 		// RUBY_T_STRUCT = 0x09,
+    oj_dump_bignum,	// RUBY_T_BIGNUM = 0x0a,
+    NULL, 		// RUBY_T_FILE   = 0x0b,
+    dump_data_strict,	// RUBY_T_DATA   = 0x0c,
+    NULL, 		// RUBY_T_MATCH  = 0x0d,
+    NULL, 		// RUBY_T_COMPLEX  = 0x0e,
+    NULL, 		// RUBY_T_RATIONAL = 0x0f,
+    NULL, 		// 0x10
+    oj_dump_nil, 	// RUBY_T_NIL    = 0x11,
+    oj_dump_true, 	// RUBY_T_TRUE   = 0x12,
+    oj_dump_false,	// RUBY_T_FALSE  = 0x13,
+    oj_dump_sym,	// RUBY_T_SYMBOL = 0x14,
+    oj_dump_fixnum,	// RUBY_T_FIXNUM = 0x15,
+};
+
+void
+oj_dump_strict_val(VALUE obj, int depth, Out out) {
+    int	type = rb_type(obj);
+    
+    if (MAX_DEPTH < depth) {
+	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
+    }
+    if (0 < type && type <= RUBY_T_FIXNUM) {
+	DumpFunc	f = strict_funcs[type];
+
+	if (NULL != f) {
+	    f(obj, depth, out, false);
+	    return;
+	}
+    }
+    raise_strict(obj);
+}
+
+static DumpFunc	null_funcs[] = {
+    NULL,	 	// RUBY_T_NONE   = 0x00,
+    dump_data_null,	// RUBY_T_OBJECT = 0x01,
+    NULL, 		// RUBY_T_CLASS  = 0x02,
+    NULL, 		// RUBY_T_MODULE = 0x03,
+    dump_float, 	// RUBY_T_FLOAT  = 0x04,
+    oj_dump_str, 	// RUBY_T_STRING = 0x05,
+    NULL, 		// RUBY_T_REGEXP = 0x06,
+    dump_array,		// RUBY_T_ARRAY  = 0x07,
+    dump_hash,	 	// RUBY_T_HASH   = 0x08,
+    NULL, 		// RUBY_T_STRUCT = 0x09,
+    oj_dump_bignum,	// RUBY_T_BIGNUM = 0x0a,
+    NULL, 		// RUBY_T_FILE   = 0x0b,
+    dump_data_null,	// RUBY_T_DATA   = 0x0c,
+    NULL, 		// RUBY_T_MATCH  = 0x0d,
+    NULL, 		// RUBY_T_COMPLEX  = 0x0e,
+    NULL, 		// RUBY_T_RATIONAL = 0x0f,
+    NULL, 		// 0x10
+    oj_dump_nil, 	// RUBY_T_NIL    = 0x11,
+    oj_dump_true, 	// RUBY_T_TRUE   = 0x12,
+    oj_dump_false,	// RUBY_T_FALSE  = 0x13,
+    oj_dump_sym,	// RUBY_T_SYMBOL = 0x14,
+    oj_dump_fixnum,	// RUBY_T_FIXNUM = 0x15,
+};
+
+void
+oj_dump_null_val(VALUE obj, int depth, Out out) {
+    int	type = rb_type(obj);
+    
+    if (MAX_DEPTH < depth) {
+	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
+    }
+    if (0 < type && type <= RUBY_T_FIXNUM) {
+	DumpFunc	f = null_funcs[type];
+
+	if (NULL != f) {
+	    f(obj, depth, out, false);
+	    return;
+	}
+    }
+    oj_dump_nil(Qnil, depth, out, false);
+}

data/ext/oj/encode.h

@@ -0,0 +1,51 @@
+/* encode.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.
+ */
+
+#ifndef __OJ_ENCODE_H__
+#define __OJ_ENCODE_H__
+
+#include "ruby.h"
+#if HAS_ENCODING_SUPPORT
+#include "ruby/encoding.h"
+#endif
+
+static inline VALUE
+oj_encode(VALUE rstr) {
+#if HAS_ENCODING_SUPPORT
+    rb_enc_associate(rstr, oj_utf8_encoding);
+#else
+    if (Qnil != oj_utf8_encoding) {
+	rstr = rb_funcall(oj_utf8_encoding, oj_iconv_id, 1, rstr);
+    }
+#endif
+    return rstr;
+}
+
+#endif /* __OJ_ENCODE_H__ */

data/ext/oj/err.c

@@ -0,0 +1,57 @@
+/* err.c
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ */
+
+#include <stdarg.h>
+
+#include "err.h"
+
+void
+oj_err_set(Err e, VALUE clas, const char *format, ...) {
+    va_list	ap;
+
+    va_start(ap, format);
+    e->clas = clas;
+    vsnprintf(e->msg, sizeof(e->msg) - 1, format, ap);
+    va_end(ap);
+}
+
+void
+oj_err_raise(Err e) {
+    rb_raise(e->clas, "%s", e->msg);
+}
+
+void
+_oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *json, const char *current, const char* file, int line) {
+    int	n = 1;
+    int	col = 1;
+
+    for (; json < current && '\n' != *current; current--) {
+	col++;
+    }
+    for (; json < current; current--) {
+	if ('\n' == *current) {
+	    n++;
+	}
+    }
+    oj_err_set(err, eclas, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
+}
+
+void
+_oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line) {
+    struct _Err	err;
+    int		n = 1;
+    int		col = 1;
+
+    for (; json < current && '\n' != *current; current--) {
+	col++;
+    }
+    for (; json < current; current--) {
+	if ('\n' == *current) {
+	    n++;
+	}
+    }
+    oj_err_set(&err, oj_parse_error_class, "%s at line %d, column %d [%s:%d]", msg, n, col, file, line);
+    rb_raise(err.clas, "%s", err.msg);
+}

data/ext/oj/err.h

@@ -0,0 +1,70 @@
+/* err.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.
+ */
+
+#ifndef __OJ_ERR_H__
+#define __OJ_ERR_H__
+
+#include "ruby.h"
+// Needed to silence 2.4.0 warnings.
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+
+#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, __FILE__, __LINE__)
+
+typedef struct _Err {
+    VALUE	clas;
+    char	msg[128];
+} *Err;
+
+extern VALUE	oj_parse_error_class;
+
+extern void	oj_err_set(Err e, VALUE clas, const char *format, ...);
+extern void	_oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *json, const char *current, const char* file, int line);
+
+NORETURN(extern void	oj_err_raise(Err e));
+
+#define raise_error(msg, json, current) _oj_raise_error(msg, json, current, __FILE__, __LINE__)
+
+NORETURN(extern void	_oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line));
+
+
+inline static void
+err_init(Err e) {
+    e->clas = Qnil;
+    *e->msg = '\0';
+}
+
+inline static int
+err_has(Err e) {
+    return (Qnil != e->clas);
+}
+
+#endif /* __OJ_ERR_H__ */

data/ext/oj/extconf.rb

@@ -20,17 +20,24 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
+  'HAS_RB_TIME_TIMESPEC' => (!is_windows && 'ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
-  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type || 'tcs-ruby' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 0 : 1,
-  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
+  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1])) ? 0 : 1,
+  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
+  'NEEDS_RATIONAL' => ('1' == version[0] && '8' == version[1]) ? 1 : 0,
   'IS_WINDOWS' => is_windows ? 1 : 0,
-  'SAFE_CACHE' => is_windows ? 0 : 1,
+  'USE_PTHREAD_MUTEX' => is_windows ? 0 : 1,
+  'USE_RB_MUTEX' => (is_windows && !('1' == version[0] && '8' == version[1])) ? 1 : 0,
+  'DATETIME_1_8' => ('ruby' == type && ('1' == version[0] && '8' == version[1])) ? 1 : 0,
+  'NO_TIME_ROUND_PAD' => ('rubinius' == type) ? 1 : 0,
+  'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
+  'HAS_METHOD_ARITY' =>  ('rubinius' == type) ? 0 : 1,
+  'HAS_STRUCT_MEMBERS' =>  ('rubinius' == type) ? 0 : 1,
+  'UNIFY_FIXNUM_AND_BIGNUM' => ('ruby' == type && '2' == version[0] && '4' <= version[1]) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
 # some reason math.h and string.h contents are not processed. Might be a
@@ -38,12 +45,14 @@ dflags = {
 if 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' == RUBY_RELEASE_DATE
   begin
     dflags['NEEDS_STPCPY'] = nil if File.read('/etc/redhat-release').include?('CentOS release 5.4')
-  rescue Exception => e
+  rescue Exception
   end
 else
   dflags['NEEDS_STPCPY'] = nil if is_windows
 end
 
+dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
+
 dflags.each do |k,v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
@@ -51,8 +60,9 @@ dflags.each do |k,v|
     $CPPFLAGS += " -D#{k}=#{v}"
   end
 end
+
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
-create_makefile(extension_name)
+create_makefile("#{extension_name}/#{extension_name}")
 
 %x{make clean}