oj 3.7.4 → 3.11.2

data/ext/oj/val_stack.c

@@ -1,34 +1,9 @@
-/* val_stack.c
- * 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.
+
+#include <string.h>
 
 #include "oj.h"
+#include "odd.h"
 #include "val_stack.h"
 
 static void
@@ -39,7 +14,7 @@ mark(void *ptr) {
     if (0 == ptr) {
 	return;
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&stack->mutex);
 #else
     rb_mutex_lock(stack->mutex);
@@ -52,8 +27,18 @@ mark(void *ptr) {
 	if (Qnil != v->key_val && Qundef != v->key_val) {
 	    rb_gc_mark(v->key_val);
 	}
+	if (NULL != v->odd_args) {
+	    VALUE	*a;
+	    int		i;
+
+	    for (i = v->odd_args->odd->attr_cnt, a = v->odd_args->args; 0 < i; i--, a++) {
+		if (Qnil != *a) {
+		    rb_gc_mark(*a);
+		}
+	    }
+	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&stack->mutex);
 #else
     rb_mutex_unlock(stack->mutex);
@@ -62,21 +47,28 @@ mark(void *ptr) {
 
 VALUE
 oj_stack_init(ValStack stack) {
-#if HAVE_LIBPTHREAD
-    pthread_mutex_init(&stack->mutex, 0);
+#ifdef HAVE_PTHREAD_MUTEX_INIT
+    int	err;
+
+    if (0 != (err = pthread_mutex_init(&stack->mutex, 0))) {
+	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
+    }
 #else
     stack->mutex = rb_mutex_new();
 #endif
     stack->head = stack->base;
-    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Val);
+    stack->end = stack->base + sizeof(stack->base) / sizeof(struct _val);
     stack->tail = stack->head;
     stack->head->val = Qundef;
-    stack->head->key = 0;
+    stack->head->key = NULL;
     stack->head->key_val = Qundef;
-    stack->head->classname = 0;
+    stack->head->classname = NULL;
+    stack->head->odd_args = NULL;
+    stack->head->clas = Qundef;
     stack->head->klen = 0;
     stack->head->clen = 0;
     stack->head->next = NEXT_NONE;
+
     return Data_Wrap_Struct(oj_cstack_class, mark, 0, stack);
 }
 

data/ext/oj/val_stack.h

@@ -1,40 +1,12 @@
-/* val_stack.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_VAL_STACK_H__
-#define __OJ_VAL_STACK_H__
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
+
+#ifndef OJ_VAL_STACK_H
+#define OJ_VAL_STACK_H
 
 #include "ruby.h"
 #include "odd.h"
 #include <stdint.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -52,18 +24,14 @@ typedef enum {
     NEXT_HASH_COMMA	= 'n',
 } ValNext;
 
-typedef struct _Val {
+typedef struct _val {
     volatile VALUE	val;
     const char		*key;
     char		karray[32];
     volatile VALUE	key_val;
-    union {
-	struct {
-	    const char	*classname;
-	    VALUE	clas;
-	};
-	OddArgs		odd_args;
-    };
+    const char		*classname;
+    VALUE		clas;
+    OddArgs		odd_args;
     uint16_t		klen;
     uint16_t		clen;
     char		next; // ValNext
@@ -71,12 +39,12 @@ typedef struct _Val {
     char		kalloc;
 } *Val;
 
-typedef struct _ValStack {
-    struct _Val		base[STACK_INC];
+typedef struct _valStack {
+    struct _val		base[STACK_INC];
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_t	mutex;
 #else
     VALUE		mutex;
@@ -109,12 +77,12 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	// A realloc can trigger a GC so make sure it happens outside the lock
 	// but lock before changing pointers.
 	if (stack->base == stack->head) {
-	    head = ALLOC_N(struct _Val, len + STACK_INC);
-	    memcpy(head, stack->base, sizeof(struct _Val) * len);
+	    head = ALLOC_N(struct _val, len + STACK_INC);
+	    memcpy(head, stack->base, sizeof(struct _val) * len);
 	} else {
-	    REALLOC_N(head, struct _Val, len + STACK_INC);
+	    REALLOC_N(head, struct _val, len + STACK_INC);
 	}
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_lock(&stack->mutex);
 #else
 	rb_mutex_lock(stack->mutex);
@@ -122,7 +90,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	stack->head = head;
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_unlock(&stack->mutex);
 #else
 	rb_mutex_unlock(stack->mutex);
@@ -132,6 +100,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
     stack->tail->next = next;
     stack->tail->classname = NULL;
     stack->tail->clas = Qundef;
+    stack->tail->odd_args = NULL;
     stack->tail->key = 0;
     stack->tail->key_val = Qundef;
     stack->tail->clen = 0;
@@ -185,4 +154,4 @@ stack_pop(ValStack stack) {
 
 extern const char*	oj_stack_next_string(ValNext n);
 
-#endif /* __OJ_VAL_STACK_H__ */
+#endif /* OJ_VAL_STACK_H */

