json_pure 1.1.0 → 1.1.1

data/tests/test_json_generate.rb

@@ -40,7 +40,7 @@ EOT
 
   def test_unparse
     json = unparse(@hash)
-    assert_equal(@json2, json)
+    assert_equal(JSON.parse(@json2), JSON.parse(json))
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
     json = generate({1=>2})
@@ -51,7 +51,7 @@ EOT
 
   def test_unparse_pretty
     json = pretty_unparse(@hash)
-    assert_equal(@json3, json)
+    assert_equal(JSON.parse(@json3), JSON.parse(json))
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
     json = pretty_generate({1=>2})
@@ -71,6 +71,7 @@ EOT
     #assert s.check_circular
     h = { 1=>2 }
     h[3] = h
+    assert_raises(JSON::CircularDatastructure) {  generate(h) }
     assert_raises(JSON::CircularDatastructure) {  generate(h, s) }
     s = JSON.state.new(:check_circular => true)
     #assert s.check_circular
@@ -78,4 +79,22 @@ EOT
     a << a
     assert_raises(JSON::CircularDatastructure) {  generate(a, s) }
   end
+
+  def test_allow_nan
+    assert_raises(GeneratorError) { generate([JSON::NaN]) }
+    assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
+    assert_equal '[NaN]', fast_generate([JSON::NaN])
+    assert_raises(GeneratorError) { pretty_generate([JSON::NaN]) }
+    assert_equal "[\n  NaN\n]", pretty_generate([JSON::NaN], :allow_nan => true)
+    assert_raises(GeneratorError) { generate([JSON::Infinity]) }
+    assert_equal '[Infinity]', generate([JSON::Infinity], :allow_nan => true)
+    assert_equal '[Infinity]', fast_generate([JSON::Infinity])
+    assert_raises(GeneratorError) { pretty_generate([JSON::Infinity]) }
+    assert_equal "[\n  Infinity\n]", pretty_generate([JSON::Infinity], :allow_nan => true)
+    assert_raises(GeneratorError) { generate([JSON::MinusInfinity]) }
+    assert_equal '[-Infinity]', generate([JSON::MinusInfinity], :allow_nan => true)
+    assert_equal '[-Infinity]', fast_generate([JSON::MinusInfinity])
+    assert_raises(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
+    assert_equal "[\n  -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
+  end
 end

data/tests/test_json_unicode.rb

@@ -40,13 +40,16 @@ class TC_JSONUnicode < Test::Unit::TestCase
   def test_chars
     (0..0x7f).each do |i|
       json = '["\u%04x"]' % i
+      if RUBY_VERSION >= "1.9."
+        i = i.chr
+      end
       assert_equal i, JSON.parse(json).first[0]
       if i == ?\b
         generated = JSON.generate(["" << i])
         assert '["\b"]' == generated || '["\10"]' == generated
       elsif [?\n, ?\r, ?\t, ?\f].include?(i)
         assert_equal '[' << ('' << i).dump << ']', JSON.generate(["" << i])
-      elsif i < 0x20
+      elsif i.chr < 0x20.chr
         assert_equal json, JSON.generate(["" << i])
       end
     end

data/tools/fuzz.rb

@@ -84,7 +84,8 @@ class MyState < JSON.state
           :space        => make_spaces,
           :space_before => make_spaces,
           :object_nl    => make_spaces,
-          :array_nl     => make_spaces
+          :array_nl     => make_spaces,
+          :max_nesting  => false
          )
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: json_pure
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-06-04 00:00:00 +02:00
+  version: 1.1.1
+date: 2007-07-06 00:00:00 +02:00
 summary: A JSON implementation in Ruby
 require_paths: 
 - lib
@@ -92,7 +92,6 @@ files:
 - ext/json/ext/generator/unicode.h
 - ext/json/ext/generator/extconf.rb
 - ext/json/ext/generator/generator.c
-- ext/json/ext/parser/parser.c
 - ext/json/ext/parser/unicode.c
 - ext/json/ext/parser/parser.rl
 - ext/json/ext/parser/unicode.h
@@ -108,6 +107,7 @@ files:
 - lib/json.rb
 - lib/json/FalseClass.xpm
 - lib/json/TrueClass.xpm
+- lib/json/add
 - lib/json/ext.rb
 - lib/json/common.rb
 - lib/json/Hash.xpm
@@ -121,10 +121,13 @@ files:
 - lib/json/NilClass.xpm
 - lib/json/version.rb
 - lib/json/json.xpm
+- lib/json/add/core.rb
+- lib/json/add/rails.rb
 - lib/json/pure/parser.rb
 - lib/json/pure/generator.rb
 - tools/server.rb
 - tools/fuzz.rb
+- ext/json/ext/parser/parser.c
 test_files: 
 - tests/runner.rb
 rdoc_options: