oj 1.4.7 → 2.0.0

data/lib/oj.rb

@@ -28,5 +28,6 @@ require 'oj/version'
 require 'oj/bag'
 require 'oj/error'
 require 'oj/mimic'
+require 'oj/saj'
 
 require 'oj/oj' # C extension

data/lib/oj/saj.rb

@@ -0,0 +1,63 @@
+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.saj_parse() method. The Saj methods will then be
+  # called as the file is parsed.
+  # @example
+  # 
+  #  require 'oj'
+  #
+  #  class MySaj < ::Oj::Saj
+  #    def initialize()
+  #      @hash_cnt = 0
+  #    end
+  #
+  #    def start_hash(key)
+  #      @hash_cnt += 1
+  #    end
+  #  end
+  #
+  #  cnt = MySaj.new()
+  #  File.open('any.xml', 'r') do |f|
+  #    Oj.saj_parse(cnt, f)
+  #  end
+  #
+  # To make the desired methods active while parsing the desired method should be made public in the subclasses. If the
+  # methods remain private they will not be called during parsing.
+  #
+  #    def hash_start(key); end
+  #    def hash_end(key); end
+  #    def array_start(key); end
+  #    def array_end(key); end
+  #    def add_value(value, key); end
+  #    def error(message, line, column); end
+  #
+  class Saj
+    # Create a new instance of the Saj handler class.
+    def initialize()
+    end
+
+    # To make the desired methods active while parsing the desired method
+    # should be made public in the subclasses. If the methods remain private
+    # they will not be called during parsing.
+    private
+
+    def hash_start(key)
+    end
+
+    def hash_end(key)
+    end
+
+    def array_start(key)
+    end
+
+    def array_end(key)
+    end
+
+    def add_value(value, key)
+    end
+
+    def error(message, line, column)
+    end
+    
+  end # Saj
+end # Oj

data/lib/oj/version.rb

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

data/test/a.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'pp'
+require 'oj'
+require 'perf'
+
+obj = [[1],[2],[3],[4],[5],[6],[7],[8],[9]]
+obj = [[],[],[],[],[],[],[],[],[]]
+obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]], # mix it up array
+  'e' => { 'one' => 1, 'two' => 2 }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, # big number
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+json = Oj.dump(obj, mode: :compat)
+
+puts json
+#pp Oj.saj_parse(nil, json)
+pp Oj.t_parse(json)
+
+if true
+  perf = Perf.new()
+  perf.add('SAJ', 'oj') { Oj.saj_parse(nil, json) }
+  perf.add('T', 'oj') { Oj.t_parse(json) }
+  perf.add('load', 'oj') { Oj.load(json) }
+  perf.run(10000)
+end

data/test/perf_saj.rb

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'yajl'
+require 'perf'
+require 'json'
+require 'json/ext'
+require 'oj'
+
+$verbose = false
+$indent = 0
+$iter = 10000
+$gets = 0
+$fetch = false
+$write = false
+$read = false
+
+opts = OptionParser.new
+opts.on("-v", "verbose")                                  { $verbose = true }
+opts.on("-c", "--count [Int]", Integer, "iterations")     { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")   { |i| $indent = i }
+opts.on("-g", "--gets [Int]", Integer, "number of gets")  { |i| $gets = i }
+opts.on("-f", "fetch")                                    { $fetch = true }
+opts.on("-w", "write")                                    { $write = true }
+opts.on("-r", "read")                                     { $read = true }
+opts.on("-h", "--help", "Show this display")              { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+class AllSaj < Oj::Saj
+  def initialize()
+  end
+
+  def hash_start(key)
+  end
+
+  def hash_end(key)
+  end
+
+  def array_start(key)
+  end
+
+  def array_end(key)
+  end
+
+  def add_value(value, key)
+  end
+end # AllSaj
+
+class NoSaj < Oj::Saj
+  def initialize()
+  end
+end # NoSaj
+
+saj_handler = AllSaj.new()
+no_saj = NoSaj.new()
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, {'12345' => 12345, 'nil' => nil}, 3.967, { 'x' => 'something', 'y' => false, 'z' => true}, nil]], # mix it up array
+  'e' => { 'one' => 1, 'two' => 2 }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, # big number
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+Oj.default_options = { :indent => $indent, :mode => :compat }
+
+$json = Oj.dump($obj)
+$failed = {} # key is same as String used in tests later
+
+def capture_error(tag, orig, load_key, dump_key, &blk)
+  begin
+    obj = blk.call(orig)
+    raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
+  rescue Exception => e
+    $failed[tag] = "#{e.class}: #{e.message}"
+  end
+end
+
+# Verify that all packages dump and load correctly and return the same Object as the original.
+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
+  puts "json:\n#{$json}\n"
+end
+
+
+puts '-' * 80
+puts "Parse Performance"
+perf = Perf.new()
+perf.add('Oj::Saj', 'all') { Oj.saj_parse(saj_handler, $json) }
+perf.add('Oj::Saj', 'none') { Oj.saj_parse(no_saj, $json) }
+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)
+
+unless $failed.empty?
+  puts "The following packages were not included for the reason listed"
+  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+end

data/test/test_fast.rb

@@ -370,7 +370,6 @@ class DocTest < ::Test::Unit::TestCase
     # a print statement confirms close is called
   end
 
-
   def test_dump
     Oj::Doc.open('[1,[2,3]]') do |doc|
       assert_equal('[1,[2,3]]', doc.dump())

data/test/test_saj.rb

@@ -0,0 +1,186 @@
+#!/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 'test/unit'
+require 'oj'
+require 'pp'
+
+$json = %{{
+  "array": [
+    {
+      "num"   : 3,
+      "string": "message",
+      "hash"  : {
+        "h2"  : {
+          "a" : [ 1, 2, 3 ]
+        }
+      }
+    }
+  ],
+  "boolean" : true
+}}
+
+class AllSaj < Oj::Saj
+  attr_accessor :calls
+
+  def initialize()
+    @calls = []
+  end
+
+  def hash_start(key)
+    @calls << [:hash_start, key]
+  end
+
+  def hash_end(key)
+    @calls << [:hash_end, key]
+  end
+
+  def array_start(key)
+    @calls << [:array_start, key]
+  end
+
+  def array_end(key)
+    @calls << [:array_end, key]
+  end
+
+  def add_value(value, key)
+    @calls << [:add_value, value, key]
+  end
+
+  def error(message, line, column)
+    @calls << [:error, message, line, column]
+  end
+
+end # AllSaj
+
+class SajTest < ::Test::Unit::TestCase
+  def test_nil
+    handler = AllSaj.new()
+    json = %{null}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, nil, nil]], handler.calls)
+  end
+
+  def test_true
+    handler = AllSaj.new()
+    json = %{true}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, true, nil]], handler.calls)
+  end
+
+  def test_false
+    handler = AllSaj.new()
+    json = %{false}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, false, nil]], handler.calls)
+  end
+
+  def test_string
+    handler = AllSaj.new()
+    json = %{"a string"}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, 'a string', nil]], handler.calls)
+  end
+
+  def test_fixnum
+    handler = AllSaj.new()
+    json = %{12345}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, 12345, nil]], handler.calls)
+  end
+
+  def test_float
+    handler = AllSaj.new()
+    json = %{12345.6789}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, 12345.6789, nil]], handler.calls)
+  end
+
+  def test_float_exp
+    handler = AllSaj.new()
+    json = %{12345.6789e7}
+    Oj.saj_parse(handler, json)
+    assert_equal(1, handler.calls.size)
+    assert_equal(:add_value, handler.calls[0][0])
+    assert_equal((12345.6789e7 * 10000).to_i, (handler.calls[0][1] * 10000).to_i)
+  end
+
+  def test_array_empty
+    handler = AllSaj.new()
+    json = %{[]}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:array_start, nil],
+                  [:array_end, nil]], handler.calls)
+  end
+
+  def test_array
+    handler = AllSaj.new()
+    json = %{[true,false]}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:array_start, nil],
+                  [:add_value, true, nil],
+                  [:add_value, false, nil],
+                  [:array_end, nil]], handler.calls)
+  end
+
+  def test_hash_empty
+    handler = AllSaj.new()
+    json = %{{}}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:hash_start, nil],
+                  [:hash_end, nil]], handler.calls)
+  end
+
+  def test_hash
+    handler = AllSaj.new()
+    json = %{{"one":true,"two":false}}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:hash_start, nil],
+                  [:add_value, true, 'one'],
+                  [:add_value, false, 'two'],
+                  [:hash_end, nil]], handler.calls)
+  end
+
+  def test_full
+    handler = AllSaj.new()
+    Oj.saj_parse(handler, $json)
+    assert_equal([[:hash_start, nil],
+                  [:array_start, 'array'],
+                  [:hash_start, nil],
+                  [:add_value, 3, 'num'],
+                  [:add_value, 'message', 'string'],
+                  [:hash_start, 'hash'],
+                  [:hash_start, 'h2'],
+                  [:array_start, 'a'],
+                  [:add_value, 1, nil],
+                  [:add_value, 2, nil],
+                  [:add_value, 3, nil],
+                  [:array_end, 'a'],
+                  [:hash_end, 'h2'],
+                  [:hash_end, 'hash'],
+                  [:hash_end, nil],
+                  [:array_end, 'array'],
+                  [:add_value, true, 'boolean'],
+                  [:hash_end, nil]], handler.calls)
+  end
+
+  def test_fixnum_bad
+    handler = AllSaj.new()
+    json = %{12345xyz}
+    Oj.saj_parse(handler, json)
+    assert_equal([[:add_value, 12345, nil],
+                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:716]", 1, 6]], handler.calls)
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -22,6 +22,7 @@ files:
 - lib/oj/bag.rb
 - lib/oj/error.rb
 - lib/oj/mimic.rb
+- lib/oj/saj.rb
 - lib/oj/version.rb
 - lib/oj.rb
 - ext/oj/extconf.rb
@@ -35,6 +36,8 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- ext/oj/saj.c
+- test/a.rb
 - test/files.rb
 - test/perf.rb
 - test/perf1.rb
@@ -42,6 +45,7 @@ files:
 - test/perf_fast.rb
 - test/perf_obj.rb
 - test/perf_obj_old.rb
+- test/perf_saj.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/sample/change.rb
@@ -60,6 +64,7 @@ files:
 - test/sample_json.rb
 - test/test_fast.rb
 - test/test_mimic.rb
+- test/test_saj.rb
 - test/tests.rb
 - LICENSE
 - README.md