oj 3.12.2 → 3.13.1

data/test/test_parser_usual.rb

@@ -0,0 +1,213 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class UsualTest < Minitest::Test
+
+  def test_nil
+    p = Oj::Parser.new(:usual)
+    doc = p.parse('nil')
+    assert_nil(doc)
+  end
+
+  def test_primitive
+    p = Oj::Parser.new(:usual)
+    [
+      ['true', true],
+      ['false', false],
+      ['123', 123],
+      ['1.25', 1.25],
+      ['"abc"', 'abc'],
+    ].each { |x|
+      doc = p.parse(x[0])
+      assert_equal(x[1], doc)
+    }
+  end
+
+  def test_big
+    p = Oj::Parser.new(:usual)
+    doc = p.parse('12345678901234567890123456789')
+    assert_equal(BigDecimal, doc.class)
+    doc = p.parse('1234567890.1234567890123456789')
+    assert_equal(BigDecimal, doc.class)
+  end
+
+  def test_array
+    p = Oj::Parser.new(:usual)
+    [
+      ['[]', []],
+      ['[false]', [false]],
+      ['[true,false]', [true,false]],
+      ['[[]]', [[]]],
+      ['[true,[],false]', [true,[],false]],
+      ['[true,[true],false]', [true,[true],false]],
+    ].each { |x|
+      doc = p.parse(x[0])
+      assert_equal(x[1], doc)
+    }
+  end
+
+  def test_hash
+    p = Oj::Parser.new(:usual)
+    [
+      ['{}', {}],
+      ['{"a": null}', {'a' => nil}],
+      ['{"t": true, "f": false, "s": "abc"}', {'t' => true, 'f' => false, 's' => 'abc'}],
+      ['{"a": {}}', {'a' => {}}],
+      ['{"a": {"b": 2}}', {'a' => {'b' => 2}}],
+      ['{"a": [true]}', {'a' => [true]}],
+    ].each { |x|
+      doc = p.parse(x[0])
+      assert_equal(x[1], doc)
+    }
+  end
+
+  def test_symbol_keys
+    p = Oj::Parser.new(:usual)
+    assert_equal(false, p.symbol_keys)
+    p.symbol_keys = true
+    doc = p.parse('{"a": true, "b": false}')
+    assert_equal({a: true, b: false}, doc)
+  end
+
+  def test_capacity
+    p = Oj::Parser.new(:usual)
+    p.capacity = 1000
+    assert_equal(4096, p.capacity)
+    p.capacity = 5000
+    assert_equal(5000, p.capacity)
+  end
+
+  def test_decimal
+    p = Oj::Parser.new(:usual)
+    assert_equal(:auto, p.decimal)
+    doc = p.parse('1.234567890123456789')
+    assert_equal(BigDecimal, doc.class)
+    assert_equal('0.1234567890123456789e1', doc.to_s)
+    doc = p.parse('1.25')
+    assert_equal(Float, doc.class)
+
+    p.decimal = :float
+    assert_equal(:float, p.decimal)
+    doc = p.parse('1.234567890123456789')
+    assert_equal(Float, doc.class)
+
+    p.decimal = :bigdecimal
+    assert_equal(:bigdecimal, p.decimal)
+    doc = p.parse('1.234567890123456789')
+    assert_equal(BigDecimal, doc.class)
+    doc = p.parse('1.25')
+    assert_equal(BigDecimal, doc.class)
+    assert_equal('0.125e1', doc.to_s)
+
+    p.decimal = :ruby
+    assert_equal(:ruby, p.decimal)
+    doc = p.parse('1.234567890123456789')
+    assert_equal(Float, doc.class)
+  end
+
+  def test_omit_null
+    p = Oj::Parser.new(:usual)
+    p.omit_null = true
+    doc = p.parse('{"a":true,"b":null}')
+    assert_equal({'a'=>true}, doc)
+
+    p.omit_null = false
+    doc = p.parse('{"a":true,"b":null}')
+    assert_equal({'a'=>true, 'b'=>nil}, doc)
+  end
+
+  class MyArray < Array
+  end
+
+  def test_array_class
+    p = Oj::Parser.new(:usual)
+    p.array_class = MyArray
+    assert_equal(MyArray, p.array_class)
+    doc = p.parse('[true]')
+    assert_equal(MyArray, doc.class)
+  end
+
+  class MyHash < Hash
+  end
+
+  def test_hash_class
+    p = Oj::Parser.new(:usual)
+    p.hash_class = MyHash
+    assert_equal(MyHash, p.hash_class)
+    doc = p.parse('{"a":true}')
+    assert_equal(MyHash, doc.class)
+  end
+
+  class MyClass
+    attr_accessor :a
+    attr_accessor :b
+
+    def to_s
+      "#{self.class}{a: #{@a} b: #{b}}"
+    end
+  end
+
+  class MyClass2 < MyClass
+    def self.json_create(arg)
+      obj = new
+      obj.a = arg['a']
+      obj.b = arg['b']
+      obj
+    end
+  end
+
+  def test_create_id
+    p = Oj::Parser.new(:usual)
+    p.create_id = '^'
+    doc = p.parse('{"a":true}')
+    assert_equal(Hash, doc.class)
+    doc = p.parse('{"a":true,"^":"UsualTest::MyClass","b":false}')
+    assert_equal('UsualTest::MyClass{a: true b: false}', doc.to_s)
+
+    doc = p.parse('{"a":true,"^":"UsualTest::MyClass2","b":false}')
+    assert_equal('UsualTest::MyClass2{a: true b: false}', doc.to_s)
+
+    p.hash_class = MyHash
+    assert_equal(MyHash, p.hash_class)
+    doc = p.parse('{"a":true}')
+    assert_equal(MyHash, doc.class)
+
+    doc = p.parse('{"a":true,"^":"UsualTest::MyClass","b":false}')
+    assert_equal('UsualTest::MyClass{a: true b: false}', doc.to_s)
+  end
+
+  def test_missing_class
+    p = Oj::Parser.new(:usual)
+    p.create_id = '^'
+    json = '{"a":true,"^":"Auto","b":false}'
+    doc = p.parse(json)
+    assert_equal(Hash, doc.class)
+
+    p.missing_class = :auto
+    doc = p.parse(json)
+    # Auto should be defined after parsing
+    assert_equal(Auto, doc.class)
+  end
+
+  def test_class_cache
+    p = Oj::Parser.new(:usual)
+    p.create_id = '^'
+    p.class_cache = true
+    p.missing_class = :auto
+    json = '{"a":true,"^":"Auto2","b":false}'
+    doc = p.parse(json)
+    assert_equal(Auto2, doc.class)
+
+    doc = p.parse(json)
+    assert_equal(Auto2, doc.class)
+  end
+
+  def test_default_parser
+    doc = Oj::Parser.usual.parse('{"a":true,"b":null}')
+    assert_equal({'a'=>true, 'b'=>nil}, doc)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.12.2
+  version: 3.13.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -86,6 +86,7 @@ extra_rdoc_files:
 - pages/JsonGem.md
 - pages/Modes.md
 - pages/Options.md
