oj 3.7.10 → 3.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c25560b508ae039d9d517cb5eacb44b658e1359e11e95317b51ff94581ea6d
-  data.tar.gz: 2ea2c2a50e8cf6d14a7c19427def90fefc460fbb626226c6299a91c8890fbeaf
+  metadata.gz: 5d48227161f707ac83a49469686bfcdbe44376055ebdcd1a449f5e62a1089256
+  data.tar.gz: ef7636a3fecfa42d00246ebedab1784a2ee9c935e863694dba38aca471b477bc
 SHA512:
-  metadata.gz: 91ee09165357ad4955030f2d395f61578375c70672245483831d1c291fe76b50c1166c4d6d75435d4961a6aac394d03069320cb8e15e6b352cf6c634d5ab0b5d
-  data.tar.gz: ea098163b5b4297777de3dcdfc1468673114ba264fd7f2733620ffe14d3ef784384ac0b8fa8c0482f5303b5c4f47164943462266af91d1662ed4eeee5d893656
+  metadata.gz: c4dc96bbdff56dd250c03eca2576a502167470c077b8852eae1698636b8dad3f9c188d4a4f755766425de7f21ab4e363938352f80a3be76da36f6bfad3e57a42
+  data.tar.gz: 77e579b56103860a3364c0e33a91fd33e5fd55e15a2385b1a9993b6fb6c11f1ec31d3b7b4cd968e08b135a772d2d786f86503a113cb0c847049b332a4397b0a5

data/ext/oj/mimic_json.c

@@ -8,7 +8,7 @@
 #include "dump.h"
 #include "parse.h"
 
-static VALUE	symbolize_names_sym;
+static VALUE	symbolize_names_sym = Qundef;
 
 extern const char	oj_json_class[];
 
@@ -26,30 +26,30 @@ static VALUE	state_class;
 // mimic JSON documentation
 
 /* Document-module: JSON::Ext
- * 
+ *
  * The Ext module is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 /* Document-class: JSON::Ext::Parser
- * 
+ *
  * The JSON::Ext::Parser is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 /* Document-class: JSON::Ext::Generator
- * 
+ *
  * The JSON::Ext::Generator is a placeholder in the mimic JSON module used for
  * compatibility only.
  */
 
 /* Document-method: parser=
  * call-seq: parser=(parser)
- * 
+ *
  * Does nothing other than provide compatibility.
  * - *parser* [_Object_] ignored
  */
 /* Document-method: generator=
  * call-seq: generator=(generator)
- * 
+ *
  * Does nothing other than provide compatibility.
  * - *generator* [_Object_] ignored
  */
