oj 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6defd3e51327c7d866dabb9caf8580c67996b5bd251d9613ec883f186cea522
-  data.tar.gz: 22a9278def6a95047eb280edd38a0be67872e263a9da259f4bdd5b3ab43f400a
+  metadata.gz: bd1a6d1169dfa2ef1c28a09f66c30d1441eeb687580063d9f9e1a7a109aeb12e
+  data.tar.gz: 10b6ab680f89ec60767f7cb35753acdf6eff3aad46e2b4ce0df03548854cab75
 SHA512:
-  metadata.gz: e0da261cf964ecd359e1ea539715c39ebc740fe8fb716b274c65e4b47a52a55033b6011f90b8a09948582df85d0fa0d942ae422b0cafd61cce34d2c0b6046519
-  data.tar.gz: 88c99360a4de1367247d76a8aff7e34f75744f58c2b64465fc3fcb90858c33902ae0c2d3aeaf1a04fe03ce29890cf44f314c6666d1cd9487c4b3355c01e71f58
+  metadata.gz: ea073f98957802f427450a299867dbabde338fd8dc809e1ff7413ee2601dd8c72ed3e0b0e9fc944e06618e2e14f4980d908637f3ac98a021deb6714bccb9c2e5
+  data.tar.gz: f4176bed42ae5092069984ba5f74a07dfacd1f9c6615d5b2ec108b8f37f0c0e95223751528e42f6ab6b17e0eee77cb98f8485df724cbee69df2207ed6274737c

data/ext/oj/custom.c

@@ -501,15 +501,11 @@ dump_common(VALUE obj, int depth, Out out) {
 	if (Yes == out->opts->trace) {
 	    oj_trace("to_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
 	}
-#if HAS_METHOD_ARITY
 	if (0 == rb_obj_method_arity(obj, oj_to_json_id)) {
 	    rs = rb_funcall(obj, oj_to_json_id, 0);
 	} else {
 	    rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
 	}
-#else
-	rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
-#endif
 	if (Yes == out->opts->trace) {
 	    oj_trace("to_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
 	}
@@ -528,15 +524,11 @@ dump_common(VALUE obj, int depth, Out out) {
 	}
 	// Some classes elect to not take an options argument so check the arity
 	// of as_json.
-#if HAS_METHOD_ARITY
 	if (0 == rb_obj_method_arity(obj, oj_as_json_id)) {
 	    aj = rb_funcall(obj, oj_as_json_id, 0);
 	} else {
 	    aj = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
 	}
-#else
-	aj = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
-#endif
 	if (Yes == out->opts->trace) {
 	    oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
 	}
@@ -592,11 +584,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     if (NULL == attr) {
 	attr = "";
     }
-#if HAS_EXCEPTION_MAGIC
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
     }
-#endif
     assure_size(out, size);
     fill_indent(out, depth);
     if ('@' == *attr) {
@@ -671,7 +661,6 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
     if (',' == *(out->cur - 1)) {
 	out->cur--; // backup to overwrite last comma
     }
-#if HAS_EXCEPTION_MAGIC
     if (rb_obj_is_kind_of(obj, rb_eException)) {
 	volatile VALUE	rv;
 
@@ -695,7 +684,6 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	oj_dump_custom_val(rv, d2, out, true);
 	assure_size(out, 2);
     }
-#endif
     out->depth = depth;
 
     fill_indent(out, depth);
@@ -821,9 +809,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	*out->cur++ = '{';
 	fill_indent(out, d2);
 	size = d3 * out->indent + 2;
-#if HAS_STRUCT_MEMBERS
 	ma = rb_struct_s_members(clas);
-#endif
 
 #ifdef RSTRUCT_LEN
 #if RSTRUCT_LEN_RETURNS_INTEGER_OBJECT

data/ext/oj/dump.c

@@ -311,7 +311,7 @@ dump_unicode(const char *str, const char *end, Out out, const char *orig) {
 static const char*
 check_unicode(const char *str, const char *end, const char *orig) {
     uint8_t	b = *(uint8_t*)str;
-    int		cnt;
+    int		cnt = 0;
     
     if (0xC0 == (0xE0 & b)) {
 	cnt = 1;
@@ -375,7 +375,7 @@ oj_dump_time(VALUE obj, Out out, int withZone) {
     long long	sec;
     long long	nsec;
 
-#if HAS_RB_TIME_TIMESPEC
+#ifdef HAVE_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
 
@@ -384,11 +384,7 @@ oj_dump_time(VALUE obj, Out out, int withZone) {
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
 #endif
 
     *b-- = '\0';
@@ -478,7 +474,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
     int		tzhour, tzmin;
     char	tzsign = '+';
 
-#if HAS_RB_TIME_TIMESPEC
+#ifdef HAVE_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
 	sec = ts.tv_sec;
@@ -486,11 +482,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
 #endif
 
     assure_size(out, 36);
@@ -704,13 +696,11 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
 
 void
 oj_dump_str(VALUE obj, int depth, Out out, bool as_ok) {
-#if HAS_ENCODING_SUPPORT
     rb_encoding	*enc = rb_to_encoding(rb_obj_encoding(obj));
 
     if (rb_utf8_encoding() != enc) {
 	obj = rb_str_conv_enc(obj, enc, rb_utf8_encoding());
     }
-#endif
     oj_dump_cstr(rb_string_value_ptr((VALUE*)&obj), (int)RSTRING_LEN(obj), 0, 0, out);
 }
 

data/ext/oj/dump_compat.c

@@ -123,15 +123,11 @@ dump_to_json(VALUE obj, Out out) {
     if (Yes == out->opts->trace) {
 	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyIn);
     }
-#if HAS_METHOD_ARITY
     if (0 == rb_obj_method_arity(obj, oj_to_json_id)) {
 	rs = rb_funcall(obj, oj_to_json_id, 0);
     } else {
 	rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
     }
-#else
-    rs = rb_funcall2(obj, oj_to_json_id, out->argc, out->argv);
-#endif
     if (Yes == out->opts->trace) {
 	oj_trace("to_json", obj, __FILE__, __LINE__, 0, TraceRubyOut);
     }
@@ -474,7 +470,7 @@ time_alt(VALUE obj, int depth, Out out) {
     time_t	sec;
     long long	nsec;
 
-#if HAS_RB_TIME_TIMESPEC
+#ifdef HAVE_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
 	sec = ts.tv_sec;
@@ -482,11 +478,7 @@ time_alt(VALUE obj, int depth, Out out) {
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
 #endif
 
     attrs[0].num = sec;

data/ext/oj/dump_object.c

@@ -346,7 +346,7 @@ dump_hash_class(VALUE obj, VALUE clas, int depth, Out out) {
     *out->cur = '\0';
 }
 
-#if HAS_IVAR_HELPERS
+#ifdef HAVE_RB_IVAR_FOREACH
 static int
 dump_attr_cb(ID key, VALUE value, Out out) {
     int		depth = out->depth;
@@ -364,11 +364,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     if (NULL == attr) {
 	attr = "";
     }
-#if HAS_EXCEPTION_MAGIC
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
     }
-#endif
     assure_size(out, size);
     fill_indent(out, depth);
     if ('@' == *attr) {
@@ -577,7 +575,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
     }
     {
 	int	cnt;
-#if HAS_IVAR_HELPERS
+#ifdef HAVE_RB_IVAR_COUNT
 	cnt = (int)rb_ivar_count(obj);
 #else
 	volatile VALUE	vars = rb_funcall2(obj, oj_instance_variables_id, 0, 0);
@@ -601,7 +599,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    }
 	}
 	out->depth = depth + 1;
-#if HAS_IVAR_HELPERS
+#ifdef HAVE_RB_IVAR_FOREACH
 	rb_ivar_foreach(obj, dump_attr_cb, (VALUE)out);
 	if (',' == *(out->cur - 1)) {
 	    out->cur--; // backup to overwrite last comma
@@ -644,7 +642,6 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    assure_size(out, 2);
 	}
 #endif
-#if HAS_EXCEPTION_MAGIC
 	if (rb_obj_is_kind_of(obj, rb_eException)) {
 	    volatile VALUE	rv;
 
@@ -669,7 +666,6 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    oj_dump_obj_val(rv, d2, out);
 	    assure_size(out, 2);
 	}
-#endif
 	out->depth = depth;
     }
     fill_indent(out, depth);
@@ -701,7 +697,6 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     *out->cur++ = '"';
     *out->cur++ = ':';
     *out->cur++ = '[';
-#if HAS_STRUCT_MEMBERS
     if ('#' == *class_name) {
 	VALUE		ma = rb_struct_s_members(clas);
 	const char	*name;
@@ -725,9 +720,6 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	}
 	*out->cur++ = ']';
     } else {
-#else
-    if (true) {
-#endif
 	fill_indent(out, d3);
 	*out->cur++ = '"';
 	memcpy(out->cur, class_name, len);

data/ext/oj/dump_strict.c

@@ -14,10 +14,6 @@
 #include "dump.h"
 #include "trace.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)
 

data/ext/oj/encode.h

@@ -32,19 +32,11 @@
 #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;
 }
 

data/ext/oj/extconf.rb

@@ -7,7 +7,6 @@ dir_config(extension_name)
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0]
 type = type[4..-1] if type.start_with?('tcs-')
-type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
 is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
 platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
@@ -20,42 +19,15 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => (!is_windows &&
-			     !['arm-linux-gnueabi',
-			       'arm-linux-gnueabihf',
-			       'i386-linux-gnu',
-			       'mips-linux-gnu',
-			       'mipsel-linux-gnu'].include?(platform) &&
-			     '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_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('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,
-  'USE_PTHREAD_MUTEX' => is_windows ? 0 : 1,
-  'USE_RB_MUTEX' => (is_windows && !('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,
   'RSTRUCT_LEN_RETURNS_INTEGER_OBJECT' => ('ruby' == type && '2' == version[0] && '4' == version[1] && '1' >= version[2]) ? 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
-# missing #define. This is the quick and easy way around it.
-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
-  end
-else
-  dflags['NEEDS_STPCPY'] = nil if is_windows
-end
+
+have_func('rb_time_timespec')
+have_func('rb_ivar_count')
+have_func('rb_ivar_foreach')
+have_func('stpcpy')
+have_func('rb_data_object_wrap')
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 
@@ -69,6 +41,7 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+
 create_makefile(File.join(extension_name, extension_name))
 
-#%x{make clean}
+%x{make clean}

data/ext/oj/fast.c

@@ -118,7 +118,7 @@ static VALUE	doc_size(VALUE self);
 VALUE	oj_doc_class = Qundef;
 
 // This is only for CentOS 5.4 with Ruby 1.9.3-p0.
-#ifdef NEEDS_STPCPY
+#ifndef HAVE_STPCPY
 char *stpcpy(char *dest, const char *src) {
     size_t	cnt = strlen(src);
     
@@ -847,7 +847,7 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
     }
 #endif
     // last arg is free func void* func(void*)
-#if HAS_DATA_OBJECT_WRAP
+#ifdef HAVE_RB_DATA_OBJECT_WRAP
     self = rb_data_object_wrap(clas, doc, mark_doc, free_doc_cb);
 #else
     self = rb_data_object_alloc(clas, doc, mark_doc, free_doc_cb);

data/ext/oj/mimic_json.c

@@ -275,14 +275,10 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 	    rb_yield(obj);
 	}
     } else {
-#if HAS_PROC_WITH_BLOCK
 	VALUE	args[1];
 
 	*args = obj;
 	rb_proc_call_with_block(proc, 1, args, Qnil);
-#else
-	rb_raise(rb_eNotImpError, "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
-#endif
     }
     return ST_CONTINUE;
 }

data/ext/oj/object.c

@@ -439,9 +439,9 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
 	    rb_funcall(parent->val, rb_intern("set_backtrace"), 1, value);
 	}
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_lock(&oj_cache_mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_lock(oj_cache_mutex);
 #endif
     if (0 == (var_id = oj_attr_hash_get(key, klen, &slot))) {
@@ -473,9 +473,9 @@ oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
 	}
 	*slot = var_id;
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_unlock(&oj_cache_mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_unlock(oj_cache_mutex);
 #endif
     rb_ivar_set(parent->val, var_id, value);

data/ext/oj/oj.c

@@ -19,10 +19,6 @@
 #include "rails.h"
 #include "encode.h"
 
-#if !HAS_ENCODING_SUPPORT || defined(RUBINIUS_RUBY)
-#define rb_eEncodingError	rb_eException
-#endif
-
 typedef struct _YesNoOpt {
     VALUE	sym;
     char	*attr;
@@ -148,15 +144,11 @@ static VALUE	word_sym;
 static VALUE	xmlschema_sym;
 static VALUE	xss_safe_sym;
 
-#if HAS_ENCODING_SUPPORT
 rb_encoding	*oj_utf8_encoding = 0;
-#else
-VALUE		oj_utf8_encoding = Qnil;
-#endif
 
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 pthread_mutex_t	oj_cache_mutex;
-#elif USE_RB_MUTEX
+#else
 VALUE oj_cache_mutex = Qnil;
 #endif
 
@@ -1488,23 +1480,6 @@ hash_test(VALUE self) {
 }
 */
 
-#if !HAS_ENCODING_SUPPORT
-static VALUE
-iconv_encoder(VALUE x) {
-    VALUE	iconv;
-
-    rb_require("iconv");
-    iconv = rb_const_get(rb_cObject, rb_intern("Iconv"));
-
-    return rb_funcall(iconv, rb_intern("new"), 2, rb_str_new2("ASCII//TRANSLIT"), rb_str_new2("UTF-8"));
-}
-
-static VALUE
-iconv_rescue(VALUE x) {
-    return Qnil;
-}
-#endif
-
 static VALUE
 protect_require(VALUE x) {
     rb_require("time");
@@ -1554,17 +1529,8 @@ Init_oj() {
     rb_require("date");
     // On Rubinius the require fails but can be done from a ruby file.
     rb_protect(protect_require, Qnil, &err);
-#if NEEDS_RATIONAL
-    rb_require("rational");
-#endif
     rb_require("stringio");
-#if HAS_ENCODING_SUPPORT
     oj_utf8_encoding = rb_enc_find("UTF-8");
-#else
-    // need an option to turn this on
-    oj_utf8_encoding = rb_rescue(iconv_encoder, Qnil, iconv_rescue, Qnil);
-    oj_utf8_encoding = Qnil;
-#endif
 
     //rb_define_module_function(Oj, "hash_test", hash_test, 0);
 
@@ -1732,9 +1698,9 @@ Init_oj() {
     oj_odd_init();
     oj_mimic_rails_init();
 
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_init(&oj_cache_mutex, 0);
-#elif USE_RB_MUTEX
+#else
     oj_cache_mutex = rb_mutex_new();
     rb_gc_register_address(&oj_cache_mutex);
 #endif

data/ext/oj/oj.h

@@ -16,14 +16,12 @@ extern "C" {
 #define RSTRING_NOT_MODIFIED
 
 #include "ruby.h"
-#if HAS_ENCODING_SUPPORT
 #include "ruby/encoding.h"
-#endif
 
 #include <stdint.h>
 #include <stdbool.h>
 
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 #include <pthread.h>
 #endif
 #include "cache8.h"
@@ -33,13 +31,8 @@ extern "C" {
 #undef T_COMPLEX
 enum st_retval {ST_CONTINUE = 0, ST_STOP = 1, ST_DELETE = 2, ST_CHECK};
 #else
-#if HAS_TOP_LEVEL_ST_H
-// Only on travis, local is where it is for all others. Seems to vary depending on the travis machine picked up.
-#include "st.h"
-#else
 #include "ruby/st.h"
 #endif
-#endif
 
 #include "rxclass.h"
 #include "err.h"
@@ -292,11 +285,7 @@ extern VALUE	oj_rails_encode(int argc, VALUE *argv, VALUE self);
 
 extern VALUE	Oj;
 extern struct _Options	oj_default_options;
-#if HAS_ENCODING_SUPPORT
 extern rb_encoding	*oj_utf8_encoding;
-#else
-extern VALUE		oj_utf8_encoding;
-#endif
 
 extern VALUE	oj_bag_class;
 extern VALUE	oj_bigdecimal_class;
@@ -376,9 +365,9 @@ extern ID	oj_write_id;
 extern bool	oj_use_hash_alt;
 extern bool	oj_use_array_alt;
 
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 extern pthread_mutex_t	oj_cache_mutex;
-#elif USE_RB_MUTEX
+#else
 extern VALUE	oj_cache_mutex;
 #endif
 

data/ext/oj/parse.c

@@ -707,12 +707,7 @@ oj_parse2(ParseInfo pi) {
 		if (Qnil == pi->proc) {
 		    rb_yield_values2(3, args);
 		} else {
-#if HAS_PROC_WITH_BLOCK
 		    rb_proc_call_with_block(pi->proc, 3, args, Qnil);
-#else
-		    rb_raise(rb_eNotImpError,
-			     "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
-#endif
 		}
 	    } else if (!pi->has_callbacks) {
 		first = 0;
@@ -850,13 +845,11 @@ extern int oj_utf8_index;
 
 static void
 oj_pi_set_input_str(ParseInfo pi, volatile VALUE *inputp) {
-#if HAS_ENCODING_SUPPORT
     rb_encoding	*enc = rb_to_encoding(rb_obj_encoding(*inputp));
 
     if (rb_utf8_encoding() != enc) {
 	*inputp = rb_str_conv_enc(*inputp, enc, rb_utf8_encoding());
     }
-#endif
     pi->json = rb_string_value_ptr((VALUE*)inputp);
     pi->end = pi->json + RSTRING_LEN(*inputp);
 }

data/ext/oj/rails.c

@@ -96,11 +96,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     if (NULL == attr) {
 	attr = "";
     }
-#if HAS_EXCEPTION_MAGIC
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
     }
-#endif
     assure_size(out, size);
     fill_indent(out, depth);
     if ('@' == *attr) {
@@ -306,7 +304,7 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
     time_t	sec;
     long long	nsec;
 
-#if HAS_RB_TIME_TIMESPEC
+#ifdef HAVE_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
 	sec = ts.tv_sec;
@@ -314,11 +312,7 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
 #endif
     dump_sec_nano(obj, sec, nsec, out);
 }
@@ -529,15 +523,11 @@ dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
     }
     // Some classes elect to not take an options argument so check the arity
     // of as_json.
-#if HAS_METHOD_ARITY
     if (0 == rb_obj_method_arity(obj, oj_as_json_id)) {
 	ja = rb_funcall(obj, oj_as_json_id, 0);
     } else {
 	ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
     }
-#else
-    ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
-#endif
     if (Yes == out->opts->trace) {
 	oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
     }
@@ -1024,16 +1014,11 @@ rails_encode(int argc, VALUE *argv, VALUE self) {
 
 static VALUE
 rails_use_standard_json_time_format(VALUE self, VALUE state) {
-    switch (state) {
-    case Qtrue:
-    case Qfalse:
-	break;
-    case Qnil:
+    if (Qtrue == state || Qfalse == state) {
+    } else if (Qnil == state) {
 	state = Qfalse;
-	break;
-    default:
+    } else {
 	state = Qtrue;
-	break;
     }
     rb_iv_set(self, "@use_standard_json_time_format", state);
     xml_time = Qtrue == state;

data/ext/oj/resolve.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 #include <pthread.h>
 #endif
 
@@ -75,9 +75,9 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
     if (No == pi->options.class_cache) {
 	return resolve_classpath(pi, name, len, auto_define, error_class);
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_lock(&oj_cache_mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_lock(oj_cache_mutex);
 #endif
     if (Qnil == (clas = oj_class_hash_get(name, len, &slot))) {
@@ -85,9 +85,9 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
 	    *slot = clas;
 	}
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_unlock(&oj_cache_mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_unlock(oj_cache_mutex);
 #endif
     return clas;

data/ext/oj/sparse.c

@@ -756,13 +756,7 @@ oj_sparse2(ParseInfo pi) {
 		if (Qnil == pi->proc) {
 		    rb_yield_values2(3, args);
 		} else {
-#if HAS_PROC_WITH_BLOCK
 		    rb_proc_call_with_block(pi->proc, 3, args, Qnil);
-#else
-		    oj_set_error_at(pi, rb_eNotImpError, __FILE__, __LINE__,
-				    "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
-		    return;
-#endif
 		}
 	    } else if (!pi->has_callbacks) {
 		first = 0;

data/ext/oj/val_stack.c

@@ -39,9 +39,9 @@ mark(void *ptr) {
     if (0 == ptr) {
 	return;
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_lock(&stack->mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_lock(stack->mutex);
     rb_gc_mark(stack->mutex);
 #endif
@@ -53,18 +53,18 @@ mark(void *ptr) {
 	    rb_gc_mark(v->key_val);
 	}
     }
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_unlock(&stack->mutex);
-#elif USE_RB_MUTEX
+#else
     rb_mutex_unlock(stack->mutex);
 #endif
 }
 
 VALUE
 oj_stack_init(ValStack stack) {
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_init(&stack->mutex, 0);
-#elif USE_RB_MUTEX
+#else
     stack->mutex = rb_mutex_new();
 #endif
     stack->head = stack->base;

data/ext/oj/val_stack.h

@@ -34,7 +34,7 @@
 #include "ruby.h"
 #include "odd.h"
 #include <stdint.h>
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 #include <pthread.h>
 #endif
 
@@ -76,9 +76,9 @@ typedef struct _ValStack {
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
     pthread_mutex_t	mutex;
-#elif USE_RB_MUTEX
+#else
     VALUE		mutex;
 #endif
 
@@ -114,17 +114,17 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	} else {
 	    REALLOC_N(head, struct _Val, len + STACK_INC);
 	}
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 	pthread_mutex_lock(&stack->mutex);
-#elif USE_RB_MUTEX
+#else
 	rb_mutex_lock(stack->mutex);
 #endif
 	stack->head = head;
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
-#if USE_PTHREAD_MUTEX
+#if HAVE_LIBPTHREAD
 	pthread_mutex_unlock(&stack->mutex);
-#elif USE_RB_MUTEX
+#else
 	rb_mutex_unlock(stack->mutex);
 #endif
     }

data/ext/oj/wab.c

@@ -199,7 +199,7 @@ dump_time(VALUE obj, Out out) {
     time_t	sec;
     long long	nsec;
 
-#if HAS_RB_TIME_TIMESPEC
+#ifdef HAVE_RB_TIME_TIMESPEC
     {
 	struct timespec	ts = rb_time_timespec(obj);
 	sec = ts.tv_sec;
@@ -207,11 +207,7 @@ dump_time(VALUE obj, Out out) {
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-#if HAS_NANO_TIME
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
-#else
-    nsec = rb_num2ll(rb_funcall2(obj, oj_tv_usec_id, 0, 0)) * 1000;
-#endif
 #endif
 
     assure_size(out, 36);

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -6,65 +6,27 @@ $: << '../ext'
 
 require 'oj'
 
-#Oj.load(StringIO.new(Oj.dump({ records: 1.upto(25).map{|i| { id: i, name: "record_#{i}" }} }, mode: :strict)))
 
 class MyParser
-  attr_accessor :enum
-
   def initialize
-    @io = StringIO.new
-    @writer = Oj::StreamWriter.new(@io)
-
-    json_string = Oj.dump({ records: 1.upto(25).map{|i| { id: i, name: "record_#{i}" }} }, mode: :strict)
-    @test_json = StringIO.new(json_string)
-
-    @enum = Enumerator.new do |yielder|
-      @yielder = yielder
-      Oj.sc_parse(self, @test_json)
-    end
-  end
-
-  # Stream parsing methods
-  def hash_start
-    @writer.push_object
-  end
-
-  def hash_end
-    @writer.pop unless @io.eof
-  end
-
-  def hash_key(key)
-    @writer.push_key(key)
+    @current_depth = 0
   end
 
-  def hash_set(h, key, value)
-    @writer.push_value(value)
+  def parse(file)
+    Oj.sc_parse(self, file)
   end
 
-  def array_start
-    @writer.push_array
-  end
-
-  def array_end
-    @writer.pop
-  end
-
-  def array_append(a, value)
-    yield_data
-  end
-
-  def add_value(value);end
-
-  def yield_data
-    @writer.pop_all
-    @yielder << @io.string
-    @io.reopen("")
-    array_start
+  def hash_start
+    puts "start"
+    @current_depth += 1
+    raise Exception.new("Hello")
+    {}
   end
-end
 
-MyParser.new.enum.each.with_index do |r, i|
-  break if i == 0
+  # Other Oj::ScHandler methods go below.
+  # The parser's purpose is to find a specific value nested deep within the streaming JSON
+  # and to stop parsing immediately afterward.
 end
 
-
+parser = MyParser.new
+parser.parse(%|{"a":{"b":{"c":{}}}}|)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler