oj 2.15.0 → 2.15.1

data/README.md

@@ -25,6 +25,11 @@ puts "Same? #{h == h2}"
 # true
 ```
 
+By default Oj uses the :object mode which is used to marshal and unmarshal Ruby
+objects. Deserialize arbitrary JSON in object mode may lead to unexpected
+results. :compat mode is a better choice for rails and :strict mode is a better
+choice for general JSON parsing. See the options section below for details.
+
 ## Installation
 ```
 gem install oj
@@ -48,7 +53,7 @@ converted to JSON. These modes are set with the `:mode` option in either the
 default options or as one of the options to the `dump` method. In addition to
 the various options there are also alternative APIs for parsing JSON.
 
-The fastest alternaive parser API is the `Oj::Doc` API. The `Oj::Doc` API takes
+The fastest alternative parser API is the `Oj::Doc` API. The `Oj::Doc` API takes
 a completely different approach by opening a JSON document and providing calls
 to navigate around the JSON while it is open. With this approach, JSON access
 can be well over 20 times faster than conventional JSON parsing.
@@ -165,18 +170,9 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-** Release 2.15.0**
-
- - Fixed bug where encoded strings could be GCed.
-
- - :nan option added for dumping Infinity, -Infinity, and NaN. This is an
-   edition to the API. The default value for the :non option is :auto which uses
-   the previous NaN handling on dumping of non-object modes.
-
-**Release 2.14.7**
+**Release 2.15.1**
 
- - Fixed bug where a comment before another JSON element caused an
-   error. Comments are not part of the spec but this keep support consistent.
+ - Fixed bug with activerecord when to_json returns an array instead of a string.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1432,8 +1432,9 @@ dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv) {
 
 	    //rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	    dump_val(h, depth, out, 0, 0);
+	} else {
+	    dump_hash(h, Qundef, depth, out->opts->mode, out);
 	}
-	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
 
@@ -2010,6 +2011,9 @@ dump_val(VALUE obj, int depth, Out out, int argc, VALUE *argv) {
     if (MAX_DEPTH < depth) {
 	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
+#ifdef OJ_DEBUG
+    printf("Oj-debug: dump_val %s\n", rb_class2name(rb_obj_class(obj)));
+#endif
     switch (type) {
     case T_NIL:		dump_nil(out);				break;
     case T_TRUE:	dump_true(out);				break;

data/ext/oj/extconf.rb

@@ -48,6 +48,8 @@ else
   dflags['NEEDS_STPCPY'] = nil if is_windows
 end
 
+dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
+
 dflags.each do |k,v|
   if v.nil?
     $CPPFLAGS += " -D#{k}"
@@ -55,6 +57,7 @@ dflags.each do |k,v|
     $CPPFLAGS += " -D#{k}=#{v}"
   end
 end
+
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
 create_makefile("#{extension_name}/#{extension_name}")

data/lib/oj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler