oj 0.6.0 → 0.7.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -22,15 +22,34 @@ files:
 - lib/oj/version.rb
 - lib/oj.rb
 - ext/oj/extconf.rb
+- ext/oj/cache.h
 - ext/oj/oj.h
+- ext/oj/cache.c
 - ext/oj/dump.c
 - ext/oj/load.c
 - ext/oj/oj.c
 - test/boo.rb
+- test/files.rb
 - test/foo.rb
+- test/perf.rb
+- test/perf_obj.rb
 - test/perf_simple.rb
+- test/perf_strict.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
+- test/sample/file.rb
+- test/sample/group.rb
+- test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/line.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
 - test/sample.rb
-- test/simple.rb
+- test/sample_json.rb
+- test/tests.rb
 - LICENSE
 - README.md
 homepage: https://github.com/ohler55/oj
@@ -61,3 +80,4 @@ signing_key:
 specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
+has_rdoc: true

data/test/simple.rb

@@ -1,208 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << 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
-    opts = Oj.default_options()
-    assert_equal(opts, {
-                   :encoding=>nil,
-                   :indent=>0,
-                   :circular=>false,
-                   :mode=>:object})
-  end
-
-  def test_set_options
-    orig = {
-      :encoding=>nil,
-      :indent=>0,
-      :circular=>false,
-      :mode=>:object}
-    o2 = {
-      :encoding=>"UTF-8",
-      :indent=>4,
-      :circular=>true,
-      :mode=>:compat}
-    o3 = { :indent => 4 }
-    Oj.default_options = o2
-    opts = Oj.default_options()
-    assert_equal(opts, o2);
-    Oj.default_options = o3 # see if it throws an exception
-    Oj.default_options = orig # return to original
-  end
-
-  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_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, false)
-    dump_and_load(2.48e16, 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_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)
-    dump_and_load(['a', 1, nil], false)
-    dump_and_load([[nil]], false)
-    dump_and_load([[nil], 58], false)
-  end
-
-  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_encode
-    Oj.default_options = { :encoding => 'UTF-8' }
-    dump_and_load("ぴーたー", false)
-    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);
-    assert_equal(obj, loaded)
-    loaded
-  end
-
-end