oj 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb93f1a098c0d7ed3cf11105c2b76ea98ab692a
-  data.tar.gz: f7cf3c8f48c0d4329a01771837f13d09103bf37c
+  metadata.gz: f4d5410c27e25a4075040fce057dafda891377af
+  data.tar.gz: f06d843cbecfc3c54eac85685be54fb9d0a2cafa
 SHA512:
-  metadata.gz: d0550705f9f2147b3e9ab45d6e96671050ec0b8f5b42338e9e8e277ea305e68d67407fdeffae673b330d827da657218d5c1a8e44fe4dbb889fd0922a88314c58
-  data.tar.gz: 9b6337fc9ab58ff49868f069275cac7a8f427ecde5a40a31de78af97494c8aefef7cb23a5765f05c3be5cfcc37fa6e44b10af1d8960a8f4a94d3b4f7b4fe56b5
+  metadata.gz: 5f5f28ef22ad9c2b60699458eb5a2e98c70a991989649b974b67c25109d31076a48244c4970aea3af4055d734f7e3c121ec9cdc1f73ed643d2a969c8895149f3
+  data.tar.gz: eee14c01cf62adabfcfe162997e74e7b31da61a5e2446495221446584e9bb39e8baaae20eff8a3245804c29a84812bb73f3a0f85d567deff9c6d90cc0f5f7e51

data/ext/oj/compat.c

@@ -217,6 +217,7 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
     pi.max_depth = 0;
     pi.options.allow_nan = Yes;
     pi.options.nilnil = Yes;
+    pi.options.empty_string = No;
     oj_set_compat_callbacks(&pi);
 
     if (T_STRING == rb_type(*argv)) {
@@ -226,6 +227,27 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
     }
 }
 
+VALUE
+oj_compat_load(int argc, VALUE *argv, VALUE self) {
+    struct _ParseInfo	pi;
+
+    parse_info_init(&pi);
+    pi.options = oj_default_options;
+    pi.handler = Qnil;
+    pi.err_class = Qnil;
+    pi.max_depth = 0;
+    pi.options.allow_nan = Yes;
+    pi.options.nilnil = Yes;
+    pi.options.empty_string = Yes;
+    oj_set_compat_callbacks(&pi);
+    
+    if (T_STRING == rb_type(*argv)) {
+	return oj_pi_parse(argc, argv, &pi, 0, 0, false);
+    } else {
+	return oj_pi_sparse(argc, argv, &pi, 0);
+    }
+}
+
 VALUE
 oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;

data/ext/oj/dump.c

@@ -689,6 +689,7 @@ void
 oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
     size_t	size;
     char	*cmap;
