oj 2.18.3 → 3.13.14

data/test/test_object.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -7,11 +7,12 @@ require 'helper'
 
 class ObjectJuice < Minitest::Test
   class Jeez
-    attr_accessor :x, :y
+    attr_accessor :x, :y, :_z
 
     def initialize(x, y)
       @x = x
       @y = y
+      @_z = x.to_s
     end
 
     def eql?(o)
@@ -28,6 +29,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
@@ -177,6 +221,13 @@ class ObjectJuice < Minitest::Test
 
   def teardown
     Oj.default_options = @default_options
+#=begin
+    if '3.1.0' <= RUBY_VERSION && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
+      #Oj::debug_odd("teardown before GC.verify_compaction_references")
+      GC.verify_compaction_references(double_heap: true, toward: :empty)
+      #Oj::debug_odd("teardown after GC.verify_compaction_references")
+    end
+#=end
   end
 
   def test_nil
@@ -208,6 +259,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 +277,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
@@ -295,15 +353,20 @@ class ObjectJuice < Minitest::Test
 
   # BigDecimal
   def test_bigdecimal_object
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    dump_and_load(BigDecimal('3.14159265358979323846'), false)
   end
 
   def test_bigdecimal_load
-    orig = BigDecimal.new('80.51')
+    orig = BigDecimal('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)
+    # Infinity is the same for Float and BigDecimal
+    json = Oj.dump(BigDecimal('Infinity'), :mode => :object)
+    assert_equal('Infinity', json)
+    json = Oj.dump(BigDecimal('-Infinity'), :mode => :object)
+    assert_equal('-Infinity', json)
   end
 
   # Stream IO
@@ -345,6 +408,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 = %{{
@@ -387,11 +466,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_xml_time
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -409,11 +484,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_xml_time_utc
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789Z')
-    else
-      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
-    end
+    t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -430,11 +501,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_ruby_time
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -452,11 +519,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_ruby_time_12345
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789+03:25')
-    else
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345/60*60)
-    end
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345/60*60)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -475,11 +538,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_ruby_time_utc
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789Z')
-    else
-      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
-    end
+    t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -497,11 +556,10 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_time_early
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('1954-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(1954, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    # Windows does not support dates before 1970.
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
+    t = Time.new(1954, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -519,11 +577,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_time_unix_zone
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -540,32 +594,26 @@ class ObjectJuice < Minitest::Test
     assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
-  unless RUBY_VERSION.start_with?('1.8')
-    def test_time_unix_zone_12345
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345)
-      # The fractional seconds are not always recreated exactly which causes a
-      # mismatch so instead the seconds, nsecs, and gmt_offset are checked
-      # separately along with utc.
-      json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
-      #puts json
-      loaded = Oj.object_load(json);
-      assert_equal(t.tv_sec, loaded.tv_sec)
-      if t.respond_to?(:tv_nsec)
-        assert_equal(t.tv_nsec, loaded.tv_nsec)
-      else
-        assert_equal(t.tv_usec, loaded.tv_usec)
-      end
-      assert_equal(t.utc?, loaded.utc?)
-      assert_equal(t.utc_offset, loaded.utc_offset)
+  def test_time_unix_zone_12345
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, 12345)
+    # The fractional seconds are not always recreated exactly which causes a
+    # mismatch so instead the seconds, nsecs, and gmt_offset are checked
+    # separately along with utc.
+    json = Oj.dump(t, :mode => :object, :time_format => :unix_zone)
+    #puts json
+    loaded = Oj.object_load(json);
+    assert_equal(t.tv_sec, loaded.tv_sec)
+    if t.respond_to?(:tv_nsec)
+      assert_equal(t.tv_nsec, loaded.tv_nsec)
+    else
+      assert_equal(t.tv_usec, loaded.tv_usec)
     end
+    assert_equal(t.utc?, loaded.utc?)
+    assert_equal(t.utc_offset, loaded.utc_offset)
   end
 
   def test_time_unix_zone_utc
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789Z')
-    else
-      t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
-    end
+    t = Time.utc(2015, 1, 5, 21, 37, 7.123456789)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -597,7 +645,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 +693,151 @@ 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, ignore_under: true)
+    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_ignore
+    obj = Jeez.new(true, 58)
+    json = Oj.dump({ 'a' => 7, 'b' => obj }, :mode => :object, :indent => 2, :ignore => [ Jeez ])
+    assert_equal(%|{
+  "a":7
+}
+|, json)
+  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 '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
+
+  class SubX < Exception
+    def initialize
+      super("sub")
+      @xyz = 123
+    end
+  end
+
+  def test_exception_subclass
+    err = nil
+    begin
+      raise SubX.new
+    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)
+    assert_equal(e, e2);
+  end
+
+  def test_range_object
+    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
+
   def test_circular_hash
     h = { 'a' => 7 }
     h['b'] = h
@@ -653,6 +846,14 @@ class ObjectJuice < Minitest::Test
     assert_equal(h2['b'].__id__, h2.__id__)
   end
 
+
+  def test_json_object_missing_fields
+    json = %{{ "^u": [ "ObjectJuice::Stuck",1]}}
+
+    obj = Oj.load(json, mode: :object)
+    assert_nil(obj['b'])
+  end
+
   def test_circular_array
     a = [7]
     a << a
@@ -661,6 +862,38 @@ 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_array3
+    a = ['^r1']
+    json = Oj.dump(a, mode: :object, circular: true)
+    assert_equal(%{["^i1","\\u005er1"]}, json)
+    a2 = Oj.load(json, mode: :object, circular: true)
+    assert_equal(a, a2)
+  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 +902,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,8 +934,32 @@ 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)
+
+    Oj.register_odd(Date, Date, :jd, :jd)
+    json = Oj.dump(Date.new(2015, 3, 7), :mode => :object)
+    assert_equal(%|{"^O":"Date","jd":2457089}|, json)
+    dump_and_load(Date.new(2012, 6, 19), false)
   end
 
   def test_odd_datetime
@@ -688,19 +967,23 @@ class ObjectJuice < Minitest::Test
     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)
     dump_and_load(s, false)
   end
 
-  def test_odd_date_replaced
-    Oj.register_odd(Date, Date, :jd, :jd)
-    json = Oj.dump(Date.new(2015, 3, 7), :mode => :object)
-    assert_equal(%|{"^O":"Date","jd":2457089}|, json)
-    dump_and_load(Date.new(2012, 6, 19), false)
-  end
-
   def test_odd_raw
     Oj.register_odd_raw(Raw, Raw, :create, :to_json)
     json = Oj.dump(Raw.new(%|{"a":1}|), :mode => :object)
@@ -738,7 +1021,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_parser.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# 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 'minitest'
+require 'minitest/autorun'
+require 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'oj'
+
+class ParserJuice < Minitest::Test
+
+  def test_array
+    p = Oj::Parser.new(:debug)
+    out = p.parse(%|[true, false, null, 123, -1.23, "abc"]|)
+    puts out
+    out = p.parse(%|{"abc": []}|)
+    puts out
+  end
+
+end