data/ext/oj/wab.c

@@ -1,7 +1,4 @@
-/* wab.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,6 +12,7 @@
 #include "encode.h"
 #include "dump.h"
 #include "trace.h"
+#include "util.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
@@ -147,11 +145,12 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 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;
     long	size;
     int		rtype = rb_type(key);
-    
+
     if (rtype != T_SYMBOL) {
 	rb_raise(rb_eTypeError, "In :wab mode all Hash keys must be Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
@@ -193,17 +192,21 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_time(VALUE obj, Out out) {
-    char	buf[64];
-    struct tm	*tm;
-    int		len;
-    time_t	sec;
-    long long	nsec;
+    char		buf[64];
+    struct _timeInfo	ti;
+    int			len;
+    time_t		sec;
+    long long		nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
+
 	sec = ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
@@ -212,11 +215,9 @@ dump_time(VALUE obj, Out out) {
 
     assure_size(out, 36);
     // 2012-01-05T23:58:07.123456000Z
-    tm = gmtime(&sec);
+    sec_as_time(sec, &ti);
 
-    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ",
-		  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		  tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec);
+    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
     oj_dump_cstr(buf, len, 0, 0, out);
 }
 
@@ -267,7 +268,7 @@ static DumpFunc	wab_funcs[] = {
 void
 oj_dump_wab_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
@@ -291,21 +292,21 @@ oj_dump_wab_val(VALUE obj, int depth, Out out) {
 ///// load functions /////
 
 static void
-hash_end(struct _ParseInfo *pi) {
+hash_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);
     }
 }
 
 static void
-array_end(struct _ParseInfo *pi) {
+array_end(ParseInfo pi) {
     if (Yes == pi->options.trace) {
 	oj_trace_parse_array_end(pi, __FILE__, __LINE__);
     }
 }
 
 static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
@@ -321,7 +322,7 @@ add_value(ParseInfo pi, VALUE val) {
 static bool
 uuid_check(const char *str, int len) {
     int		i;
-    
+
     for (i = 0; i < 8; i++, str++) {
 	if ('x' != hex_chars[*(uint8_t*)str]) {
 	    return false;
@@ -377,7 +378,7 @@ time_parse(const char *s, int len) {
     long	nsecs = 0;
     int		i;
     time_t	secs;
-    
+
     memset(&tm, 0, sizeof(tm));
     if ('-' == *s) {
 	s++;
@@ -441,7 +442,7 @@ protect_uri(VALUE rstr) {
 static VALUE
 cstr_to_rstr(const char *str, size_t len) {
     volatile VALUE	v = Qnil;
-    
+
     if (30 == len && '-' == str[4] && '-' == str[7] && 'T' == str[10] && ':' == str[13] && ':' == str[16]  && '.' == str[19] && 'Z' == str[29]) {
 	if (Qnil != (v = time_parse(str, (int)len))) {
 	    return v;
@@ -516,9 +517,9 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 }
 
 static void
-hash_set_num(struct _ParseInfo *pi, Val parent, NumInfo ni) {
+hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = Qnil;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -548,7 +549,7 @@ start_array(ParseInfo pi) {
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = cstr_to_rstr(str, len);
-    
+
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
@@ -598,7 +599,7 @@ oj_set_wab_callbacks(ParseInfo pi) {
 
 VALUE
 oj_wab_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -615,7 +616,7 @@ oj_wab_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_wab_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;
@@ -625,4 +626,3 @@ oj_wab_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     return oj_pi_parse(argc, argv, &pi, json, len, true);
 }
-

data/lib/oj.rb

@@ -2,14 +2,6 @@
 module Oj
 end
 
-begin
-  # This require exists to get around Rubinius failing to load bigdecimal from
-  # the C extension.
-  require 'bigdecimal'
-rescue Exception
-  # ignore
-end
-
 require 'oj/version'
 require 'oj/bag'
 require 'oj/easy_hash'

data/lib/oj/json.rb

@@ -95,7 +95,7 @@ module JSON
   State = ::JSON::Ext::Generator::State unless defined?(::JSON::State)
 
   begin
-    Object.send(:remove_const, :Parser)
+    send(:remove_const, :Parser)
   rescue
   end
   Parser = ::JSON::Ext::Parser unless defined?(::JSON::Parser)

data/lib/oj/mimic.rb

@@ -8,6 +8,50 @@ end
 
 module Oj
 
+  ##
+  # Custom mode can be used to emulate the compat mode with some minor
+  # differences. These are the options that setup the custom mode to be like
+  # the compat mode.
+  CUSTOM_MIMIC_JSON_OPTIONS = {
+    allow_gc: true,
+    allow_invalid_unicode: false,
+    allow_nan: false,
+    array_class: nil,
+    array_nl: nil,
+    auto_define: false,
+    bigdecimal_as_decimal: false,
+    bigdecimal_load: :auto,
+    circular: false,
+    class_cache: false,
+    create_additions: false,
+    create_id: "json_class",
+    empty_string: false,
+    escape_mode: :unicode_xss,
+    float_precision: 0,
+    hash_class: nil,
+    ignore: nil,
+    ignore_under: false,
+    indent: 0,
+    integer_range: nil,
+    mode: :custom,
+    nan: :raise,
+    nilnil: false,
+    object_nl: nil,
+    omit_nil: false,
+    quirks_mode: true,
+    safe: false,
+    second_precision: 3,
+    space: nil,
+    space_before: nil,
+    symbol_keys: false,
+    time_format: :ruby,
+    trace: false,
+    use_as_json: false,
+    use_raw_json: false,
+    use_to_hash: false,
+    use_to_json: true,
+  }
+
   # A bit hack-ish but does the trick. The JSON.dump_default_options is a Hash
   # but in mimic we use a C struct to store defaults. This class creates a view
   # onto that struct.
@@ -31,14 +75,14 @@ module Oj
   end
 
   # Loads mimic-ed JSON paths. Used by Oj.mimic_JSON().
-  # @param mimic_path [Array] additional paths to add to the Ruby loaded features.
+  # @param mimic_paths [Array] additional paths to add to the Ruby loaded features.
   def self.mimic_loaded(mimic_paths=[])
     $LOAD_PATH.each do |d|
       next unless File.exist?(d)
 
       jfile = File.join(d, 'json.rb')
       $LOADED_FEATURES << jfile unless $LOADED_FEATURES.include?(jfile) if File.exist?(jfile)
-      
+
       Dir.glob(File.join(d, 'json', '**', '*.rb')).each do |file|
         # allow json/add/xxx to be loaded. User can override with Oj.add_to_json(xxx).
         $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file) unless file.include?('add')