oj 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668ead8e90334db6467d560eea8f2bb1f514fc53
-  data.tar.gz: 2556e815c19eaf4b0a2cdd432a25942420166cfe
+  metadata.gz: 4f45b0b28345f47bc50144ccd5750143f5a3ccb0
+  data.tar.gz: ba321d9b7543648e1b024f85a2b1257b876c414b
 SHA512:
-  metadata.gz: 63163bdb7c6b7b1580072f33c8256126cf087313cd3f85ba3cb899431ce139a81ee24eafbc11fa362e1611b02ecaadb6bf58bf2cc1d2a1c55aebbbd6341d0535
-  data.tar.gz: 3fee65bcd045885bed8e744ea4f51cb6bb93c14220c2de5ef272d624aa03aa1949f3afca1da02ad10102396052cb5a898020d338e9064916dccc94a140dc3231
+  metadata.gz: 9a290c251d3bfd068add15c3f7238807efb7ea7d6321161008e11000a9492cfbb52731e18b7c29bfca57e97540d5158bc08cbacbfa1cd680c8d190bf2c6b8152
+  data.tar.gz: b6bdfc9702edf98b18487ddea0aa5ee9502baac7dd286f7aa7033456de40cc870714920244877690b7390220a611e86b528b0fea243c31a8c8064cfc958ac942

data/README.md

@@ -32,16 +32,13 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.13
+### Release 2.0.14
 
- - Mimic is better at masking out json gem but the oj_mimic_json gem does not
-   work with ruby 2.0.0 correctly. The Oj.mimic_JSON() method should be called
-   directly either before or after the json gem is required. Depending on the
-   situation one may work better than the other. Oj.mimic_JSON() may now be
-   called multiple times.
+ - Fixed bug in Oj::Doc.each_leaf that caused an incorrect where path to be
+   created and also added a chack for where path maximum length.
 
- - Changed dump to put closing array brackets and closing object curlies on the
-   line following the last element if :indent is set to greater than zero.
+ - Updated the documentation to note that invalid JSON documents, which includes
+   an empty string or file, will cause an exception to be raised.
 
 ## <a name="description">Description</a>
 

data/ext/oj/fast.c

@@ -902,6 +902,9 @@ get_doc_leaf(Doc doc, const char *path) {
 	} else {
 	    size_t	cnt = doc->where - doc->where_path;
 
+	    if (MAX_STACK <= cnt) {
+		rb_raise(rb_const_get_at(Oj, rb_intern("DepthError")), "Path too deep. Limit is %d levels.", MAX_STACK);
+	    }
 	    memcpy(stack, doc->where_path, sizeof(Leaf) * cnt);
 	    lp = stack + cnt;
 	}
@@ -988,11 +991,15 @@ each_leaf(Doc doc, VALUE self) {
 	    Leaf	e = first;
 
 	    doc->where++;
+	    if (MAX_STACK <= doc->where - doc->where_path) {
+		rb_raise(rb_const_get_at(Oj, rb_intern("DepthError")), "Path too deep. Limit is %d levels.", MAX_STACK);
+	    }
 	    do {
 		*doc->where = e;
 		each_leaf(doc, self);
 		e = e->next;
 	    } while (e != first);
+	    doc->where--;
 	}
     } else {
 	rb_yield(self);

data/ext/oj/oj.c

@@ -488,7 +488,10 @@ load_with_opts(VALUE input, Options copts) {
  *
  * Parses a JSON document String into a Hash, Array, String, Fixnum, Float,
  * true, false, or nil. Raises an exception if the JSON is malformed or the
- * classes specified are not valid.
+ * classes specified are not valid. If the string input is not a valid JSON
+ * document (an empty string is not a valid JSON document) an exception is
+ * raised.
+ *
  * @param [String] json JSON String
  * @param [Hash] options load options (same as default_options)
  */
@@ -508,9 +511,10 @@ load(int argc, VALUE *argv, VALUE self) {
 /* Document-method: load_file
  *   call-seq: load_file(path, options) => Hash, Array, String, Fixnum, Float, true, false, or nil
  *
- * Parses a JSON document from a file into a Hash, Array, String, Fixnum,
- * Float, true, false, or nil. Raises an exception if the JSON is malformed or
- * the classes specified are not valid.
+ * Parses a JSON document from a file into a Hash, Array, String, Fixnum, Float,
+ * true, false, or nil. Raises an exception if the JSON is malformed or the
+ * classes specified are not valid. If the input file is not a valid JSON
+ * document (an empty file is not a valid JSON document) an exception is raised.
  *
  * @param [String] path path to a file containing a JSON document
  * @param [Hash] options load options (same as default_options)

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+reltypes={}
+Oj::Doc.open_file('foo.json') do |doc|
+  doc.each_child do |target|
+    puts "#{target.local_key} is #{target.local_key.class}"
+    target.each_leaf do |score|
+      reltype=score.local_key
+      reltypes[reltype] = (reltypes[reltype] || 0) + 1
+    end
+  end
+end

data/test/test_fast.rb

@@ -387,6 +387,15 @@ class DocTest < ::Test::Unit::TestCase
     assert_equal({'/1' => 1, '/2/1' => 2, '/2/2' => 3}, results)
   end
 
+  def test_each_leaf_hash
+    results = Oj::Doc.open('{"a":{"x":2},"b":{"y":4}}') do |doc|
+      h = {}
+      doc.each_leaf() { |d| h[d.where?] = d.fetch() }
+      h
+    end
+    assert_equal({'/a/x' => 2, '/b/y' => 4}, results)
+  end
+
   def test_comment
     json = %{{
   "x"/*one*/:/*two*/true,//three

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -25,7 +25,6 @@ files:
 - lib/oj/version.rb
 - lib/oj.rb
 - ext/oj/extconf.rb
-- ext/oj/foo.rb
 - ext/oj/cache.h
 - ext/oj/cache8.h
 - ext/oj/oj.h
@@ -39,6 +38,7 @@ files:
 - test/a.rb
 - test/bug.rb
 - test/files.rb
+- test/foo.rb
 - test/mj.rb
 - test/perf.rb
 - test/perf1.rb

data/ext/oj/foo.rb

@@ -1,6 +0,0 @@
-
-def foo()
-  [1, [true, false]].each { |x| yield x }
-end
-
-foo() { |x| puts x }