oj 2.18.5 → 3.0.0

data/test/test_object.rb

@@ -28,6 +28,49 @@ class ObjectJuice < Minitest::Test
     end
   end # Jeez
 
+  class Jam
+    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?
+
+  end # Jam
+
+  class Jazz < Jam
+    def initialize(x, y)
+      super
+    end
+    def to_hash()
+      { 'json_class' => self.class.to_s, 'x' => @x, 'y' => @y }
+    end
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end # Jazz
+
+  class Orange < Jam
+    def initialize(x, y)
+      super
+    end
+
+    def as_json()
+      { :json_class => self.class,
+        :x => @x,
+        :y => @y }
+    end
+
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end
+
   module One
     module Two
       module Three
@@ -208,6 +251,12 @@ class ObjectJuice < Minitest::Test
     dump_and_load(2.48e16, false)
     dump_and_load(2.48e100 * 1.0e10, false)
     dump_and_load(-2.48e100 * 1.0e10, false)
+    dump_and_load(1/0.0, false)
+    # NaN does not always == NaN
+    json = Oj.dump(0/0.0, :mode => :object)
+    assert_equal('3.3e14159265358979323846', json)
+    loaded = Oj.load(json);
+    assert_equal(true, loaded.nan?)
   end
 
   def test_string
@@ -220,6 +269,7 @@ class ObjectJuice < Minitest::Test
   def test_symbol
     dump_and_load(:abc, false)
     dump_and_load(":abc", false)
+    dump_and_load(':xyz'.to_sym, false)
   end
 
   def test_encode
@@ -304,6 +354,11 @@ class ObjectJuice < Minitest::Test
     bg = Oj.load(json, :mode => :object, :bigdecimal_load => true)
     assert_equal(BigDecimal, bg.class)
     assert_equal(orig, bg)
+    # Infinity is the same for Float and BigDecimal
+    json = Oj.dump(BigDecimal.new('Infinity'), :mode => :object)
+    assert_equal('Infinity', json)
+    json = Oj.dump(BigDecimal.new('-Infinity'), :mode => :object)
+    assert_equal('-Infinity', json)
   end
 
   # Stream IO
@@ -345,6 +400,22 @@ class ObjectJuice < Minitest::Test
     assert_equal({ :x => true, :y => 58, :z => [1, 2, 3]}, obj)
   end
 
+  def test_class_object
+    dump_and_load(ObjectJuice, false)
+  end
+
+  def test_module_object
+    dump_and_load(One, false)
+  end
+
+  def test_non_str_hash_object
+    json = Oj.dump({ 1 => true, :sim => nil }, :mode => :object)
+    h = Oj.load(json, :mode => :strict)
+    assert_equal({"^#1" => [1, true], ":sim" => nil}, h)
+    h = Oj.load(json, :mode => :object)
+    assert_equal({ 1 => true, :sim => nil }, h)
+  end
+
   # comments
   def test_comment_slash
     json = %{{
@@ -597,7 +668,7 @@ class ObjectJuice < Minitest::Test
     begin
       Oj.object_load(json)
     rescue Exception => e
-      assert_equal("Oj::ParseError", e.class().name)
+      assert_equal("ArgumentError", e.class().name)
       return
     end
     assert(false, "*** expected an exception")
@@ -645,6 +716,120 @@ class ObjectJuice < Minitest::Test
     assert_equal({ 1 => true, 'nil' => nil, :sim => 4 }, h)
   end
 
+  def test_json_object_object
+    obj = Jeez.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert(%{{
+  "^o":"ObjectJuice::Jeez",
+  "x":true,
+  "y":58
+}
+} == json ||
+%{{
+  "^o":"ObjectJuice::Jeez",
+  "y":58,
+  "x":true
+}
+} == json)
+    obj2 = Oj.load(json, :mode => :object)
+    assert_equal(obj, obj2)
+  end
+
+  def test_to_hash_object_object
+    obj = Jazz.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert(%{{
+  "^o":"ObjectJuice::Jazz",
+  "x":true,
+  "y":58
+}
+} == json ||
+%{{
+  "^o":"ObjectJuice::Jazz",
+  "y":58,
+  "x":true
+}
+} == json)
+    obj2 = Oj.load(json, :mode => :object)
+    assert_equal(obj, obj2)
+  end
+
+  def test_as_json_object_object
+    obj = Orange.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert(%{{
+  "^o":"ObjectJuice::Orange",
+  "x":true,
+  "y":58
+}
+} == json ||
+%{{
+  "^o":"ObjectJuice::Orange",
+  "y":58,
+  "x":true
+}
+} == json)
+    obj2 = Oj.load(json, :mode => :object)
+    assert_equal(obj, obj2)
+  end
+
+  def test_object_object_no_cache
+    obj = Jam.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert(%{{
+  "^o":"ObjectJuice::Jam",
+  "x":true,
+  "y":58
+}
+} == json ||
+%{{
+  "^o":"ObjectJuice::Jam",
+  "y":58,
+  "x":true
+}
+} == json)
+    obj2 = Oj.load(json, :mode => :object, :class_cache => false)
+    assert_equal(obj, obj2)
+  end
+
+  def test_exception
+    err = nil
+    begin
+      raise StandardError.new('A Message')
+    rescue Exception => e
+      err = e
+    end
+    json = Oj.dump(err, :mode => :object, :indent => 2)
+    #puts "*** #{json}"
+    e2 = Oj.load(json, :mode => :strict)
+    assert_equal(err.class.to_s, e2['^o'])
+    assert_equal(err.message, e2['~mesg'])
+    assert_equal(err.backtrace, e2['~bt'])
+    e2 = Oj.load(json, :mode => :object)
+    if RUBY_VERSION.start_with?('1.8') || 'rubinius' == $ruby
+      assert_equal(e.class, e2.class);
+      assert_equal(e.message, e2.message);
+      assert_equal(e.backtrace, e2.backtrace);
+    else
+      assert_equal(e, e2);
+    end
+  end
+
+  def test_range_object
+    unless RUBY_VERSION.start_with?('1.8')
+      Oj.default_options = { :mode => :object }
+      json = Oj.dump(1..7, :mode => :object, :indent => 0)
+      if 'rubinius' == $ruby
+        assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
+      else
+        assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+      end
+      dump_and_load(1..7, false)
+      dump_and_load(1..1, false)
+      dump_and_load(1...7, false)
+    end
+  end
+
   def test_circular_hash
     h = { 'a' => 7 }
     h['b'] = h
@@ -661,6 +846,30 @@ class ObjectJuice < Minitest::Test
     assert_equal(a2[1].__id__, a2.__id__)
   end
 
+  def test_circular_array2
+    a = [7]
+    a << a
+    json = Oj.dump(a, :mode => :object, :indent => 2, :circular => true)
+    assert_equal(%{[
+  "^i1",
+  7,
+  "^r1"
+]
+}, json)
+    a2 = Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(a2[1].__id__, a2.__id__)
+  end
+
+  def test_circular_hash2
+    h = { 'a' => 7 }
+    h['b'] = h
+    json = Oj.dump(h, :mode => :object, :indent => 2, :circular => true)
+    ha = Oj.load(json, :mode => :strict)
+    assert_equal({'^i' => 1, 'a' => 7, 'b' => '^r1'}, ha)
+    Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(h['b'].__id__, h.__id__)
+  end
+
   def test_circular_object
     obj = Jeez.new(nil, 58)
     obj.x = obj
@@ -669,6 +878,28 @@ class ObjectJuice < Minitest::Test
     assert_equal(obj2.x.__id__, obj2.__id__)
   end
 
+  def test_circular_object2
+    obj = Jam.new(nil, 58)
+    obj.x = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    assert(%{{
+  "^o":"ObjectJuice::Jam",
+  "^i":1,
+  "x":"^r1",
+  "y":58
+}
+} == json ||
+%{{
+  "^o":"ObjectJuice::Jam",
+  "^i":1,
+  "y":58,
+  "x":"^r1"
+}
+} == json)
+    obj2 = Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(obj2.x.__id__, obj2.__id__)
+  end
+
   def test_circular
     h = { 'a' => 7 }
     obj = Jeez.new(h, 58)
@@ -679,15 +910,45 @@ class ObjectJuice < Minitest::Test
     assert_equal(h['b'].__id__, obj.__id__)
   end
 
+  def test_circular2
+    h = { 'a' => 7 }
+    obj = Jam.new(h, 58)
+    obj.x['b'] = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    ha = Oj.load(json, :mode => :strict)
+    assert_equal({'^o' => 'ObjectJuice::Jam', '^i' => 1, 'x' => { '^i' => 2, 'a' => 7, 'b' => '^r1' }, 'y' => 58 }, ha)
+    Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(obj.x.__id__, h.__id__)
+    assert_equal(h['b'].__id__, obj.__id__)
+  end
+
+  def test_omit_nil
+    jam = Jam.new({'a' => 1, 'b' => nil }, nil)
+
+    json = Oj.dump(jam, :omit_nil => true, :mode => :object)
+    assert_equal(%|{"^o":"ObjectJuice::Jam","x":{"a":1}}|, json)
+  end
+  
   def test_odd_date
     dump_and_load(Date.new(2012, 6, 19), false)
   end
-
+  
   def test_odd_datetime
     dump_and_load(DateTime.new(2012, 6, 19, 13, 5, Rational(4, 3)), false)
     dump_and_load(DateTime.new(2012, 6, 19, 13, 5, Rational(7123456789, 1000000000)), false)
   end
 
+  def test_bag
+    json = %{{
+  "^o":"ObjectJuice::Jem",
+  "x":true,
+  "y":58 }}
+    obj = Oj.load(json, :mode => :object, :auto_define => true)
+    assert_equal('ObjectJuice::Jem', obj.class.name)
+    assert_equal(true, obj.x)
+    assert_equal(58, obj.y)
+  end
+
   def test_odd_string
     Oj.register_odd(Strung, Strung, :create, :to_s, 'safe?')
     s = Strung.new("Pete", true)
@@ -738,7 +999,11 @@ class ObjectJuice < Minitest::Test
     json = Oj.dump(obj, :indent => 2, :mode => :object)
     puts json if trace
     loaded = Oj.object_load(json);
-    assert_equal(obj, loaded)
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      assert_equal(obj, loaded)
+    end
     loaded
   end
 

data/test/test_scp.rb

@@ -5,6 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 require 'socket'
+require 'stringio'
 
 $json = %{{
   "array": [
@@ -260,7 +261,27 @@ class ScpTest < Minitest::Test
   def test_double
     handler = AllHandler.new()
     json = %{{"one":true,"two":false}{"three":true,"four":false}}
-    Oj.sc_parse(handler, json) { |j| j }
+    Oj.sc_parse(handler, json)
+    assert_equal([[:hash_start],
+                  [:hash_key, 'one'],
+                  [:hash_set, 'one', true],
+                  [:hash_key, 'two'],
+                  [:hash_set, 'too', false],
+                  [:hash_end],
+                  [:add_value, {}],
+                  [:hash_start],
+                  [:hash_key, 'three'],
+                  [:hash_set, 'three', true],
+                  [:hash_key, 'four'],
+                  [:hash_set, 'four', false],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
+  def test_double_io
+    handler = AllHandler.new()
+    json = %{{"one":true,"two":false}{"three":true,"four":false}}
+    Oj.sc_parse(handler, StringIO.new(json))
     assert_equal([[:hash_start],
                   [:hash_key, 'one'],
                   [:hash_set, 'one', true],

data/test/test_strict.rb

@@ -2,13 +2,36 @@
 # encoding: UTF-8
 
 $: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
 
-require 'helper'
+require 'minitest'
+require 'minitest/autorun'
+require 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'oj'
 
 class StrictJuice < Minitest::Test
 
+  module TestModule
+  end
+
+  class Jeez
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+  end
+
   def setup
     @default_options = Oj.default_options
+    # in strict mode other options other than the number formats are not used.
+    Oj.default_options = { :mode => :strict }
   end
 
   def teardown
@@ -46,6 +69,42 @@ class StrictJuice < Minitest::Test
     dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
+  def test_nan_dump
+    assert_equal('null', Oj.dump(0/0.0, :nan => :null))
+    assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :nan => :huge))
+    begin
+      Oj.dump(0/0.0, :nan => :word)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_infinity_dump
+    assert_equal('null', Oj.dump(1/0.0, :nan => :null))
+    assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :nan => :huge))
+    begin
+      Oj.dump(1/0.0, :nan => :word)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_neg_infinity_dump
+    assert_equal('null', Oj.dump(-1/0.0, :nan => :null))
+    assert_equal('-3.0e14159265358979323846', Oj.dump(-1/0.0, :nan => :huge))
+    begin
+      Oj.dump(-1/0.0, :nan => :word)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
   def test_string
     dump_and_load('', false)
     dump_and_load('abc', false)
@@ -96,6 +155,15 @@ class StrictJuice < Minitest::Test
     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_deep_nest
+    begin
+      n = 10000
+      Oj.strict_load('[' * n + ']' * n)
+    rescue Exception => e
+      assert(false, e.message)
+    end
+  end
+
   # Hash
   def test_hash
     dump_and_load({}, false)
@@ -132,23 +200,55 @@ class StrictJuice < Minitest::Test
     assert_equal({"a\nb" => true, "c\td" => false}, obj)
   end
 
+  def test_non_str_hash
+    begin
+      Oj.dump({ 1 => true, 0 => false })
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
   def test_bignum_object
     dump_and_load(7 ** 55, false)
   end
 
   # BigDecimal
   def test_bigdecimal_strict
+    Oj.default_options = { :bigdecimal_load => true}
     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)
+    json = Oj.dump(orig, :mode => :strict, :bigdecimal_as_decimal => true)
+    bg = Oj.load(json, :mode => :strict, :bigdecimal_load => true)
     assert_equal(BigDecimal, bg.class)
     assert_equal(orig, bg)
   end
 
+  def test_json_object
+    obj = Jeez.new(true, 58)
+    begin
+      Oj.dump(obj)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_range
+    begin
+      Oj.dump(1..7)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
   # Stream IO
   def test_io_string
     json = %{{
@@ -176,6 +276,42 @@ class StrictJuice < Minitest::Test
     assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
   end
 
+  def test_symbol
+    json = Oj.dump(:abc)
+    assert_equal('"abc"', json)
+  end
+
+  def test_time
+    t = Time.local(2012, 1, 5, 23, 58, 7)
+    begin
+      Oj.dump(t)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_class
+    begin
+      Oj.dump(StrictJuice)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_module
+    begin
+      Oj.dump(TestModule)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
   # symbol_keys option
   def test_symbol_keys
     json = %{{
@@ -243,11 +379,31 @@ class StrictJuice < Minitest::Test
     assert_equal([{ 'x' => 1 }, { 'y' => 2 }], results)
   end
 
+  def test_circular_hash
+    h = { 'a' => 7 }
+    h['b'] = h
+    json = Oj.dump(h, :indent => 2, :circular => true)
+    assert_equal(%|{
+  "a":7,
+  "b":null
+}
+|, json)
+  end
+
+  def test_omit_nil
+    json = Oj.dump({'x' => {'a' => 1, 'b' => nil }, 'y' => nil}, :omit_nil => true)
+    assert_equal(%|{"x":{"a":1}}|, json)
+  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)
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      assert_equal(obj, loaded)
+    end
     loaded
   end