oj 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2a2d3b4fd246384540dcb2b35b335bddd57388
-  data.tar.gz: 89b10cb944cf00447fcc96cadcc4098c6fbd88df
+  metadata.gz: 5a9a1e933a2b0c03c3fb9c0e0b8ef0447edf2438
+  data.tar.gz: 588b81842eb490fd7beb6021a048f7703ddeb28a
 SHA512:
-  metadata.gz: 826667035ad04a8e76a63e9d1ada8ead7c3d2f7d3f83876a28d6cec476cdf8cb4bfd57f61d3607ea2bb9edd489b6d619b27b0299d89466cafd71f25e5a744240
-  data.tar.gz: 8a6d58b91255b62fe651a5dee8eb8f302ec20a60cf900061ec8dfdcd7bda5fcf331e68eca9416efbf8068fdc0b05d77c17e3360c70d7a376d32cebbc8e4030bb
+  metadata.gz: e74ce695c617c00f6124a523294f949eb291b6c80f8da2c1e122d088b0c381473142bb3650ddd634693458c2356f37185ecebb03adf4c682e5337cbccf1b10de
+  data.tar.gz: e8eb16851a194c06a5a41527c63c149001bee902132e4591fbf3f46544b17ec942924ca5e5f7abf7bda5cc4fcf24623c1dd03c12afc9525561f52231b68486e8

data/ext/oj/mimic_json.c

@@ -421,7 +421,35 @@ oj_mimic_generate(int argc, VALUE *argv, VALUE self) {
 VALUE
 oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     struct _Options	copts = oj_default_options;
-
+    VALUE		rargs[2];
+    volatile VALUE	h;
+
+    // Some (all?) json gem to_json methods need a State instance and not just
+    // a Hash. I haven't dug deep enough to find out why but using a State
+    // instance and not a Hash gives the desired behavior.
+    *rargs = *argv;
+    if (1 == argc) {
+	h = rb_hash_new();
+    } else {
+	h = argv[1];
+    }
+    if (Qfalse == rb_funcall(h, oj_has_key_id, 1, oj_indent_sym)) {
+	rb_hash_aset(h, oj_indent_sym, rb_str_new2("  "));
+    }
+    if (Qfalse == rb_funcall(h, oj_has_key_id, 1, oj_space_before_sym)) {
+	rb_hash_aset(h, oj_space_before_sym, rb_str_new2(""));
+    }
+    if (Qfalse == rb_funcall(h, oj_has_key_id, 1, oj_space_sym)) {
+	rb_hash_aset(h, oj_space_sym, rb_str_new2(" "));
+    }
+    if (Qfalse == rb_funcall(h, oj_has_key_id, 1, oj_object_nl_sym)) {
+	rb_hash_aset(h, oj_object_nl_sym, rb_str_new2("\n"));
+    }
+    if (Qfalse == rb_funcall(h, oj_has_key_id, 1, oj_array_nl_sym)) {
+	rb_hash_aset(h, oj_array_nl_sym, rb_str_new2("\n"));
+    }
+    rargs[1] = rb_funcall(state_class, oj_new_id, 1, h);
+    
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
     strcpy(copts.dump_opts.indent_str, "  ");
@@ -436,7 +464,7 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     copts.dump_opts.array_size = (uint8_t)strlen(copts.dump_opts.array_nl);
     copts.dump_opts.use = true;
 
-    return mimic_generate_core(argc, argv, &copts);
+    return mimic_generate_core(2, rargs, &copts);
 }
 
 static VALUE

data/ext/oj/oj.c

@@ -1340,6 +1340,13 @@ extern VALUE	oj_define_mimic_json(int argc, VALUE *argv, VALUE self);
  */
 extern VALUE	oj_mimic_generate(int argc, VALUE *argv, VALUE self);
 
+/* Document-module: Oj.optimize_rails()
+ *
+ * Sets the Oj as the Rails encoder and decoder. Oj::Rails.optimize is also
+ * called.
+ */
+extern VALUE	oj_optimize_rails(VALUE self);
+
 /*
 extern void	oj_hash_test();
 

data/ext/oj/rails.c

@@ -324,17 +324,29 @@ dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
     oj_dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 }
 
+static ID	parameters_id = 0;
+
+static void
+dump_actioncontroller_parameters(VALUE obj, int depth, Out out, bool as_ok) {
+    if (0 == parameters_id) {
+	parameters_id = rb_intern("@parameters");
+    }
+    out->argc = 0;
+    dump_rails_val(rb_ivar_get(obj, parameters_id), depth, out, true);
+}
+
 typedef struct _NamedFunc {
     const char	*name;
     DumpFunc	func;
 } *NamedFunc;
 
 static struct _NamedFunc	dump_map[] = {
+    { "ActionController::Parameters", dump_actioncontroller_parameters },
+    { "ActiveSupport::TimeWithZone", dump_timewithzone },
     { "BigDecimal", dump_bigdecimal },
     { "Range", dump_to_s },
     { "Regexp", dump_to_s },
     { "Time", dump_time },
-    { "ActiveSupport::TimeWithZone", dump_timewithzone },
     { NULL, NULL },
 };
 

data/lib/oj/version.rb

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

data/pages/Rails.md

@@ -10,7 +10,13 @@ require 'oj'
 
 Oj::Rails.set_encoder()
 Oj::Rails.set_decoder()
-Oj::Rails.optimize(Array, BigDecimal, Hash, Range, Regexp, Time, ActiveSupport::TimeWithZone)
+Oj::Rails.optimize()
+```
+
+or simply call
+
+```ruby
+Oj.optimize_rails()
 ```
 
 Some of the Oj options are supported as arguments to the encoder if called
@@ -47,10 +53,11 @@ optimized version is the same as the ActiveSupport default encoding for a
 given class. The optimized versions are toggled with the optimize() and
 deoptimize() methods. There is a default optimized version for every class
 that takes the visible attributes and encodes them but that may not be the
-same as what Rails uses. Trial an error is the best approach for classes not
+same as what Rails uses. Trial and error is the best approach for classes not
 listed here.
 
-The classes that can be put in optimized mode are:
+The classes that can be put in optimized mode and are optimized when
+Oj::Rails.optimize is called with no arguments are:
 
  * Array
  * BigDecimal
@@ -59,6 +66,7 @@ The classes that can be put in optimized mode are:
  * Regexp
  * Time
  * ActiveSupport::TimeWithZone
+ * ActionController::Parameters
  * any class inheriting from ActiveRecord::Base
  * any other class where all attributes should be dumped
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -60,14 +60,14 @@ extensions:
 extra_rdoc_files:
 - README.md
 - pages/Advanced.md
-- pages/Encoding.md
-- pages/Modes.md
-- pages/Security.md
-- pages/JsonGem.md
-- pages/Rails.md
 - pages/Compatibility.md
 - pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
 - pages/Options.md
+- pages/Rails.md
+- pages/Security.md
 files:
 - LICENSE
 - README.md
@@ -239,75 +239,75 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/activesupport5/test_helper.rb
-- test/activesupport5/time_zone_test_helpers.rb
+- 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_cases.rb
 - test/activesupport5/encoding_test.rb
-- test/test_file.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.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/test_debian.rb
-- test/test_gc.rb
-- test/_test_mimic_rails.rb
-- test/test_writer.rb
-- test/test_hash.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
 - test/sample/file.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
 - test/sample/layer.rb
-- test/sample/change.rb
-- test/sample/doc.rb
+- test/sample/line.rb
 - test/sample/oval.rb
+- test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.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/tests_mimic.rb
-- test/perf_saj.rb
-- test/tests_mimic_addition.rb
-- test/test_saj.rb
 - test/sample.rb
-- test/test_scp.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/perf_file.rb
-- test/perf_compat.rb
-- test/test_various.rb
-- test/test_strict.rb
+- test/test_compat.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_debian.rb
 - test/test_fast.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_hash.rb
+- test/test_null.rb
+- test/test_object.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
+- test/test_various.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb