oj 3.6.13 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5fd9fac91126f270714362850b976b7f4cf1102462aab26c2f4f65f457a905
-  data.tar.gz: e2e200e2ec9e76f073206c084c1a7e45592710e0fbb43a5ba4f9593af74ff583
+  metadata.gz: e6defd3e51327c7d866dabb9caf8580c67996b5bd251d9613ec883f186cea522
+  data.tar.gz: 22a9278def6a95047eb280edd38a0be67872e263a9da259f4bdd5b3ab43f400a
 SHA512:
-  metadata.gz: 3b5f0e4bede1f60d010a51e32141c6b864f92abe17fbe12d310e805ce16b8ef67483cf51dee0914f6a29f54556817d91ed2ffa5dccb64cbd8468c68de0d50f83
-  data.tar.gz: 390a4c2953392485757949aee885fb82b3c54b456f659ba672ae7b8da0b45bee484eb3b7c3ee0ef31a01dd33fe0bac8e877d01c91649c197970defe3e7727399
+  metadata.gz: e0da261cf964ecd359e1ea539715c39ebc740fe8fb716b274c65e4b47a52a55033b6011f90b8a09948582df85d0fa0d942ae422b0cafd61cce34d2c0b6046519
+  data.tar.gz: 88c99360a4de1367247d76a8aff7e34f75744f58c2b64465fc3fcb90858c33902ae0c2d3aeaf1a04fe03ce29890cf44f314c6666d1cd9487c4b3355c01e71f58

data/ext/oj/dump.c

@@ -993,12 +993,24 @@ oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok) {
     char	*b = buf + sizeof(buf) - 1;
     long long	num = rb_num2ll(obj);
     int		neg = 0;
+	bool	dump_as_string = false;
+
+	if (out->opts->integer_range_max != 0 && out->opts->integer_range_min != 0 &&
+		(out->opts->integer_range_max < num || out->opts->integer_range_min > num)) {
+	dump_as_string = true;
+	}
 
     if (0 > num) {
 	neg = 1;
 	num = -num;
     }
+
     *b-- = '\0';
+
+	if (dump_as_string) {
+	*b-- = '"';
+	}
+
     if (0 < num) {
 	for (; 0 < num; num /= 10, b--) {
 	    *b = (num % 10) + '0';
@@ -1011,6 +1023,11 @@ oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok) {
     } else {
 	*b = '0';
     }
+
+	if (dump_as_string) {
+	*--b = '"';
+	}
+
     assure_size(out, (sizeof(buf) - (b - buf)));
     for (; '\0' != *b; b++) {
 	*out->cur++ = *b;
@@ -1022,10 +1039,23 @@ void
 oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     volatile VALUE	rs = rb_big2str(obj, 10);
     int			cnt = (int)RSTRING_LEN(rs);
+	bool		dump_as_string = false;
+
+	if (out->opts->integer_range_max != 0 || out->opts->integer_range_min != 0) { // Bignum cannot be inside of Fixnum range
+	dump_as_string = true; 
+	assure_size(out, cnt + 2);
+	*out->cur++ = '"';
+	} else {
+	assure_size(out, cnt);
+	}
 
-    assure_size(out, cnt);
     memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
+
+	if(dump_as_string) {
+	*out->cur++ = '"';
+	}
+
     *out->cur = '\0';
 }
 

data/ext/oj/dump_compat.c

@@ -870,6 +870,7 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     // this must use to_s to pass the json gem unit tests.
     volatile VALUE	rs;
     int			cnt;
+	bool		dump_as_string = false;
 
     if (use_bignum_alt) {
 	rs = rb_big2str(obj, 10);
@@ -878,9 +879,22 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     }
     rb_check_type(rs, T_STRING);
     cnt = (int)RSTRING_LEN(rs);
-    assure_size(out, cnt);
+
+	if (out->opts->integer_range_min != 0 || out->opts->integer_range_max != 0) {
+	dump_as_string = true; // Bignum cannot be inside of Fixnum range
+	assure_size(out, cnt + 2);
+	*out->cur++ = '"';
+	} else {
+	assure_size(out, cnt);
+	}
+
     memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
+
+	if(dump_as_string) {
+	*out->cur++ = '"';
+	}
+
     *out->cur = '\0';
 }
 

data/ext/oj/mimic_json.c

@@ -686,6 +686,8 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// create_ok
     No,		// allow_nan
     No,		// trace
+    0,		// integer_range_min
+    0,		// integer_range_max
     oj_json_class,// create_id
     10,		// create_id_len
     3,		// sec_prec

data/ext/oj/oj.c

@@ -116,6 +116,7 @@ static VALUE	create_id_sym;
 static VALUE	custom_sym;
 static VALUE	empty_string_sym;
 static VALUE	escape_mode_sym;
+static VALUE	integer_range_sym;
 static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	huge_sym;
@@ -183,6 +184,8 @@ struct _Options	oj_default_options = {
     No,		// create_ok
     Yes,	// allow_nan
     No,		// trace
+    0,		// integer_range_min
+    0,		// integer_range_max
     oj_json_class,	// create_id
     10,		// create_id_len
     9,		// sec_prec
@@ -250,6 +253,7 @@ struct _Options	oj_default_options = {
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
  * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
  * - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ * - *:integer_range* [_Range_] Dump integers outside range as strings. 
  * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
  *
  * Return [_Hash_] all current option settings.
@@ -291,6 +295,18 @@ get_def_opts(VALUE self) {
     case WabMode:	rb_hash_aset(opts, mode_sym, wab_sym);		break;
     default:		rb_hash_aset(opts, mode_sym, object_sym);	break;
     }
+    
+    if (oj_default_options.integer_range_max != 0 || oj_default_options.integer_range_min != 0) {
+    VALUE range = rb_obj_alloc(rb_cRange);
+    VALUE min = LONG2FIX(oj_default_options.integer_range_min);
+    VALUE max = LONG2FIX(oj_default_options.integer_range_max);
+    rb_ivar_set(range, oj_begin_id, min);
+    rb_ivar_set(range, oj_end_id, max);
+    rb_hash_aset(opts, integer_range_sym, range);
+    }
+    else {
+    rb_hash_aset(opts, integer_range_sym, Qnil);
+    }
     switch (oj_default_options.escape_mode) {
     case NLEsc:		rb_hash_aset(opts, escape_mode_sym, newline_sym);	break;
     case JSONEsc:	rb_hash_aset(opts, escape_mode_sym, json_sym);		break;
@@ -380,6 +396,7 @@ get_def_opts(VALUE self) {
  *   - *:array_class* [_Class_|_nil_] Class to use instead of Array on load.
  *   - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted.
  *   - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ *   - *:integer_range* [_Range_] Dump integers outside range as strings. 
  *   - *:trace* [_Boolean_] turn trace on or off.
  */
 static VALUE
@@ -715,6 +732,21 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    }
 	}
     }
+    if (Qnil != (v = rb_hash_lookup(ropts, integer_range_sym))) {
+    if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
+        VALUE min = rb_funcall(v, oj_begin_id, 0);
+        VALUE max = rb_funcall(v, oj_end_id, 0);
+
+        if (TYPE(min) != T_FIXNUM || TYPE(max) != T_FIXNUM) {
+            rb_raise(rb_eArgError, ":integer_range range bounds is not Fixnum.");
+        }
+
+        copts->integer_range_min = FIX2LONG(min);
+        copts->integer_range_max = FIX2LONG(max);
+    } else if (Qfalse != v) {
+        rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
+    }
+    }
 }
 
 static int
@@ -1645,6 +1677,7 @@ Init_oj() {
     custom_sym = ID2SYM(rb_intern("custom"));			rb_gc_register_address(&custom_sym);
     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);
     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

@@ -153,6 +153,8 @@ typedef struct _Options {
     char		create_ok;	// YesNo allow create_id
     char		allow_nan;	// YEsyNo for parsing only
     char		trace;		// YesNo
+    int64_t		integer_range_min; // dump numbers outside range as string
+    int64_t		integer_range_max;
     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/lib/oj/version.rb

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

data/pages/Modes.md

@@ -107,6 +107,7 @@ information.
     | :ignore                | Array   |         |         |         |         |       x |       x |         |
     | :indent                | Integer |       x |       x |       3 |       4 |       x |       x |       x |
     | :indent_str            | String  |         |         |       x |       x |         |       x |         |
+    | :integer_range         | Range   |       x |       x |       x |       x |       x |       x |       x |
     | :match_string          | Hash    |         |         |       x |       x |         |       x |         |
     | :max_nesting           | Fixnum  |       4 |       4 |       x |         |       5 |       4 |         |
     | :mode                  | Symbol  |       - |       - |       - |       - |       - |       - |         |

data/pages/Options.md

@@ -147,6 +147,11 @@ Indentation for each element when dumping. The default is an empty
 string. Primarily intended for json gem compatibility. Using just indent as an
 integer gives better performance.
 
+### :integer_range [Range]
+
+Dump integers outside range as strings. 
+Note: range bounds must be Fixnum.
+
 ### :match_string
 
 Provides a means to detect strings that should be used to create non-String
@@ -259,5 +264,3 @@ the :compat and :rails mode.
 Call `to_json()` methods on dump, default is false. The option is ignored in
 the :compat and :rails mode.
 
-
-

data/test/test_integer_range.rb

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+class IntegerRangeTest < Minitest::Test
+  def setup
+    @default_options = Oj.default_options
+    # in null mode other options other than the number formats are not used.
+    Oj.default_options = { :mode => :null }
+  end
+
+  def teardown
+    Oj.default_options = @default_options
+  end
+
+  def test_range
+    test = {s: 0, s2: -1, s3: 1, u: -2, u2: 2, u3: 9007199254740993}
+    exp = '{"s":0,"s2":-1,"s3":1,"u":"-2","u2":"2","u3":"9007199254740993"}'
+    assert_equal(exp, Oj.dump(test, integer_range: (-1..1)))
+  end
+
+  def test_bignum
+    test = {u: -10000000000000000000, u2: 10000000000000000000}
+    exp = '{"u":"-10000000000000000000","u2":"10000000000000000000"}'
+    assert_equal(exp, Oj.dump(test, integer_range: (-1..1)))
+  end
+
+  def test_valid_modes
+    test = {safe: 0, unsafe: 9007199254740993}
+    exp  = '{"safe":0,"unsafe":"9007199254740993"}'
+
+    [:strict, :null, :compat, :rails, :custom].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode, integer_range: (-1..1)), "Invalid mode #{mode}")
+    end
+
+    exp = '{":safe":0,":unsafe":"9007199254740993"}'
+    [:object].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode, integer_range: (-1..1)), "Invalid mode #{mode}")
+    end
+  end
+
+  def test_modes_without_opt
+    test = {safe:0, unsafe: 10000000000000000000}
+    exp = '{"safe":0,"unsafe":10000000000000000000}'
+
+    [:strict, :null, :compat, :rails, :custom].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode), "Invalid mode #{mode}")
+    end
+
+    exp = '{":safe":0,":unsafe":10000000000000000000}'
+    [:object].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode), "Invalid mode #{mode}")
+    end
+  end
+
+  def test_accept_nil_and_false
+    test = {safe:0, unsafe: 10000000000000000000}
+    exp = '{"safe":0,"unsafe":10000000000000000000}'
+
+    assert_equal(exp, Oj.dump(test, integer_range: nil))
+    assert_equal(exp, Oj.dump(test, integer_range: false))
+  end
+end
+

data/test/test_various.rb

@@ -154,6 +154,7 @@ class Juice < Minitest::Test
       :hash_class=>Hash,
       :omit_nil=>false,
       :allow_nan=>true,
+      :integer_range=>nil,
       :array_class=>Array,
       :ignore=>nil,
       :trace=>true,

data/test/tests.rb

@@ -21,3 +21,4 @@ require 'test_strict'
 require 'test_various'
 require 'test_wab'
 require 'test_writer'
+require 'test_integer_range'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.13
+  version: 3.7.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -230,6 +230,7 @@ files:
 - test/test_file.rb
 - test/test_gc.rb
 - test/test_hash.rb
+- test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
 - test/test_saj.rb
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
@@ -284,6 +285,7 @@ test_files:
 - test/test_compat.rb
 - test/test_custom.rb
 - test/perf_scp.rb
+- test/test_integer_range.rb
 - test/test_gc.rb
 - test/sample.rb
 - test/json_gem/json_string_matching_test.rb