oj 0.5.2 → 0.6.0

data/test/sample.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby -wW2
+
+if $0 == __FILE__
+  $: << '.'
+  $: << '..'
+  $: << '../lib'
+  $: << '../ext'
+end
+
+require 'pp'
+require 'oj'
+
+def sample_json(size=3)
+  colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
+  container = []
+  size.times do |i|
+    box = {
+      'color' => colors[i % colors.size],
+      'fragile' => (0 == (i % 2)),
+      'width' => i,
+      'height' => i,
+      'depth' => i,
+      'weight' => i * 1.3,
+      'address' => {
+        'street' => "#{i} Main Street",
+        'city' => 'Sity',
+        'state' => nil
+      }
+    }
+    container << box
+  end
+  container
+end
+
+if $0 == __FILE__
+  File.open('sample.json', "w") { |f| f.write(Oj.dump(sample_json(3), :indent => 2)) }
+end

data/test/simple.rb

@@ -7,6 +7,29 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 require 'test/unit'
 require 'oj'
 
+class Jeez
+  def initialize(x, y)
+    @x = x
+    @y = y
+  end
+  
+  def to_json()
+    %{{"x":#{@x},"y":#{@y}}}
+  end
+  
+end # Jeez
+
+class Jazz
+  def initialize(x, y)
+    @x = x
+    @y = y
+  end
+  def to_hash()
+    { 'x' => @x, 'y' => @y }
+  end
+  
+end # Jazz
+
 class Juice < ::Test::Unit::TestCase
 
   def test_get_options
@@ -15,8 +38,7 @@ class Juice < ::Test::Unit::TestCase
                    :encoding=>nil,
                    :indent=>0,
                    :circular=>false,
-                   :mode=>nil,
-                   :effort=>:tolerant})
+                   :mode=>:object})
   end
 
   def test_set_options
@@ -24,14 +46,12 @@ class Juice < ::Test::Unit::TestCase
       :encoding=>nil,
       :indent=>0,
       :circular=>false,
-      :mode=>nil,
-      :effort=>:tolerant}
+      :mode=>:object}
     o2 = {
       :encoding=>"UTF-8",
       :indent=>4,
       :circular=>true,
-      :mode=>:object,
-      :effort=>:strict }
+      :mode=>:compat}
     o3 = { :indent => 4 }
     Oj.default_options = o2
     opts = Oj.default_options()
@@ -59,10 +79,14 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(1, false)
   end
 
+  def test_bignum
+    dump_and_load(12345678901234567890123456789, true)
+  end
+
   def test_float
     dump_and_load(0.0, false)
     dump_and_load(12345.6789, false)
-    dump_and_load(-54321.012, true)
+    dump_and_load(-54321.012, false)
     dump_and_load(2.48e16, false)
   end
 
@@ -73,6 +97,18 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load("a\u0041", false)
   end
 
+  def test_class
+    begin
+      json = Oj.dump(self.class, :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+    json = Oj.dump(self.class, :mode => :object)
+    assert_equal('{"*":"Class","-":"Juice"}', json)
+    json = Oj.dump(self.class, :mode => :null)
+    assert_equal('null', json)
+  end
+
   def test_array
     dump_and_load([], false)
     dump_and_load([true, false], false)
@@ -93,10 +129,78 @@ class Juice < ::Test::Unit::TestCase
     Oj.default_options = { :encoding => nil }
   end
 
+  def test_time
+    t = Time.new(2012, 1, 5, 23, 58, 7)
+    begin
+      json = Oj.dump(t, :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+    json = Oj.dump(t, :mode => :compat)
+    assert_equal(%{{"*":"Time","-":1325775487.000000}}, json)
+    json = Oj.dump(t, :mode => :null)
+    assert_equal('null', json)
+  end
+
+  def test_json_object
+    begin
+      json = Oj.dump(Jeez.new(true, 58), :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+    json = Oj.dump(Jeez.new(true, 58), :mode => :compat, :indent => 2)
+    assert_equal(%{{"x":true,"y":58}}, json)
+    json = Oj.dump(Jeez.new(true, 58), :mode => :null)
+    assert_equal('null', json)
+  end
+
+  def test_hash_object
+    begin
+      json = Oj.dump(Jazz.new(true, 58), :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+    json = Oj.dump(Jazz.new(true, 58), :mode => :compat, :indent => 2)
+    assert_equal(%{{
+  "x":true,
+  "y":58}}, json)
+    json = Oj.dump(Jazz.new(true, 58), :mode => :null)
+    assert_equal('null', json)
+  end
+
+  def test_object
+    begin
+      json = Oj.dump(Jazz.new(true, 58), :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+    json = Oj.dump(Jazz.new(true, 58), :mode => :object, :indent => 2)
+    assert_equal(%{{
+  "*":"Jazz",
+  "x":true,
+  "y":58}}, json)
+    json = Oj.dump(Jazz.new(true, 58), :mode => :null)
+    assert_equal('null', 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)
+    e2 = Oj.load(json, :mode => :strict)
+    assert_equal(err.class.to_s, e2['*'])
+    assert_equal(err.message, e2['mesg'])
+    assert_equal(err.backtrace, e2['bt'])
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace
-    loaded = Oj.load(json, :mode => :simple);
+    loaded = Oj.load(json);
     assert_equal(obj, loaded)
     loaded
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -29,6 +29,7 @@ files:
 - test/boo.rb
 - test/foo.rb
 - test/perf_simple.rb
+- test/sample.rb
 - test/simple.rb
 - LICENSE
 - README.md