json-jruby 1.1.3-universal-java-1.6 → 1.1.6-universal-java-1.6

data/lib/json.rb

@@ -230,6 +230,4 @@ module JSON
       require 'json/pure'
     end
   end
-
-  JSON_LOADED = true
 end

data/lib/json/add/core.rb

@@ -96,7 +96,7 @@ class Struct
 
   def to_json(*args)
     klass = self.class.name
-    klass.empty? and raise JSON::JSONError, "Only named structs are supported!"
+    klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
     {
       'json_class' => klass,
       'v'     => values,

data/lib/json/ext.rb

@@ -10,4 +10,6 @@ module JSON
     JSON.parser = Parser
     JSON.generator = Generator
   end
+
+  JSON_LOADED = true
 end

data/lib/json/pure.rb

@@ -72,4 +72,6 @@ module JSON
     JSON.parser = Parser
     JSON.generator = Generator
   end
+
+  JSON_LOADED = true
 end

data/lib/json/pure/generator.rb

@@ -39,23 +39,48 @@ module JSON
 
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
-  def utf8_to_json(string) # :nodoc:
-    string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
-    string.gsub!(/(
-                    (?:
-                      [\xc2-\xdf][\x80-\xbf]    |
-                      [\xe0-\xef][\x80-\xbf]{2} |
-                      [\xf0-\xf4][\x80-\xbf]{3}
-                    )+ |
-                    [\x80-\xc1\xf5-\xff]       # invalid
-                  )/nx) { |c|
-      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
-      s.gsub!(/.{4}/n, '\\\\u\&')
-    }
-    string
-  rescue Iconv::Failure => e
-    raise GeneratorError, "Caught #{e.class}: #{e}"
+  if String.method_defined?(:force_encoding)
+    def utf8_to_json(string) # :nodoc:
+      string = string.dup
+      string << '' # XXX workaround: avoid buffer sharing
+      string.force_encoding(Encoding::ASCII_8BIT)
+      string.gsub!(/["\\\/\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/(
+                      (?:
+                        [\xc2-\xdf][\x80-\xbf]    |
+                        [\xe0-\xef][\x80-\xbf]{2} |
+                        [\xf0-\xf4][\x80-\xbf]{3}
+                      )+ |
+                      [\x80-\xc1\xf5-\xff]       # invalid
+                    )/nx) { |c|
+                      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+                      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+                      s.gsub!(/.{4}/n, '\\\\u\&')
+                    }
+      string.force_encoding(Encoding::UTF_8)
+      string
+    rescue Iconv::Failure => e
+      raise GeneratorError, "Caught #{e.class}: #{e}"
+    end
+  else
+    def utf8_to_json(string) # :nodoc:
+      string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/(
+                      (?:
+                        [\xc2-\xdf][\x80-\xbf]    |
+                        [\xe0-\xef][\x80-\xbf]{2} |
+                        [\xf0-\xf4][\x80-\xbf]{3}
+                      )+ |
+                      [\x80-\xc1\xf5-\xff]       # invalid
+                    )/nx) { |c|
+        c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
+        s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+        s.gsub!(/.{4}/n, '\\\\u\&')
+      }
+      string
+    rescue Iconv::Failure => e
+      raise GeneratorError, "Caught #{e.class}: #{e}"
+    end
   end
   module_function :utf8_to_json
 
@@ -239,20 +264,28 @@ module JSON
 
           def json_transform(state, depth)
             delim = ','
-            delim << state.object_nl if state
-            result = '{'
-            result << state.object_nl if state
-            result << map { |key,value|
-              s = json_shift(state, depth + 1)
-              s << key.to_s.to_json(state, depth + 1)
-              s << state.space_before if state
-              s << ':'
-              s << state.space if state
-              s << value.to_json(state, depth + 1)
-            }.join(delim)
-            result << state.object_nl if state
-            result << json_shift(state, depth)
-            result << '}'
+            if state
+              delim << state.object_nl
+              result = '{'
+              result << state.object_nl
+              result << map { |key,value|
+                s = json_shift(state, depth + 1)
+                s << key.to_s.to_json(state, depth + 1)
+                s << state.space_before
+                s << ':'
+                s << state.space
+                s << value.to_json(state, depth + 1)
+              }.join(delim)
+              result << state.object_nl
+              result << json_shift(state, depth)
+              result << '}'
+            else
+              result = '{'
+              result << map { |key,value|
+                key.to_s.to_json << ':' << value.to_json
+              }.join(delim)
+              result << '}'
+            end
             result
           end
         end
@@ -293,16 +326,19 @@ module JSON
 
           def json_transform(state, depth)
             delim = ','
-            delim << state.array_nl if state
-            result = '['
-            result << state.array_nl if state
-            result << map { |value|
-              json_shift(state, depth + 1) << value.to_json(state, depth + 1)
-            }.join(delim)
-            result << state.array_nl if state
-            result << json_shift(state, depth) 
-            result << ']'
-            result
+            if state
+              delim << state.array_nl
+              result = '['
+              result << state.array_nl
+              result << map { |value|
+                json_shift(state, depth + 1) << value.to_json(state, depth + 1)
+              }.join(delim)
+              result << state.array_nl
+              result << json_shift(state, depth) 
+              result << ']'
+            else
+              '[' << map { |value| value.to_json }.join(delim) << ']'
+            end
           end
         end
 

data/lib/json/pure/parser.rb

@@ -61,6 +61,8 @@ module JSON
       # * *create_additions*: If set to false, the Parser doesn't create
       #   additions even if a matchin class and create_id was found. This option
       #   defaults to true.
+      # * *object_class*: Defaults to Hash
+      # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
         super
         if !opts.key?(:max_nesting) # defaults to 19
@@ -74,6 +76,8 @@ module JSON
         ca = true
         ca = opts[:create_additions] if opts.key?(:create_additions)
         @create_id = ca ? JSON.create_id : nil
+        @object_class = opts[:object_class] || Hash
+        @array_class = opts[:array_class] || Array
       end
 
       alias source string
@@ -122,19 +126,23 @@ module JSON
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
-          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
+          string = self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
             if u = UNESCAPE_MAP[$&[1]]
               u
             else # \uXXXX
               bytes = ''
               i = 0
-              while c[6 * i] == ?\\ && c[6 * i + 1] == ?u 
+              while c[6 * i] == ?\\ && c[6 * i + 1] == ?u
                 bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
                 i += 1
               end
               JSON::UTF16toUTF8.iconv(bytes)
             end
           end
+          if string.respond_to?(:force_encoding)
+            string.force_encoding(Encoding::UTF_8)
+          end
+          string
         else
           UNPARSED
         end
@@ -180,7 +188,7 @@ module JSON
       def parse_array
         raise NestingError, "nesting of #@current_nesting is to deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = []
+        result = @array_class.new
         delim = false
         until eos?
           case
@@ -212,7 +220,7 @@ module JSON
       def parse_object
         raise NestingError, "nesting of #@current_nesting is to deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = {}
+        result = @object_class.new
         delim = false
         until eos?
           case

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.1.3'
+  VERSION         = '1.1.6'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/runner.rb

@@ -10,6 +10,7 @@ require 'test_json_unicode'
 require 'test_json_addition'
 require 'test_json_rails'
 require 'test_json_fixtures'
+require 'test_jjrb_offsets'
 
 class TS_AllTests
   def self.suite
@@ -20,6 +21,7 @@ class TS_AllTests
     suite << TC_JSONAddition.suite
     suite << TC_JSONRails.suite
     suite << TC_JSONFixtures.suite
+    suite << TestJjrbOffsets.suite
   end
 end
 Test::Unit::UI::Console::TestRunner.run(TS_AllTests)

data/tests/test_jjrb_offsets.rb

