oj 3.7.4 → 3.13.23

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.13.23
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2022-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
@@ -79,20 +65,28 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
+- LICENSE
+- CHANGELOG.md
+- RELEASE_NOTES.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Parser.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - ext/oj/buf.h
+- ext/oj/cache.c
+- ext/oj/cache.h
 - ext/oj/cache8.c
 - ext/oj/cache8.h
 - ext/oj/circarray.c
@@ -101,6 +95,7 @@ files:
 - ext/oj/code.h
 - ext/oj/compat.c
 - ext/oj/custom.c
+- ext/oj/debug.c
 - ext/oj/dump.c
 - ext/oj/dump.h
 - ext/oj/dump_compat.c
@@ -108,13 +103,13 @@ files:
 - ext/oj/dump_object.c
 - ext/oj/dump_strict.c
 - ext/oj/encode.h
+- ext/oj/encoder.c
 - ext/oj/err.c
 - ext/oj/err.h
 - ext/oj/extconf.rb
 - ext/oj/fast.c
-- ext/oj/hash.c
-- ext/oj/hash.h
-- ext/oj/hash_test.c
+- ext/oj/intern.c
+- ext/oj/intern.h
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c
@@ -123,6 +118,8 @@ files:
 - ext/oj/oj.h
 - ext/oj/parse.c
 - ext/oj/parse.h
+- ext/oj/parser.c
+- ext/oj/parser.h
 - ext/oj/rails.c
 - ext/oj/rails.h
 - ext/oj/reader.c
@@ -132,6 +129,8 @@ files:
 - ext/oj/rxclass.c
 - ext/oj/rxclass.h
 - ext/oj/saj.c
+- ext/oj/saj2.c
+- ext/oj/saj2.h
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
@@ -139,8 +138,13 @@ files:
 - ext/oj/string_writer.c
 - ext/oj/trace.c
 - ext/oj/trace.h
+- ext/oj/usual.c
+- ext/oj/usual.h
+- ext/oj/util.c
+- ext/oj/util.h
 - ext/oj/val_stack.c
 - ext/oj/val_stack.h
+- ext/oj/validate.c
 - ext/oj/wab.c
 - lib/oj.rb
 - lib/oj/active_support_helper.rb
@@ -160,6 +164,7 @@ files:
 - pages/JsonGem.md
 - pages/Modes.md
 - pages/Options.md
+- pages/Parser.md
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
@@ -170,12 +175,27 @@ files:
 - test/activesupport4/decoding_test.rb
 - test/activesupport4/encoding_test.rb
 - test/activesupport4/test_helper.rb
+- test/activesupport5/abstract_unit.rb
 - test/activesupport5/decoding_test.rb
 - test/activesupport5/encoding_test.rb
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport6/abstract_unit.rb
+- test/activesupport6/decoding_test.rb
+- test/activesupport6/encoding_test.rb
+- test/activesupport6/encoding_test_cases.rb
+- test/activesupport6/test_common.rb
+- test/activesupport6/test_helper.rb
+- test/activesupport6/time_zone_test_helpers.rb
+- test/activesupport7/abstract_unit.rb
+- test/activesupport7/decoding_test.rb
+- test/activesupport7/encoding_test.rb
+- test/activesupport7/encoding_test_cases.rb
+- test/activesupport7/time_zone_test_helpers.rb
 - test/bar.rb
+- test/baz.rb
+- test/bug.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -198,16 +218,21 @@ files:
 - test/json_gem/json_parser_test.rb
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
+- test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
+- test/perf_dump.rb
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
+- test/perf_once.rb
+- test/perf_parser.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/prec.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -228,10 +253,16 @@ files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_generate.rb
 - test/test_hash.rb
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_parser.rb
+- test/test_parser_debug.rb
+- test/test_parser_saj.rb
+- test/test_parser_usual.rb
+- test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb
 - test/test_strict.rb
@@ -241,6 +272,7 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -251,7 +283,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -263,94 +295,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
-- test/foo.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
-- test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
-- test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
-- test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
-- test/sample/change.rb
-- test/sample/text.rb
-- test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
-- test/sample/file.rb
-- test/sample/rect.rb
-- test/sample/hasprops.rb
-- test/sample/line.rb
-- test/sample/dir.rb
-- test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- test/tests_mimic_addition.rb
-- test/test_writer.rb
-- test/perf.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/test_debian.rb
-- test/test_gc.rb
-- test/files.rb
-- test/test_various.rb
+test_files: []

data/ext/oj/hash.c

