oj 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3bd53d19ca0596197ef568e62ecd42cc06bf50da464f3d12e8c930a8b522e63
-  data.tar.gz: c86a9bb989dda968386361ef7ec598d60728f135fc4215d94155e86c560f7236
+  metadata.gz: e19d294e6f097eaef9b3a336ad95728690cab3875f155f922ffe18857713be8f
+  data.tar.gz: 0d6090bbe88e53d9d33eea3dad09c8f1d3163b925ea39ef8ff927919568ce9b1
 SHA512:
-  metadata.gz: 6f5db14003bb717967c40273ea6e2dc3d2605490fa54c3b9130ba7543bc3ce8b36aa86f1ea514d6c509ffd1313f4ed88dae32326a0585c84407cd1e3c0275220
-  data.tar.gz: 302da9f08e30fe0c6bd5f3aeea668328975d4f153befd4812b1c3b50a8720d6d255f216e8bb22451672947d23f3c0fa3d7837415813950f87717b02a0238d291
+  metadata.gz: 3b5168386d95712f0b936819d6c8a3409c86d1ef6dda60cf3447adf222edfc4040b8c3e047b5af327064e6598b79d0a48f94724ac0660bf8fcb5e40bea6e6c49
+  data.tar.gz: 3cc4309e5248d9c9e7bcd993cb6cad207de40e0b0d6230e1175cbe9f6fc6cd05f6ce48d2522056bc566e7d8f88500ecb1124a73eda23cc04be4c81b292bb7e92

data/ext/oj/dump_compat.c

@@ -189,6 +189,7 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	    } else {
 		fill_indent(out, d2);
 	    }
+	    // TBD for child as_ok check the type, time is to_s while others are to_json
 	    oj_dump_compat_val(rb_ary_entry(a, i), d2, out, true);
 	    if (i < cnt) {
 		*out->cur++ = ',';

data/ext/oj/mimic_json.c

@@ -370,6 +370,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     // it is.
     copts->dump_opts.nan_dump = RaiseNan;
     copts->mode = CompatMode;
+    copts->to_json = Yes;
     if (2 == argc && Qnil != argv[1]) {
 	oj_parse_mimic_dump_options(argv[1], copts);
     }
@@ -858,9 +859,6 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
 	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
 	}
     }
-
-    // TBD create all modules in mimic_loaded
-
     oj_mimic_json_methods(json);
 
     rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);

data/ext/oj/oj.c

@@ -229,6 +229,7 @@ struct _Options	oj_default_options = {
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
  * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
  * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_class'
+ * - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on load.
  * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the seconds portion of time
  * - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0 indicates use Ruby
  * - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false
@@ -268,6 +269,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, auto_define_sym, (Yes == oj_default_options.auto_define) ? Qtrue : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
     rb_hash_aset(opts, symbol_keys_sym, (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
     rb_hash_aset(opts, bigdecimal_as_decimal_sym, (Yes == oj_default_options.bigdec_as_num) ? Qtrue : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
+    rb_hash_aset(opts, oj_create_additions_sym, (Yes == oj_default_options.create_ok) ? Qtrue : ((No == oj_default_options.create_ok) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_to_json_sym, (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_to_hash_sym, (Yes == oj_default_options.to_hash) ? Qtrue : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_as_json_sym, (Yes == oj_default_options.as_json) ? Qtrue : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
@@ -358,6 +360,7 @@ get_def_opts(VALUE self) {
  *   - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump mode to use for JSON :strict raises an exception when a non-supported Object is encountered. :compat attempts to extract variable values from an Object using to_json() or to_hash() then it walks the Object's variables if neither is found. The :object mode ignores to_hash() and to_json() methods and encodes variables using code internal to the Oj gem. The :null mode ignores non-supported Objects and replaces them with a null. The :custom mode honors all dump options. The :rails more mimics rails and Active behavior.
  *   - *:time_format* [_:unix_|_:xmlschema_|_:ruby_] time format when dumping in :compat mode :unix decimal number denoting the number of seconds since 1/1/1970, :unix_zone decimal number denoting the number of seconds since 1/1/1970 plus the utc_offset in the exponent, :xmlschema date-time format taken from XML Schema as a String, :ruby Time.to_s formatted String.
  *   - *:create_id* [_String_|_nil_] create id for json compatible object encoding
+ *   - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on load.
  *   - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the seconds portion of time.
  *   - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0 indicates use Ruby.
  *   - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false.

data/ext/oj/rails.c

@@ -823,6 +823,7 @@ rails_mimic_json(VALUE self) {
 	json = rb_define_module("JSON");
     }
     oj_mimic_json_methods(json);
+    oj_default_options.mode = RailsMode;
 
     return Qnil;
 }

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -4,33 +4,64 @@ $: << '.'
 $: << '../lib'
 $: << '../ext'
 
-require 'tracer'
-require 'oj'
-require 'sample'
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_support/json/encoding.rb'
+require 'json'
 
 class Foo
-  def initialize()
-    @x = 'abc'
-    @y = 123
-    @a = [{}]
-  end
-
-  def to_json()
-    '{"x":33}'
+  def to_json(*)
+    '{"foo":"bar"}'
   end
+end
 
-  def as_json(options={})
-    { z: @a, y: @y, x: @x }
+class Dub
+  def initialize(a,b)
+    @a = a
+    @b = b
   end
 end
 
-Tracer.display_c_call = true
-Tracer.on
+puts "*** time respond to: #{Time.now.utc.respond_to?(:to_json)}"
+
+hash_with_time = { foo: Time.now.utc }
+boo = { boo: Time.now.utc, foo: Foo.new, dub: Dub.new(1,2) }
+aaa = [Time.now.utc, Foo.new, Dub.new(1,2)]
+
+puts "*** boo #{JSON.generate(boo)}"
+puts "*** aaa #{JSON.generate(aaa)}"
+
+puts "*** time: #{Time.now.utc.to_json}"
+
+puts hash_with_time.to_json
+# => {"foo":"2018-06-28T09:07:40.464Z"}
+puts JSON.generate(hash_with_time)
+# => {"foo":"2018-06-28 09:07:40 UTC"}
+
+
+puts JSON.generate({ foo: Foo.new }.with_indifferent_access)
+puts JSON.generate({ foo: Foo.new })
+# => {"foo":{"foo":"bar"}}
+puts({ foo: Foo.new }.to_json)
+# => {"foo":{}}
+
+puts "-------------------"
+require 'oj'
 
-obj = Foo.new
+#Oj.optimize_rails
+Oj.mimic_JSON
 
-j = Oj.dump(obj, mode: :custom, trace: true, use_as_json: true)
+puts "*** boo #{JSON.generate(boo)}"
 
-#puts j
+Oj.default_options = {trace: true}
+puts hash_with_time.to_json
+# => {"foo":"2018-06-28T09:07:40.464Z"}
+puts JSON.generate(hash_with_time)
+# => {"foo":"2018-06-28T09:07:40.464Z"}
+puts hash_with_time.to_json
 
-#Oj.load(j, mode: :rails, trace: true)
+puts JSON.generate({ foo: Foo.new }.with_indifferent_access)
+puts JSON.generate({ foo: Foo.new })
+# => {"foo":{}}
+puts({ foo: Foo.new }.to_json)
+# => {"foo":{}}

data/test/test_various.rb

@@ -145,6 +145,7 @@ class Juice < Minitest::Test
       :time_format=>:unix_zone,
       :bigdecimal_load=>:float,
       :create_id=>'classy',
+      :create_additions=>true,
       :space=>'z',
       :array_nl=>'a',
       :object_nl=>'o',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler