oj 2.0.14 → 2.1.0

data/test/test_saj.rb

@@ -178,7 +178,7 @@ class SajTest < ::Test::Unit::TestCase
     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:714]", 1, 6]], handler.calls)
+                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:716]", 1, 6]], handler.calls)
   end
 
 end

data/test/test_scp.rb

@@ -0,0 +1,224 @@
+#!/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 NoHandler < Oj::ScHandler
+  def initialize()
+  end
+end
+
+class AllHandler < Oj::ScHandler
+  attr_accessor :calls
+
+  def initialize()
+    @calls = []
+  end
+
+  def hash_start()
+    @calls << [:hash_start]
+    {}
+  end
+
+  def hash_end()
+    @calls << [:hash_end]
+  end
+
+  def array_start()
+    @calls << [:array_start]
+    []
+  end
+
+  def array_end()
+    @calls << [:array_end]
+  end
+
+  def add_value(value)
+    @calls << [:add_value, value]
+  end
+
+  def hash_set(h, key, value)
+    @calls << [:hash_set, key, value]
+  end
+  
+  def array_append(a, value)
+    @calls << [:array_append, value]
+  end
+
+end # AllHandler
+
+class ScpTest < ::Test::Unit::TestCase
+
+  def test_nil
+    handler = AllHandler.new()
+    json = %{null}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, nil]], handler.calls)
+  end
+
+  def test_true
+    handler = AllHandler.new()
+    json = %{true}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, true]], handler.calls)
+  end
+
+  def test_false
+    handler = AllHandler.new()
+    json = %{false}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, false]], handler.calls)
+  end
+
+  def test_string
+    handler = AllHandler.new()
+    json = %{"a string"}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, 'a string']], handler.calls)
+  end
+
+  def test_fixnum
+    handler = AllHandler.new()
+    json = %{12345}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, 12345]], handler.calls)
+  end
+
+  def test_float
+    handler = AllHandler.new()
+    json = %{12345.6789}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:add_value, 12345.6789]], handler.calls)
+  end
+
+  def test_float_exp
+    handler = AllHandler.new()
+    json = %{12345.6789e7}
+    Oj.sc_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 = AllHandler.new()
+    json = %{[]}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:array_start],
+                  [:array_end],
+                  [:add_value, []]], handler.calls)
+  end
+
+  def test_array
+    handler = AllHandler.new()
+    json = %{[true,false]}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:array_start],
+                  [:array_append, true],
+                  [:array_append, false],
+                  [:array_end],
+                  [:add_value, []]], handler.calls)
+  end
+
+  def test_hash_empty
+    handler = AllHandler.new()
+    json = %{{}}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:hash_start],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
+  def test_hash
+    handler = AllHandler.new()
+    json = %{{"one":true,"two":false}}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:hash_start],
+                  [:hash_set, 'one', true],
+                  [:hash_set, 'two', false],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
+  def test_hash_sym
+    handler = AllHandler.new()
+    json = %{{"one":true,"two":false}}
+    Oj.sc_parse(handler, json, :symbol_keys => true)
+    assert_equal([[:hash_start],
+                  [:hash_set, :one, true],
+                  [:hash_set, :two, false],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
+  def test_full
+    handler = AllHandler.new()
+    Oj.sc_parse(handler, $json)
+    assert_equal([[:hash_start],
+                  [:array_start],
+                  [:hash_start],
+                  [:hash_set, "num", 3],
+                  [:hash_set, "string", "message"],
+                  [:hash_start],
+                  [:hash_start],
+                  [:array_start],
+                  [:array_append, 1],
+                  [:array_append, 2],
+                  [:array_append, 3],
+                  [:array_end],
+                  [:hash_set, "a", []],
+                  [:hash_end],
+                  [:hash_set, "h2", {}],
+                  [:hash_end],
+                  [:hash_set, "hash", {}],
+                  [:hash_end],
+                  [:array_append, {}],
+                  [:array_end],
+                  [:hash_set, "array", []],
+                  [:hash_set, "boolean", true],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
+  def test_none
+    handler = NoHandler.new()
+    Oj.sc_parse(handler, $json)
+  end
+
+  def test_fixnum_bad
+    handler = AllHandler.new()
+    json = %{12345xyz}
+    begin
+      Oj.sc_parse(handler, json)
+    rescue Exception => e
+      assert_equal("unexpected character at line 1, column 6 [parse.c:626]", e.message)
+    end
+  end
+
+end

data/test/test_strict.rb

@@ -0,0 +1,250 @@
+#!/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 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'oj'
+
+$ruby = RUBY_DESCRIPTION.split(' ')[0]
+$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+
+def hash_eql(h1, h2)
+  return false if h1.size != h2.size
+  h1.keys.each do |k|
+    return false unless h1[k] == h2[k]
+  end
+  true
+end
+
+class StrictJuice < ::Test::Unit::TestCase
+
+  def test_nil
+    dump_and_load(nil, false)
+  end
+
+  def test_true
+    dump_and_load(true, false)
+  end
+
+  def test_false
+    dump_and_load(false, false)
+  end
+
+  def test_fixnum
+    dump_and_load(0, false)
+    dump_and_load(12345, false)
+    dump_and_load(-54321, false)
+    dump_and_load(1, false)
+  end
+
+  def test_float
+    dump_and_load(0.0, false)
+    dump_and_load(12345.6789, false)
+    dump_and_load(70.35, false)
+    dump_and_load(-54321.012, false)
+    dump_and_load(2.48e16, false)
+    dump_and_load(2.48e100 * 1.0e10, false)
+    dump_and_load(-2.48e100 * 1.0e10, false)
+  end
+
+  def test_string
+    dump_and_load('', false)
+    dump_and_load('abc', false)
+    dump_and_load("abc\ndef", false)
+    dump_and_load("a\u0041", false)
+  end
+
+  def test_encode
+    opts = Oj.default_options
+    Oj.default_options = { :ascii_only => false }
+    unless 'jruby' == $ruby
+      dump_and_load("ぴーたー", false)
+    end
+    Oj.default_options = { :ascii_only => true }
+    json = Oj.dump("ぴーたー")
+    assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
+    unless 'jruby' == $ruby
+      dump_and_load("ぴーたー", false)
+    end
+    Oj.default_options = opts
+  end
+
+  def test_unicode
+    # hits the 3 normal ranges and one extended surrogate pair
+    json = %{"\\u019f\\u05e9\\u3074\\ud834\\udd1e"}
+    obj = Oj.load(json)
+    json2 = Oj.dump(obj, :ascii_only => true)
+    assert_equal(json, json2)
+  end
+
+  def test_array
+    dump_and_load([], false)
+    dump_and_load([true, false], false)
+    dump_and_load(['a', 1, nil], false)
+    dump_and_load([[nil]], false)
+    dump_and_load([[nil], 58], false)
+  end
+
+  def test_array_deep
+    dump_and_load([1,[2,[3,[4,[5,[6,[7,[8,[9,[10,[11,[12,[13,[14,[15,[16,[17,[18,[19,[20]]]]]]]]]]]]]]]]]]]], false)
+  end
+
+  # Hash
+  def test_hash
+    dump_and_load({}, false)
+    dump_and_load({ 'true' => true, 'false' => false}, false)
+    dump_and_load({ 'true' => true, 'array' => [], 'hash' => { }}, false)
+  end
+
+  def test_hash_deep
+    dump_and_load({'1' => {
+                      '2' => {
+                        '3' => {
+                          '4' => {
+                            '5' => {
+                              '6' => {
+                                '7' => {
+                                  '8' => {
+                                    '9' => {
+                                      '10' => {
+                                        '11' => {
+                                          '12' => {
+                                            '13' => {
+                                              '14' => {
+                                                '15' => {
+                                                  '16' => {
+                                                    '17' => {
+                                                      '18' => {
+                                                        '19' => {
+                                                          '20' => {}}}}}}}}}}}}}}}}}}}}}, false)
+  end
+
+  def test_hash_escaped_key
+    json = %{{"a\nb":true,"c\td":false}}
+    obj = Oj.strict_load(json)
+    assert_equal({"a\nb" => true, "c\td" => false}, obj)
+  end
+
+  def test_bignum_object
+    dump_and_load(7 ** 55, false)
+  end
+
+  # BigDecimal
+  def test_bigdecimal_strict
+    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+  end
+
+  def test_bigdecimal_load
+    orig = BigDecimal.new('80.51')
+    json = Oj.dump(orig, :mode => :compat, :bigdecimal_as_decimal => true)
+    bg = Oj.load(json, :mode => :compat, :bigdecimal_load => true)
+    assert_equal(BigDecimal, bg.class)
+    assert_equal(orig, bg)
+  end
+
+  # Stream IO
+  def test_io_string
+    json = %{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}
+    input = StringIO.new(json)
+    obj = Oj.strict_load(input)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_io_file
+    filename = 'open_file_test.json'
+    File.open(filename, 'w') { |f| f.write(%{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}) }
+    f = File.new(filename)
+    obj = Oj.strict_load(f)
+    f.close()
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  # symbol_keys option
+  def test_symbol_keys
+    json = %{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}
+    obj = Oj.strict_load(json, :symbol_keys => true)
+    assert_equal({ :x => true, :y => 58, :z => [1, 2, 3]}, obj)
+  end
+
+  def test_symbol_keys_safe
+    json = %{{
+  "x":true,
+  "y":58,
+  "z": [1,2,3]
+}
+}
+    obj = Oj.safe_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  # comments
+  def test_comment_slash
+    json = %{{
+  "x":true,//three
+  "y":58,
+  "z": [1,2,
+3 // six
+]}
+}
+    obj = Oj.strict_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_comment_c
+    json = %{{
+  "x"/*one*/:/*two*/true,
+  "y":58,
+  "z": [1,2,3]}
+}
+    obj = Oj.strict_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_comment
+    json = %{{
+  "x"/*one*/:/*two*/true,//three
+  "y":58/*four*/,
+  "z": [1,2/*five*/,
+3 // six
+]
+}
+}
+    obj = Oj.strict_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def dump_and_load(obj, trace=false)
+    json = Oj.dump(obj, :indent => 2)
+    puts json if trace
+    loaded = Oj.strict_load(json);
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end