@@ -0,0 +1,308 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'test/unit'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
+
+class TestJjrbOffsets < Test::Unit::TestCase
+  # Test non-zero ByteList offsets.
+  # Yes, this is a very ad-hoc, copy-pasted test suite.
+
+  include JSON
+
+  def o(string, offset = 1)
+    full = "!" * offset + string
+    return full[offset, string.length]
+  end
+
+  def parse(string, *args)
+    return JSON.parse(o(string), *args)
+  end
+
+  def setup
+    @ary = [1, "foo", 3.14, 4711.0, 2.718, nil, [1,-2,3], false, true].map do
+      |x| [x]
+    end
+    @ary_to_parse = ["1", '"foo"', "3.14", "4711.0", "2.718", "null",
+      "[1,-2,3]", "false", "true"].map do
+      |x| "[#{x}]"
+    end
+    @hash = {
+      'a' => 2,
+      'b' => 3.141,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "\"\0\037",
+      'h' => 1000.0,
+      'i' => 0.001
+    }
+    @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
+      '"g":"\\"\\u0000\\u001f","h":1.0E3,"i":1.0E-3}'
+  end
+
+  def test_parser_source_offset
+    parser = JSON::Parser.new(o("test"))
+    assert_equal 'test', parser.source
+    assert_equal [], parse("[]")
+  end
+
+  def assert_equal_float(expected, is)
+    assert_in_delta(expected.first, is.first, 1e-2)
+  end
+
+  def test_parse_simple_arrays
+    assert_equal([], parse('[]'))
+    assert_equal([], parse('  [  ] '))
+    assert_equal([nil], parse('[null]'))
+    assert_equal([false], parse('[false]'))
+    assert_equal([true], parse('[true]'))
+    assert_equal([-23], parse('[-23]'))
+    assert_equal([23], parse('[23]'))
+    assert_equal([0.23], parse('[0.23]'))
+    assert_equal([0.0], parse('[0e0]'))
+    assert_raises(JSON::ParserError) { parse('[+23.2]') }
+    assert_raises(JSON::ParserError) { parse('[+23]') }
+    assert_raises(JSON::ParserError) { parse('[.23]') }
+    assert_raises(JSON::ParserError) { parse('[023]') }
+    assert_equal_float [3.141], parse('[3.141]')
+    assert_equal_float [-3.141], parse('[-3.141]')
+    assert_equal_float [3.141], parse('[3141e-3]')
+    assert_equal_float [3.141], parse('[3141.1e-3]')
+    assert_equal_float [3.141], parse('[3141E-3]')
+    assert_equal_float [3.141], parse('[3141.0E-3]')
+    assert_equal_float [-3.141], parse('[-3141.0e-3]')
+    assert_equal_float [-3.141], parse('[-3141e-3]')
+    assert_raises(ParserError) { parse('[NaN]') }
+    assert parse('[NaN]', :allow_nan => true).first.nan?
+    assert_raises(ParserError) { parse('[Infinity]') }
+    assert_equal [1.0/0], parse('[Infinity]', :allow_nan => true)
+    assert_raises(ParserError) { parse('[-Infinity]') }
+    assert_equal [-1.0/0], parse('[-Infinity]', :allow_nan => true)
+    assert_equal([""], parse('[""]'))
+    assert_equal(["foobar"], parse('["foobar"]'))
+    assert_equal([{}], parse('[{}]'))
+  end
+
+  def test_parse_simple_objects
+    assert_equal({}, parse('{}'))
+    assert_equal({}, parse(' {   }   '))
+    assert_equal({ "a" => nil }, parse('{   "a"   :  null}'))
+    assert_equal({ "a" => nil }, parse('{"a":null}'))
+    assert_equal({ "a" => false }, parse('{   "a"  :  false  }  '))
+    assert_equal({ "a" => false }, parse('{"a":false}'))
+    assert_raises(JSON::ParserError) { parse('{false}') }
+    assert_equal({ "a" => true }, parse('{"a":true}'))
+    assert_equal({ "a" => true }, parse('  { "a" :  true  }   '))
+    assert_equal({ "a" => -23 }, parse('  {  "a"  :  -23  }  '))
+    assert_equal({ "a" => -23 }, parse('  { "a" : -23 } '))
+    assert_equal({ "a" => 23 }, parse('{"a":23  } '))
+    assert_equal({ "a" => 23 }, parse('  { "a"  : 23  } '))
+    assert_equal({ "a" => 0.23 }, parse(' { "a"  :  0.23 }  '))
+    assert_equal({ "a" => 0.23 }, parse('  {  "a"  :  0.23  }  '))
+  end
+
+  begin
+    require 'permutation'
+    def test_parse_more_complex_arrays
+      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+      perms = Permutation.for a
+      perms.each do |perm|
+        orig_ary = perm.project
+        json = pretty_generate(orig_ary)
+        assert_equal orig_ary, parse(json)
+      end
+    end
+
+    def test_parse_complex_objects
+      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
+      perms = Permutation.for a
+      perms.each do |perm|
+        s = "a"
+        orig_obj = perm.project.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
+        json = pretty_generate(orig_obj)
+        assert_equal orig_obj, parse(json)
+      end
+    end
+  rescue LoadError
+    warn "Skipping permutation tests."
+  end
+
+  def test_parse_arrays
+    assert_equal([1,2,3], parse('[1,2,3]'))
+    assert_equal([1.2,2,3], parse('[1.2,2,3]'))
+    assert_equal([[],[[],[]]], parse('[[],[[],[]]]'))
+  end
+
+  def test_parse_values
+    assert_equal([""], parse('[""]'))
+    assert_equal(["\\"], parse('["\\\\"]'))
+    assert_equal(['"'], parse('["\""]'))
+    assert_equal(['\\"\\'], parse('["\\\\\\"\\\\"]'))
+    assert_equal(["\"\b\n\r\t\0\037"],
+      parse('["\"\b\n\r\t\u0000\u001f"]'))
+    for i in 0 ... @ary.size
+      assert_equal(@ary[i], parse(@ary_to_parse[i]))
+    end
+  end
+
+  def test_parse_array
+    assert_equal([], parse('[]'))
+    assert_equal([], parse('  [  ]  '))
+    assert_equal([1], parse('[1]'))
+    assert_equal([1], parse('  [ 1  ]  '))
+    assert_equal(@ary,
+      parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]]'\
+      ',[false],[true]]'))
+    assert_equal(@ary, parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2] 
+      , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
+  end
+
+  def test_parse_object
+    assert_equal({}, parse('{}'))
+    assert_equal({}, parse('  {  }  '))
+    assert_equal({'foo'=>'bar'}, parse('{"foo":"bar"}'))
+    assert_equal({'foo'=>'bar'}, parse('    { "foo"  :   "bar"   }   '))
+  end
+
+  def test_parser_reset
+    parser = Parser.new(@json)
+    assert_equal(@hash, parser.parse)
+    assert_equal(@hash, parser.parse)
+  end
+
+  def test_comments
+    json = <<EOT
+{
+  "key1":"value1", // eol comment
+  "key2":"value2"  /* multi line
+                    *  comment */,
+  "key3":"value3"  /* multi line
+                    // nested eol comment
+                    *  comment */
+}
+EOT
+    assert_equal(
+      { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
+      parse(json))
+    json = <<EOT
+{
+  "key1":"value1"  /* multi line
+                    // nested eol comment
+                    /* illegal nested multi line comment */
+                    *  comment */
+}
+EOT
+    assert_raises(ParserError) { parse(json) }
+    json = <<EOT
+{
+  "key1":"value1"  /* multi line
+                   // nested eol comment
+                   closed multi comment */
+                   and again, throw an Error */
+}
+EOT
+    assert_raises(ParserError) { parse(json) }
+    json = <<EOT
+{
+  "key1":"value1"  /*/*/
+}
+EOT
+    assert_equal({ "key1" => "value1" }, parse(json))
+  end
+
+  def test_backslash
+    data = [ '\\.(?i:gif|jpe?g|png)$' ]
+    json = '["\\\\.(?i:gif|jpe?g|png)$"]'
+    assert_equal json, JSON.unparse(data)
+    assert_equal data, JSON.parse(json)
+    #
+    data = [ '\\"' ]
+    json = '["\\\\\""]'
+    assert_equal json, JSON.unparse(data)
+    assert_equal data, JSON.parse(json)
+    #
+    json = '["\/"]'
+    data = JSON.parse(json)
+    assert_equal ['/'], data
+    assert_equal json, JSON.unparse(data)
+    #
+    json = '["\""]'
+    data = JSON.parse(json)
+    assert_equal ['"'], data
+    assert_equal json, JSON.unparse(data)
+    json = '["\\\'"]'
+    data = JSON.parse(json)
+    assert_equal ["'"], data
+    assert_equal '["\'"]', JSON.unparse(data)
+  end
+
+  def test_wrong_inputs
+    assert_raises(ParserError) { JSON.parse('"foo"') }
+    assert_raises(ParserError) { JSON.parse('123') }
+    assert_raises(ParserError) { JSON.parse('[] bla') }
+    assert_raises(ParserError) { JSON.parse('[] 1') }
+    assert_raises(ParserError) { JSON.parse('[] []') }
+    assert_raises(ParserError) { JSON.parse('[] {}') }
+    assert_raises(ParserError) { JSON.parse('{} []') }
+    assert_raises(ParserError) { JSON.parse('{} {}') }
+    assert_raises(ParserError) { JSON.parse('[NULL]') }
+    assert_raises(ParserError) { JSON.parse('[FALSE]') }
+    assert_raises(ParserError) { JSON.parse('[TRUE]') }
+    assert_raises(ParserError) { JSON.parse('[07]    ') }
+    assert_raises(ParserError) { JSON.parse('[0a]') }
+    assert_raises(ParserError) { JSON.parse('[1.]') }
+    assert_raises(ParserError) { JSON.parse('     ') }
+  end
+
+  def test_nesting
+    assert_raises(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 }
+    assert_raises(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse }
+    assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2)
+    too_deep = '[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]'
+    too_deep_ary = eval too_deep
+    assert_raises(JSON::NestingError) { JSON.parse too_deep }
+    assert_raises(JSON::NestingError) { JSON.parser.new(too_deep).parse }
+    assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 19 }
+    ok = JSON.parse too_deep, :max_nesting => 20
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => nil
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => false
+    assert_equal too_deep_ary, ok
+    ok = JSON.parse too_deep, :max_nesting => 0
+    assert_equal too_deep_ary, ok
+    assert_raises(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 }
+    assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2)
+    assert_raises(JSON::NestingError) { JSON.generate too_deep_ary }
+    assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 19 }
+    ok = JSON.generate too_deep_ary, :max_nesting => 20
+    assert_equal too_deep, ok
+    ok = JSON.generate too_deep_ary, :max_nesting => nil
+    assert_equal too_deep, ok
+    ok = JSON.generate too_deep_ary, :max_nesting => false
+    assert_equal too_deep, ok
+    ok = JSON.generate too_deep_ary, :max_nesting => 0
+    assert_equal too_deep, ok
+  end
+
+  def test_load_dump
+    too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
+    assert_equal too_deep, JSON.dump(eval(too_deep))
+    assert_kind_of String, Marshal.dump(eval(too_deep))
+    assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 19) }
+    assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 19) }
+    assert_equal too_deep, JSON.dump(eval(too_deep), 20)
+    assert_kind_of String, Marshal.dump(eval(too_deep), 20)
+    output = StringIO.new
+    JSON.dump(eval(too_deep), output)
+    assert_equal too_deep, output.string
+    output = StringIO.new
+    JSON.dump(eval(too_deep), output, 20)
+    assert_equal too_deep, output.string
+  end
+end