@@ -184,9 +184,9 @@ mimic_limit_arg(VALUE a) {
 
 /* Document-method: dump
  * call-seq: dump(obj, anIO=nil, limit=nil)
- * 
+ *
  * Encodes an object as a JSON String.
- * 
+ *
  * - *obj* [_Object_] object to convert to encode as JSON
  * - *anIO* [_IO_] an IO that allows writing
  * - *limit* [_Fixnum_] ignored
@@ -218,7 +218,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     out.omit_nil = copts.dump_opts.omit_nil;
     if (2 <= argc) {
 	int	limit;
-	
+
 	// The json gem take a more liberal approach to optional
 	// arguments. Expected are (obj, anIO=nil, limit=nil) yet the io
 	// argument can be left off completely and the 2nd argument is then
@@ -285,11 +285,11 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 
 /* Document-method: restore
  * call-seq: restore(source, proc=nil)
- * 
+ *
  * Loads a Ruby Object from a JSON source that can be either a String or an
  * IO. If Proc is given or a block is providedit is called with each nested
  * element of the loaded Object.
- * 
+ *
  * - *source* [_String_|IO] JSON source
  * - *proc* [_Proc_] to yield to on each element or nil
  *
@@ -298,11 +298,11 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 
 /* Document-method: load
  * call-seq: load(source, proc=nil)
- * 
+ *
  * Loads a Ruby Object from a JSON source that can be either a String or an
  * IO. If Proc is given or a block is providedit is called with each nested
  * element of the loaded Object.
- * 
+ *
  * - *source* [_String_|IO] JSON source
  * - *proc* [_Proc_] to yield to on each element or nil
  *
@@ -330,10 +330,10 @@ mimic_load(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: []
  * call-seq: [](obj, opts={})
- * 
+ *
  * If the obj argument is a String then it is assumed to be a JSON String and
  * parsed otherwise the obj is encoded as a JSON String.
- * 
+ *
  * - *obj* [_String_|Hash|Array] object to convert
  * - *opts* [_Hash_] same options as either generate or parse
  *
@@ -396,11 +396,11 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
 
 /* Document-method: generate
  * call-seq: generate(obj, opts=nil)
- * 
+ *
  * Encode obj as a JSON String. The obj argument must be a Hash, Array, or
  * respond to to_h or to_json. Options other than those listed such as
  * +:allow_nan+ or +:max_nesting+ are ignored.
- * 
+ *
  * - *obj* [_Object_|Hash|Array] object to convert to a JSON String
  * - *opts* [_Hash_] options
  * - - *:indent* [_String_] String to use for indentation.
@@ -461,7 +461,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
 	rb_hash_aset(h, oj_array_nl_sym, rb_str_new2("\n"));
     }
     rargs[1] = rb_funcall(state_class, oj_new_id, 1, h);
-    
+
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
     strcpy(copts.dump_opts.indent_str, "  ");
@@ -510,6 +510,9 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
 	if (T_HASH != rb_type(ropts)) {
 	    rb_raise(rb_eArgError, "options must be a hash.");
 	}
+	if (Qundef == symbolize_names_sym) {
+	    symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
+	}
 	if (Qnil != (v = rb_hash_lookup(ropts, symbolize_names_sym))) {
 	    pi.options.sym_key = (Qtrue == v) ? Yes : No;
 	}
@@ -602,9 +605,9 @@ mimic_parse_bang(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: recurse_proc
  * call-seq: recurse_proc(obj, &proc)
- * 
+ *
  * Yields to the proc for every element in the obj recursively.
- * 
+ *
  * - *obj* [_Hash_|Array] object to walk
  * - *proc* [_Proc_] to yield to on each element
  */
@@ -834,7 +837,7 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
     VALUE	dummy;
     VALUE	verbose;
     VALUE	json;
-    
+
     // Either set the paths to indicate JSON has been loaded or replaces the
     // methods if it has been loaded.
     if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module.
-  VERSION = '3.7.10'
+  VERSION = '3.7.11'
 end

data/test/bar.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'oj'
+
+#Oj.load_file(ARGV[0], mode: :strict) { |obj|
+#  puts Oj.dump(obj, indent: 2)
+#}
+
+data = open('invalid_unicode.data').read
+
+puts data
+
+puts Oj.dump(data)
+
+Oj.mimic_JSON
+puts Oj.dump(data, escape_mode: :json)
+
+puts Oj.default_options

data/test/foo.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'oj'
+require 'active_support'
+require 'active_support/json'
+#require 'tracer'
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+Oj::Rails.optimize()
+
+#Oj::mimic_JSON
+
+puts JSON.parse('{"a":1}', symbolize_names: true)

data/test/zoo.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#require 'json'
+
+$: << File.dirname(__FILE__)
+require 'helper'
+require 'oj'
+
+Oj.mimic_JSON
+puts "\u3074"
+
+puts JSON.dump(["\u3074"])
+puts JSON.generate(["\u3074"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.10
+  version: 3.7.11
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ 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
 - 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/Rails.md
 - pages/Security.md
-- pages/WAB.md
 files:
 - LICENSE
 - README.md
@@ -177,9 +177,9 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
-- test/crash.rb
+- test/bar.rb
 - test/files.rb
+- test/foo.rb
 - test/helper.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
@@ -243,6 +243,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
@@ -277,81 +278,82 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activerecord/result_test.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/bug.rb
-- test/crash.rb
-- test/files.rb
+- 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/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/perf_file.rb
+- test/test_scp.rb
+- test/perf_compat.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_addition_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_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/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.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/perf_saj.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/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.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/dir.rb
+- test/sample/text.rb
 - test/sample/doc.rb
-- test/sample/file.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/layer.rb
 - test/sample/line.rb
+- test/sample/dir.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/tests_mimic.rb
+- test/perf_simple.rb
+- test/zoo.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_fast.rb
-- test/test_file.rb
 - test/test_gc.rb
-- test/test_hash.rb
-- test/test_integer_range.rb
-- test/test_null.rb
-- test/test_object.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
+- test/files.rb
 - test/test_various.rb
-- test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb

data/test/bug.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'rails'
-require 'active_support'
-require 'active_support/json'
-require 'oj'
-
-x = {"a": BigDecimal("1.1"), "t": Time.now}
-
-#ActiveSupport.encode_big_decimal_as_string = false
-
-Oj.optimize_rails
-
-puts "to_json #{x.to_json}"
-
-Oj.default_options = { bigdecimal_as_decimal: true}
-#puts Oj.default_options
-
-puts "to_json #{x.to_json}"
-

data/test/crash.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-#$VERBOSE = true
-
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/json'
-require 'oj'
-
-Oj.optimize_rails
-
-h = {:type=>:record, :name=>:group, :namespace=>"com.salsify.identity", :fields=>[{:name=>"id", :type=>{:name=>:salsify_uuid, :type=>:fixed, :namespace=>"com.salsify", :size=>38}}, {:name=>"type", :type=>"string", :default=>"groups"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"name", :type=>"string"}, {:name=>"policy", :type=>[:null, {:type=>:record, :name=>:policy, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"policies"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"name", :type=>"string"}, {:name=>"statements", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:statement, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"statements"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"action", :type=>{:name=>"__statement_action_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:manage, :read]}}, {:name=>"resource", :type=>{:name=>"__statement_resource_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:product, :digital_asset]}}, {:name=>"conditions", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:condition, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"conditions"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"operator", :type=>{:name=>"__condition_operator_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:equals]}}, {:name=>"attribute_type", :type=>{:name=>"__condition_attribute_type_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:resource]}}, {:name=>"value", :type=>"string"}, {:name=>"attribute", :type=>[:null, {:type=>:record, :name=>:reference, :namespace=>"com.salsify", :fields=>[{:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :doc=>"snake_case, plural name for the resource type"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}]}], :default=>nil}, {:name=>"broken", :type=>[:null, "boolean"], :default=>nil}]}}}]}}}]}], :default=>nil}]}
-
-100000.times {
-   JSON.pretty_generate(h)
-  }
-#puts JSON.generate(h)