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/hash.c
DELETED
@@ -1,163 +0,0 @@
|
|
1
|
-
/* hash.c
|
2
|
-
* Copyright (c) 2011, Peter Ohler
|
3
|
-
* All rights reserved.
|
4
|
-
*
|
5
|
-
* Redistribution and use in source and binary forms, with or without
|
6
|
-
* modification, are permitted provided that the following conditions are met:
|
7
|
-
*
|
8
|
-
* - Redistributions of source code must retain the above copyright notice, this
|
9
|
-
* list of conditions and the following disclaimer.
|
10
|
-
*
|
11
|
-
* - Redistributions in binary form must reproduce the above copyright notice,
|
12
|
-
* this list of conditions and the following disclaimer in the documentation
|
13
|
-
* and/or other materials provided with the distribution.
|
14
|
-
*
|
15
|
-
* - Neither the name of Peter Ohler nor the names of its contributors may be
|
16
|
-
* used to endorse or promote products derived from this software without
|
17
|
-
* specific prior written permission.
|
18
|
-
*
|
19
|
-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
20
|
-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
21
|
-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
22
|
-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
23
|
-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
24
|
-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
25
|
-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
26
|
-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
27
|
-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
28
|
-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
|
-
*/
|
30
|
-
|
31
|
-
#include "hash.h"
|
32
|
-
#include <stdint.h>
|
33
|
-
|
34
|
-
#define HASH_MASK 0x000003FF
|
35
|
-
#define HASH_SLOT_CNT 1024
|
36
|
-
|
37
|
-
typedef struct _KeyVal {
|
38
|
-
struct _KeyVal *next;
|
39
|
-
const char *key;
|
40
|
-
size_t len;
|
41
|
-
VALUE val;
|
42
|
-
} *KeyVal;
|
43
|
-
|
44
|
-
struct _Hash {
|
45
|
-
struct _KeyVal slots[HASH_SLOT_CNT];
|
46
|
-
};
|
47
|
-
|
48
|
-
struct _Hash class_hash;
|
49
|
-
struct _Hash intern_hash;
|
50
|
-
|
51
|
-
// almost the Murmur hash algorithm
|
52
|
-
#define M 0x5bd1e995
|
53
|
-
#define C1 0xCC9E2D51
|
54
|
-
#define C2 0x1B873593
|
55
|
-
#define N 0xE6546B64
|
56
|
-
|
57
|
-
static uint32_t
|
58
|
-
hash_calc(const uint8_t *key, size_t len) {
|
59
|
-
const uint8_t *end = key + len;
|
60
|
-
const uint8_t *endless = key + (len / 4 * 4);
|
61
|
-
uint32_t h = (uint32_t)len;
|
62
|
-
uint32_t k;
|
63
|
-
|
64
|
-
while (key < endless) {
|
65
|
-
k = (uint32_t)*key++;
|
66
|
-
k |= (uint32_t)*key++ << 8;
|
67
|
-
k |= (uint32_t)*key++ << 16;
|
68
|
-
k |= (uint32_t)*key++ << 24;
|
69
|
-
|
70
|
-
k *= M;
|
71
|
-
k ^= k >> 24;
|
72
|
-
h *= M;
|
73
|
-
h ^= k * M;
|
74
|
-
}
|
75
|
-
if (1 < end - key) {
|
76
|
-
uint16_t k16 = (uint16_t)*key++;
|
77
|
-
|
78
|
-
k16 |= (uint16_t)*key++ << 8;
|
79
|
-
h ^= k16 << 8;
|
80
|
-
}
|
81
|
-
if (key < end) {
|
82
|
-
h ^= *key;
|
83
|
-
}
|
84
|
-
h *= M;
|
85
|
-
h ^= h >> 13;
|
86
|
-
h *= M;
|
87
|
-
h ^= h >> 15;
|
88
|
-
|
89
|
-
return h;
|
90
|
-
}
|
91
|
-
|
92
|
-
void
|
93
|
-
oj_hash_init() {
|
94
|
-
memset(class_hash.slots, 0, sizeof(class_hash.slots));
|
95
|
-
memset(intern_hash.slots, 0, sizeof(intern_hash.slots));
|
96
|
-
}
|
97
|
-
|
98
|
-
// if slotp is 0 then just lookup
|
99
|
-
static VALUE
|
100
|
-
hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value) {
|
101
|
-
uint32_t h = hash_calc((const uint8_t*)key, len) & HASH_MASK;
|
102
|
-
KeyVal bucket = hash->slots + h;
|
103
|
-
|
104
|
-
if (0 != bucket->key) {
|
105
|
-
KeyVal b;
|
106
|
-
|
107
|
-
for (b = bucket; 0 != b; b = b->next) {
|
108
|
-
if (len == b->len && 0 == strncmp(b->key, key, len)) {
|
109
|
-
*slotp = &b->val;
|
110
|
-
return b->val;
|
111
|
-
}
|
112
|
-
bucket = b;
|
113
|
-
}
|
114
|
-
}
|
115
|
-
if (0 != slotp) {
|
116
|
-
if (0 != bucket->key) {
|
117
|
-
KeyVal b = ALLOC(struct _KeyVal);
|
118
|
-
|
119
|
-
b->next = 0;
|
120
|
-
bucket->next = b;
|
121
|
-
bucket = b;
|
122
|
-
}
|
123
|
-
bucket->key = oj_strndup(key, len);
|
124
|
-
bucket->len = len;
|
125
|
-
bucket->val = def_value;
|
126
|
-
*slotp = &bucket->val;
|
127
|
-
}
|
128
|
-
return def_value;
|
129
|
-
}
|
130
|
-
|
131
|
-
void
|
132
|
-
oj_hash_print() {
|
133
|
-
int i;
|
134
|
-
KeyVal b;
|
135
|
-
|
136
|
-
for (i = 0; i < HASH_SLOT_CNT; i++) {
|
137
|
-
printf("%4d:", i);
|
138
|
-
for (b = class_hash.slots + i; 0 != b && 0 != b->key; b = b->next) {
|
139
|
-
printf(" %s", b->key);
|
140
|
-
}
|
141
|
-
printf("\n");
|
142
|
-
}
|
143
|
-
}
|
144
|
-
|
145
|
-
VALUE
|
146
|
-
oj_class_hash_get(const char *key, size_t len, VALUE **slotp) {
|
147
|
-
return hash_get(&class_hash, key, len, slotp, Qnil);
|
148
|
-
}
|
149
|
-
|
150
|
-
ID
|
151
|
-
oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
|
152
|
-
return (ID)hash_get(&intern_hash, key, len, (VALUE**)slotp, 0);
|
153
|
-
}
|
154
|
-
|
155
|
-
char*
|
156
|
-
oj_strndup(const char *s, size_t len) {
|
157
|
-
char *d = ALLOC_N(char, len + 1);
|
158
|
-
|
159
|
-
memcpy(d, s, len);
|
160
|
-
d[len] = '\0';
|
161
|
-
|
162
|
-
return d;
|
163
|
-
}
|
data/ext/oj/hash.h
DELETED
@@ -1,46 +0,0 @@
|
|
1
|
-
/* hash.h
|
2
|
-
* Copyright (c) 2011, Peter Ohler
|
3
|
-
* All rights reserved.
|
4
|
-
*
|
5
|
-
* Redistribution and use in source and binary forms, with or without
|
6
|
-
* modification, are permitted provided that the following conditions are met:
|
7
|
-
*
|
8
|
-
* - Redistributions of source code must retain the above copyright notice, this
|
9
|
-
* list of conditions and the following disclaimer.
|
10
|
-
*
|
11
|
-
* - Redistributions in binary form must reproduce the above copyright notice,
|
12
|
-
* this list of conditions and the following disclaimer in the documentation
|
13
|
-
* and/or other materials provided with the distribution.
|
14
|
-
*
|
15
|
-
* - Neither the name of Peter Ohler nor the names of its contributors may be
|
16
|
-
* used to endorse or promote products derived from this software without
|
17
|
-
* specific prior written permission.
|
18
|
-
*
|
19
|
-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
20
|
-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
21
|
-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
22
|
-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
23
|
-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
24
|
-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
25
|
-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
26
|
-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
27
|
-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
28
|
-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
|
-
*/
|
30
|
-
|
31
|
-
#ifndef __OJ_HASH_H__
|
32
|
-
#define __OJ_HASH_H__
|
33
|
-
|
34
|
-
#include "ruby.h"
|
35
|
-
|
36
|
-
typedef struct _Hash *Hash;
|
37
|
-
|
38
|
-
extern void oj_hash_init();
|
39
|
-
|
40
|
-
extern VALUE oj_class_hash_get(const char *key, size_t len, VALUE **slotp);
|
41
|
-
extern ID oj_attr_hash_get(const char *key, size_t len, ID **slotp);
|
42
|
-
|
43
|
-
extern void oj_hash_print();
|
44
|
-
extern char* oj_strndup(const char *s, size_t len);
|
45
|
-
|
46
|
-
#endif /* __OJ_HASH_H__ */
|