oj 2.9.3 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a00c99e1a81e8db2d4d074dd75c207d35dba89
-  data.tar.gz: a7945af118f56ce1b883ee8df51fac93c692714b
+  metadata.gz: 472794bb4413026604920270cbf2d91e9486184d
+  data.tar.gz: da2a776a8dd4e69c8b34bfbc478dbbcd11c60db3
 SHA512:
-  metadata.gz: 7a31a3c396f291fd4c9c851b2a3d2d6ad85582abd30046251757e44f73e3146319daa543d23f707226d32507bbe55695274a08706c8a2d2546f3c1b328a69a7a
-  data.tar.gz: 1f8979189385a752ec69bde1611728bc9d382608c251d3e59252268e6622f2dd9b6d3f37335663d041790e036802fb8871739275d247d3ba41873f3d3db378f2
+  metadata.gz: b4619f73d69dde844139216836a04570e2abb5103a0235e7199d3a98449c8b6f8c96385f86e627f6592d0095229d329f3f9d0b608b1eb09a9381e7b0d626f398
+  data.tar.gz: 2dcd720bd6e964c23f33e83227163388bc72b8294c583501bc51ef79d24b7395771f0657b5ba575ea638e2814b1fa3bdc707db8cec6d565638399befac751d03

data/README.md

@@ -26,10 +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.9.3
+### Current Release 2.9.4
 
- - Fixed IO read error that showed up in IO objects that return nil instead of
-   raising an EOF error when read is done.
+ - In mimic mode parse errors not match the JSON::ParserError.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
@@ -158,6 +157,8 @@ parsing.
 
 [Need for Speed](http://www.ohler.com/dev/need_for_speed/need_for_speed.html) for an overview of how Oj::Doc was designed.
 
+*OjC, a C JSON parser*: https://www.ohler.com/ojc also at https://github.com/ohler55/ojc
+
 ### License:
 
     Copyright (c) 2012, Peter Ohler

data/ext/oj/oj.c

@@ -1708,7 +1708,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     }
     if (rb_const_defined_at(mimic, rb_intern("Ext"))) {
 	ext = rb_const_get_at(mimic, rb_intern("Ext"));
-    } else {
+     } else {
 	ext = rb_define_module_under(mimic, "Ext");
     }
     if (!rb_const_defined_at(ext, rb_intern("Parser"))) {
@@ -1761,6 +1761,9 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
 
+    if (!rb_const_defined_at(mimic, rb_intern("ParserError"))) {
+	rb_define_const(mimic, "ParserError", oj_parse_error_class);
+    }
     oj_default_options.mode = CompatMode;
     oj_default_options.escape_mode = ASCIIEsc;
     oj_default_options.nilnil = Yes;

data/lib/oj/version.rb

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

data/test/perf_fast.rb

@@ -6,7 +6,7 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'optparse'
-require 'yajl'
+#require 'yajl'
 require 'perf'
 require 'json'
 require 'json/ext'
@@ -14,7 +14,7 @@ require 'oj'
 
 $verbose = false
 $indent = 0
-$iter = 10000
+$iter = 100000
 $gets = 0
 $fetch = false
 $write = false
@@ -71,7 +71,7 @@ end
 
 # Verify that all packages dump and load correctly and return the same Object as the original.
 capture_error('Oj::Doc', $obj, 'load', 'dump') { |o| Oj::Doc.open(Oj.dump(o, :mode => :strict)) { |f| f.fetch() } }
-capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+#capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
 capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o| JSON.generator = JSON::Ext::Generator; JSON::Ext::Parser.new(JSON.generate(o)).parse }
 
 if $verbose
@@ -82,7 +82,7 @@ puts '-' * 80
 puts "Parse Performance"
 perf = Perf.new()
 perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| } } unless $failed.has_key?('Oj::Doc')
-perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
+#perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
 perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
 perf.run($iter)
 
@@ -91,7 +91,7 @@ puts "JSON generation Performance"
 Oj::Doc.open($json) do |doc|
   perf = Perf.new()
   perf.add('Oj::Doc', 'dump') { doc.dump() }
-  perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
+#  perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
   perf.add('JSON::Ext', 'fast_generate') { JSON.fast_generate($obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
   perf.run($iter)
@@ -102,7 +102,7 @@ if 0 < $gets
   puts "Parse and get all values Performance"
   perf = Perf.new()
   perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| $gets.times { f.each_value() {} } } } unless $failed.has_key?('Oj::Doc')
-  perf.add('Yajl', 'parse') { $gets.times { dig(Yajl::Parser.parse($json)) {} } } unless $failed.has_key?('Yajl')
+#  perf.add('Yajl', 'parse') { $gets.times { dig(Yajl::Parser.parse($json)) {} } } unless $failed.has_key?('Yajl')
   perf.add('JSON::Ext', 'parse') { $gets.times { dig(JSON::Ext::Parser.new($json).parse) {} } } unless $failed.has_key?('JSON::Ext')
   perf.run($iter)
 end
@@ -134,7 +134,7 @@ if $write
   Oj::Doc.open($json) do |doc|
     perf = Perf.new()
     perf.add('Oj::Doc', 'dump') { doc.dump(nil, 'oj.json') }
-    perf.add('Yajl', 'encode') { File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) } }
+#    perf.add('Yajl', 'encode') { File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) } }
     perf.add('JSON::Ext', 'fast_generate') { File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) } }
     perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
     perf.run($iter)
@@ -145,13 +145,13 @@ if $read
   puts '-' * 80
   puts "JSON read from file Performance"
   Oj::Doc.open($json) { |doc| doc.dump(nil, 'oj.json') }
-  File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) }
+#  File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) }
   JSON.generator = JSON::Ext::Generator
   File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) }
   Oj::Doc.open($json) do |doc|
     perf = Perf.new()
     perf.add('Oj::Doc', 'open_file') { ::Oj::Doc.open_file('oj.json') }
-    perf.add('Yajl', 'decode') { Yajl::decoder.decode(File.read('yajl.json')) }
+#    perf.add('Yajl', 'decode') { Yajl::decoder.decode(File.read('yajl.json')) }
     perf.add('JSON::Ext', '') { JSON.parse(File.read('json_ext.json')) }
     perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
     perf.run($iter)

data/test/perf_strict.rb

@@ -64,6 +64,7 @@ end
 $json = Oj.dump($obj)
 $obj_json = Oj.dump($obj, :mode => :object)
 #puts "*** size: #{$obj_json.size}"
+#puts "*** #{$obj_json}"
 $failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)

data/test/test_mimic.rb

@@ -203,4 +203,17 @@ class Mimic < ::Test::Unit::TestCase
     end
   end
 
+  # exception check
+  def test_exception
+    json = %{["a":1]}
+    begin
+      obj = JSON.parse(json)
+      
+    rescue JSON::ParserError => je
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an JSON::ParserError")
+  end
+
 end # Mimic

data/test/write_fake_log.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '.'
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'optparse'
+require 'oj'
+require 'perf'
+
+$indent = 0
+$iter = 1
+
+opts = OptionParser.new
+
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indent")          { |i| $indent = i }
+
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+$levels = [ "ERROR", "WARN", "INFO", "DEBUG", "TRACE" ]
+$entry = {
+  "bar" => "0",
+  "level" => "INFO",
+  "message" => "A message",
+  "msgType" => 1,
+  "source" => "Test",
+  "thread" => "main",
+  "version" => 1,
+  "when" => 1400000000000000000,
+}
+
+Oj.default_options = { :mode => :strict, :indent => $indent }
+
+filename = 'log.json'
+File.open(filename, "w") { |f|
+  $iter.times do |i|
+    $entry["bar"] = (1_400_000_000_000 + i * 200) / 1000
+    $entry["when"] = 1_400_000_000_000_000_000 + i * 100_000_000
+    $entry["message"] = "This is log message number #{i} out of #{$iter} entries."
+    $entry["level"] = $levels[i % $levels.size]
+    Oj.to_stream(f, $entry, :indent => $indent)
+    if 0 == $indent
+      f.flush()
+      f.write("\n")
+    end
+  end
+}
+
+$cnt = 0
+perf = Perf.new()
+perf.add('Oj.load_file', '') { Oj.load_file(filename) { |o| $cnt += 1 } }
+perf.run(1)
+
+puts "*** read #{$cnt} entries"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -106,6 +106,7 @@ files:
 - test/test_strictx.rb
 - test/test_writer.rb
 - test/tests.rb
+- test/write_fake_log.rb
 - test/x.rb
 homepage: http://www.ohler.com/oj
 licenses: