oj 3.0.11 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f9a694459b58b7e423bd685ea28a1fcfb582a3c
-  data.tar.gz: 609715b5ff8e615f59dbdceabdc7ec691c4f8287
+  metadata.gz: 921337fe55a2f80cc6537cb652c5d54a98dd39d3
+  data.tar.gz: acdf0cc3bdaed92fd5ecb0a7239cfcf88873c59b
 SHA512:
-  metadata.gz: ad438e894a9540489bbc29c75d39972db15389e41b83700467736b3b1fb7e329c11def32cabc6753b2e60ae1a548f5fd5c89074057c4b6c8816b014c9fb5bd5d
-  data.tar.gz: b25cdb2139bea0f973b80c421c956f0ecece0c50b70f6b87707f52ac452d418672d8e865026020804cb5bc69434ed3e0214c3034df116bba540ef955aa07c0d7
+  metadata.gz: d51c9c25369ca4c5d9b7cd5670e1d4d87ce3458b9e8760d1d893c37f48f4775b145f9fad1b2aba78ba5a157981d7cda854e3c091dd9cf4256f1c9bb096699bd8
+  data.tar.gz: bdc8810b381c0a6f822432443ba201a2ed37aa30c8fe3f2e2ce00c446cae53a4cfdd90cb796e29cb2bcf60e34c62b607cdd90bf8bbc7b1ca773ba840caed5899

data/ext/oj/mimic_json.c

@@ -750,6 +750,54 @@ mimic_state(VALUE self) {
     return state_class;
 }
 
