oj 2.0.0 → 3.0.0

data/test/tests_mimic.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), 'json_gem')
+
+require 'json_common_interface_test'
+require 'json_encoding_test'
+require 'json_ext_parser_test'
+require 'json_fixtures_test'
+require 'json_generator_test'
+require 'json_generic_object_test'
+require 'json_parser_test'
+require 'json_string_matching_test'

data/test/tests_mimic_addition.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), 'json_gem')
+
+require 'json_addition_test'

metadata

@@ -1,53 +1,186 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
-dependencies: []
-description: ! 'The fastest JSON parser and object serializer. '
+date: 2017-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !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: []
 extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
+- pages/Advanced.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
+- pages/Security.md
 files:
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/version.rb
-- lib/oj.rb
-- ext/oj/extconf.rb
-- ext/oj/foo.rb
-- ext/oj/cache.h
-- ext/oj/cache8.h
-- ext/oj/oj.h
-- ext/oj/cache.c
+- LICENSE
+- README.md
+- ext/oj/buf.h
 - ext/oj/cache8.c
+- ext/oj/cache8.h
+- ext/oj/circarray.c
+- ext/oj/circarray.h
+- ext/oj/code.c
+- ext/oj/code.h
+- ext/oj/compat.c
+- ext/oj/custom.c
 - ext/oj/dump.c
+- ext/oj/dump.h
+- ext/oj/dump_compat.c
+- ext/oj/dump_leaf.c
+- ext/oj/dump_object.c
+- ext/oj/dump_rails.c
+- ext/oj/dump_strict.c
+- ext/oj/encode.h
+- ext/oj/err.c
+- ext/oj/err.h
+- ext/oj/extconf.rb
 - ext/oj/fast.c
-- ext/oj/load.c
+- ext/oj/hash.c
+- ext/oj/hash.h
+- ext/oj/hash_test.c
+- ext/oj/mimic_json.c
+- ext/oj/mimic_rails.c
+- ext/oj/mimic_rails.h
+- ext/oj/object.c
+- ext/oj/odd.c
+- ext/oj/odd.h
 - ext/oj/oj.c
+- ext/oj/oj.h
+- ext/oj/parse.c
+- ext/oj/parse.h
+- ext/oj/reader.c
+- ext/oj/reader.h
+- ext/oj/resolve.c
+- ext/oj/resolve.h
+- ext/oj/rxclass.c
+- ext/oj/rxclass.h
 - ext/oj/saj.c
-- test/a.rb
+- ext/oj/scp.c
+- ext/oj/sparse.c
+- ext/oj/stream_writer.c
+- ext/oj/strict.c
+- ext/oj/string_writer.c
+- ext/oj/val_stack.c
+- ext/oj/val_stack.h
+- lib/oj.rb
+- lib/oj/active_support_helper.rb
+- lib/oj/bag.rb
+- lib/oj/easy_hash.rb
+- lib/oj/error.rb
+- lib/oj/json.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/state.rb
+- lib/oj/version.rb
+- pages/Advanced.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
+- pages/Security.md
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.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/files.rb
+- test/helper.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_redefine.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
 - test/perf.rb
-- test/perf1.rb
-- test/perf2.rb
+- test/perf_compat.rb
 - test/perf_fast.rb
-- test/perf_obj.rb
-- test/perf_obj_old.rb
+- test/perf_file.rb
+- test/perf_object.rb
 - test/perf_saj.rb
+- test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
+- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -60,40 +193,122 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
 - test/sample_json.rb
+- test/test_compat.rb
+- test/test_custom.rb
+- test/test_debian.rb
 - test/test_fast.rb
-- test/test_mimic.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_hash.rb
+- test/test_null.rb
+- test/test_object.rb
 - test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
+- test/test_various.rb
+- test/test_writer.rb
 - test/tests.rb
-- LICENSE
-- README.md
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb
 homepage: http://www.ohler.com/oj
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--title"
+- Oj
+- "--main"
 - README.md
 require_paths:
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.23
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files: []
-has_rdoc: true
+test_files:
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.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/files.rb
+- test/helper.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_redefine.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
+- test/perf_object.rb
+- test/perf_saj.rb
+- test/perf_scp.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
+- test/sample/file.rb
+- test/sample/group.rb
+- test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/line.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
+- test/sample.rb
+- test/sample_json.rb
+- test/test_compat.rb
+- test/test_custom.rb
+- test/test_debian.rb
+- test/test_fast.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_hash.rb
+- test/test_null.rb
+- test/test_object.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
+- test/test_various.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb

