oj 2.12.3 → 2.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 655072c6be3f9b0fe883178b02266e5f12838157
-  data.tar.gz: d37bc3d0333cec27246610451dda289ce4a4fbc2
+  metadata.gz: 19a014def903ab0e1994fd5c35f882bbfc4d19b4
+  data.tar.gz: b02d7ad3224f234b26c3a53039c4f802fc362427
 SHA512:
-  metadata.gz: 604bc05ecad569b0791530e48b142a8cc83d4bd97192222b99f69c709c236ac0ff448ee9d4f766de8ea04ea273eecfe29d654405a4d7d3d781a9830f0f025aea
-  data.tar.gz: 4ceefa024654e05eddfa9efa8e98bc06641e06887045da4b7fb4944f3271789a69cc8d2c0b0cec375a3038aa2ff2113f3c698ccabe8d35f4f3b7a89f4c8f58f0
+  metadata.gz: d48e74d74f16124fe1a3db9111071886cbcdb2f92714b75a73534125a6c6ae79697d419a31e99a7aa0546a53075e90c83f4d1ee99ebf979c14667f66375c1125
+  data.tar.gz: b8ec4119322934662c75def9c6951b1d27ee10dc9872fa9214f6e511afe4e3e47adc9cd4cde3b7a3addfeaee6cd786f4474c92042c5fe267ff514ebb0c3adba2

data/README.md

@@ -26,9 +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)
 
-## Future Release 2.12.3
+## Current Release 2.12.4
 
- - Fixed bug when trying to resolve an invalid class path in object mode load.
+ - Fixed memory leak in Oj::Doc when not using a given proc.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/fast.c

@@ -1580,6 +1580,7 @@ doc_close(VALUE self) {
     if (0 != doc) {
 	xfree(doc->json);
 	doc_free(doc);
+	xfree(doc);
     }
     return Qnil;
 }

data/ext/oj/saj.c

@@ -69,9 +69,9 @@ static void	next_non_white(ParseInfo pi);
 static char*	read_quoted_value(ParseInfo pi);
 static void	skip_comment(ParseInfo pi);
 
-/* This XML parser is a single pass, destructive, callback parser. It is a
+/* This JSON parser is a single pass, destructive, callback parser. It is a
  * single pass parse since it only make one pass over the characters in the
- * XML document string. It is destructive because it re-uses the content of
+ * JSON document string. It is destructive because it re-uses the content of
  * the string for values in the callback and places \0 characters at various
  * places to mark the end of tokens and strings. It is a callback parser like
  * a SAX parser because it uses callback when document elements are

data/lib/oj/saj.rb

@@ -1,8 +1,8 @@
 module Oj
   # A SAX style parse handler for JSON hence the acronym SAJ for Simple API for
-  # JSON. The Oj::Saj handler class should be subclassed and then used with
-  # the Oj.sajkey_parse() method. The Saj methods will then be called as the
-  # file is parsed.
+  # JSON. The Oj::Saj handler class should be subclassed and then used with the
+  # Oj::Saj key_parse() method. The Saj methods will then be called as the file
+  # is parsed.
   #
   # @example
   # 
@@ -19,7 +19,7 @@ module Oj
   #  end
   #
   #  cnt = MySaj.new()
-  #  File.open('any.xml', 'r') do |f|
+  #  File.open('any.json', 'r') do |f|
   #    Oj.saj_parse(cnt, f)
   #  end
   #

data/lib/oj/version.rb

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

data/test/bug_fast.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+def create_item(doc)
+  #puts "#{doc.fetch('/id')}: #{doc.fetch('/labels/it/value')} - #{doc.fetch('/descriptions/it/value')}"
+  doc.fetch('/id')
+  doc.fetch('/labels/it/value')
+  doc.fetch('/descriptions/it/value')
+end
+
+100.times { |i|
+  File.open('dump_10k.json') { |f|
+    f.each { |line|
+      #Oj::Doc.open(line) { |doc|
+      doc = Oj::Doc.open(line)
+        begin
+          create_item(doc) if doc.fetch('/type') == 'item'
+        rescue Exception => e
+          puts "*** #{e.class}: #{e.message}"
+        end
+      doc.close
+      #}
+    }
+  }
+  puts i
+}

data/test/bug_load.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+def create_item(doc)
+  item_id = doc['source']
+  # ...
+  puts item_id
+end
+
+File.open('log.json') { |f|
+  Oj::load(f, mode: :compat) { |doc|
+    begin
+      create_item(doc) if doc['msgType'] == 1
+    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.3
+  version: 2.12.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -108,6 +108,8 @@ files:
 - test/bug.rb
 - test/bug2.rb
 - test/bug3.rb
+- test/bug_fast.rb
+- test/bug_load.rb
 - test/example.rb
 - test/files.rb
 - test/helper.rb