oj 3.3.10 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687f7d149d0cf1490c71c850e9b899211bf93dff
-  data.tar.gz: e60c06c52ab2946307618cdc78a180ed2333f19b
+  metadata.gz: 9badf52195a57cbb014c118468e251a6410492be
+  data.tar.gz: 8cf51afa4ee58bbb314625d6b4e4c91c69c1f816
 SHA512:
-  metadata.gz: '0287e158af4e2637f70aeaef9bd90fbdd92270ba8b94d58eb77f3371671ead837638440677a67f00880b1b0024098ea31530f843950c434154f72dfd844d8854'
-  data.tar.gz: 279a77556142e021b88e6e2b1b75ae93a11aa373dad3098f994559004ecfa4089ebd3514cd412b08004896438d014fde5a2c9dc27f87ad3558627920146870df
+  metadata.gz: 3366cc54755af4f3d8abbded2afac3b1235a4fe25315964d6d1225c69e849611eecedb2e7d893e14b72514bcc0115b1a2cce94bc007f0e8460230798d1531276
+  data.tar.gz: 02d082acfd67708b44582a8fe69e10a5f639cc56ec57484c56c283be96ffc4d64b0a41b4c31bac2f707225388b2f5cd2551c9e6aba048c4c973e6c6461a462a8

data/ext/oj/custom.c

@@ -244,6 +244,9 @@ static int
 hash_cb(VALUE key, VALUE value, Out out) {
     int	depth = out->depth;
 
+    if (oj_dump_ignore(out->opts, value)) {
+	return ST_CONTINUE;
+    }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
     }
@@ -529,6 +532,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     size_t	size;
     const char	*attr;
 
+    if (oj_dump_ignore(out->opts, value)) {
+	return ST_CONTINUE;
+    }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
     }

data/ext/oj/dump.c

@@ -1143,3 +1143,18 @@ oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *fo
     }
     return cnt;
 }
+
+bool
+oj_dump_ignore(Options opts, VALUE obj) {
+    if (NULL != opts->ignore && (ObjectMode == opts->mode || CustomMode == opts->mode)) {
+	VALUE	*vp = opts->ignore;
+	VALUE	clas = rb_obj_class(obj);
+
+	for (; Qnil != *vp; vp++) {
+	    if (clas == *vp) {
+		return true;
+	    }
+	}
+    }
+    return false;
+}

data/ext/oj/dump.h

@@ -50,6 +50,8 @@ extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
 
 extern int	oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
 
+extern bool	oj_dump_ignore(Options opts, VALUE obj);
+
 inline static void
 assure_size(Out out, size_t len) {
     if (out->end - out->cur <= (long)len) {

data/ext/oj/dump_object.c

@@ -227,6 +227,9 @@ hash_cb(VALUE key, VALUE value, Out out) {
     int		depth = out->depth;
     long	size = depth * out->indent + 1;
 
+    if (oj_dump_ignore(out->opts, value)) {
+	return ST_CONTINUE;
+    }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
     }
@@ -349,6 +352,9 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);
 
+    if (oj_dump_ignore(out->opts, value)) {
+	return ST_CONTINUE;
+    }
     if (out->omit_nil && Qnil == value) {
 	return ST_CONTINUE;
     }
@@ -607,6 +613,10 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
 	    value = rb_ivar_get(obj, vid);
+
+	    if (oj_dump_ignore(out->opts, value)) {
+		continue;
+	    }
 	    if (out->omit_nil && Qnil == value) {
 		continue;
 	    }
@@ -735,6 +745,9 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	
 	for (i = 0; i < cnt; i++) {
 	    v = RSTRUCT_GET(obj, i);
+	    if (oj_dump_ignore(out->opts, v)) {
+		v = Qnil;
+	    }
 	    assure_size(out, size);
 	    fill_indent(out, d3);
 	    oj_dump_obj_val(v, d3, out);
@@ -750,6 +763,9 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	for (i = 0; i < slen; i++) {
 	    assure_size(out, size);
 	    fill_indent(out, d3);
+	    if (oj_dump_ignore(out->opts, v)) {
+		v = Qnil;
+	    }
 	    oj_dump_obj_val(rb_struct_aref(obj, INT2FIX(i)), d3, out, 0, 0, true);
 	    *out->cur++ = ',';
 	}

data/ext/oj/oj.c

@@ -118,6 +118,7 @@ static VALUE	escape_mode_sym;
 static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	huge_sym;
+static VALUE	ignore_sym;
 static VALUE	json_sym;
 static VALUE	match_string_sym;
 static VALUE	mode_sym;
@@ -207,7 +208,8 @@ struct _Options	oj_default_options = {
 	NULL,	// head
 	NULL,	// tail
 	{ '\0' }, // err
-    }
+    },
+    NULL,	// ignore
 };
 
 /* Document-method: default_options()
@@ -244,6 +246,7 @@ struct _Options	oj_default_options = {
  * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be used
  * - *: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
  *
  * Return [_Hash_] all current option settings.
  */
@@ -320,7 +323,18 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, omit_nil_sym, oj_default_options.dump_opts.omit_nil ? Qtrue : Qfalse);
     rb_hash_aset(opts, oj_hash_class_sym, oj_default_options.hash_class);
     rb_hash_aset(opts, oj_array_class_sym, oj_default_options.array_class);
-    
+
+    if (NULL == oj_default_options.ignore) {
+	rb_hash_aset(opts, ignore_sym, Qnil);
+    } else {
+	VALUE		*vp;
+	volatile VALUE	a = rb_ary_new();
+	
+	for (vp = oj_default_options.ignore; Qnil != *vp; vp++) {
+	    rb_ary_push(a, *vp);
+	}
+	rb_hash_aset(opts, ignore_sym, a);
+    }
     return opts;
 }
 
@@ -358,6 +372,7 @@ get_def_opts(VALUE self) {
  *   - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be used.
  *   - *: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
  */
 static VALUE
 set_def_opts(VALUE self, VALUE opts) {
@@ -672,6 +687,25 @@ oj_parse_options(VALUE ropts, Options copts) {
 	}
     }
     oj_parse_opt_match_string(&copts->str_rx, ropts);
+    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, ignore_sym)) {
+	xfree(copts->ignore);
+	copts->ignore = NULL;
+	if (Qnil != (v = rb_hash_lookup(ropts, ignore_sym))) {
+	    int	cnt;
+
+	    rb_check_type(v, T_ARRAY);
+	    cnt = (int)RARRAY_LEN(v);
+	    if (0 < cnt) {
+		int	i;
+		
+		copts->ignore = ALLOC_N(VALUE, cnt + 1);
+		for (i = 0; i < cnt; i++) {
+		    copts->ignore[i] = rb_ary_entry(v, i);
+		}
+		copts->ignore[i] = Qnil;
+	    }
+	}
+    }
 }
 
 static int
@@ -1604,6 +1638,7 @@ Init_oj() {
     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);
+    ignore_sym = ID2SYM(rb_intern("ignore"));			rb_gc_register_address(&ignore_sym);
     json_sym = ID2SYM(rb_intern("json"));			rb_gc_register_address(&json_sym);
     match_string_sym = ID2SYM(rb_intern("match_string"));	rb_gc_register_address(&match_string_sym);
     mode_sym = ID2SYM(rb_intern("mode"));			rb_gc_register_address(&mode_sym);

data/ext/oj/oj.h

@@ -161,6 +161,7 @@ typedef struct _Options {
     VALUE		array_class;	// class to use in place of Array on load
     struct _DumpOpts	dump_opts;
     struct _RxClass	str_rx;
+    VALUE		*ignore;	// Qnil terminated array of classes or NULL
 } *Options;
 
 struct _Out;

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -104,6 +104,7 @@ information.
     | :escape_mode           | Symbol  |         |         |         |         |         |       x |         |
     | :float_precision       | Fixnum  |       x |       x |         |         |         |       x |         |
     | :hash_class            | Class   |         |         |       x |       x |         |       x |         |
+    | :ignore                | Array   |         |         |         |         |       x |       x |         |
     | :indent                | Integer |       x |       x |       3 |       4 |       x |       x |       x |
     | :indent_str            | String  |         |         |       x |       x |         |       x |         |
     | :match_string          | Hash    |         |         |       x |       x |         |       x |         |