data/ext/oj/cache.c

@@ -1,148 +0,0 @@
-/* cache.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 <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "cache.h"
-
-struct _Cache {
-    char                *key; // only set if the node has a value, and it is not an exact match
-    VALUE               value;
-    struct _Cache       *slots[16];
-};
-
-static void     slot_print(Cache cache, unsigned int depth);
-
-void
-oj_cache_new(Cache *cache) {
-    if (0 == (*cache = ALLOC(struct _Cache))) {
-        rb_raise(rb_eNoMemError, "not enough memory\n");
-    }
-    (*cache)->key = 0;
-    (*cache)->value = Qundef;
-    memset((*cache)->slots, 0, sizeof((*cache)->slots));
-}
-
-VALUE
-oj_cache_get(Cache cache, const char *key, VALUE **slot) {
-    unsigned char       *k = (unsigned char*)key;
-    Cache               *cp;
-
-    for (; '\0' != *k; k++) {
-        cp = cache->slots + (unsigned int)(*k >> 4); // upper 4 bits
-        if (0 == *cp) {
-            oj_cache_new(cp);
-        }
-        cache = *cp;
-        cp = cache->slots + (unsigned int)(*k & 0x0F); // lower 4 bits
-        if (0 == *cp) {
-            oj_cache_new(cp);
-            cache = *cp;
-            cache->key = ('\0' == *(k + 1)) ? 0 : strdup(key);
-            break;
-        } else {
-            cache = *cp;
-            if (Qundef != cache->value && 0 != cache->key) {
-                unsigned char   *ck = (unsigned char*)(cache->key + (unsigned int)(k - (unsigned char*)key + 1));
-
-                if (0 == strcmp((char*)ck, (char*)(k + 1))) {
-                    break;
-                } else {
-                    Cache     *cp2 = cp;
-
-                    // if value was set along with the key then there are no slots filled yet
-                    cp2 = (*cp2)->slots + (*ck >> 4);
-                    oj_cache_new(cp2);
-                    cp2 = (*cp2)->slots + (*ck & 0x0F);
-                    oj_cache_new(cp2);
-                    if ('\0' == *(ck + 1)) {
-                        xfree(cache->key);
-                    } else {
-                        (*cp2)->key = cache->key;
-                    }
-                    (*cp2)->value = cache->value;
-                    cache->key = 0;
-                    cache->value = Qundef;
-                }
-            }
-        }
-    }
-    *slot = &cache->value;
-
-    return cache->value;
-}
-
-void
-oj_cache_print(Cache cache) {
-    //printf("-------------------------------------------\n");
-    slot_print(cache, 0);
-}
-
-static void
-slot_print(Cache c, unsigned int depth) {
-    char                indent[256];
-    Cache               *cp;
-    unsigned int        i;
-
-    if (sizeof(indent) - 1 < depth) {
-        depth = ((int)sizeof(indent) - 1);
-    }
-    memset(indent, ' ', depth);
-    indent[depth] = '\0';
-    for (i = 0, cp = c->slots; i < 16; i++, cp++) {
-        if (0 == *cp) {
-            //printf("%s%02u:\n", indent, i);
-        } else {
-            if (0 == (*cp)->key && Qundef == (*cp)->value) {
-                printf("%s%02u:\n", indent, i);
-            } else {
-                const char      *key = (0 == (*cp)->key) ? "*" : (*cp)->key;
-                const char      *vs;
-                const char      *clas;
-
-                if (Qundef == (*cp)->value) {
-                    vs = "undefined";
-                    clas = "";
-                } else {
-                    VALUE       rs = rb_funcall2((*cp)->value, rb_intern("to_s"), 0, 0);
-
-                    vs = StringValuePtr(rs);
-                    clas = rb_class2name(rb_obj_class((*cp)->value));
-                }
-                printf("%s%02u: %s = %s (%s)\n", indent, i, key, vs, clas);
-            }
-            slot_print(*cp, depth + 2);
-        }
-    }
-}

data/ext/oj/foo.rb

@@ -1,6 +0,0 @@
-
-def foo()
-  [1, [true, false]].each { |x| yield x }
-end
-
-foo() { |x| puts x }