oj 3.7.4 → 3.13.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (147) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +1360 -0
  3. data/README.md +31 -8
  4. data/RELEASE_NOTES.md +61 -0
  5. data/ext/oj/buf.h +53 -72
  6. data/ext/oj/cache.c +326 -0
  7. data/ext/oj/cache.h +21 -0
  8. data/ext/oj/cache8.c +61 -64
  9. data/ext/oj/cache8.h +12 -39
  10. data/ext/oj/circarray.c +37 -43
  11. data/ext/oj/circarray.h +16 -17
  12. data/ext/oj/code.c +165 -179
  13. data/ext/oj/code.h +27 -29
  14. data/ext/oj/compat.c +174 -194
  15. data/ext/oj/custom.c +790 -866
  16. data/ext/oj/debug.c +132 -0
  17. data/ext/oj/dump.c +848 -863
  18. data/ext/oj/dump.h +81 -67
  19. data/ext/oj/dump_compat.c +85 -123
  20. data/ext/oj/dump_leaf.c +100 -188
  21. data/ext/oj/dump_object.c +527 -656
  22. data/ext/oj/dump_strict.c +315 -338
  23. data/ext/oj/encode.h +7 -34
  24. data/ext/oj/encoder.c +43 -0
  25. data/ext/oj/err.c +40 -29
  26. data/ext/oj/err.h +48 -48
  27. data/ext/oj/extconf.rb +17 -4
  28. data/ext/oj/fast.c +1073 -1088
  29. data/ext/oj/intern.c +298 -0
  30. data/ext/oj/intern.h +26 -0
  31. data/ext/oj/mimic_json.c +469 -436
  32. data/ext/oj/object.c +532 -599
  33. data/ext/oj/odd.c +154 -138
  34. data/ext/oj/odd.h +37 -38
  35. data/ext/oj/oj.c +1333 -986
  36. data/ext/oj/oj.h +336 -316
  37. data/ext/oj/parse.c +1002 -846
  38. data/ext/oj/parse.h +92 -87
  39. data/ext/oj/parser.c +1587 -0
  40. data/ext/oj/parser.h +102 -0
  41. data/ext/oj/rails.c +888 -878
  42. data/ext/oj/rails.h +11 -14
  43. data/ext/oj/reader.c +141 -147
  44. data/ext/oj/reader.h +73 -89
  45. data/ext/oj/resolve.c +41 -62
  46. data/ext/oj/resolve.h +7 -9
  47. data/ext/oj/rxclass.c +71 -75
  48. data/ext/oj/rxclass.h +18 -19
  49. data/ext/oj/saj.c +443 -486
  50. data/ext/oj/saj2.c +596 -0
  51. data/ext/oj/saj2.h +23 -0
  52. data/ext/oj/scp.c +88 -113
  53. data/ext/oj/sparse.c +787 -709
  54. data/ext/oj/stream_writer.c +133 -159
  55. data/ext/oj/strict.c +127 -118
  56. data/ext/oj/string_writer.c +230 -249
  57. data/ext/oj/trace.c +34 -41
  58. data/ext/oj/trace.h +19 -19
  59. data/ext/oj/usual.c +1207 -0
  60. data/ext/oj/usual.h +68 -0
  61. data/ext/oj/util.c +136 -0
  62. data/ext/oj/util.h +20 -0
  63. data/ext/oj/val_stack.c +60 -68
  64. data/ext/oj/val_stack.h +91 -129
  65. data/ext/oj/validate.c +46 -0
  66. data/ext/oj/wab.c +342 -353
  67. data/lib/oj/bag.rb +1 -0
  68. data/lib/oj/easy_hash.rb +5 -4
  69. data/lib/oj/error.rb +1 -1
  70. data/lib/oj/json.rb +1 -1
  71. data/lib/oj/mimic.rb +48 -14
  72. data/lib/oj/saj.rb +20 -6
  73. data/lib/oj/state.rb +9 -8
  74. data/lib/oj/version.rb +2 -2
  75. data/lib/oj.rb +0 -8
  76. data/pages/Compatibility.md +1 -1
  77. data/pages/JsonGem.md +15 -0
  78. data/pages/Modes.md +53 -46
  79. data/pages/Options.md +78 -11
  80. data/pages/Parser.md +309 -0
  81. data/pages/Rails.md +73 -22
  82. data/pages/Security.md +1 -1
  83. data/test/activerecord/result_test.rb +7 -2
  84. data/test/activesupport5/abstract_unit.rb +45 -0
  85. data/test/activesupport5/decoding_test.rb +68 -60
  86. data/test/activesupport5/encoding_test.rb +111 -96
  87. data/test/activesupport5/encoding_test_cases.rb +33 -25
  88. data/test/activesupport5/test_helper.rb +43 -21
  89. data/test/activesupport5/time_zone_test_helpers.rb +18 -3
  90. data/test/activesupport6/abstract_unit.rb +44 -0
  91. data/test/activesupport6/decoding_test.rb +133 -0
  92. data/test/activesupport6/encoding_test.rb +507 -0
  93. data/test/activesupport6/encoding_test_cases.rb +98 -0
  94. data/test/activesupport6/test_common.rb +17 -0
  95. data/test/activesupport6/test_helper.rb +163 -0
  96. data/test/activesupport6/time_zone_test_helpers.rb +39 -0
  97. data/test/activesupport7/abstract_unit.rb +49 -0
  98. data/test/activesupport7/decoding_test.rb +125 -0
  99. data/test/activesupport7/encoding_test.rb +486 -0
  100. data/test/activesupport7/encoding_test_cases.rb +104 -0
  101. data/test/activesupport7/time_zone_test_helpers.rb +47 -0
  102. data/test/bar.rb +6 -12
  103. data/test/baz.rb +16 -0
  104. data/test/bug.rb +16 -0
  105. data/test/foo.rb +69 -75
  106. data/test/helper.rb +16 -0
  107. data/test/json_gem/json_common_interface_test.rb +8 -3
  108. data/test/json_gem/json_generator_test.rb +21 -8
  109. data/test/json_gem/json_parser_test.rb +8 -1
  110. data/test/json_gem/test_helper.rb +12 -0
  111. data/test/mem.rb +33 -0
  112. data/test/perf.rb +1 -1
  113. data/test/perf_dump.rb +50 -0
  114. data/test/perf_once.rb +58 -0
  115. data/test/perf_parser.rb +189 -0
  116. data/test/perf_scp.rb +11 -10
  117. data/test/perf_strict.rb +17 -23
  118. data/test/prec.rb +23 -0
  119. data/test/sample_json.rb +1 -1
  120. data/test/test_compat.rb +46 -10
  121. data/test/test_custom.rb +145 -7
  122. data/test/test_fast.rb +62 -2
  123. data/test/test_file.rb +23 -7
  124. data/test/test_gc.rb +11 -0
  125. data/test/test_generate.rb +21 -0
  126. data/test/test_hash.rb +11 -1
  127. data/test/test_integer_range.rb +1 -2
  128. data/test/test_object.rb +43 -12
  129. data/test/test_parser.rb +11 -0
  130. data/test/test_parser_debug.rb +27 -0
  131. data/test/test_parser_saj.rb +335 -0
  132. data/test/test_parser_usual.rb +217 -0
  133. data/test/test_rails.rb +35 -0
  134. data/test/test_saj.rb +1 -1
  135. data/test/test_scp.rb +3 -5
  136. data/test/test_strict.rb +26 -1
  137. data/test/test_various.rb +86 -65
  138. data/test/test_wab.rb +2 -0
  139. data/test/test_writer.rb +19 -2
  140. data/test/tests.rb +10 -1
  141. data/test/tests_mimic.rb +9 -0
  142. data/test/tests_mimic_addition.rb +9 -0
  143. data/test/zoo.rb +13 -0
  144. metadata +63 -110
  145. data/ext/oj/hash.c +0 -163
  146. data/ext/oj/hash.h +0 -46
  147. data/ext/oj/hash_test.c +0 -512