+- pages/Parser.md
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
@@ -93,6 +94,8 @@ files:
 - LICENSE
 - README.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 +104,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
@@ -112,9 +116,8 @@ files:
 - 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 +126,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 +137,7 @@ files:
 - ext/oj/rxclass.c
 - ext/oj/rxclass.h
 - ext/oj/saj.c
+- ext/oj/saj2.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
@@ -139,10 +145,12 @@ files:
 - ext/oj/string_writer.c
 - ext/oj/trace.c
 - ext/oj/trace.h
+- ext/oj/usual.c
 - 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
@@ -162,6 +170,7 @@ files:
 - pages/JsonGem.md
 - pages/Modes.md
 - pages/Options.md
+- pages/Parser.md
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
@@ -214,6 +223,7 @@ files:
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
+- test/perf_parser.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
@@ -245,6 +255,9 @@ files:
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_parser.rb
+- test/test_parser_saj.rb
+- test/test_parser_usual.rb
 - test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb
@@ -339,6 +352,7 @@ test_files:
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
+- test/perf_parser.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
@@ -370,6 +384,9 @@ test_files:
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_parser.rb
+- test/test_parser_saj.rb
+- test/test_parser_usual.rb
 - test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb

data/ext/oj/hash.c

@@ -1,168 +0,0 @@
-// Copyright (c) 2011 Peter Ohler. All rights reserved.
-// Licensed under the MIT License. See LICENSE file in the project root for license details.
-
-#include "hash.h"
-
-#include <stdint.h>
-
-#define HASH_SLOT_CNT ((uint32_t)8192)
-#define HASH_MASK (HASH_SLOT_CNT - 1)
-
-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 str_hash;
-struct _hash sym_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(str_hash.slots, 0, sizeof(str_hash.slots));
-    memset(sym_hash.slots, 0, sizeof(sym_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() {
-    uint32_t 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");
-    }
-}
-
-void oj_hash_sizes() {
-    uint32_t i;
-    KeyVal   b;
-    int      max = 0;
-    int      min = 1000000;
-
-    for (i = 0; i < HASH_SLOT_CNT; i++) {
-        int cnt = 0;
-
-        for (b = str_hash.slots + i; 0 != b && 0 != b->key; b = b->next) {
-            cnt++;
-        }
-        // printf(" %4d\n", cnt);
-        if (max < cnt) {
-            max = cnt;
-        }
-        if (cnt < min) {
-            min = cnt;
-        }
-    }
-    printf("min: %d  max: %d\n", min, max);
-}
-
-VALUE
-oj_class_hash_get(const char *key, size_t len, VALUE **slotp) {
-    return hash_get(&class_hash, key, len, slotp, Qnil);
-}
-
-VALUE
-oj_str_hash_get(const char *key, size_t len, VALUE **slotp) {
-    return hash_get(&str_hash, key, len, slotp, Qnil);
-}
-
-VALUE
-oj_sym_hash_get(const char *key, size_t len, VALUE **slotp) {
-    return hash_get(&sym_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;
-}