data/tests/test_json.rb

@@ -1,14 +1,18 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 require 'stringio'
 
 class TC_JSON < Test::Unit::TestCase
   include JSON
 
   def setup
-    $KCODE = 'UTF8'
     @ary = [1, "foo", 3.14, 4711.0, 2.718, nil, [1,-2,3], false, true].map do
       |x| [x]
     end
@@ -26,10 +30,9 @@ class TC_JSON < Test::Unit::TestCase
       'h' => 1000.0,
       'i' => 0.001
     }
-    @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
+    @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
       '"g":"\\"\\u0000\\u001f","h":1.0E3,"i":1.0E-3}'
   end
-    suite << TC_JSON.suite
 
   def test_construction
     parser = JSON::Parser.new('test')
@@ -147,6 +150,14 @@ class TC_JSON < Test::Unit::TestCase
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
 
+  class SubArray < Array; end
+
+  def test_parse_array_custom_class
+    res = parse('[]', :array_class => SubArray)
+    assert_equal([], res)
+    assert_equal(SubArray, res.class)
+  end
+
   def test_parse_object
     assert_equal({}, parse('{}'))
     assert_equal({}, parse('  {  }  '))
@@ -154,6 +165,14 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal({'foo'=>'bar'}, parse('    { "foo"  :   "bar"   }   '))
   end
 