data/ext/oj/dump.h CHANGED
@@ -1,10 +1,8 @@
1
- /* dump.h
2
- * Copyright (c) 2011, Peter Ohler
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 __OJ_DUMP_H__
7
- #define __OJ_DUMP_H__
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 oj_dump_nil(VALUE obj, int depth, Out out, bool as_ok);
19
- extern void oj_dump_true(VALUE obj, int depth, Out out, bool as_ok);
20
- extern void oj_dump_false(VALUE obj, int depth, Out out, bool as_ok);
21
- extern void oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok);
22
- extern void oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok);
23
- extern void oj_dump_float(VALUE obj, int depth, Out out, bool as_ok);
24
- extern void oj_dump_str(VALUE obj, int depth, Out out, bool as_ok);
25
- extern void oj_dump_sym(VALUE obj, int depth, Out out, bool as_ok);
26
- extern void oj_dump_class(VALUE obj, int depth, Out out, bool as_ok);
27
-
28
- extern void oj_dump_raw(const char *str, size_t cnt, Out out);
29
- extern void oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out);
30
- extern void oj_dump_ruby_time(VALUE obj, Out out);
31
- extern void oj_dump_xml_time(VALUE obj, Out out);
32
- extern void oj_dump_time(VALUE obj, Out out, int withZone);
33
- extern void oj_dump_obj_to_s(VALUE obj, Out out);
34
-
35
- extern const char* oj_nan_str(VALUE obj, int opt, int mode, bool plus, int *lenp);
36
-
37
- extern void oj_grow_out(Out out, size_t len);
38
- extern long oj_check_circular(VALUE obj, Out out);
39
-
40
- extern void oj_dump_strict_val(VALUE obj, int depth, Out out);
41
- extern void oj_dump_null_val(VALUE obj, int depth, Out out);
42
- extern void oj_dump_obj_val(VALUE obj, int depth, Out out);
43
- extern void oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok);
44
- extern void oj_dump_rails_val(VALUE obj, int depth, Out out);
45
- extern void oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
46
- extern void oj_dump_wab_val(VALUE obj, int depth, Out out);
47
-
48
- extern VALUE oj_add_to_json(int argc, VALUE *argv, VALUE self);
49
- extern VALUE oj_remove_to_json(int argc, VALUE *argv, VALUE self);
50
-
51
- extern int oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
52
-
53
- extern bool oj_dump_ignore(Options opts, VALUE obj);
54
- extern time_t oj_sec_from_time_hard_way(VALUE obj);
55
-
56
- inline static void
57
- assure_size(Out out, size_t len) {
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
- oj_grow_out(out, len);
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
- cnt *= out->indent;
67
- *out->cur++ = '\n';
68
- for (; 0 < cnt; cnt--) {
69
- *out->cur++ = ' ';
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 void
75
- dump_ulong(unsigned long num, Out out) {
76
- char buf[32];
77
- char *b = buf + sizeof(buf) - 1;
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
- for (; 0 < num; num /= 10, b--) {
82
- *b = (num % 10) + '0';
83
- }
84
- b++;
96
+ for (; 0 < num; num /= 10, b--) {
97
+ *b = (num % 10) + '0';
98
+ }
99
+ b++;
85
100
  } else {
86
- *b = '0';
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 /* __OJ_DUMP_H__ */
108
+ #endif /* OJ_DUMP_H */