@@ -1,163 +0,0 @@
-/* hash.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.
- */
-
-#include "hash.h"
-#include <stdint.h>
-
-#define HASH_MASK	0x000003FF
-#define  HASH_SLOT_CNT	1024
-
-typedef struct _KeyVal {
-    struct _KeyVal	*next;
-    const char		*key;
-    size_t		len;
-    VALUE		val;
-} *KeyVal;
-
-struct _Hash {
-    struct _KeyVal	slots[HASH_SLOT_CNT];
-};
-
-struct _Hash	class_hash;
-struct _Hash	intern_hash;
-
-// almost the Murmur hash algorithm
-#define M 0x5bd1e995
-#define C1 0xCC9E2D51
-#define C2 0x1B873593
-#define N  0xE6546B64
-
-static uint32_t
-hash_calc(const uint8_t *key, size_t len) {
-    const uint8_t	*end = key + len;
-    const uint8_t	*endless = key + (len / 4 * 4);
-    uint32_t		h = (uint32_t)len;
-    uint32_t		k;
-
-    while (key < endless) {
-	k = (uint32_t)*key++;
-	k |= (uint32_t)*key++ << 8;
-	k |= (uint32_t)*key++ << 16;
-	k |= (uint32_t)*key++ << 24;
-
-        k *= M;
-        k ^= k >> 24;
-        h *= M;
-        h ^= k * M;
-    }
-    if (1 < end - key) {
-	uint16_t	k16 = (uint16_t)*key++;
-
-	k16 |= (uint16_t)*key++ << 8;
-	h ^= k16 << 8;
-    }
-    if (key < end) {
-	h ^= *key;
-    }
-    h *= M;
-    h ^= h >> 13;
-    h *= M;
-    h ^= h >> 15;
-    
-    return h;
-}
-
-void
-oj_hash_init() {
-    memset(class_hash.slots, 0, sizeof(class_hash.slots));
-    memset(intern_hash.slots, 0, sizeof(intern_hash.slots));
-}
-
-// if slotp is 0 then just lookup
-static VALUE
-hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value) {
-    uint32_t	h = hash_calc((const uint8_t*)key, len) & HASH_MASK;
-    KeyVal	bucket = hash->slots + h;
-
-    if (0 != bucket->key) {
-	KeyVal	b;
-
-	for (b = bucket; 0 != b; b = b->next) {
-	    if (len == b->len && 0 == strncmp(b->key, key, len)) {
-		*slotp = &b->val;
-		return b->val;
-	    }
-	    bucket = b;
-	}
-    }
-    if (0 != slotp) {
-	if (0 != bucket->key) {
-	    KeyVal	b = ALLOC(struct _KeyVal);
-	
-	    b->next = 0;
-	    bucket->next = b;
-	    bucket = b;
-	}
-	bucket->key = oj_strndup(key, len);
-	bucket->len = len;
-	bucket->val = def_value;
-	*slotp = &bucket->val;
-    }
-    return def_value;
-}
-
-void
-oj_hash_print() {
-    int		i;
-    KeyVal	b;
-
-    for (i = 0; i < HASH_SLOT_CNT; i++) {
-	printf("%4d:", i);
-	for (b = class_hash.slots + i; 0 != b && 0 != b->key; b = b->next) {
-	    printf(" %s", b->key);
-	}
-	printf("\n");
-    }
-}
-
-VALUE
-oj_class_hash_get(const char *key, size_t len, VALUE **slotp) {
-    return hash_get(&class_hash, key, len, slotp, Qnil);
-}
-
-ID
-oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
-    return (ID)hash_get(&intern_hash, key, len, (VALUE**)slotp, 0);
-}
-
-char*
-oj_strndup(const char *s, size_t len) {
-    char	*d = ALLOC_N(char, len + 1);
-    
-    memcpy(d, s, len);
-    d[len] = '\0';
-
-    return d;
-}

data/ext/oj/hash.h

@@ -1,46 +0,0 @@
-/* hash.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_HASH_H__
-#define __OJ_HASH_H__
-
-#include "ruby.h"
-
-typedef struct _Hash	*Hash;
-
-extern void	oj_hash_init();
-
-extern VALUE	oj_class_hash_get(const char *key, size_t len, VALUE **slotp);
-extern ID	oj_attr_hash_get(const char *key, size_t len, ID **slotp);
-
-extern void	oj_hash_print();
-extern char*	oj_strndup(const char *s, size_t len);
-
-#endif /* __OJ_HASH_H__ */