+  class SubHash < Hash; end
+
+  def test_parse_object_custom_class
+    res = parse('{}', :object_class => SubHash)
+    assert_equal({}, res)
+    assert_equal(SubHash, res.class)
+  end
+
   def test_parser_reset
     parser = Parser.new(@json)
     assert_equal(@hash, parser.parse)

data/tests/test_json_addition.rb

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
+# -*- coding:utf-8 -*-
 
 require 'test/unit'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 require 'json/add/core'
 require 'date'
 
@@ -54,10 +60,6 @@ class TC_JSONAddition < Test::Unit::TestCase
     end
   end
 
-  def setup
-    $KCODE = 'UTF8'
-  end
-
   def test_extended_json
     a = A.new(666)
     assert A.json_creatable?
@@ -98,6 +100,7 @@ class TC_JSONAddition < Test::Unit::TestCase
 
   def test_raw_strings
     raw = ''
+    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
     raw_array = []
     for i in 0..255
       raw << i
@@ -120,7 +123,7 @@ EOT
 
   def test_core
     t = Time.now
-    assert_equal t, JSON(JSON(t))
+    assert_equal t.inspect, JSON(JSON(t)).inspect
     d = Date.today
     assert_equal d, JSON(JSON(d))
     d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)

data/tests/test_json_fixtures.rb