data/pages/Options.md

@@ -130,6 +130,11 @@ The number of digits of precision when dumping floats, 0 indicates use Ruby dire
 
 Class to use instead of Hash on load. This is the same as the :object_class.
 
+### :ignore [Array]
+
+Ignore all the classes in the Array when dumping. A value of nil indicates
+ignore nothing.
+
 ### :indent [Fixnum]
 
 Number of spaces to indent each element in a JSON document, zero is no newline

data/test/test_object.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -761,6 +761,15 @@ class ObjectJuice < Minitest::Test
     assert_equal(obj, obj2)
   end
 
+  def test_ignore
+    obj = Jeez.new(true, 58)
+    json = Oj.dump({ 'a' => 7, 'b' => obj }, :mode => :object, :indent => 2, :ignore => [ Jeez ])
+    assert_equal(%|{
+  "a":7
+}
+|, json)
+  end
+
   def test_exception
     err = nil
     begin

data/test/test_various.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -154,6 +154,7 @@ class Juice < Minitest::Test
       :omit_nil=>false,
       :allow_nan=>true,
       :array_class=>Array,
+      :ignore=>nil,
     }
     Oj.default_options = alt
     #keys = alt.keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.3.10
+  version: 3.4.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -80,15 +80,15 @@ extensions:
 extra_rdoc_files:
 - README.md
 - pages/Advanced.md
-- pages/Compatibility.md
-- pages/Custom.md
+- pages/WAB.md
 - pages/Encoding.md
-- pages/JsonGem.md
 - pages/Modes.md
-- pages/Options.md
-- pages/Rails.md
 - pages/Security.md
-- pages/WAB.md
+- pages/JsonGem.md
+- pages/Rails.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Options.md
 files:
 - LICENSE
 - README.md
@@ -172,7 +172,6 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
 - test/files.rb
 - test/helper.rb
 - test/isolated/shared.rb
@@ -265,78 +264,77 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
-- test/bug.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/encoding_test.rb
+- test/test_file.rb
 - test/files.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_saj.rb
 - test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
+- test/test_debian.rb
+- test/test_gc.rb
+- test/_test_mimic_rails.rb
+- test/test_writer.rb
+- test/test_hash.rb
 - test/sample/file.rb
-- test/sample/group.rb
 - test/sample/hasprops.rb
 - test/sample/layer.rb
-- test/sample/line.rb
+- test/sample/change.rb
+- test/sample/doc.rb
 - test/sample/oval.rb
-- test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_hash.rb
-- test/test_null.rb
+- test/sample/group.rb
+- test/sample/dir.rb
+- test/sample/line.rb
+- test/sample/rect.rb
+- test/tests.rb
 - test/test_object.rb
+- test/perf_wab.rb
+- test/tests_mimic.rb
+- test/perf_saj.rb
+- test/tests_mimic_addition.rb
 - test/test_saj.rb
+- test/sample.rb
 - test/test_scp.rb
-- test/test_strict.rb
-- test/test_various.rb
+- test/perf_object.rb
+- test/perf_simple.rb
+- test/test_null.rb
+- test/_test_active_mimic.rb
+- test/_test_active.rb
+- test/test_compat.rb
+- test/sample_json.rb
+- test/json_gem/test_helper.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/helper.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
 - test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
+- test/perf_file.rb
+- test/perf_compat.rb
+- test/test_various.rb
+- test/test_strict.rb
+- test/test_custom.rb
+- test/perf_strict.rb
+- test/perf_fast.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_redefine.rb
+- test/perf.rb
+- test/test_fast.rb

data/test/bug.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'rails'
-require 'active_support'
-require 'active_support/json'
-require 'oj'
-
-x = {"a": BigDecimal("1.1"), "t": Time.now}
-
-#ActiveSupport.encode_big_decimal_as_string = false
-
-Oj.optimize_rails
-
-puts "to_json #{x.to_json}"
-
-Oj.default_options = { bigdecimal_as_decimal: true}
-#puts Oj.default_options
-
-puts "to_json #{x.to_json}"
-