oj 2.12.2 → 2.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a621ea1cf610e5b78949d860fc54f2c6fe43e0c
-  data.tar.gz: 11cd52b0f0747e95007d678b291560b6271b9235
+  metadata.gz: 655072c6be3f9b0fe883178b02266e5f12838157
+  data.tar.gz: d37bc3d0333cec27246610451dda289ce4a4fbc2
 SHA512:
-  metadata.gz: 76bdb63802a6f728259dd9cb7351d64f38862cf8a522bdb56c208cdc5803cb52a4625493c4c0d7d103d5e6a7a2522bfd847a1942ccb56ce2a59a3b22ae9d969e
-  data.tar.gz: 5a215c6a81a876ee0f1a777ff90f1d55b1ad5eb809da6b431eb21b79f7bcaab7a552febdcc090f12e17aa0acf0ea885c78d70940b13e298d8524db1c227c0500
+  metadata.gz: 604bc05ecad569b0791530e48b142a8cc83d4bd97192222b99f69c709c236ac0ff448ee9d4f766de8ea04ea273eecfe29d654405a4d7d3d781a9830f0f025aea
+  data.tar.gz: 4ceefa024654e05eddfa9efa8e98bc06641e06887045da4b7fb4944f3271789a69cc8d2c0b0cec375a3038aa2ff2113f3c698ccabe8d35f4f3b7a89f4c8f58f0

data/README.md

@@ -26,11 +26,9 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-## Current Release 2.12.2
+## Future Release 2.12.3
 
- - Fixed Oj::Doc bug that causes a crash on local name lookups.
-
- - Fixed Oj::Doc unicode parsing. 
+ - Fixed bug when trying to resolve an invalid class path in object mode load.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/object.c

@@ -271,7 +271,15 @@ hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t len) {
 	    parent->val = oj_encode(parent->val);
 	    break;
 	case 'c': // class
-	    parent->val = oj_name2class(pi, str, len, Yes == pi->options.auto_define);
+	    {
+		VALUE	clas = oj_name2class(pi, str, len, Yes == pi->options.auto_define);
+
+		if (Qundef == clas) {
+		    return 0;
+		} else {
+		    parent->val = clas;
+		}
+	    }
 	    break;
 	case 't': // time
 	    parent->val = parse_xml_time(str, len);

data/lib/oj/version.rb

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

data/test/bug3.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+require 'stringio'
+
+class Parser < Oj::Saj
+
+  def parse(json)
+    Oj.saj_parse(self, StringIO.new(json))
+  end
+
+  def hash_start(key)
+    puts "START: #{key}"
+  end
+
+  def error(message, line, column)
+    puts "Error callback: #{message}"
+  end
+
+end
+
+parser = Parser.new
+
+begin
+  # truncated JSON, Oj.saj_parse raises, #error not called
+  parser.parse('{"foo{"bar":')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end
+
+puts "\n\n"
+
+begin
+  # invalid JSON, doesn't raise an error
+  parser.parse('{"foo":{"bar":}')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.12.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -107,6 +107,7 @@ files:
 - test/_test_mimic_rails.rb
 - test/bug.rb
 - test/bug2.rb
+- test/bug3.rb
 - test/example.rb
 - test/files.rb
 - test/helper.rb
@@ -185,4 +186,3 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true