+void
+oj_mimic_json_methods(VALUE json) {
+    VALUE	json_error;
+
+    rb_define_module_function(json, "create_id=", mimic_set_create_id, 1);
+    rb_define_module_function(json, "create_id", mimic_create_id, 0);
+
+    rb_define_module_function(json, "dump", mimic_dump, -1);
+    rb_define_module_function(json, "load", mimic_load, -1);
+    rb_define_module_function(json, "restore", mimic_load, -1);
+    rb_define_module_function(json, "recurse_proc", mimic_recurse_proc, 1);
+    rb_define_module_function(json, "[]", mimic_dump_load, -1);
+
+    rb_define_module_function(json, "generate", oj_mimic_generate, -1);
+    rb_define_module_function(json, "fast_generate", oj_mimic_generate, -1);
+    rb_define_module_function(json, "pretty_generate", oj_mimic_pretty_generate, -1);
+    // For older versions of JSON, the deprecated unparse methods.
+    rb_define_module_function(json, "unparse", oj_mimic_generate, -1);
+    rb_define_module_function(json, "fast_unparse", oj_mimic_generate, -1);
+    rb_define_module_function(json, "pretty_unparse", oj_mimic_pretty_generate, -1);
+
+    rb_define_module_function(json, "parse", oj_mimic_parse, -1);
+    rb_define_module_function(json, "parse!", mimic_parse_bang, -1);
+
+    rb_define_module_function(json, "state", mimic_state, 0);
+
+    if (rb_const_defined_at(json, rb_intern("JSONError"))) {
+        json_error = rb_const_get(json, rb_intern("JSONError"));
+    } else {
+        json_error = rb_define_class_under(json, "JSONError", rb_eStandardError);
+    }
+    if (rb_const_defined_at(json, rb_intern("ParserError"))) {
+        oj_json_parser_error_class = rb_const_get(json, rb_intern("ParserError"));
+    } else {
+    	oj_json_parser_error_class = rb_define_class_under(json, "ParserError", json_error);
+    }
+    if (rb_const_defined_at(json, rb_intern("GeneratorError"))) {
+        oj_json_generator_error_class = rb_const_get(json, rb_intern("GeneratorError"));
+    } else {
+    	oj_json_generator_error_class = rb_define_class_under(json, "GeneratorError", json_error);
+    }
+    if (rb_const_defined_at(json, rb_intern("NestingError"))) {
+        rb_const_get(json, rb_intern("NestingError"));
+    } else {
+    	rb_define_class_under(json, "NestingError", json_error);
+    }
+}
+
 /* Document-module: JSON
  *
  * A mimic of the json gem module.
@@ -759,7 +807,6 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
     VALUE	ext;
     VALUE	dummy;
     VALUE	verbose;
-    VALUE	json_error;
     VALUE	json;
     VALUE	generator;
     
@@ -804,27 +851,7 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
     state_class = rb_const_get_at(generator, rb_intern("State"));
     // TBD create all modules in mimic_loaded
 
-    rb_define_module_function(json, "create_id=", mimic_set_create_id, 1);
-    rb_define_module_function(json, "create_id", mimic_create_id, 0);
-
-    rb_define_module_function(json, "dump", mimic_dump, -1);
-    rb_define_module_function(json, "load", mimic_load, -1);
-    rb_define_module_function(json, "restore", mimic_load, -1);
-    rb_define_module_function(json, "recurse_proc", mimic_recurse_proc, 1);
-    rb_define_module_function(json, "[]", mimic_dump_load, -1);
-
-    rb_define_module_function(json, "generate", oj_mimic_generate, -1);
-    rb_define_module_function(json, "fast_generate", oj_mimic_generate, -1);
-    rb_define_module_function(json, "pretty_generate", oj_mimic_pretty_generate, -1);
-    // For older versions of JSON, the deprecated unparse methods.
-    rb_define_module_function(json, "unparse", oj_mimic_generate, -1);
-    rb_define_module_function(json, "fast_unparse", oj_mimic_generate, -1);
-    rb_define_module_function(json, "pretty_unparse", oj_mimic_pretty_generate, -1);
-
-    rb_define_module_function(json, "parse", oj_mimic_parse, -1);
-    rb_define_module_function(json, "parse!", mimic_parse_bang, -1);
-
-    rb_define_module_function(json, "state", mimic_state, 0);
+    oj_mimic_json_methods(json);
 
     rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);
 
@@ -832,27 +859,6 @@ oj_define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
 
-    if (rb_const_defined_at(json, rb_intern("JSONError"))) {
-        json_error = rb_const_get(json, rb_intern("JSONError"));
-    } else {
-        json_error = rb_define_class_under(json, "JSONError", rb_eStandardError);
-    }
-    if (rb_const_defined_at(json, rb_intern("ParserError"))) {
-        oj_json_parser_error_class = rb_const_get(json, rb_intern("ParserError"));
-    } else {
-    	oj_json_parser_error_class = rb_define_class_under(json, "ParserError", json_error);
-    }
-    if (rb_const_defined_at(json, rb_intern("GeneratorError"))) {
-        oj_json_generator_error_class = rb_const_get(json, rb_intern("GeneratorError"));
-    } else {
-    	oj_json_generator_error_class = rb_define_class_under(json, "GeneratorError", json_error);
-    }
-    if (rb_const_defined_at(json, rb_intern("NestingError"))) {
-        rb_const_get(json, rb_intern("NestingError"));
-    } else {
-    	rb_define_class_under(json, "NestingError", json_error);
-    }
-
     oj_default_options = mimic_object_to_json_options;
     oj_default_options.to_json = Yes;
 

data/ext/oj/rails.c

@@ -21,6 +21,8 @@ bool	oj_rails_hash_opt = false;
 bool	oj_rails_array_opt = false;
 bool	oj_rails_float_opt = false;
 
+extern void	oj_mimic_json_methods(VALUE json);
+
 static void	dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
 
 extern VALUE	Oj;
@@ -537,6 +539,27 @@ rails_optimize(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
+/* Document-module: mimic_JSON
+ *	call-seq: mimic_JSON()
+ *
+ * Sets the JSON method to use Oj similar to Oj.mimic_JSON except with the
+ * ActiveSupport monkey patches instead of the json gem monkey patches.
+ */
+VALUE
+rails_mimic_json(VALUE self) {
+    VALUE	json;
+    
+    if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
+	json = rb_const_get_at(rb_cObject, rb_intern("JSON"));
+    } else {
+	json = rb_define_module("JSON");
+    }
+    oj_mimic_json_methods(json);
+    // TBD
+
+    return Qnil;
+}
+
 /* Document-method: deoptimize
  *	call-seq: deoptimize(*classes)
  * 
@@ -851,6 +874,7 @@ oj_optimize_rails(VALUE self) {
     rails_set_encoder(self);
     rails_set_decoder(self);
     rails_optimize(0, NULL, self);
+    rails_mimic_json(self);
 
     return Qnil;
 }
@@ -874,6 +898,7 @@ oj_mimic_rails_init() {
     rb_define_module_function(rails, "optimize", rails_optimize, -1);
     rb_define_module_function(rails, "deoptimize", rails_deoptimize, -1);
     rb_define_module_function(rails, "optimized?", rails_optimized, 1);
+    rb_define_module_function(rails, "mimic_JSON?", rails_mimic_json, 0);
 
     rb_define_module_function(rails, "set_encoder", rails_set_encoder, 0);
     rb_define_module_function(rails, "set_decoder", rails_set_decoder, 0);

data/lib/oj/version.rb

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

data/pages/Rails.md

@@ -11,6 +11,7 @@ require 'oj'
 Oj::Rails.set_encoder()
 Oj::Rails.set_decoder()
 Oj::Rails.optimize()
+Oj::Rails.mimic_JSON()
 ```
 
 or simply call

data/test/activesupport5/encoding_test.rb

@@ -11,7 +11,8 @@ require 'oj'
 # Sets the ActiveSupport encoder to be Oj and also wraps the setting of
 # globals.
 Oj::Rails.set_encoder()
-Oj::Rails.optimize(Hash, Array, BigDecimal, Time, Range, Regexp, ActiveSupport::TimeWithZone)
+#Oj::Rails.optimize(Hash, Array, BigDecimal, Time, Range, Regexp, ActiveSupport::TimeWithZone)
+Oj::Rails.optimize()
 
 class TestJSONEncoding < ActiveSupport::TestCase
   include TimeZoneTestHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.1.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler