oj 3.7.4 → 3.11.2

data/ext/oj/stream_writer.c

@@ -1,13 +1,10 @@
-/* stream_writer.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include <errno.h>
 
 #include <ruby.h>
 
-#include "oj.h"
+#include "encode.h"
 
 extern VALUE	Oj;
 
@@ -36,11 +33,17 @@ stream_writer_write(StreamWriter sw) {
 
     switch (sw->type) {
     case STRING_IO:
-	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
-	break;
-    case STREAM_IO:
-	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
+    case STREAM_IO: {
+	volatile VALUE	rs = rb_str_new(sw->sw.out.buf, size);
+
+	// Oddly enough, when pushing ASCII characters with UTF-8 encoding or
+	// even ASCII-8BIT does not change the output encoding. Pushing any
+	// non-ASCII no matter what the encoding changes the output encoding
+	// to ASCII-8BIT if it the string is not forced to UTF-8 here.
+	rs = oj_encode(rs);
+	rb_funcall(sw->stream, oj_write_id, 1, rs);
 	break;
+    }
     case FILE_IO:
 	if (size != write(sw->fd, sw->sw.out.buf, size)) {
 	    rb_raise(rb_eIOError, "Write failed. [_%d_:%s]\n", errno, strerror(errno));
@@ -80,7 +83,7 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
 #if !IS_WINDOWS
     VALUE		s;
 #endif
-    
+
     if (oj_stringio_class == clas) {
 	type = STRING_IO;
 #if !IS_WINDOWS
@@ -94,14 +97,14 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
     } else {
 	rb_raise(rb_eArgError, "expected an IO Object.");
     }
-    sw = ALLOC(struct _StreamWriter);
+    sw = ALLOC(struct _streamWriter);
     if (2 == argc && T_HASH == rb_type(argv[1])) {
 	volatile VALUE	v;
 	int		buf_size = 0;
 
 	if (Qundef == buffer_size_sym) {
 	    buffer_size_sym = ID2SYM(rb_intern("buffer_size"));	rb_gc_register_address(&buffer_size_sym);
-	    
+
 	}
 	if (Qnil != (v = rb_hash_lookup(argv[1], buffer_size_sym))) {
 #ifdef RUBY_INTEGER_UNIFICATION
@@ -334,7 +337,7 @@ stream_writer_flush(VALUE self) {
 }
 
 /* Document-class: Oj::StreamWriter
- * 
+ *
  * Supports building a JSON document one element at a time. Build the IO stream
  * document by pushing values into the document. Pushing an array or an object
  * will create that element in the JSON document and subsequent pushes will add
@@ -353,5 +356,3 @@ oj_stream_writer_init() {
     rb_define_method(oj_stream_writer_class, "pop_all", stream_writer_pop_all, 0);
     rb_define_method(oj_stream_writer_class, "flush", stream_writer_flush, 0);
 }
-
-

data/ext/oj/strict.c

@@ -1,7 +1,4 @@
-/* strict.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -15,21 +12,21 @@
 #include "trace.h"
 
 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;
 }
 
@@ -100,9 +97,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	v;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -143,7 +140,7 @@ array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
 static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     volatile VALUE	v;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -183,7 +180,7 @@ oj_set_strict_callbacks(ParseInfo pi) {
 
 VALUE
 oj_strict_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     parse_info_init(&pi);
     pi.options = oj_default_options;
@@ -200,7 +197,7 @@ oj_strict_parse(int argc, VALUE *argv, VALUE self) {
 
 VALUE
 oj_strict_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/string_writer.c

@@ -1,13 +1,12 @@
-/* strwriter.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "dump.h"
 #include "encode.h"
 
 extern VALUE	Oj;
 
+bool	string_writer_optimized = false;
+
 static void
 key_check(StrWriter sw, const char *key) {
     DumpType	type = sw->types[sw->depth];
@@ -152,7 +151,7 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 void
 oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
     Out	out = &sw->out;
-    
+
     if (sw->keyWritten) {
 	sw->keyWritten = 0;
     } else {
@@ -272,8 +271,8 @@ str_writer_free(void *ptr) {
  */
 static VALUE
 str_writer_new(int argc, VALUE *argv, VALUE self) {
-    StrWriter	sw = ALLOC(struct _StrWriter);
-    
+    StrWriter	sw = ALLOC(struct _strWriter);
+
     oj_str_writer_init(sw, 0);
     if (1 == argc) {
 	oj_parse_options(argv[0], &sw->opts);
@@ -487,8 +486,26 @@ str_writer_to_s(VALUE self) {
     return oj_encode(rstr);
 }
 
+/* Document-method: as_json
+ * call-seq: as_json()
+ *
+ * Returns the contents of the writer as a JSON element. If called from inside
+ * an array or hash by Oj the raw buffer will be used othersize a more
+ * inefficient parse of the contents and a return of the result is
+ * completed. The parse uses the trict mode.
+ *
+ * *return* [_Hash_|_Array_|_String_|_Integer_|_Float_|_True_|_False_|_nil|)
+ */
+static VALUE
+str_writer_as_json(VALUE self) {
+    if (string_writer_optimized) {
+	return self;
+    }
+    return rb_hash_new();
+}
+
 /* Document-class: Oj::StringWriter
- * 
+ *
  * Supports building a JSON document one element at a time. Build the document
  * by pushing values into the document. Pushing an array or an object will
  * create that element in the JSON document and subsequent pushes will add the
@@ -509,4 +526,6 @@ oj_string_writer_init() {
     rb_define_method(oj_string_writer_class, "pop_all", str_writer_pop_all, 0);
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
     rb_define_method(oj_string_writer_class, "to_s", str_writer_to_s, 0);
+    rb_define_method(oj_string_writer_class, "raw_json", str_writer_to_s, 0);
+    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, 0);
 }

data/ext/oj/trace.c

@@ -1,7 +1,4 @@
-/* trace.h
- * Copyright (c) 2018, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2018 Peter Ohler. All rights reserved.
 
 #include "parse.h"
 #include "trace.h"
@@ -37,7 +34,7 @@ oj_trace_parse_call(const char *func, ParseInfo pi, const char *file, int line,
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:-:%%%ds %%s %%s\n", depth);
     printf(fmt, file, line, indent, func, rb_obj_classname(obj));
@@ -48,7 +45,7 @@ oj_trace_parse_in(const char *func, ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:}:%%%ds %%s\n", depth);
     printf(fmt, file, line, indent, func);
@@ -61,7 +58,7 @@ oj_trace_parse_hash_end(ParseInfo pi, const char *file, int line) {
     int		depth = (int)(stack_size(&pi->stack) * 2 - 2);
     Val		v = stack_peek(&pi->stack);
     VALUE	obj = v->val;
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds hash_end %%s\n", depth);
     printf(fmt, file, line, indent, rb_obj_classname(obj));
@@ -72,7 +69,7 @@ oj_trace_parse_array_end(ParseInfo pi, const char *file, int line) {
     char	fmt[64];
     char	indent[MAX_INDENT];
     int		depth = (int)(stack_size(&pi->stack) * 2);
-    
+
     fill_indent(indent, depth);
     sprintf(fmt, "#0:%%13s:%%3d:Oj:{:%%%ds array_ned\n", depth);
     printf(fmt, file, line, indent);

data/ext/oj/trace.h

@@ -1,10 +1,7 @@
-/* trace.h
- * Copyright (c) 2018, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2018 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_TRACE_H__
-#define __OJ_TRACE_H__
+#ifndef OJ_TRACE_H
+#define OJ_TRACE_H
 
 #include <stdbool.h>
 #include <ruby.h>
@@ -17,12 +14,12 @@ typedef enum {
     TraceRubyOut	= '<',
 } TraceWhere;
 
-struct _ParseInfo;
+struct _parseInfo;
 
 extern void	oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where);
-extern void	oj_trace_parse_in(const char *func, struct _ParseInfo *pi, const char *file, int line);
-extern void	oj_trace_parse_call(const char *func, struct _ParseInfo *pi, const char *file, int line, VALUE obj);
-extern void	oj_trace_parse_hash_end(struct _ParseInfo *pi, const char *file, int line);
-extern void	oj_trace_parse_array_end(struct _ParseInfo *pi, const char *file, int line);
+extern void	oj_trace_parse_in(const char *func, struct _parseInfo *pi, const char *file, int line);
+extern void	oj_trace_parse_call(const char *func, struct _parseInfo *pi, const char *file, int line, VALUE obj);
+extern void	oj_trace_parse_hash_end(struct _parseInfo *pi, const char *file, int line);
+extern void	oj_trace_parse_array_end(struct _parseInfo *pi, const char *file, int line);
 
-#endif /* __OJ_TRACE_H__ */
+#endif /* OJ_TRACE_H */

data/ext/oj/util.c

@@ -0,0 +1,136 @@
+// Copyright (c) 2019 Peter Ohler. All rights reserved.
+
+#include "util.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#define SECS_PER_DAY		86400LL
+#define SECS_PER_YEAR		31536000LL
+#define SECS_PER_LEAP		31622400LL
+#define SECS_PER_QUAD_YEAR	(SECS_PER_YEAR * 3 + SECS_PER_LEAP)
+#define SECS_PER_CENT		(SECS_PER_QUAD_YEAR * 24 + SECS_PER_YEAR * 4)
+#define SECS_PER_LEAP_CENT	(SECS_PER_CENT + SECS_PER_DAY)
+#define SECS_PER_QUAD_CENT	(SECS_PER_CENT * 4 + SECS_PER_DAY)
+
+static int64_t	eom_secs[] = {
+    2678400,  // January (31)
+    5097600,  // February (28)	2419200	 2505600
+    7776000,  // March (31)
+    10368000, // April (30  2592000
+    13046400, // May (31)
+    15638400, // June (30)
+    18316800, // July (31)
+    20995200, // August (31)
+    23587200, // September (30)
+    26265600, // October (31)
+    28857600, // November (30)
+    31536000, // December (31)
+};
+
+static int64_t	eom_leap_secs[] = {
+    2678400,  // January (31)
+    5184000,  // February (28)	2419200	 2505600
+    7862400,  // March (31)
+    10454400, // April (30  2592000
+    13132800, // May (31)
+    15724800, // June (30)
+    18403200, // July (31)
+    21081600, // August (31)
+    23673600, // September (30)
+    26352000, // October (31)
+    28944000, // November (30)
+    31622400, // December (31)
+};
+
+
+void
+sec_as_time(int64_t secs, TimeInfo ti) {
+    int64_t	qc = 0;
+    int64_t	c = 0;
+    int64_t	qy = 0;
+    int64_t	y = 0;
+    bool	leap = false;
+    int64_t	*ms;
+    int		m;
+    int		shift = 0;
+
+    secs += 62167219200LL; // normalize to first day of the year 0
+    if (secs < 0) {
+	shift = -secs / SECS_PER_QUAD_CENT;
+	shift++;
+	secs += shift * SECS_PER_QUAD_CENT;
+    }
+    qc = secs / SECS_PER_QUAD_CENT;
+    secs = secs - qc * SECS_PER_QUAD_CENT;
+    if (secs < SECS_PER_LEAP) {
+	leap = true;
+    } else if (secs < SECS_PER_QUAD_YEAR) {
+	if (SECS_PER_LEAP <= secs) {
+	    secs -= SECS_PER_LEAP;
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	    y++;
+	    leap = false;
+	}
+    } else if (secs < SECS_PER_LEAP_CENT) { // first century in 400 years is a leap century (one extra day)
+	qy = secs / SECS_PER_QUAD_YEAR;
+	secs = secs - qy * SECS_PER_QUAD_YEAR;
+	if (secs < SECS_PER_LEAP) {
+	    leap = true;
+	} else {
+	    secs -= SECS_PER_LEAP;
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	    y++;
+	}
+    } else {
+	secs -= SECS_PER_LEAP_CENT;
+	c = secs / SECS_PER_CENT;
+	secs = secs - c * SECS_PER_CENT;
+	c++;
+	if (secs < SECS_PER_YEAR * 4) {
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	} else {
+	    secs -= SECS_PER_YEAR * 4;
+	    qy = secs / SECS_PER_QUAD_YEAR;
+	    secs = secs - qy * SECS_PER_QUAD_YEAR;
+	    qy++;
+	    if (secs < SECS_PER_LEAP) {
+		leap = true;
+	    } else {
+		secs -= SECS_PER_LEAP;
+		y = secs / SECS_PER_YEAR;
+		secs = secs - y * SECS_PER_YEAR;
+		y++;
+	    }
+	}
+    }
+    ti->year = (int)((qc - (int64_t)shift) * 400 + c * 100 + qy * 4 + y);
+    if (leap) {
+	ms = eom_leap_secs;
+    } else {
+	ms = eom_secs;
+    }
+    for (m = 1; m <= 12; m++, ms++) {
+	if (secs < *ms) {
+	    if (1 < m) {
+		secs -= *(ms - 1);
+	    }
+	    ti->mon = m;
+	    break;
+	}
+    }
+    ti->day = (int)(secs / 86400LL);
+    secs = secs - (int64_t)ti->day * 86400LL;
+    ti->day++;
+    ti->hour = (int)(secs / 3600LL);
+    secs = secs - (int64_t)ti->hour * 3600LL;
+    ti->min = (int)(secs / 60LL);
+    secs = secs - (int64_t)ti->min * 60LL;
+    ti->sec = (int)secs;
+}

data/ext/oj/util.h

@@ -0,0 +1,19 @@
+// Copyright (c) 2019 Peter Ohler. All rights reserved.
+
+#ifndef OJ_UTIL_H
+#define OJ_UTIL_H
+
+#include <stdint.h>
+
+typedef struct _timeInfo {
+    int sec;
+    int min;
+    int hour;
+    int day;
+    int mon;
+    int year;
+} *TimeInfo;
+
+extern void	sec_as_time(int64_t secs, TimeInfo ti);
+
+#endif /* OJ_UTIL_H */