oj 2.0.14 → 2.1.0

data/test/sample.rb

@@ -29,7 +29,7 @@ def sample_doc(size=3)
       (1..size).each do |k|
         g2 = ::Sample::Group.new
         r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
-                                 10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
+                               10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
         r.add_prop(:part_of, layer.name)
         g2 << r
         g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
@@ -38,7 +38,7 @@ def sample_doc(size=3)
       g2 = ::Sample::Group.new
       (1..size).each do |k|
         o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
-                                 6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
+                               6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o
       end

data/test/test_compat.rb

@@ -0,0 +1,342 @@
+#!/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')
+
+class Jeez
+  attr_accessor :x, :y
+
+  def initialize(x, y)
+    @x = x
+    @y = y
+  end
+
+  def eql?(o)
+    self.class == o.class && @x == o.x && @y == o.y
+  end
+  alias == eql?
+  
+  def to_json(*a)
+    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
+  end
+
+  def self.json_create(h)
+    self.new(h['x'], h['y'])
+  end
+end # Jeez
+
+module One
+  module Two
+    module Three
+      class Deep
+
+        def initialize()
+        end
+
+        def eql?(o)
+          self.class == o.class
+        end
+        alias == eql?
+
+        def to_hash()
+          {'json_class' => "#{self.class.name}"}
+        end
+
+        def to_json(*a)
+          %{{"json_class":"#{self.class.name}"}}
+        end
+
+        def self.json_create(h)
+          self.new()
+        end
+      end # Deep
+    end # Three
+  end # Two
+end # One
+
+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 CompatJuice < ::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.compat_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_compat
+    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.compat_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.compat_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.compat_load(json, :symbol_keys => true)
+    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.compat_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.compat_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.compat_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_json_object_compat
+    obj = Jeez.new(true, 58)
+    dump_and_load(obj, false)
+  end
+
+  def test_json_module_object
+    obj = One::Two::Three::Deep.new()
+    dump_and_load(obj, false)
+  end
+
+  def test_json_object_create_id
+    expected = Jeez.new(true, 58)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    obj = Oj.compat_load(json)
+    assert_equal(expected, obj)
+  end
+
+  def test_json_object_bad
+    json = %{{"json_class":"Junk","x":true}}
+    begin
+      Oj.compat_load(json)
+    rescue Exception => e
+      assert_equal("Oj::ParseError", e.class().name)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_json_object_create_cache
+    expected = Jeez.new(true, 58)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    obj = Oj.compat_load(json, :class_cache => true)
+    assert_equal(expected, obj)
+    obj = Oj.compat_load(json, :class_cache => false)
+    assert_equal(expected, obj)
+  end
+
+  def test_json_object_create_id_other
+    expected = Jeez.new(true, 58)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    json.gsub!('json_class', '_class_')
+    obj = Oj.compat_load(json, :create_id => "_class_")
+    assert_equal(expected, obj)
+  end
+
+  def test_json_object_create_deep
+    expected = One::Two::Three::Deep.new()
+    json = Oj.dump(expected, :indent => 2, :mode => :compat)
+    obj = Oj.compat_load(json)
+    assert_equal(expected, obj)
+  end
+
+  def dump_and_load(obj, trace=false)
+    json = Oj.dump(obj, :indent => 2, :mode => :compat)
+    puts json if trace
+    loaded = Oj.compat_load(json);
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end

data/test/test_object.rb

@@ -0,0 +1,390 @@
+#!/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')
+
+class Jeez
+  attr_accessor :x, :y
+
+  def initialize(x, y)
+    @x = x
+    @y = y
+  end
+
+  def eql?(o)
+    self.class == o.class && @x == o.x && @y == o.y
+  end
+  alias == eql?
+  
+  def to_json(*a)
+    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
+  end
+
+  def self.json_create(h)
+    self.new(h['x'], h['y'])
+  end
+end # Jeez
+
+module One
+  module Two
+    module Three
+      class Deep
+
+        def initialize()
+        end
+
+        def eql?(o)
+          self.class == o.class
+        end
+        alias == eql?
+
+        def to_hash()
+          {'json_class' => "#{self.class.name}"}
+        end
+
+        def to_json(*a)
+          %{{"json_class":"#{self.class.name}"}}
+        end
+
+        def self.json_create(h)
+          self.new()
+        end
+      end # Deep
+    end # Three
+  end # Two
+end # One
+
+class Stuck < Struct.new(:a, :b)
+end
+
+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 ObjectJuice < ::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_symbol
+    dump_and_load(:abc, false)
+    dump_and_load(":abc", 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.object_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_object
+    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+  end
+
+  def test_bigdecimal_load
+    orig = BigDecimal.new('80.51')
+    json = Oj.dump(orig, :mode => :object, :bigdecimal_as_decimal => true)
+    bg = Oj.load(json, :mode => :object, :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.object_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.object_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.object_load(json, :symbol_keys => true)
+    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.object_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.object_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.object_load(json)
+    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+  end
+
+  def test_json_module_object
+    obj = One::Two::Three::Deep.new()
+    dump_and_load(obj, false)
+  end
+
+  def test_time
+    t = Time.now()
+    dump_and_load(t, false)
+  end
+
+  def test_time_early
+    t = Time.xmlschema("1954-01-05T00:00:00.123456")
+    dump_and_load(t, false)
+  end
+
+  def test_json_object
+    obj = Jeez.new(true, 58)
+    dump_and_load(obj, false)
+  end
+
+  def test_json_object_create_deep
+    obj = One::Two::Three::Deep.new()
+    dump_and_load(obj, false)
+  end
+
+  def test_json_object_bad
+    json = %{{"^o":"Junk","x":true}}
+    begin
+      Oj.object_load(json)
+    rescue Exception => e
+      assert_equal("Oj::ParseError", e.class().name)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_json_struct
+    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
+      obj = Stuck.new(false, 7)
+      dump_and_load(obj, false)
+    end
+  end
+
+  def test_json_non_str_hash
+    obj = { 59 => "young", false => true }
+    dump_and_load(obj, false)
+  end
+
+  def test_mixed_hash_object
+    json = Oj.dump({ 1 => true, 'nil' => nil, :sim => 4 })
+    h = Oj.object_load(json)
+    assert_equal({ 1 => true, 'nil' => nil, :sim => 4 }, h)
+  end
+
+  def test_circular_hash
+    h = { 'a' => 7 }
+    h['b'] = h
+    json = Oj.dump(h, :mode => :object, :indent => 2, :circular => true)
+    h2 = Oj.object_load(json, :circular => true)
+    assert_equal(h2['b'].__id__, h2.__id__)
+  end
+
+  def test_circular_array
+    a = [7]
+    a << a
+    json = Oj.dump(a, :mode => :object, :indent => 2, :circular => true)
+    a2 = Oj.object_load(json, :circular => true)
+    assert_equal(a2[1].__id__, a2.__id__)
+  end
+
+  def test_circular_object
+    obj = Jeez.new(nil, 58)
+    obj.x = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    obj2 = Oj.object_load(json, :circular => true)
+    assert_equal(obj2.x.__id__, obj2.__id__)
+  end
+
+  def test_circular
+    h = { 'a' => 7 }
+    obj = Jeez.new(h, 58)
+    obj.x['b'] = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    Oj.object_load(json, :circular => true)
+    assert_equal(obj.x.__id__, h.__id__)
+    assert_equal(h['b'].__id__, obj.__id__)
+  end
+
+  def test_odd_date
+    dump_and_load(Date.new(2012, 6, 19), false)
+  end
+
+  def dump_and_load(obj, trace=false)
+    json = Oj.dump(obj, :indent => 2, :mode => :object)
+    puts json if trace
+    loaded = Oj.object_load(json);
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end