+    const char	*orig = str;
 
     switch (out->opts->escape_mode) {
     case NLEsc:
@@ -817,7 +818,15 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	// 0x110xxxxx for 2 characters, 0x1110xxxx for 3, and 0x11110xxx for
 	// 4.
 	if (0 != (0x40 & c)) {
-	    rb_raise(oj_json_generator_error_class, "Partial character in string. 1");
+	    char	buf[1024];
+	    char	*b = buf;
+	    const char	*s = orig;
+
+	    for (; s < s + cnt; s++) {
+		b += sprintf(b, " %02x", *s);
+	    }
+	    *b = '\0';
+	    rb_raise(oj_json_generator_error_class, "Partial character in string. %s", buf);
 	}
 	for (i = 1; i < (int)cnt && i < 4; i++) {
 	    c = str[-1 - i];

data/ext/oj/mimic_json.c

@@ -317,7 +317,7 @@ mimic_load(int argc, VALUE *argv, VALUE self) {
     VALUE	obj;
     VALUE	p = Qnil;
 
-    obj = oj_compat_parse(argc, argv, self);
+    obj = oj_compat_load(argc, argv, self);
     if (2 <= argc) {
 	if (rb_cProc == rb_obj_class(argv[1])) {
 	    p = argv[1];
@@ -491,7 +491,7 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     rb_scan_args(argc, argv, "11", NULL, &ropts);
     parse_info_init(&pi);
     oj_set_compat_callbacks(&pi);
-    // TBD
+
     pi.err_class = oj_json_parser_error_class;
     //pi.err_class = Qnil;
 
@@ -678,7 +678,7 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// to_json
     No,		// as_json
     No,		// nilnil
-    Yes,	// empty_string
+    No,		// empty_string
     Yes,	// allow_gc
     Yes,	// quirks_mode
     No,		// allow_invalid
@@ -795,6 +795,7 @@ oj_mimic_json_methods(VALUE json) {
     } else {
     	oj_json_parser_error_class = rb_define_class_under(json, "ParserError", json_error);
     }
+    printf("*** setting parse error to %lx %s\n", oj_json_parser_error_class, rb_class2name(oj_json_parser_error_class));
     if (rb_const_defined_at(json, rb_intern("GeneratorError"))) {
         oj_json_generator_error_class = rb_const_get(json, rb_intern("GeneratorError"));
     } else {

data/ext/oj/oj.h

@@ -244,6 +244,7 @@ extern VALUE	oj_sc_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_strict_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_strict_sparse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_compat_parse(int argc, VALUE *argv, VALUE self);
+extern VALUE	oj_compat_load(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_object_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_custom_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_wab_parse(int argc, VALUE *argv, VALUE self);

data/ext/oj/parse.c

@@ -859,8 +859,10 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	pi->end = json + len;
 	free_json = 1;
     } else if (T_STRING == rb_type(input)) {
-	if (No == pi->options.nilnil && 0 == RSTRING_LEN(input)) {
-	    rb_raise(oj_json_parser_error_class, "An empty string is not a valid JSON string.");
+	if (CompatMode == pi->options.mode) {
+	    if (No == pi->options.nilnil && 0 == RSTRING_LEN(input)) {
+		rb_raise(oj_json_parser_error_class, "An empty string is not a valid JSON string.");
+	    }
 	}
 	oj_pi_set_input_str(pi, &input);
     } else if (Qnil == input) {
@@ -919,6 +921,11 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     // value stack (while it is in scope).
     wrapped_stack = oj_stack_init(&pi->stack);
     rb_protect(protect_parse, (VALUE)pi, &line);
+    if (Qundef == pi->stack.head->val && !empty_ok(&pi->options)) {
+	if (No == pi->options.nilnil || (CompatMode == pi->options.mode && 0 < pi->cur - pi->json)) {
+	    oj_set_error_at(pi, oj_json_parser_error_class, __FILE__, __LINE__, "Empty input");
+	}
+    }
     result = stack_head_val(&pi->stack);
     DATA_PTR(wrapped_stack) = 0;
     if (No == pi->options.allow_gc) {

data/ext/oj/parse.h

@@ -90,4 +90,22 @@ parse_info_init(ParseInfo pi) {
     memset(pi, 0, sizeof(struct _ParseInfo));
 }
 
+static inline bool
+empty_ok(Options options) {
+    switch (options->mode) {
+    case ObjectMode:
+    case WabMode:
+	return true;
+    case CompatMode:
+    case RailsMode:
+	return false;
+    case StrictMode:
+    case NullMode:
+    case CustomMode:
+    default:
+	break;
+    }
+    return Yes == options->empty_string;
+}
+
 #endif /* __OJ_PARSE_H__ */

data/ext/oj/sparse.c

@@ -826,6 +826,8 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
 	} else {
 	    rb_raise(rb_eTypeError, "Nil is not a valid JSON source.");
 	}
+    } else if (CompatMode == pi->options.mode && T_STRING == rb_type(input) && No == pi->options.nilnil && 0 == RSTRING_LEN(input)) {
+	rb_raise(oj_json_parser_error_class, "An empty string is not a valid JSON string.");
     }
     if (rb_block_given_p()) {
 	pi->proc = Qnil;
@@ -845,10 +847,13 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
     }
     // GC can run at any time. When it runs any Object created by C will be
     // freed. We protect against this by wrapping the value stack in a ruby
-    // data object and poviding a mark function for ruby objects on the
+    // data object and providing a mark function for ruby objects on the
     // value stack (while it is in scope).
     wrapped_stack = oj_stack_init(&pi->stack);
     rb_protect(protect_parse, (VALUE)pi, &line);
+    if (Qundef == pi->stack.head->val && !empty_ok(&pi->options)) {
+	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Empty input");
+    }
     result = stack_head_val(&pi->stack);
     DATA_PTR(wrapped_stack) = 0;
     if (No == pi->options.allow_gc) {

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -1,7 +1,7 @@
 # Oj Modes
 
 Oj uses modes to switch the load and dump behavior. Initially Oj supported on
-the :object mode which uses a format that allows Juby object encoding and
+the :object mode which uses a format that allows Ruby object encoding and
 decoding in a manner that lets almost any Ruby object be encoded and decoded
 without monkey patching the object classes. From that start other demands were
 made the were best met by giving Oj multiple modes of operation. The current

data/pages/Options.md

@@ -91,18 +91,21 @@ specifying the class for an encoded object. The default is `json_create`.
 
 ### :empty_string [Boolean]
 
-If true an empty input will not raise an Exception. The default differs
-according to the mode and in some cases the function used to load or dump. The
-defaults are:
-
- - :null - true
- - :strict - true
- - :compat or :json - true
-    - JSON.parse() - false
-    - JSON.load() - true (or what ever is set in the defaults)
- - :rails - TBD
- - :object - true
- - :custom - true
+If true an empty or all whitespace input will not raise an Exception. The
+default_options will be honored for :null, :strict, and :custom modes. Ignored
+for :custom and :wab. The :compat has a more complex set of rules. The JSON
+gem compatibility is best described by examples.
+
+```
+JSON.parse('') => raise
+JSON.parse(' ') => raise
+JSON.load('') => nil
+JSON.load('', nil, allow_blank: false) => raise
+JSON.load('', nil, allow_blank: true) => nil
+JSON.load(' ') => raise
+JSON.load(' ', nil, allow_blank: false) => raise
+JSON.load(' ', nil, allow_blank: true) => raise
+```
 
 ### :escape_mode [Symbol]
 

data/test/json_gem/json_common_interface_test.rb

@@ -112,6 +112,11 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
     assert_equal nil, JSON.load(nil, nil, :allow_blank => true)
     assert_raise(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
     assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
+    # The next tests are added by Oj to catch additional cases.
+    assert_equal nil, JSON.load('', nil, :allow_blank => true)
+    assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
+    assert_raise(JSON::ParserError) { JSON.load(' ', nil, :allow_blank => true) }
+    assert_raise(JSON::ParserError) { JSON.load(' ', nil, :allow_blank => false) }
   end
 
   def test_dump

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.