oj 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d543163764b5c7910fcbd77662a531acb56d8cff
-  data.tar.gz: f9c6554f24fc5ccf9ea95b755e009ddfbd603567
+  metadata.gz: f30913f8e7b9a96cd9388dcd6959330f34960c04
+  data.tar.gz: 8bb5882a6def1fbb9348f0ac0a48f59d1d7468f4
 SHA512:
-  metadata.gz: b4363a5dab53fe54977632c92caec3a77e304893a70230066dfc3332c81b570e82715140330e4affcb0e69f6094c108b563675873bdd1896a667fa757d6f8249
-  data.tar.gz: 4c7cdfcb15522a3ced05947997f31e30d2a55b2386456ea2279eb48852cbac08b8bd6378115b2f835beea264c0aea34d616c2d0ad2d7d5257506526d36fcb7ed
+  metadata.gz: 70e9ec5a16483c18e964d2ab4f8801c111353018fef608fc035de8bbd19b855baf825659e55a1af11a0ed9795902316517a27ad58b82cc05b81773f5678a434a
+  data.tar.gz: c9f605979c2b2051a8257fcb57a125aa3b5da8d833829a36701655415951deb6540b11ba7c7e2a69e622d6920725685c817cda08419e70c7d0cbc9183a6c0c2f

data/README.md

@@ -26,13 +26,9 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.7.1
+### Current Release 2.7.2
 
- - Fixed bug in new push_key which caused duplicate characters.
-
-### Current Release 2.7.0
-
- - Added the push_key() method to the StringWriter and StreamWriter classes.
+ - Added option return nil if nil is provided as input to load.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/oj.c

@@ -110,6 +110,7 @@ static VALUE	float_sym;
 static VALUE	indent_sym;
 static VALUE	json_sym;
 static VALUE	mode_sym;
+static VALUE	nilnil_sym;
 static VALUE	null_sym;
 static VALUE	object_sym;
 static VALUE	ruby_sym;
@@ -156,6 +157,7 @@ struct _Options	oj_default_options = {
     Yes,		// bigdec_as_num
     AutoDec,		// bigdec_load
     No,			// to_json
+    No,			// nilnil
     json_class,		// create_id
     10,			// create_id_len
     9,			// sec_prec
@@ -181,6 +183,7 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
  * - create_id: [String|nil] create id for json compatible object encoding, default is 'json_create'
  * - second_precision: [Fixnum|nil] number of digits after the decimal when dumping the seconds portion of time
  * - use_to_json: [true|false|nil] call to_json() methods on dump, default is false
+ * - nilnil: [true|false|nil] if true a nil input to load will return nil and not raise an Exception
  * - allow_gc: [true|false|nil] allow or prohibit GC during parsing, default is true (allow)
  * @return [Hash] all current option settings.
  */
@@ -196,6 +199,7 @@ get_def_opts(VALUE self) {
     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, use_to_json_sym, (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
+    rb_hash_aset(opts, nilnil_sym, (Yes == oj_default_options.nilnil) ? Qtrue : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
     rb_hash_aset(opts, allow_gc_sym, (Yes == oj_default_options.allow_gc) ? Qtrue : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
@@ -256,6 +260,7 @@ get_def_opts(VALUE self) {
  * @param [String|nil] :create_id create id for json compatible object encoding
  * @param [Fixnum|nil] :second_precision number of digits after the decimal when dumping the seconds portion of time
  * @param [true|false|nil] :use_to_json call to_json() methods on dump, default is false
+ * @param [true|false|nil] :nilnil if true a nil input to load will return nil and not raise an Exception
  * @param [true|false|nil] :allow_gc allow or prohibit GC during parsing, default is true (allow)
  * @return [nil]
  */
@@ -268,6 +273,7 @@ set_def_opts(VALUE self, VALUE opts) {
 	{ class_cache_sym, &oj_default_options.class_cache },
 	{ bigdecimal_as_decimal_sym, &oj_default_options.bigdec_as_num },
 	{ use_to_json_sym, &oj_default_options.to_json },
+	{ nilnil_sym, &oj_default_options.nilnil },
 	{ allow_gc_sym, &oj_default_options.allow_gc },
 	{ Qnil, 0 }
     };
@@ -399,6 +405,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ class_cache_sym, &copts->class_cache },
 	{ bigdecimal_as_decimal_sym, &copts->bigdec_as_num },
 	{ use_to_json_sym, &copts->to_json },
+	{ nilnil_sym, &copts->nilnil },
 	{ allow_gc_sym, &copts->allow_gc },
 	{ Qnil, 0 }
     };
@@ -517,7 +524,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    copts->escape_mode = JSONEsc;
 	}
     }
- }
+}
 
 /* Document-method: strict_load
  *	call-seq: strict_load(json, options) => Hash, Array, String, Fixnum, Float, true, false, or nil
@@ -1698,6 +1705,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
     oj_default_options.mode = CompatMode;
     oj_default_options.escape_mode = ASCIIEsc;
+    oj_default_options.nilnil = Yes;
 
     return mimic;
 }
@@ -1852,6 +1860,7 @@ void Init_oj() {
     bigdecimal_load_sym = ID2SYM(rb_intern("bigdecimal_load"));rb_gc_register_address(&bigdecimal_load_sym);
     bigdecimal_sym = ID2SYM(rb_intern("bigdecimal"));	rb_gc_register_address(&bigdecimal_sym);
     circular_sym = ID2SYM(rb_intern("circular"));	rb_gc_register_address(&circular_sym);
+    nilnil_sym = ID2SYM(rb_intern("nilnil"));		rb_gc_register_address(&nilnil_sym);
     class_cache_sym = ID2SYM(rb_intern("class_cache"));	rb_gc_register_address(&class_cache_sym);
     compat_sym = ID2SYM(rb_intern("compat"));		rb_gc_register_address(&compat_sym);
     create_id_sym = ID2SYM(rb_intern("create_id"));	rb_gc_register_address(&create_id_sym);

data/ext/oj/oj.h

@@ -136,6 +136,7 @@ typedef struct _Options {
     char	bigdec_as_num;	// YesNo
     char	bigdec_load;	// BigLoad
     char	to_json;	// YesNo
+    char	nilnil;		// YesNo
     const char	*create_id;	// 0 or string
     size_t	create_id_len;	// length of create_id
     int		sec_prec;	// second precision when dumping time

data/ext/oj/parse.c

@@ -742,6 +742,8 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len) {
     } else if (rb_type(input) == T_STRING) {
 	pi->json = rb_string_value_cstr((VALUE*)&input);
 	pi->end = pi->json + RSTRING_LEN(input);
+    } else if (Qnil == input && Yes == pi->options.nilnil) {
+	return Qnil;
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -135,6 +135,7 @@ class Juice < ::Test::Unit::TestCase
                    :bigdecimal_as_decimal=>true,
                    :bigdecimal_load=>:auto,
                    :use_to_json=>false,
+                   :nilnil=>false,
                    :allow_gc=>true,
                    :create_id=>'json_class'}, opts)
   end
@@ -153,6 +154,7 @@ class Juice < ::Test::Unit::TestCase
       :bigdecimal_as_decimal=>true,
       :bigdecimal_load=>:auto,
       :use_to_json=>true,
+      :nilnil=>false,
       :allow_gc=>true,
       :create_id=>'json_class'}
     o2 = {
@@ -168,6 +170,7 @@ class Juice < ::Test::Unit::TestCase
       :bigdecimal_as_decimal=>false,
       :bigdecimal_load=>:bigdecimal,
       :use_to_json=>false,
+      :nilnil=>true,
       :allow_gc=>false,
       :create_id=>nil}
     o3 = { :indent => 4 }
@@ -1106,6 +1109,21 @@ class Juice < ::Test::Unit::TestCase
     assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
   end
 
+  def test_nilnil_false
+    begin
+      Oj.load(nil)
+    rescue Exception => e
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_nilnil_true
+    obj = Oj.load(nil, :nilnil => true)
+    assert_equal(nil, obj)
+  end
+
 # Rails re-call test. Active support recalls the json dumper when the to_json
 # method is called. This mimics that and verifies Oj detects it.
   def test_rails_like

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com