Merge commit 'v1.2.3'

Merged in some additional features from the v1.2 branch.

2 files changed, 11 insertions, 0 deletions

diff --git a/tests/test_json.rb b/tests/test_json.rb
index 736c57b..3d26ddb 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -302,6 +302,13 @@ EOT
     assert_equal too_deep, ok
   end
 
+  def test_symbolize_names
+    assert_equal({ "foo" => "bar", "baz" => "quux" },
+      JSON.parse('{"foo":"bar", "baz":"quux"}'))
+    assert_equal({ :foo => "bar", :baz => "quux" },
+      JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
+  end
+
   def test_load_dump
     too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
     assert_equal too_deep, JSON.dump(eval(too_deep))
diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb
index d57602c..26ca1ad 100755
--- a/tests/test_json_generate.rb
+++ b/tests/test_json_generate.rb
@@ -88,6 +88,8 @@ EOT
     json = generate({1=>2}, nil)
     assert_equal('{"1":2}', json)
     s = JSON.state.new
+    assert s.check_circular?
+    assert s[:check_circular?]
     h = { 1=>2 }
     h[3] = h
     assert_raises(JSON::NestingError) {  generate(h) }
@@ -96,6 +98,8 @@ EOT
     a = [ 1, 2 ]
     a << a
     assert_raises(JSON::NestingError) {  generate(a, s) }
+    assert s.check_circular?
+    assert s[:check_circular?]
   end
 
   def test_allow_nan