oj 0.8.0 → 0.9.0

data/ext/oj/oj.c

@@ -45,8 +45,10 @@ void Init_oj();
 
 VALUE    Oj = Qnil;
 
+ID	oj_as_json_id;
 ID	oj_at_id;
 ID	oj_instance_variables_id;
+ID	oj_json_create_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
 ID	oj_to_sym_id;
@@ -55,6 +57,7 @@ ID	oj_tv_sec_id;
 ID	oj_tv_usec_id;
 
 VALUE	oj_bag_class;
+VALUE	oj_struct_class;
 VALUE	oj_time_class;
 
 static VALUE	auto_define_sym;
@@ -188,6 +191,7 @@ static void
 parse_options(VALUE ropts, Options copts) {
     struct _YesNoOpt    ynos[] = {
         { circular_sym, &copts->circular },
+        { auto_define_sym, &copts->auto_define },
         { Qnil, 0 }
     };
     YesNoOpt    o;
@@ -364,8 +368,10 @@ void Init_oj() {
     rb_define_module_function(Oj, "dump", dump, -1);
     rb_define_module_function(Oj, "to_file", to_file, -1);
 
+    oj_as_json_id = rb_intern("as_json");
     oj_at_id = rb_intern("at");
     oj_instance_variables_id = rb_intern("instance_variables");
+    oj_json_create_id = rb_intern("json_create");
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");
     oj_to_sym_id = rb_intern("to_sym");
@@ -374,6 +380,7 @@ void Init_oj() {
     oj_tv_usec_id = rb_intern("tv_usec");
     
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
+    oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
     oj_time_class = rb_const_get(rb_cObject, rb_intern("Time"));
 
     auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_ary_push(keep, auto_define_sym);

data/ext/oj/oj.h

@@ -94,10 +94,13 @@ extern void	_oj_raise_error(const char *msg, const char *xml, const char *curren
 extern VALUE    Oj;
 
 extern VALUE	oj_bag_class;
+extern VALUE	oj_struct_class;
 extern VALUE	oj_time_class;
 
+extern ID	oj_as_json_id;
 extern ID	oj_at_id;
 extern ID	oj_instance_variables_id;
+extern ID	oj_json_create_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;
 extern ID	oj_to_sym_id;

data/lib/oj/version.rb

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

data/test/perf_obj.rb

@@ -63,8 +63,8 @@ end
 if files.empty?
   $obj = do_sample ? sample_doc(2) : files('..')
   $mars = Marshal.dump($obj)
-  $xml = Ox.dump($obj, :indent => $indent, circular: $circular)
-  $json = Oj.dump($obj, :indent => $indent, circular: $circular)
+  $xml = Ox.dump($obj, :indent => $indent, :circular => $circular)
+  $json = Oj.dump($obj, :indent => $indent, :circular => $circular)
   File.open('sample.xml', 'w') { |f| f.write($xml) }
   File.open('sample.json', 'w') { |f| f.write($json) }
   File.open('sample.marshal', 'w') { |f| f.write($mars) }
@@ -79,7 +79,7 @@ else
   end
 end
 
-Oj.default_options = { :mode => :object, :indent => $indent }
+Oj.default_options = { :mode => :object, :indent => $indent, :circular => $circular }
 
 if do_load
   puts '-' * 80

data/test/perf_strict.rb

@@ -16,36 +16,54 @@ require 'oj'
 require 'ox'
 
 class Jazz
+  attr_accessor :boolean, :number, :string
+
   def initialize()
     @boolean = true
     @number = 58
     @string = "A string"
-    @array = [true, false, nil]
-    @hash = { 'one' => 1, 'two' => 2 }
   end
+
+  def eql?(o)
+    (self.class == o.class &&
+     boolean == o.boolean &&
+     number == o.number &&
+     string == o.string)
+  end
+  alias == eql?
+
   def to_json(*) # Yajl and JSON have different signatures
     %{
-    { "boolean":#{@boolean},
-      "number":#{@number},
-      "string":#{@string},
-      "array":#{@array},
-      "hash":#{@hash},
-    }
-}
+{ "json_class":"Jazz",
+  "boolean":#{@boolean},
+  "number":#{@number},
+  "string":"#{@string}"
+}}
   end
+
   def to_hash()
-    { 'boolean' => @boolean,
+    { 'json_class' => "Jazz",
+      'boolean' => @boolean,
       'number' => @number,
-      'string' => @string,
-      'array' => @array,
-      'hash' => @hash,
+      'string' => @string
     }
   end
+  alias as_json to_hash
+
   def to_msgpack(out)
     out << MessagePack.pack(to_hash())
   end
+
+  def self.json_create(h)
+    j = self.new()
+    j.instance_variable_set(:@boolean, h['boolean'])
+    j.instance_variable_set(:@number, h['number'])
+    j.instance_variable_set(:@string, h['string'])
+    j
+  end
 end
 
+$verbose = false
 $indent = 0
 $iter = 100000
 $with_object = true
@@ -53,6 +71,7 @@ $with_bignum = true
 $with_nums = true
 
 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("-o", "without objects")                            { $with_object = false }
@@ -70,7 +89,6 @@ if $with_nums
     'e' => { 'one' => 1, 'two' => 2 },
     'f' => nil,
   }
-  $obj['g'] = Jazz.new() if $with_object
   $obj['h'] = 12345678901234567890123456789 if $with_bignum
 else
   $obj = {
@@ -82,50 +100,102 @@ else
     'f' => nil,
   }
 end
+$obj['g'] = Jazz.new() if $with_object
 
 Oj.default_options = { :indent => $indent, :mode => :compat }
 Ox.default_options = { :indent => $indent, :mode => :object }
 
 $json = Oj.dump($obj)
+$obj_json = Oj.dump($obj, :mode => :object)
 $xml = Ox.dump($obj, :indent => $indent)
+$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('Oj:compat', $obj, 'load', 'dump') { |o| Oj.load(Oj.dump(o)) }
+capture_error('Oj', $obj, 'load', 'dump') { |o| Oj.load(Oj.dump(o, :mode => :compat), :mode => :compat) }
+capture_error('Ox', $obj, 'load', 'dump') { |o| Ox.load(Ox.dump(o, :mode => :object), :mode => :object) }
+capture_error('MessagePack', $obj, 'unpack', 'pack') { |o| MessagePack.unpack(MessagePack.pack($obj)) }
+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 }
+capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o| JSON.generator = JSON::Pure::Generator; JSON::Pure::Parser.new(JSON.generate(o)).parse }
+
 begin
   $msgpack = MessagePack.pack($obj)
 rescue Exception => e
-  puts "MessagePack failed to pack! #{e.class}: #{e.message}.\nSkipping."
   $msgpack = nil
 end
 
+if $verbose
+  puts "json:\n#{$json}\n"
+  puts "object json:\n#{$obj_json}\n"
+  puts "Oj loaded object:\n#{Oj.load($json)}\n"
+  puts "Yajl loaded object:\n#{Yajl::Parser.parse($json)}\n"
+  puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
+end
+
 puts '-' * 80
 puts "Load/Parse Performance"
 perf = Perf.new()
-perf.add('Oj', 'load') { Oj.load($json) }
-perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) }
-perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse }
-perf.add('JSON::Pure', 'parse') { JSON::Pure::Parser.new($json).parse }
-perf.add('Ox', 'load') { Ox.load($xml) }
-perf.add('MessagePack', 'unpack') { MessagePack.unpack($msgpack) } unless $msgpack.nil?
+unless $failed.has_key?('Oj:compat')
+  perf.add('Oj:compat', 'load') { Oj.load($json) }
+  perf.before('Oj:compat') { Oj.default_options = { :mode => :compat} }
+end
+unless $failed.has_key?('Oj')
+  perf.add('Oj', 'load') { Oj.load($obj_json) }
+  perf.before('Oj') { Oj.default_options = { :mode => :object} }
+end
+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.add('JSON::Pure', 'parse') { JSON::Pure::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
+perf.add('Ox', 'load') { Ox.load($xml) } unless $failed.has_key?('Ox')
+perf.add('MessagePack', 'unpack') { MessagePack.unpack($msgpack) } unless $failed.has_key?('MessagePack')
 perf.run($iter)
 
 puts
 puts '-' * 80
 puts "Dump/Encode/Generate Performance"
 perf = Perf.new()
-perf.add('Oj', 'dump') { Oj.dump($obj) }
-perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
-if 0 == $indent
-  perf.add('JSON::Ext', 'generate') { JSON.generate($obj) }
-else
-  perf.add('JSON::Ext', 'generate') { JSON.pretty_generate($obj) }
+unless $failed.has_key?('Oj:compat')
+  perf.add('Oj:compat', 'dump') { Oj.dump($obj) }
+  perf.before('Oj:compat') { Oj.default_options = { :mode => :compat} }
 end
-perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
-if 0 == $indent
-  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
-else
-  perf.add('JSON::Pure', 'generate') { JSON.pretty_generate($obj) }
+unless $failed.has_key?('Oj')
+  perf.add('Oj', 'dump') { Oj.dump($obj) }
+  perf.before('Oj') { Oj.default_options = { :mode => :object} }
 end
-perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
-perf.add('Ox', 'dump') { Ox.dump($obj) }
-perf.add('MessagePack', 'pack') { MessagePack.pack($obj) } unless $msgpack.nil?
+perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) } unless $failed.has_key?('Yajl')
+unless $failed.has_key?('JSON::Ext')
+  if 0 == $indent
+    perf.add('JSON::Ext', 'generate') { JSON.generate($obj) }
+  else
+    perf.add('JSON::Ext', 'generate') { JSON.pretty_generate($obj) }
+  end
+  perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
+end
+unless $failed.has_key?('JSON::Pure')
+  if 0 == $indent
+    perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
+  else
+    perf.add('JSON::Pure', 'generate') { JSON.pretty_generate($obj) }
+  end
+  perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
+end
+perf.add('Ox', 'dump') { Ox.dump($obj) } unless $failed.has_key?('Ox')
+perf.add('MessagePack', 'pack') { MessagePack.pack($obj) } unless $failed.has_key?('MessagePack')
 perf.run($iter)
 
 puts
+
+unless $failed.empty?
+  puts "The following packages were not included for the reason listed"
+  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+end

data/test/tests.rb

@@ -8,7 +8,7 @@ require 'test/unit'
 require 'oj'
 
 class Jam
-  attr_reader :x, :y
+  attr_accessor :x, :y
 
   def initialize(x, y)
     @x = x
@@ -28,9 +28,12 @@ class Jeez < Jam
   end
   
   def to_json()
-    %{{"x":#{@x},"y":#{@y}}}
+    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
+  end
+
+  def self.json_create(h)
+    self.new(h['x'], h['y'])
   end
-  
 end # Jeez
 
 class Jazz < Jam
@@ -38,10 +41,19 @@ class Jazz < Jam
     super
   end
   def to_hash()
-    { 'x' => @x, 'y' => @y }
+    { '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 Range
+  def to_hash()
+    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  end
+end # Range
+
 class Juice < ::Test::Unit::TestCase
 
   def test_get_options
@@ -260,9 +272,11 @@ class Juice < ::Test::Unit::TestCase
     assert_equal('null', json)
   end
   def test_json_object_compat
+    Oj.default_options = { :mode => :compat }
     obj = Jeez.new(true, 58)
-    json = Oj.dump(obj, :mode => :compat, :indent => 2)
-    assert_equal(%{{"x":true,"y":58}}, json)
+    json = Oj.dump(obj, :indent => 2)
+    assert_equal(%{{"json_class":"Jeez","x":true,"y":58}}, json)
+    dump_and_load(obj, false)
   end
   def test_json_object_object
     obj = Jeez.new(true, 58)
@@ -293,6 +307,7 @@ class Juice < ::Test::Unit::TestCase
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :compat, :indent => 2)
     assert_equal(%{{
+  "json_class":"Jazz",
   "x":true,
   "y":58}}, json)
   end
@@ -307,7 +322,7 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(obj, obj2)
   end
 
-# Object without to_json() or to_hash()
+  # Object without to_json() or to_hash()
   def test_object_strict
     obj = Jam.new(true, 58)
     begin
@@ -339,6 +354,7 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(obj, obj2)
   end
 
+  # Exception
   def test_exception
     err = nil
     begin
@@ -356,6 +372,34 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(e, e2);
   end
 
+  # Range
+  def test_range_strict
+    begin
+      json = Oj.dump(1..7, :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+  end
+  def test_range_null
+    json = Oj.dump(1..7, :mode => :null)
+    assert_equal('null', json)
+  end
+  def test_range_compat
+    json = Oj.dump(1..7, :mode => :compat)
+    assert_equal(%{{"begin":1,"end":7,"exclude_end":false}}, json)
+    json = Oj.dump(1...7, :mode => :compat)
+    assert_equal(%{{"begin":1,"end":7,"exclude_end":true}}, json)
+  end    
+  def test_range_object
+    Oj.default_options = { :mode => :object }
+    json = Oj.dump(1..7, :mode => :object, :indent => 0)
+    assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+    dump_and_load(1..7, false)
+    dump_and_load(1..1, false)
+    dump_and_load(1...7, false)
+  end
+
+  # autodefine Oj::Bag
   def test_bag
     json = %{{
   "^o":"Jem",
@@ -367,6 +411,63 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(58, obj.y)
   end
 
+  # Circular
+  def test_circular_object
+    obj = Jam.new(nil, 58)
+    obj.x = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    assert_equal(%{{
+  "^o":"Jam",
+  "^i":1,
+  "x":"^r1",
+  "y":58}}, json)
+    obj2 = Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(obj2.x.__id__, obj2.__id__)
+  end
+
+  def test_circular_hash
+    h = { 'a' => 7 }
+    h['b'] = h
+    json = Oj.dump(h, :mode => :object, :indent => 2, :circular => true)
+    assert_equal(%{{
+  "^i":1,
+  "a":7,
+  "b":"^r1"}}, json)
+    h2 = Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(h['b'].__id__, h.__id__)
+  end
+
+  def test_circular_array
+    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
+    h = { 'a' => 7 }
+    obj = Jam.new(h, 58)
+    obj.x['b'] = obj
+    json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
+    assert_equal(%{{
+  "^o":"Jam",
+  "^i":1,
+  "x":{
+    "^i":2,
+    "a":7,
+    "b":"^r1"
+  },
+  "y":58}}, json)
+    obj2 = Oj.load(json, :mode => :object, :circular => true)
+    assert_equal(obj.x.__id__, h.__id__)
+    assert_equal(h['b'].__id__, obj.__id__)
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace