oj 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480e8d68bf5d70f51afeaaf27513e75d5c035b22
-  data.tar.gz: 4325e7d94beb26b75cadf14b5f167df78bdd1e5a
+  metadata.gz: 4f9a694459b58b7e423bd685ea28a1fcfb582a3c
+  data.tar.gz: 609715b5ff8e615f59dbdceabdc7ec691c4f8287
 SHA512:
-  metadata.gz: c48a73e6ee72bfea2be0744705d81114089455f6eb822f575daa60a3b58346aa194eb051ab744c34fc4a4555d2f768334db8de7dcc4a12118afb41e622e2fe78
-  data.tar.gz: c6dd31f00e395990f84c19a0d71b5c1ac07d822b24efd772d74e484dc2bd0f045dcee1f44ca251b60fdc938cfa99c7bde0617c06d303acaa2b67f0ec974ff4ac
+  metadata.gz: ad438e894a9540489bbc29c75d39972db15389e41b83700467736b3b1fb7e329c11def32cabc6753b2e60ae1a548f5fd5c89074057c4b6c8816b014c9fb5bd5d
+  data.tar.gz: b25cdb2139bea0f973b80c421c956f0ecece0c50b70f6b87707f52ac452d418672d8e865026020804cb5bc69434ed3e0214c3034df116bba540ef955aa07c0d7

data/README.md

@@ -7,8 +7,6 @@ A *fast* JSON parser and Object marshaller as a Ruby gem.
 Version 3.0 is out! 3.0 provides better json gem and Rails compatibility. It
 also provides additional optimization options.
 
-Please check out issue #364 and help pick or suggest a image to represent Oj.
-
 ## Using
 
 ```ruby

data/ext/oj/mimic_json.c

@@ -10,7 +10,7 @@
 
 static VALUE	symbolize_names_sym;
 
-static const char	json_class[] = "json_class";
+extern const char	oj_json_class[];
 
 VALUE	oj_array_nl_sym;
 VALUE	oj_ascii_only_sym;
@@ -155,6 +155,9 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
 	copts->dump_opts.array_size = (uint8_t)len;
 	copts->dump_opts.use = true;
     }
+    if (Qnil != (v = rb_hash_lookup(ropts, oj_quirks_mode_sym))) {
+	copts->quirks_mode = (Qtrue == v) ? Yes : No;
+    }
     if (Qnil != (v = rb_hash_lookup(ropts, oj_ascii_only_sym))) {
 	// generate seems to assume anything except nil and false are true.
 	if (Qfalse == v) {
@@ -198,9 +201,11 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     out.allocated = 0;
     out.caller = CALLER_DUMP;
     
+    /* seems like this is not correct
     if (No == copts.nilnil && Qnil == *argv) {
 	rb_raise(rb_eTypeError, "nil not allowed.");
     }
+    */
     copts.dump_opts.max_depth = MAX_DEPTH; // when using dump there is no limit
     out.omit_nil = copts.dump_opts.omit_nil;
     if (2 <= argc) {
@@ -347,7 +352,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     char	buf[4096];
     struct _Out	out;
     VALUE	rstr;
-    
+
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
@@ -360,9 +365,11 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     if (2 == argc && Qnil != argv[1]) {
 	oj_parse_mimic_dump_options(argv[1], copts);
     }
+    /* seems like this is not correct
     if (No == copts->nilnil && Qnil == *argv) {
 	rb_raise(rb_eTypeError, "nil not allowed.");
     }
+    */
     oj_dump_obj_to_json_using_params(*argv, copts, &out, argc - 1, argv + 1);
 
     if (0 == out.buf) {
@@ -619,11 +626,11 @@ static VALUE
 mimic_set_create_id(VALUE self, VALUE id) {
     Check_Type(id, T_STRING);
 
-    if (0 != oj_default_options.create_id) {
-	if (json_class != oj_default_options.create_id) {
+    if (NULL != oj_default_options.create_id) {
+	if (oj_json_class != oj_default_options.create_id && NULL != oj_default_options.create_id) {
 	    xfree((char*)oj_default_options.create_id);
 	}
-	oj_default_options.create_id = 0;
+	oj_default_options.create_id = NULL;
 	oj_default_options.create_id_len = 0;
     }
     if (Qnil != id) {
@@ -643,10 +650,10 @@ mimic_set_create_id(VALUE self, VALUE id) {
  */
 static VALUE
 mimic_create_id(VALUE self) {
-    if (0 != oj_default_options.create_id) {
+    if (NULL != oj_default_options.create_id) {
 	return oj_encode(rb_str_new_cstr(oj_default_options.create_id));
     }
-    return rb_str_new_cstr(json_class);
+    return rb_str_new_cstr(oj_json_class);
 }
 
 static struct _Options	mimic_object_to_json_options = {
@@ -670,7 +677,7 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// allow_invalid
     No,		// create_ok
     No,		// allow_nan
-    json_class,	// create_id
+    oj_json_class,// create_id
     10,		// create_id_len
     3,		// sec_prec
     16,		// float_prec

data/ext/oj/oj.c

@@ -155,7 +155,7 @@ pthread_mutex_t	oj_cache_mutex;
 VALUE oj_cache_mutex = Qnil;
 #endif
 
-static const char	json_class[] = "json_class";
+const char	oj_json_class[] = "json_class";
 
 struct _Options	oj_default_options = {
     0,		// indent
@@ -178,7 +178,7 @@ struct _Options	oj_default_options = {
     No,		// allow_invalid
     No,		// create_ok
     Yes,	// allow_nan
-    json_class,	// create_id
+    oj_json_class,	// create_id
     10,		// create_id_len
     9,		// sec_prec
     16,		// float_prec
@@ -521,7 +521,7 @@ oj_parse_options(VALUE ropts, Options copts) {
     if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
 	v = rb_hash_lookup(ropts, create_id_sym);
 	if (Qnil == v) {
-	    if (json_class != oj_default_options.create_id) {
+	    if (oj_json_class != oj_default_options.create_id && NULL != copts->create_id) {
 		xfree((char*)oj_default_options.create_id);
 	    }
 	    copts->create_id = NULL;

data/ext/oj/rails.c

@@ -760,7 +760,7 @@ rails_time_precision(VALUE self, VALUE prec) {
 }
 
 /* Document-method: set_encoder
- *call-seq: set_encoder()
+ *	call-seq: set_encoder()
  * 
  * Sets the ActiveSupport.encoder to Oj::Rails::Encoder and wraps some of the
  * formatting globals used by ActiveSupport to allow the use of those globals

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -0,0 +1,12 @@
+#!/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 'oj'
+
+Oj.mimic_JSON
+
+nil.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -149,6 +149,7 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
+- test/bug.rb
 - test/files.rb
 - test/helper.rb
 - test/isolated/shared.rb
@@ -250,6 +251,7 @@ test_files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
+- test/bug.rb
 - test/files.rb
 - test/helper.rb
 - test/isolated/shared.rb