oj 3.10.2 → 3.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0569d0892b3b9d79f0edf0866d843adb9abc21046838be295164884edb930b61'
-  data.tar.gz: ff04edae94da97c911b19c93015035df9fb3ce89162c0afc1df036e0f675e65f
+  metadata.gz: cb725babd05d3dadf33c86b0737e278f0f2eed8bb1792300dca74f5138a472a5
+  data.tar.gz: c60cd42eccaeea5937726f90225a611b19901ff4d133968e304de6f6d9077a31
 SHA512:
-  metadata.gz: 2d5a28e21b6c37bc5a11917512906c040cf8a0b038a07f23c0447a1705986fe98803191f6d2462e4f0ec67f7f3694cd9c61d0149d782f0a5e5f6b6d36a88d372
-  data.tar.gz: 789c0fdfe061476ee5e5c4bbe84519e7b1a6a015436e7fbe2cdb5f7922d6eef8de5914bd61488be4c297633e053f2a217630f7358796de9ba746aa6935466983
+  metadata.gz: 56791447ce08bbe3aca701ff0b50e17f70dbd2bae22bcc07fcdbe5216b9da7e976f6ee748bee83d12a2915148ddc83e99ac52203e9baa7a3e268023a808515e0
+  data.tar.gz: 9906af11fb4fd41f2a4d311d0c7e0a4d72c3947e53201fa745717f356d67cbc757ebcbbb341eff03f7d4c1cb1bb76da59d05b14e31119f098e1b398d8f164304

data/ext/oj/custom.c

@@ -1089,7 +1089,7 @@ hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
 		// offset and then a conversion to UTC keeps makes the time
 		// match the expected value.
 		parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
