oj 3.7.4 → 3.13.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1352 -0
- data/README.md +29 -8
- data/RELEASE_NOTES.md +61 -0
- data/ext/oj/buf.h +53 -72
- data/ext/oj/cache.c +326 -0
- data/ext/oj/cache.h +21 -0
- data/ext/oj/cache8.c +61 -64
- data/ext/oj/cache8.h +12 -39
- data/ext/oj/circarray.c +37 -43
- data/ext/oj/circarray.h +16 -17
- data/ext/oj/code.c +165 -179
- data/ext/oj/code.h +27 -29
- data/ext/oj/compat.c +174 -194
- data/ext/oj/custom.c +809 -866
- data/ext/oj/debug.c +132 -0
- data/ext/oj/dump.c +848 -863
- data/ext/oj/dump.h +81 -67
- data/ext/oj/dump_compat.c +85 -123
- data/ext/oj/dump_leaf.c +100 -188
- data/ext/oj/dump_object.c +527 -656
- data/ext/oj/dump_strict.c +315 -338
- data/ext/oj/encode.h +7 -34
- data/ext/oj/encoder.c +43 -0
- data/ext/oj/err.c +40 -29
- data/ext/oj/err.h +48 -48
- data/ext/oj/extconf.rb +17 -4
- data/ext/oj/fast.c +1070 -1087
- data/ext/oj/intern.c +301 -0
- data/ext/oj/intern.h +26 -0
- data/ext/oj/mimic_json.c +469 -436
- data/ext/oj/object.c +525 -593
- data/ext/oj/odd.c +154 -138
- data/ext/oj/odd.h +37 -38
- data/ext/oj/oj.c +1325 -986
- data/ext/oj/oj.h +333 -316
- data/ext/oj/parse.c +1002 -846
- data/ext/oj/parse.h +92 -87
- data/ext/oj/parser.c +1557 -0
- data/ext/oj/parser.h +91 -0
- data/ext/oj/rails.c +888 -878
- data/ext/oj/rails.h +11 -14
- data/ext/oj/reader.c +141 -147
- data/ext/oj/reader.h +73 -89
- data/ext/oj/resolve.c +41 -62
- data/ext/oj/resolve.h +7 -9
- data/ext/oj/rxclass.c +71 -75
- data/ext/oj/rxclass.h +18 -19
- data/ext/oj/saj.c +443 -486
- data/ext/oj/saj2.c +602 -0
- data/ext/oj/scp.c +88 -113
- data/ext/oj/sparse.c +787 -709
- data/ext/oj/stream_writer.c +133 -159
- data/ext/oj/strict.c +127 -118
- data/ext/oj/string_writer.c +230 -249
- data/ext/oj/trace.c +34 -41
- data/ext/oj/trace.h +19 -19
- data/ext/oj/usual.c +1254 -0
- data/ext/oj/util.c +136 -0
- data/ext/oj/util.h +20 -0
- data/ext/oj/val_stack.c +59 -67
- data/ext/oj/val_stack.h +91 -129
- data/ext/oj/validate.c +46 -0
- data/ext/oj/wab.c +342 -353
- data/lib/oj/bag.rb +1 -0
- data/lib/oj/easy_hash.rb +5 -4
- data/lib/oj/error.rb +1 -1
- data/lib/oj/json.rb +1 -1
- data/lib/oj/mimic.rb +48 -14
- data/lib/oj/saj.rb +20 -6
- data/lib/oj/state.rb +8 -7
- data/lib/oj/version.rb +2 -2
- data/lib/oj.rb +0 -8
- data/pages/Compatibility.md +1 -1
- data/pages/JsonGem.md +15 -0
- data/pages/Modes.md +53 -46
- data/pages/Options.md +72 -11
- data/pages/Parser.md +309 -0
- data/pages/Rails.md +73 -22
- data/pages/Security.md +1 -1
- data/test/activerecord/result_test.rb +7 -2
- data/test/activesupport5/abstract_unit.rb +45 -0
- data/test/activesupport5/decoding_test.rb +68 -60
- data/test/activesupport5/encoding_test.rb +111 -96
- data/test/activesupport5/encoding_test_cases.rb +33 -25
- data/test/activesupport5/test_helper.rb +43 -21
- data/test/activesupport5/time_zone_test_helpers.rb +18 -3
- data/test/activesupport6/abstract_unit.rb +44 -0
- data/test/activesupport6/decoding_test.rb +133 -0
- data/test/activesupport6/encoding_test.rb +507 -0
- data/test/activesupport6/encoding_test_cases.rb +98 -0
- data/test/activesupport6/test_common.rb +17 -0
- data/test/activesupport6/test_helper.rb +163 -0
- data/test/activesupport6/time_zone_test_helpers.rb +39 -0
- data/test/activesupport7/abstract_unit.rb +49 -0
- data/test/activesupport7/decoding_test.rb +125 -0
- data/test/activesupport7/encoding_test.rb +486 -0
- data/test/activesupport7/encoding_test_cases.rb +104 -0
- data/test/activesupport7/time_zone_test_helpers.rb +47 -0
- data/test/bar.rb +6 -12
- data/test/baz.rb +16 -0
- data/test/bug.rb +16 -0
- data/test/foo.rb +69 -75
- data/test/helper.rb +16 -0
- data/test/json_gem/json_common_interface_test.rb +8 -3
- data/test/json_gem/json_generator_test.rb +18 -4
- data/test/json_gem/json_parser_test.rb +9 -0
- data/test/json_gem/test_helper.rb +12 -0
- data/test/mem.rb +33 -0
- data/test/perf.rb +1 -1
- data/test/perf_dump.rb +50 -0
- data/test/perf_once.rb +58 -0
- data/test/perf_parser.rb +189 -0
- data/test/perf_scp.rb +11 -10
- data/test/perf_strict.rb +17 -23
- data/test/prec.rb +23 -0
- data/test/sample_json.rb +1 -1
- data/test/test_compat.rb +46 -10
- data/test/test_custom.rb +147 -8
- data/test/test_fast.rb +62 -2
- data/test/test_file.rb +25 -2
- data/test/test_gc.rb +13 -0
- data/test/test_generate.rb +21 -0
- data/test/test_hash.rb +11 -1
- data/test/test_integer_range.rb +7 -2
- data/test/test_object.rb +85 -9
- data/test/test_parser.rb +27 -0
- data/test/test_parser_saj.rb +335 -0
- data/test/test_parser_usual.rb +217 -0
- data/test/test_rails.rb +35 -0
- data/test/test_saj.rb +1 -1
- data/test/test_scp.rb +5 -5
- data/test/test_strict.rb +26 -1
- data/test/test_various.rb +87 -65
- data/test/test_wab.rb +2 -0
- data/test/test_writer.rb +19 -2
- data/test/tests.rb +1 -1
- data/test/zoo.rb +13 -0
- metadata +60 -110
- data/ext/oj/hash.c +0 -163
- data/ext/oj/hash.h +0 -46
- data/ext/oj/hash_test.c +0 -512
data/ext/oj/dump.h
CHANGED
@@ -1,10 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
* All rights reserved.
|
4
|
-
*/
|
1
|
+
// Copyright (c) 2011 Peter Ohler. All rights reserved.
|
2
|
+
// Licensed under the MIT License. See LICENSE file in the project root for license details.
|
5
3
|
|
6
|
-
#ifndef
|
7
|
-
#define
|
4
|
+
#ifndef OJ_DUMP_H
|
5
|
+
#define OJ_DUMP_H
|
8
6
|
|
9
7
|
#include <ruby.h>
|
10
8
|
|
@@ -15,80 +13,96 @@
|
|
15
13
|
// Extra padding at end of buffer.
|
16
14
|
#define BUFFER_EXTRA 64
|
17
15
|
|
18
|
-
extern void
|
19
|
-
extern void
|
20
|
-
extern void
|
21
|
-
extern void
|
22
|
-
extern void
|
23
|
-
extern void
|
24
|
-
extern void
|
25
|
-
extern void
|
26
|
-
extern void
|
27
|
-
|
28
|
-
extern void
|
29
|
-
extern void
|
30
|
-
extern void
|
31
|
-
extern void
|
32
|
-
extern void
|
33
|
-
extern void
|
34
|
-
|
35
|
-
extern const char*
|
36
|
-
|
37
|
-
|
38
|
-
extern
|
39
|
-
|
40
|
-
extern void
|
41
|
-
|
42
|
-
extern void
|
43
|
-
extern
|
44
|
-
|
45
|
-
extern void
|
46
|
-
extern void
|
47
|
-
|
48
|
-
extern VALUE
|
49
|
-
extern VALUE
|
50
|
-
|
51
|
-
extern
|
52
|
-
|
53
|
-
extern
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
16
|
+
extern void oj_dump_nil(VALUE obj, int depth, Out out, bool as_ok);
|
17
|
+
extern void oj_dump_true(VALUE obj, int depth, Out out, bool as_ok);
|
18
|
+
extern void oj_dump_false(VALUE obj, int depth, Out out, bool as_ok);
|
19
|
+
extern void oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok);
|
20
|
+
extern void oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok);
|
21
|
+
extern void oj_dump_float(VALUE obj, int depth, Out out, bool as_ok);
|
22
|
+
extern void oj_dump_str(VALUE obj, int depth, Out out, bool as_ok);
|
23
|
+
extern void oj_dump_sym(VALUE obj, int depth, Out out, bool as_ok);
|
24
|
+
extern void oj_dump_class(VALUE obj, int depth, Out out, bool as_ok);
|
25
|
+
|
26
|
+
extern void oj_dump_raw(const char *str, size_t cnt, Out out);
|
27
|
+
extern void oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out);
|
28
|
+
extern void oj_dump_ruby_time(VALUE obj, Out out);
|
29
|
+
extern void oj_dump_xml_time(VALUE obj, Out out);
|
30
|
+
extern void oj_dump_time(VALUE obj, Out out, int withZone);
|
31
|
+
extern void oj_dump_obj_to_s(VALUE obj, Out out);
|
32
|
+
|
33
|
+
extern const char *oj_nan_str(VALUE obj, int opt, int mode, bool plus, int *lenp);
|
34
|
+
|
35
|
+
// initialize an out buffer with the provided stack allocated memory
|
36
|
+
extern void oj_out_init(Out out);
|
37
|
+
// clean up the out buffer if it uses heap allocated memory
|
38
|
+
extern void oj_out_free(Out out);
|
39
|
+
|
40
|
+
extern void oj_grow_out(Out out, size_t len);
|
41
|
+
extern long oj_check_circular(VALUE obj, Out out);
|
42
|
+
|
43
|
+
extern void oj_dump_strict_val(VALUE obj, int depth, Out out);
|
44
|
+
extern void oj_dump_null_val(VALUE obj, int depth, Out out);
|
45
|
+
extern void oj_dump_obj_val(VALUE obj, int depth, Out out);
|
46
|
+
extern void oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok);
|
47
|
+
extern void oj_dump_rails_val(VALUE obj, int depth, Out out);
|
48
|
+
extern void oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
|
49
|
+
extern void oj_dump_wab_val(VALUE obj, int depth, Out out);
|
50
|
+
|
51
|
+
extern void oj_dump_raw_json(VALUE obj, int depth, Out out);
|
52
|
+
|
53
|
+
extern VALUE oj_add_to_json(int argc, VALUE *argv, VALUE self);
|
54
|
+
extern VALUE oj_remove_to_json(int argc, VALUE *argv, VALUE self);
|
55
|
+
|
56
|
+
extern int oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
|
57
|
+
|
58
|
+
extern time_t oj_sec_from_time_hard_way(VALUE obj);
|
59
|
+
|
60
|
+
inline static void assure_size(Out out, size_t len) {
|
58
61
|
if (out->end - out->cur <= (long)len) {
|
59
|
-
|
62
|
+
oj_grow_out(out, len);
|
60
63
|
}
|
61
64
|
}
|
62
65
|
|
63
|
-
inline static void
|
64
|
-
fill_indent(Out out, int cnt) {
|
66
|
+
inline static void fill_indent(Out out, int cnt) {
|
65
67
|
if (0 < out->indent) {
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
}
|
68
|
+
cnt *= out->indent;
|
69
|
+
*out->cur++ = '\n';
|
70
|
+
memset(out->cur, ' ', cnt);
|
71
|
+
out->cur += cnt;
|
71
72
|
}
|
72
73
|
}
|
73
74
|
|
74
|
-
inline static
|
75
|
-
|
76
|
-
|
77
|
-
|
75
|
+
inline static bool dump_ignore(Options opts, VALUE obj) {
|
76
|
+
if (NULL != opts->ignore && (ObjectMode == opts->mode || CustomMode == opts->mode)) {
|
77
|
+
VALUE *vp = opts->ignore;
|
78
|
+
VALUE clas = rb_obj_class(obj);
|
79
|
+
|
80
|
+
for (; Qnil != *vp; vp++) {
|
81
|
+
if (clas == *vp) {
|
82
|
+
return true;
|
83
|
+
}
|
84
|
+
}
|
85
|
+
}
|
86
|
+
return false;
|
87
|
+
}
|
88
|
+
|
89
|
+
inline static void dump_ulong(unsigned long num, Out out) {
|
90
|
+
char buf[32];
|
91
|
+
char *b = buf + sizeof(buf) - 1;
|
92
|
+
size_t cnt = 0;
|
78
93
|
|
79
94
|
*b-- = '\0';
|
80
95
|
if (0 < num) {
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
96
|
+
for (; 0 < num; num /= 10, b--) {
|
97
|
+
*b = (num % 10) + '0';
|
98
|
+
}
|
99
|
+
b++;
|
85
100
|
} else {
|
86
|
-
|
87
|
-
}
|
88
|
-
for (; '\0' != *b; b++) {
|
89
|
-
*out->cur++ = *b;
|
101
|
+
*b = '0';
|
90
102
|
}
|
103
|
+
cnt = sizeof(buf) - (b - buf) - 1;
|
104
|
+
APPEND_CHARS(out->cur, b, cnt);
|
91
105
|
*out->cur = '\0';
|
92
106
|
}
|
93
107
|
|
94
|
-
#endif /*
|
108
|
+
#endif /* OJ_DUMP_H */
|