@@ -1,11 +1,15 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 
 class TC_JSONFixtures < Test::Unit::TestCase
   def setup
-    $KCODE = 'UTF8'
     fixtures = File.join(File.dirname(__FILE__), 'fixtures/*.json')
     passed, failed = Dir[fixtures].partition { |f| f['pass'] }
     @passed = passed.inject([]) { |a, f| a << [ f, File.read(f) ] }.sort

data/tests/test_json_generate.rb

@@ -1,11 +1,17 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 
 class TC_JSONGenerate < Test::Unit::TestCase
   include JSON
 
   def setup
-    $KCODE = 'UTF8'
     @hash = {
       'a' => 2,
       'b' => 3.141,

data/tests/test_json_rails.rb

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 require 'json/add/rails'
 require 'date'
 
@@ -50,17 +56,38 @@ class TC_JSONRails < Test::Unit::TestCase
     end
   end
 
-  def setup
-    $KCODE = 'UTF8'
+  class D
+    def initialize
+      @foo = 666
+    end
+
+    attr_reader :foo
+
+    def ==(other)
+      foo == other.foo
+    end
   end
 
   def test_extended_json
     a = A.new(666)
     assert A.json_creatable?
+    assert_equal 666, a.a
     json = generate(a)
     a_again = JSON.parse(json)
     assert_kind_of a.class, a_again
     assert_equal a, a_again
+    assert_equal 666, a_again.a
+  end
+
+  def test_extended_json_generic_object
+    d = D.new
+    assert D.json_creatable?
+    assert_equal 666, d.foo
+    json = generate(d)
+    d_again = JSON.parse(json)
+    assert_kind_of d.class, d_again
+    assert_equal d, d_again
+    assert_equal 666, d_again.foo
   end
 
   def test_extended_json_disabled
@@ -94,6 +121,7 @@ class TC_JSONRails < Test::Unit::TestCase
 
   def test_raw_strings
     raw = ''
+    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
     raw_array = []
     for i in 0..255
       raw << i

data/tests/test_json_unicode.rb

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 
 class TC_JSONUnicode < Test::Unit::TestCase
   include JSON
 
-  def setup
-    $KCODE = 'UTF8'
-  end
-
   def test_unicode
     assert_equal '""', ''.to_json
     assert_equal '"\\b"', "\b".to_json
@@ -53,8 +54,8 @@ class TC_JSONUnicode < Test::Unit::TestCase
         assert_equal json, JSON.generate(["" << i])
       end
     end
-    assert_raises(JSON::GeneratorError) do
-      JSON.generate(["" << 0x80])
+    assert_raise(JSON::GeneratorError) do
+      JSON.generate(["\x80"])
     end
     assert_equal "\302\200", JSON.parse('["\u0080"]').first
   end

metadata

@@ -17,23 +17,21 @@ signing_key:
 name: json-jruby
 rdoc_options: []
 
-autorequire: 
 rubyforge_project: json-jruby
+autorequire: 
+licenses: []
+
 executables: []
 
 description: 
-specification_version: 2
+specification_version: 3
 default_executable: 
 files: 
 - lib/json.rb
-- lib/json
 - lib/json/version.rb
-- lib/json/add
-- lib/json/ext
 - lib/json/ext.rb
 - lib/json/pure.rb
 - lib/json/common.rb
-- lib/json/pure
 - lib/json/add/rails.rb
 - lib/json/add/core.rb
 - lib/json/ext/generator.jar
@@ -42,7 +40,7 @@ files:
 - lib/json/pure/parser.rb
 - tests/test_json_generate.rb
 - tests/test_json_unicode.rb
-- tests/fixtures
+- tests/test_jjrb_offsets.rb
 - tests/test_json_addition.rb
 - tests/test_json_fixtures.rb
 - tests/test_json_rails.rb
@@ -87,20 +85,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 requirements: []
 
 authors: 
 - Daniel Luz
-date: 2009-01-04 02:00:00 +00:00
+date: 2009-05-13 03:00:00 +00:00
 platform: universal-java-1.6
 test_files: 
 - tests/runner.rb
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.6
 require_paths: 
 - lib
 dependencies: []
 
 bindir: bin
-has_rdoc: false
+has_rdoc: true