-	    } else if (ni->hasExp) {
+	    } else if (ni->has_exp) {
 		int64_t			t = (int64_t)(ni->i + ni->exp);
 		struct _timeInfo	ti;
 		VALUE			args[8];

data/ext/oj/dump.c

@@ -111,7 +111,7 @@ static char	rails_friendly_chars[256] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
-11611111111111111111111111111111";
+11111111111111111111111111111111";
 
 static void
 raise_strict(VALUE obj) {

data/ext/oj/dump_object.c

@@ -618,7 +618,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
 	    if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
-		return ST_CONTINUE;
+		continue;
 	    }
 	    value = rb_ivar_get(obj, vid);
 

data/ext/oj/object.c

@@ -295,7 +295,7 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 		    // offset and then a conversion to UTC keeps makes the time
 		    // match the expected value.
 		    parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
-		} else if (ni->hasExp) {
+		} else if (ni->has_exp) {
 		    int64_t		t = (int64_t)(ni->i + ni->exp);
 		    struct _timeInfo	ti;
 		    VALUE		args[8];

data/ext/oj/oj.c

@@ -115,6 +115,7 @@ static VALUE	custom_sym;
 static VALUE	empty_string_sym;
 static VALUE	escape_mode_sym;
 static VALUE	integer_range_sym;
+static VALUE	fast_sym;
 static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	huge_sym;
@@ -230,7 +231,7 @@ struct _options	oj_default_options = {
  * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes to use for JSON
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *: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.
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits. :float should be the same as ruby. :fast may require rounding but is must faster.
  * - *: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
@@ -331,6 +332,7 @@ get_def_opts(VALUE self) {
     switch (oj_default_options.bigdec_load) {
     case BigDec:	rb_hash_aset(opts, bigdecimal_load_sym, bigdecimal_sym);break;
     case FloatDec:	rb_hash_aset(opts, bigdecimal_load_sym, float_sym);	break;
+    case FastDec:	rb_hash_aset(opts, bigdecimal_load_sym, fast_sym);	break;
     case AutoDec:
     default:		rb_hash_aset(opts, bigdecimal_load_sym, auto_sym);	break;
     }
@@ -574,6 +576,8 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    copts->bigdec_load = BigDec;
 	} else if (float_sym == v) {
 	    copts->bigdec_load = FloatDec;
+	} else if (fast_sym == v) {
+	    copts->bigdec_load = FastDec;
 	} else if (auto_sym == v || Qfalse == v) {
 	    copts->bigdec_load = AutoDec;
 	} else {
@@ -803,7 +807,7 @@ oj_parse_opt_match_string(RxClass rc, VALUE ropts) {
 }
 
 /* Document-method: load
- * call-seq: load(json, options) { _|_obj, start, len_|_ }
+ * call-seq: load(json, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -887,7 +891,7 @@ load(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: load_file
- * call-seq: load_file(path, options) { _|_obj, start, len_|_ }
+ * call-seq: load_file(path, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -1045,7 +1049,7 @@ safe_load(VALUE self, VALUE doc) {
  */
 
 /* Document-method: dump
- * call-seq: dump(obj, options)
+ * call-seq: dump(obj, options={})
  *
  * Dumps an Object (obj) to a string.
  * - *obj* [_Object_] Object to serialize as an JSON document String
@@ -1143,7 +1147,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_file
- * call-seq: to_file(file_path, obj, options)
+ * call-seq: to_file(file_path, obj, options={})
  *
  * Dumps an Object to the specified file.
  * - *file* [_String_] _path file path to write the JSON document to
@@ -1166,7 +1170,7 @@ to_file(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_stream
- * call-seq: to_stream(io, obj, options)
+ * call-seq: to_stream(io, obj, options={})
  *
  * Dumps an Object to the specified IO stream.
  * - *io* [_IO_] IO stream to write the JSON document to
@@ -1654,6 +1658,7 @@ Init_oj() {
     empty_string_sym = ID2SYM(rb_intern("empty_string"));	rb_gc_register_address(&empty_string_sym);
     escape_mode_sym = ID2SYM(rb_intern("escape_mode"));		rb_gc_register_address(&escape_mode_sym);
     integer_range_sym = ID2SYM(rb_intern("integer_range"));	rb_gc_register_address(&integer_range_sym);
+    fast_sym = ID2SYM(rb_intern("fast"));			rb_gc_register_address(&fast_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);
     huge_sym = ID2SYM(rb_intern("huge"));			rb_gc_register_address(&huge_sym);

data/ext/oj/oj.h

@@ -77,7 +77,8 @@ typedef enum {
 typedef enum {
     BigDec	= 'b',
     FloatDec	= 'f',
-    AutoDec	= 'a'
+    AutoDec	= 'a',
+    FastDec	= 'F'
 } BigLoad;
 
 typedef enum {

data/ext/oj/parse.c

@@ -393,8 +393,9 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
-    ni.hasExp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    ni.has_exp = 0;
+    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load);
+    ni.bigdec_load = pi->options.bigdec_load;
 
     if ('-' == *pi->cur) {
 	pi->cur++;
@@ -453,6 +454,7 @@ read_num(ParseInfo pi) {
 	    // except when mimicing the JSON gem or in strict mode.
 	    if (StrictMode == pi->options.mode || CompatMode == pi->options.mode) {
 		int	pos = (int)(pi->cur - ni.str);
+
 		if (1 == pos || (2 == pos && ni.neg)) {
 		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
 		    return;
@@ -468,18 +470,26 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}
 	if ('e' == *pi->cur || 'E' == *pi->cur) {
 	    int	eneg = 0;
 
-	    ni.hasExp = 1;
+	    ni.has_exp = 1;
 	    pi->cur++;
 	    if ('-' == *pi->cur) {
 		pi->cur++;
@@ -490,7 +500,7 @@ read_num(ParseInfo pi) {
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		ni.exp = ni.exp * 10 + (*pi->cur - '0');
 		if (EXP_MAX <= ni.exp) {
-		    ni.big = 1;
+		    ni.big = true;
 		}
 	    }
 	    if (eneg) {
@@ -750,6 +760,59 @@ parse_big_decimal(VALUE str) {
     return rb_funcall(rb_cObject, oj_bigdecimal_id, 1, str);
 }
 
+static long double	exp_plus[] = {
+    1.0,
+    1.0e1,
+    1.0e2,
+    1.0e3,
+    1.0e4,
+    1.0e5,
+    1.0e6,
+    1.0e7,
+    1.0e8,
+    1.0e9,
+    1.0e10,
+    1.0e11,
+    1.0e12,
+    1.0e13,
+    1.0e14,
+    1.0e15,
+    1.0e16,
+    1.0e17,
+    1.0e18,
+    1.0e19,
+    1.0e20,
+    1.0e21,
+    1.0e22,
+    1.0e23,
+    1.0e24,
+    1.0e25,
+    1.0e26,
+    1.0e27,
+    1.0e28,
+    1.0e29,
+    1.0e30,
+    1.0e31,
+    1.0e32,
+    1.0e33,
+    1.0e34,
+    1.0e35,
+    1.0e36,
+    1.0e37,
+    1.0e38,
+    1.0e39,
+    1.0e40,
+    1.0e41,
+    1.0e42,
+    1.0e43,
+    1.0e44,
+    1.0e45,
+    1.0e46,
+    1.0e47,
+    1.0e48,
+    1.0e49,
+};
+
 VALUE
 oj_num_as_value(NumInfo ni) {
     volatile VALUE	rnum = Qnil;
@@ -762,7 +825,7 @@ oj_num_as_value(NumInfo ni) {
 	}
     } else if (ni->nan) {
 	rnum = rb_float_new(0.0/0.0);
-    } else if (1 == ni->div && 0 == ni->exp) { // fixnum
+    } else if (1 == ni->div && 0 == ni->exp && !ni->has_exp) { // fixnum
 	if (ni->big) {
 	    if (256 > ni->len) {
 		char	buf[256];
@@ -793,33 +856,35 @@ oj_num_as_value(NumInfo ni) {
 	    if (ni->no_big) {
 		rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
 	    }
-	} else {
-	    // All these machinations are to get rounding to work better.
-	    long double	d = (long double)ni->i * (long double)ni->div + (long double)ni->num;
+	} else if (FastDec == ni->bigdec_load) {
+	    long double	ld = (long double)ni->i * (long double)ni->div + (long double)ni->num;
 	    int		x = (int)((int64_t)ni->exp - ni->di);
 
-	    // Rounding sometimes cuts off the last digit even if there are only
-	    // 15 digits. This attempts to fix those few cases where this
-	    // occurs.
-	    if ((long double)INT64_MAX > d && (int64_t)d != (ni->i * ni->div + ni->num)) {
-		volatile VALUE	bd = rb_str_new(ni->str, ni->len);
-
-		rnum = rb_rescue2(parse_big_decimal, bd, rescue_big_decimal, bd, rb_eException, 0);
-		if (ni->no_big) {
-		    rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
-		}
-	    } else {
-		d = roundl(d);
-		if (0 < x) {
-		    d *= powl(10.0L, x);
-		} else if (0 > x) {
-		    d /= powl(10.0L, -x);
+	    if (0 < x) {
+		if (x < (int)(sizeof(exp_plus) / sizeof(*exp_plus))) {
+		    ld *= exp_plus[x];
+		} else {
+		    ld *= powl(10.0, x);
 		}
-		if (ni->neg) {
-		    d = -d;
+	    } else if (x < 0) {
+		if (-x < (int)(sizeof(exp_plus) / sizeof(*exp_plus))) {
+		    ld /= exp_plus[-x];
+		} else {
+		    ld /= powl(10.0, -x);
 		}
-		rnum = rb_float_new((double)d);
 	    }
+	    if (ni->neg) {
+		ld = -ld;
+	    }
+	    rnum = rb_float_new((double)ld);
+	} else {
+	    char	*end;
+	    double	d = strtod(ni->str, &end);
+
+	    if ((long)ni->len != (long)(end - ni->str)) {
+		rb_raise(oj_parse_error_class, "Invalid float");
+	    }
+	    rnum = rb_float_new(d);
 	}
     }
     return rnum;
@@ -841,6 +906,12 @@ oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const
     if (p + 3 < end) {
 	*p++ = ' ';
 	*p++ = '(';
+	*p++ = 'a';
+	*p++ = 'f';
+	*p++ = 't';
+	*p++ = 'e';
+	*p++ = 'r';
+	*p++ = ' ';
 	start = p;
 	for (vp = pi->stack.head; vp < pi->stack.tail; vp++) {
 	    if (end <= p + 1 + vp->klen) {
@@ -1041,12 +1112,6 @@ CLEANUP:
     if (pi->str_rx.head != oj_default_options.str_rx.head) {
 	oj_rxclass_cleanup(&pi->str_rx);
     }
-    // TBD if validate only then (Qundef == result ??)
-    //  if pi->err or 0 != line
-    // 	  rb_get_errinfo();??
-    //    rb_set_errinfo(Qnil);
-    //  return nil or error
-
     if (err_has(&pi->err)) {
 	rb_set_errinfo(Qnil);
 	if (Qnil != pi->err_class) {

data/ext/oj/parse.h

@@ -31,8 +31,9 @@ typedef struct _numInfo {
     int		infinity;
     int		nan;
     int		neg;
-    int		hasExp;
+    int		has_exp;
     int		no_big;
+    int		bigdec_load;
 } *NumInfo;
 
 typedef struct _parseInfo {

data/ext/oj/rails.c

@@ -1012,7 +1012,6 @@ rails_encode(int argc, VALUE *argv, VALUE self) {
     }
 }
 
-// TBD provide a get function as well
 static VALUE
 rails_use_standard_json_time_format(VALUE self, VALUE state) {
     if (Qtrue == state || Qfalse == state) {

data/ext/oj/sparse.c

@@ -407,8 +407,10 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
-    ni.hasExp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    ni.has_exp = 0;
+    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load);
+    ni.bigdec_load = pi->options.bigdec_load;
+
     c = reader_get(&pi->rd);
     if ('-' == c) {
 	c = reader_get(&pi->rd);
@@ -469,18 +471,26 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}
 	if ('e' == c || 'E' == c) {
 	    int	eneg = 0;
 
-	    ni.hasExp = 1;
+	    ni.has_exp = 1;
 	    c = reader_get(&pi->rd);
 	    if ('-' == c) {
 		c = reader_get(&pi->rd);
@@ -539,7 +549,8 @@ read_nan(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 1;
     ni.neg = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load);
+    ni.bigdec_load = pi->options.bigdec_load;
 
     if ('a' != reader_get(&pi->rd) ||
 	('N' != (c = reader_get(&pi->rd)) && 'n' != c)) {
@@ -737,6 +748,7 @@ oj_sparse2(ParseInfo pi) {
 		ni.nan = 1;
 		ni.neg = 0;
 		ni.no_big = (FloatDec == pi->options.bigdec_load);
+		ni.bigdec_load = pi->options.bigdec_load;
 		add_num_value(pi, &ni);
 	    } else {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid token");

data/lib/oj/version.rb

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

data/pages/Options.md

@@ -80,16 +80,16 @@ dynamically modifying classes or reloading classes then don't use this.
 
 ### :create_additions
 
-A flag indicating the :create_id key when encountered during parsing should
-creating an Object mactching the class name specified in the value associated
-with the key.
+A flag indicating that the :create_id key, when encountered during parsing,
+should create an Object matching the class name specified in the value
+associated with the key.
 
 ### :create_id [String]
 
 The :create_id option specifies that key is used for dumping and loading when
 specifying the class for an encoded object. The default is `json_create`.
 
-In the `:custom` mode setting the `:create_id` to nil will cause Complex,
+In the `:custom` mode, setting the `:create_id` to nil will cause Complex,
 Rational, Range, and Regexp to be output as strings instead of as JSON
 objects.
 
@@ -179,7 +179,7 @@ customization.
 ### :nan [Symbol]
 
 How to dump Infinity, -Infinity, and NaN in :null, :strict, and :compat
-mode. Default is :auto but is ignored in the :compat and :rails mode.
+mode. Default is :auto but is ignored in the :compat and :rails modes.
 
  - `:null` places a null
 
@@ -252,7 +252,7 @@ The :time_format when dumping.
 
  - `:unix` time is output as a decimal number in seconds since epoch including fractions of a second.
 
- - `:unix_zone` similar to the `:unix` format but with the timezone encoded in
+ - `:unix_zone` is similar to the `:unix` format but with the timezone encoded in
    the exponent of the decimal number of seconds since epoch.
 
  - `:xmlschema` time is output as a string that follows the XML schema definition.
@@ -262,16 +262,16 @@ The :time_format when dumping.
 ### :use_as_json [Boolean]
 
 Call `as_json()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.
 
 
 ### :use_raw_json [Boolean]
 
 Call `raw_json()` methods on dump, default is false. The option is
-accepted in the :compat and :rails mode even though it is not
+accepted in the :compat and :rails modes even though it is not
 supported by other JSON gems. It provides a means to optimize dump or
 generate performance. The `raw_json(depth, indent)` method should be
-called only by Oj. It is not intended for any other use. This is mean
+called only by Oj. It is not intended for any other use. This is meant
 to replace the abused `to_json` methods. Calling `Oj.dump` inside the
 `raw_json` with the object itself when `:use_raw_json` is true will
 result in an infinite loop.
@@ -279,9 +279,9 @@ result in an infinite loop.
 ### :use_to_hash [Boolean]
 
 Call `to_hash()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.
 
 ### :use_to_json [Boolean]
 
 Call `to_json()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.

data/pages/Rails.md

@@ -89,10 +89,11 @@ require 'oj'
 
 module OjJsonEncoder
   def render(options = nil, extra_options = {}, &block)
-    if options && options[:json]
+    if options && options.is_a?(Hash) && options[:json]
       obj = options.delete(:json)
-      options[:text] = Oj.dump(obj, :mode => :rails)
-      options[:content_type] = 'application/json'
+      obj = Oj.dump(obj, :mode => :rails) unless obj.is_a?(String)
+      options[:text] = obj
+      response.content_type ||= Mime::JSON
     end
     super
   end

data/test/bar.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -7,16 +6,30 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-require 'rails'
 require 'active_support'
-require 'active_support/json'
+require "active_support/json"
 
-require 'oj'
+$s = "\u2014 & \n \u{1F618}"
+
+=begin
+def check(label)
+  puts "\n--- #{label} --------------------"
+
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
+  puts "with standard_json == true: t.to_json - #{$t.to_json}"
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+  puts "with standard_json == false: t.to_json - #{$t.to_json}"
+end
+
+check('Before Oj')
+=end
 
-puts Rails::VERSION::STRING
+require 'oj'
 
-#Oj.optimize_rails
+ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false
+puts "ActiveSupport.encode(s) - #{ActiveSupport::JSON.encode($s)}"
 
-h = {foo: "bar"}
+Oj.optimize_rails
+Oj.default_options = { mode: :rails }
 
-puts Oj.dump(h, mode: :rails)
+puts "Oj.dump(s) - #{Oj.dump($s)}"

data/test/json_gem/json_common_interface_test.rb

@@ -15,7 +15,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   def setup
     @hash = {
       'a' => 2,
-      'b' => 3.141,
+      'b' => 5.23683071,
       'c' => 'c',
       'd' => [ 1, "b", 3.14 ],
       'e' => { 'foo' => 'bar' },
@@ -23,7 +23,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
       'h' => 1000.0,
       'i' => 0.001
     }
-    @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
+    @json = '{"a":2,"b":5.23683071,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 

data/test/prec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'oj'
+
+extras = {"locationLng" => -97.14690769100295}
+
+Oj.default_options = {float_precision: 17}
+
+encoded = Oj.dump(extras)
+puts encoded
+puts Oj.load(encoded)
+
+require "active_record"
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+
+Oj.default_options = {float_precision: 17}
+# Using Oj rails encoder, gets the correct value: {"locationLng":-97.14690769100295}
+encoded = ActiveSupport::JSON.encode(extras)
+puts encoded
+puts ActiveSupport::JSON.decode(encoded)
+puts Oj.load(encoded)

data/test/sample_json.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW2
+#!/usr/bin/env ruby
 
 if $0 == __FILE__
   $: << '.'

data/test/test_custom.rb

@@ -118,6 +118,17 @@ class CustomJuice < Minitest::Test
     dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
+  def test_float_parse
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :float);
+    assert_equal(Float, f.class)
+  end
+
+  def test_float_parse_fast
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :fast);
+    assert_equal(Float, f.class)
+    assert_equal(12.123456789012346, f)
+  end
+
   def test_nan_dump
     assert_equal('null', Oj.dump(0/0.0, :nan => :null))
     assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :nan => :huge))

data/test/test_various.rb

@@ -185,7 +185,6 @@ class Juice < Minitest::Test
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
     assert_equal('-0.12345678901234567E-4', n.to_s.upcase)
-
   end
 
 =begin
@@ -671,7 +670,7 @@ class Juice < Minitest::Test
 	raise e
       end
     }
-    assert_equal('first[2].third', msg.split('(')[1].split(')')[0])
+    assert_equal('after first[2].third', msg.split('(')[1].split(')')[0])
   end
 
   def test_bad_bignum

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.10.2
+  version: 3.10.8
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -219,6 +219,7 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/prec.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -289,6 +290,7 @@ specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
 - test/foo.rb
+- test/prec.rb
 - test/test_integer_range.rb
 - test/test_strict.rb
 - test/perf_strict.rb