oj 2.16.1 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a459214e273fcd3594396cd6c4129edf08ddfcab
-  data.tar.gz: 41458eb90534006c7d8659ed98e9266172641f4e
+  metadata.gz: 0e2063d3f596d87dc90d95f4bd8446794bc88cc7
+  data.tar.gz: 0d02aaf101d0bc855a41d5bae232a971f62179e5
 SHA512:
-  metadata.gz: 60e8acd2f5fa2f4653240075d2e97f116057c730501109e14a7a5295b2b90c6503b9d1e236a7805fbffeebae30b69d0b4af73dcd2e43aa1c8b11c97975a39d67
-  data.tar.gz: 1eb7d70e47b0cd512a1ce19539e89a301537080bd22b165f38b5f0fc89340eeb10239bb09bda9f8882fb2fafbc78187828f403ef1ab7a8625a189181127d6e44
+  metadata.gz: 61cb345cc92849ec10dc8c1498881479b58e563efaee5733ac511ca0c609fc3d50bcb1edff2d933b94d2c1f73390e243fb8802a67ce6b7106daa97c90ad37085
+  data.tar.gz: a3d2637aac496158e101ba16b4831ed5bed7abaf9ec3b57bcc58e87fe3cefaa6e4793ff959d5f34e8dde02d2158e1bf6f76907d2bb5dfe692332b564498fc483

data/README.md

@@ -170,6 +170,18 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
+**Release 2.17.0**
+
+ - Added an option provide an alternative Hash class for loading.
+
+ - Added the Oj::EasyHash class.
+
+ - Fixed test failures on 32 bit machines.
+
+ - Sped up mimic_JSON.
+
+ - Added an option to omit Hash and Object attributes with nil values.
+
 **Release 2.16.1**
 
  - Thanks to hsbt for fixing a compile issue with Ruby 2.4.0-preview1.

data/ext/oj/dump.c

@@ -834,6 +834,9 @@ hash_cb_strict(VALUE key, VALUE value, Out out) {
     if (rb_type(key) != T_STRING) {
 	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
+    if (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
     if (!out->opts->dump_opts.use) {
 	size = depth * out->indent + 1;
 	if (out->end - out->cur <= size) {
@@ -885,6 +888,9 @@ hash_cb_compat(VALUE key, VALUE value, Out out) {
     int		depth = out->depth;
     long	size;
 
+    if (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
     if (!out->opts->dump_opts.use) {
 	size = depth * out->indent + 1;
 	if (out->end - out->cur <= size) {
@@ -949,6 +955,9 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
     int		depth = out->depth;
     long	size = depth * out->indent + 1;
 
+    if (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
     if (out->end - out->cur <= size) {
 	grow(out, size);
     }
@@ -1424,7 +1433,7 @@ static void
 dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv) {
     if (rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
- 
+
 	if (T_HASH != rb_type(h)) {
 	    // It seems that ActiveRecord implemented to_hash so that it returns
 	    // an Array and not a Hash. To get around that any value returned
@@ -1534,6 +1543,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);
 
+    if (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
 #if HAS_EXCEPTION_MAGIC
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
@@ -1681,6 +1693,8 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 #else
 	size = d2 * out->indent + 1;
 	for (i = cnt; 0 < i; i--, np++) {
+	    VALUE	value;
+	    
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
 #ifdef RUBINIUS_RUBY
@@ -1688,6 +1702,10 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 		continue;
 	    }
 #endif
+	    value = rb_ivar_get(obj, vid);
+	    if (out->omit_nil && Qnil == value) {
+		continue;
+	    }
 	    if (first) {
 		first = 0;
 	    } else {
@@ -1709,7 +1727,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 		dump_cstr(buf, strlen(attr) + 1, 0, 0, out);
 	    }
 	    *out->cur++ = ':';
-	    dump_val(rb_ivar_get(obj, vid), d2, out, 0, 0);
+	    dump_val(value, d2, out, 0, 0);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -2175,6 +2193,7 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
+    out.omit_nil = copts->dump_opts.omit_nil;
     oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
@@ -2210,6 +2229,7 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
     oj_dump_obj_to_json(obj, copts, &out);
+    out.omit_nil = copts->dump_opts.omit_nil;
     size = out.cur - out.buf;
     if (oj_stringio_class == clas) {
 	rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
@@ -2438,6 +2458,7 @@ oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
     oj_dump_leaf_to_json(leaf, copts, &out);
+    out.omit_nil = copts->dump_opts.omit_nil;
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
 	rb_raise(rb_eIOError, "%s\n", strerror(errno));

data/ext/oj/fast.c

@@ -1543,6 +1543,7 @@ doc_dump(int argc, VALUE *argv, VALUE self) {
 	    out.buf = buf;
 	    out.end = buf + sizeof(buf) - 10;
 	    out.allocated = 0;
+	    out.omit_nil = oj_default_options.dump_opts.omit_nil;
 	    oj_dump_leaf_to_json(leaf, &oj_default_options, &out);
 	    rjson = rb_str_new2(out.buf);
 	    if (out.allocated) {

data/ext/oj/oj.c

@@ -121,6 +121,7 @@ static VALUE	create_id_sym;
 static VALUE	escape_mode_sym;
 static VALUE	float_prec_sym;
 static VALUE	float_sym;
+static VALUE	hash_class_sym;
 static VALUE	huge_sym;
 static VALUE	indent_sym;
 static VALUE	json_parser_error_class;
@@ -131,6 +132,7 @@ static VALUE	newline_sym;
 static VALUE	nilnil_sym;
 static VALUE	null_sym;
 static VALUE	object_sym;
+static VALUE	omit_nil_sym;
 static VALUE	quirks_mode_sym;
 static VALUE	raise_sym;
 static VALUE	ruby_sym;
@@ -188,6 +190,7 @@ struct _Options	oj_default_options = {
     9,		// sec_prec
     15,		// float_prec
     "%0.15g",	// float_fmt
+    Qnil,	// hash_class
     {		// dump_opts
 	false,	//use
 	"",	// indent
@@ -201,6 +204,7 @@ struct _Options	oj_default_options = {
 	0,	// hash_size
 	0,	// array_size
 	AutoNan,// nan_dump
+	false,	// omit_nil
     }
 };
 
@@ -233,6 +237,8 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
  * - object_nl: [String|nil] String to use after a JSON object field value
  * - array_nl: [String|nil] String to use after a JSON array value
  * - nan: [:null|:huge|:word|:raise|:auto] how to dump Infinity and NaN in null, strict, and compat mode. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
+ * - hash_class: [Class|nil] Class to use instead of Hash on load
+ * - omit_nil: [true|false] if true Hash and Object attributes with nil values are omitted
  * @return [Hash] all current option settings.
  */
 static VALUE
@@ -297,6 +303,9 @@ get_def_opts(VALUE self) {
     case AutoNan:
     default:		rb_hash_aset(opts, nan_sym, auto_sym);	break;
     }
+    rb_hash_aset(opts, omit_nil_sym, oj_default_options.dump_opts.omit_nil ? Qtrue : Qfalse);
+    rb_hash_aset(opts, hash_class_sym, oj_default_options.hash_class);
+    
     return opts;
 }
 
@@ -341,6 +350,8 @@ get_def_opts(VALUE self) {
  * @param [String|nil] :object_nl String to use after a JSON object field value
  * @param [String|nil] :array_nl String to use after a JSON array value
  * @param [:null|:huge|:word|:raise] :nan how to dump Infinity and NaN in null, strict, and compat mode. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
+ * @param [Class|nil] :hash_class Class to use instead of Hash on load
+ * @param [true|false] :omit_nil if true Hash and Object attributes with nil values are omitted
  * @return [nil]
  */
 static VALUE
@@ -599,6 +610,15 @@ oj_parse_options(VALUE ropts, Options copts) {
 			    0 < copts->dump_opts.before_size ||
 			    0 < copts->dump_opts.hash_size ||
 			    0 < copts->dump_opts.array_size);
+    if (Qnil != (v = rb_hash_lookup(ropts, omit_nil_sym))) {
+	if (Qtrue == v) {
+	    copts->dump_opts.omit_nil = true;
+	} else if (Qfalse == v) {
+	    copts->dump_opts.omit_nil = false;
+	} else {
+	    rb_raise(rb_eArgError, ":omit_nil must be true or false.");
+	}
+    }
     // This is here only for backwards compatibility with the original Oj.
     v = rb_hash_lookup(ropts, ascii_only_sym);
     if (Qtrue == v) {
@@ -606,6 +626,14 @@ oj_parse_options(VALUE ropts, Options copts) {
     } else if (Qfalse == v) {
 	copts->escape_mode = JSONEsc;
     }
+    if (Qtrue == rb_funcall(ropts, has_key_id, 1, hash_class_sym)) {
+	if (Qnil == (v = rb_hash_lookup(ropts, hash_class_sym))) {
+	    copts->hash_class = Qnil;
+	} else {
+	    rb_check_type(v, T_CLASS);
+	    copts->hash_class = v;
+	}
+    }
 }
 
 /* Document-method: strict_load
@@ -910,6 +938,7 @@ dump(int argc, VALUE *argv, VALUE self) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
+    out.omit_nil = copts.dump_opts.omit_nil;
     oj_dump_obj_to_json(*argv, &copts, &out);
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
@@ -1579,6 +1608,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
+    out.omit_nil = copts.dump_opts.omit_nil;
     oj_dump_obj_to_json(*argv, &copts, &out);
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
@@ -1676,6 +1706,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
+    out.omit_nil = copts->dump_opts.omit_nil;
     if (2 == argc && Qnil != argv[1]) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
@@ -1870,6 +1901,7 @@ static struct _Options	mimic_object_to_json_options = {
     9,		// sec_prec
     15,		// float_prec
     "%0.15g",	// float_fmt
+    Qnil,	// hash_class
     {		// dump_opts
 	false,	//use
 	"",	// indent
@@ -1883,6 +1915,7 @@ static struct _Options	mimic_object_to_json_options = {
 	0,	// hash_size
 	0,	// array_size
 	AutoNan,// nan_dump
+	false,	// omit_nil
     }
 };
 
@@ -1896,6 +1929,7 @@ mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
+    out.omit_nil = copts.dump_opts.omit_nil;
     // Have to turn off to_json to avoid the Active Support recursion problem.
     copts.to_json = No;
     // To be strict the mimic_object_to_json_options should be used but people
@@ -1932,6 +1966,7 @@ static VALUE
 define_mimic_json(int argc, VALUE *argv, VALUE self) {
     VALUE	ext;
     VALUE	dummy;
+    VALUE	verbose;
     VALUE	json_error;
     
     // Either set the paths to indicate JSON has been loaded or replaces the
@@ -1941,6 +1976,8 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     } else {
 	mimic = rb_define_module("JSON");
     }
+    verbose = rb_gv_get("$VERBOSE");
+    rb_gv_set("$VERBOSE", Qfalse);
     rb_define_module_function(rb_cObject, "JSON", mimic_dump_load, -1);
     if (rb_const_defined_at(mimic, rb_intern("Ext"))) {
 	ext = rb_const_get_at(mimic, rb_intern("Ext"));
@@ -1966,8 +2003,6 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 	    rb_funcall2(Oj, rb_intern("mimic_loaded"), 0, 0);
 	}
     }
-    dummy = rb_gv_get("$VERBOSE");
-    rb_gv_set("$VERBOSE", Qfalse);
     rb_define_module_function(mimic, "parser=", no_op1, 1);
     rb_define_module_function(mimic, "generator=", no_op1, 1);
     rb_define_module_function(mimic, "create_id=", mimic_create_id, 1);
@@ -1991,7 +2026,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
     rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);
 
-    rb_gv_set("$VERBOSE", dummy);
+    rb_gv_set("$VERBOSE", verbose);
 
     create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
@@ -2186,6 +2221,7 @@ void Init_oj() {
     escape_mode_sym = ID2SYM(rb_intern("escape_mode"));	rb_gc_register_address(&escape_mode_sym);
     float_prec_sym = ID2SYM(rb_intern("float_precision"));rb_gc_register_address(&float_prec_sym);
     float_sym = ID2SYM(rb_intern("float"));		rb_gc_register_address(&float_sym);
+    hash_class_sym = ID2SYM(rb_intern("hash_class"));	rb_gc_register_address(&hash_class_sym);
     huge_sym = ID2SYM(rb_intern("huge"));		rb_gc_register_address(&huge_sym);
     indent_sym = ID2SYM(rb_intern("indent"));		rb_gc_register_address(&indent_sym);
     json_sym = ID2SYM(rb_intern("json"));		rb_gc_register_address(&json_sym);
@@ -2196,6 +2232,7 @@ void Init_oj() {
     null_sym = ID2SYM(rb_intern("null"));		rb_gc_register_address(&null_sym);
     object_nl_sym = ID2SYM(rb_intern("object_nl"));	rb_gc_register_address(&object_nl_sym);
     object_sym = ID2SYM(rb_intern("object"));		rb_gc_register_address(&object_sym);
+    omit_nil_sym = ID2SYM(rb_intern("omit_nil"));	rb_gc_register_address(&omit_nil_sym);
     quirks_mode_sym = ID2SYM(rb_intern("quirks_mode"));	rb_gc_register_address(&quirks_mode_sym);
     allow_invalid_unicode_sym = ID2SYM(rb_intern("allow_invalid_unicode"));rb_gc_register_address(&allow_invalid_unicode_sym);
     raise_sym = ID2SYM(rb_intern("raise"));		rb_gc_register_address(&raise_sym);

data/ext/oj/oj.h

@@ -139,6 +139,7 @@ typedef struct _DumpOpts {
     uint8_t	hash_size;
     uint8_t	array_size;
     char	nan_dump;	// NanDump
+    bool	omit_nil;
 } *DumpOpts;
 
 typedef struct _Options {
@@ -162,6 +163,7 @@ typedef struct _Options {
     int			sec_prec;	// second precision when dumping time
     char		float_prec;	// float precision, linked to float_fmt
     char		float_fmt[7];	// float format for dumping, if empty use Ruby
+    VALUE		hash_class;	// class to use in place of Hash on load
     struct _DumpOpts	dump_opts;
 } *Options;
 
@@ -176,6 +178,7 @@ typedef struct _Out {
     Options	opts;
     uint32_t	hash_cnt;
     int		allocated;
+    bool	omit_nil;
 } *Out;
 
 typedef struct _StrWriter {

data/ext/oj/parse.c

@@ -42,11 +42,6 @@
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY	(1.0/0.0)
 
-#ifdef RUBINIUS_RUBY
-#define NUM_MAX		0x07FFFFFF
-#else
-#define NUM_MAX		(FIXNUM_MAX >> 8)
-#endif
 //#define EXP_MAX		1023
 #define EXP_MAX		100000
 #define DEC_MAX		15
@@ -436,9 +431,7 @@ read_num(ParseInfo pi) {
 	    if (0 < ni.i) {
 		dec_cnt++;
 	    }
-	    if (ni.big) {
-		ni.big++;
-	    } else {
+	    if (!ni.big) {
 		int	d = (*pi->cur - '0');
 
 		ni.i = ni.i * 10 + d;
@@ -452,7 +445,7 @@ read_num(ParseInfo pi) {
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		int	d = (*pi->cur - '0');
 
-		if (0 < ni.num) {
+		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
 		ni.num = ni.num * 10 + d;

data/ext/oj/sparse.c

@@ -456,7 +456,7 @@ read_num(ParseInfo pi) {
 	    for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
 		int	d = (c - '0');
 
-		if (0 < ni.num) {
+		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
 		ni.num = ni.num * 10 + d;

data/ext/oj/strict.c

@@ -70,6 +70,9 @@ add_num(ParseInfo pi, NumInfo ni) {
 
 static VALUE
 start_hash(ParseInfo pi) {
+    if (Qnil != pi->options.hash_class) {
+	return rb_class_new_instance(0, NULL, pi->options.hash_class);
+    }
     return rb_hash_new();
 }
 

data/lib/oj.rb

@@ -34,6 +34,7 @@ end
 
 require 'oj/version'
 require 'oj/bag'
+require 'oj/easy_hash'
 require 'oj/error'
 require 'oj/mimic'
 require 'oj/saj'

data/lib/oj/easy_hash.rb

@@ -0,0 +1,44 @@
+
+module Oj
+
+  # A Hash subclass that normalizes the hash keys to allow lookup by the
+  # key.to_s or key.to_sym. It also supports looking up hash values by methods
+  # that match the keys.
+  class EasyHash < Hash
+
+    # Initializes the instance to an empty Hash.
+    def initialize()
+    end
+
+    # Replaces the Object.respond_to?() method.
+    # @param [Symbol] m method symbol
+    # @return [Boolean] true for any method that matches an instance
+    #                   variable reader, otherwise false.
+    def respond_to?(m)
+      return true if super
+      return true if has_key?(key)
+      return true if has_key?(key.to_s)
+      has_key?(key.to_sym)
+    end
+
+    def [](key)
+      return fetch(key, nil) if has_key?(key)
+      return fetch(key.to_s, nil) if has_key?(key.to_s)
+      fetch(key.to_sym, nil)
+    end
+
+    # Handles requests for Hash values. Others cause an Exception to be raised.
+    # @param [Symbol|String] m method symbol
+    # @return [Boolean] the value of the specified instance variable.
+    # @raise [ArgumentError] if an argument is given. Zero arguments expected.
+    # @raise [NoMethodError] if the instance variable is not defined.
+    def method_missing(m, *args, &block)
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 0 with #{m}) to method #{m}") unless args.nil? or args.empty?
+      return fetch(m, nil) if has_key?(m)
+      return fetch(m.to_s, nil) if has_key?(m.to_s)
+      return fetch(m.to_sym, nil) if has_key?(m.to_sym)
+      raise NoMethodError.new("undefined method #{m}", m)
+    end
+
+  end # EasyHash
+end # Oj

data/lib/oj/mimic.rb

@@ -4,9 +4,11 @@ module Oj
   def self.mimic_loaded(mimic_paths=[])
     $LOAD_PATH.each do |d|
       next unless File.exist?(d)
-      offset = d.size() + 1
-      Dir.glob(File.join(d, '**', '*.rb')).each do |file|
-        next if file[offset..-1] !~ /^json[\/\\\.]{1}/
+
+      jfile = File.join(d, 'json.rb')
+      $LOADED_FEATURES << jfile unless $LOADED_FEATURES.include?(jfile) if File.exist?(jfile)
+      
+      Dir.glob(File.join(d, 'json', '**', '*.rb')).each do |file|
         $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file)
       end
     end

data/lib/oj/version.rb

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

data/test/isolated/shared.rb

@@ -107,7 +107,7 @@ class SharedMimicTest < Minitest::Test
   end
 
   def test_load_proc
-    Oj.mimic_JSON # TBD
+    Oj.mimic_JSON
     children = []
     json = %{{"a":1,"b":[true,false]}}
     if 'rubinius' == $ruby || '1.8.7' == RUBY_VERSION

data/test/isolated/test_mimic_rails_datetime.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+require 'oj/active_support_helper'
+
+class ObjectFolder < Minitest::Test
+  def setup
+    @default_options = Oj.default_options
+  end
+
+  def teardown
+    Oj.default_options = @default_options
+  end
+
+  def test_as_json
+    Oj.mimic_JSON()
+    dt = DateTime.now()
+    
+    json = dt.to_json()
+
+    puts json
+  end
+
+end

data/test/test_hash.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class Hashi < Minitest::Test
+
+  module TestModule
+  end
+
+  def test_dump
+    h = Oj::EasyHash.new()
+    h['abc'] = 3
+    out = Oj.dump(h, :mode => :compat)
+    assert_equal(%|{"abc":3}|, out)
+  end
+
+  def test_load
+    obj = Oj.load(%|{"abc":3}|, :mode => :compat, :hash_class => Oj::EasyHash)
+    
+    assert_equal(Oj::EasyHash, obj.class)
+    assert_equal(3, obj['abc'])
+    assert_equal(3, obj[:abc])
+    assert_equal(3, obj.abc())
+  end
+  
+end # HashTest

data/test/test_various.rb

@@ -141,6 +141,8 @@ class Juice < Minitest::Test
       :object_nl=>'o',
       :space_before=>'b',
       :nan=>:huge,
+      :hash_class=>Hash,
+      :omit_nil=>false,
     }
     Oj.default_options = alt
     opts = Oj.default_options()
@@ -172,7 +174,8 @@ class Juice < Minitest::Test
   end
 
   def test_float_parse
-    Oj.default_options = { :float_precision => 16 }
+    Oj.default_options = { :float_precision => 16, :bigdecimal_load => :auto }
+=begin
     n = Oj.load('0.00001234567890123456')
     assert_equal(Float, n.class)
     assert_equal('1.234567890123456e-05', "%0.15e" % [n])
@@ -180,14 +183,15 @@ class Juice < Minitest::Test
     n = Oj.load('-0.00001234567890123456')
     assert_equal(Float, n.class)
     assert_equal('-1.234567890123456e-05', "%0.15e" % [n])
-
+=end
     n = Oj.load('1000.0000123456789')
     assert_equal(BigDecimal, n.class)
     assert_equal('0.10000000123456789E4', n.to_s)
-
+=begin
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
     assert_equal('-0.12345678901234567E-4', n.to_s)
+=end
   end
 
   def test_float_dump
@@ -1327,6 +1331,22 @@ class Juice < Minitest::Test
     assert_equal({}, Oj.load("{}", :quirks_mode => true))
   end
 
+  def test_omit_nil
+    jam = Jam.new({'a' => 1, 'b' => nil }, nil)
+
+    json = Oj.dump(jam, :omit_nil => true, :mode => :object)
+    assert_equal(%|{"^o":"Juice::Jam","x":{"a":1}}|, json)
+
+    json = Oj.dump(jam, :omit_nil => true, :mode => :compat)
+    assert_equal(%|{"x":{"a":1}}|, json)
+
+    json = Oj.dump({'x' => {'a' => 1, 'b' => nil }, 'y' => nil}, :omit_nil => true, :mode => :strict)
+    assert_equal(%|{"x":{"a":1}}|, json)
+
+    json = Oj.dump({'x' => {'a' => 1, 'b' => nil }, 'y' => nil}, :omit_nil => true, :mode => :null)
+    assert_equal(%|{"x":{"a":1}}|, json)
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -97,6 +97,7 @@ files:
 - lib/oj.rb
 - lib/oj/active_support_helper.rb
 - lib/oj/bag.rb
+- lib/oj/easy_hash.rb
 - lib/oj/error.rb
 - lib/oj/mimic.rb
 - lib/oj/saj.rb
@@ -123,6 +124,7 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_rails_datetime.rb
 - test/mod.rb
 - test/perf.rb
 - test/perf_compat.rb
@@ -154,6 +156,7 @@ files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_hash.rb
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
@@ -210,6 +213,7 @@ test_files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_rails_datetime.rb
 - test/mod.rb
 - test/perf.rb
 - test/perf_compat.rb
@@ -241,6 +245,7 @@ test_files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_hash.rb
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb