json-jruby 1.1.7-universal-java-1.6 → 1.2.0-universal-java-1.6

data/lib/json.rb

@@ -1,233 +1,10 @@
 require 'json/common'
-# = json - JSON for Ruby
-#
-# == Description
-#
-# This is a implementation of the JSON specification according to RFC 4627
-# (http://www.ietf.org/rfc/rfc4627.txt). Starting from version 1.0.0 on there
-# will be two variants available:
-#
-# * A pure ruby variant, that relies on the iconv and the stringscan
-#   extensions, which are both part of the ruby standard library.
-# * The quite a bit faster C extension variant, which is in parts implemented
-#   in C and comes with its own unicode conversion functions and a parser
-#   generated by the ragel state machine compiler
-#   (http://www.cs.queensu.ca/~thurston/ragel).
-#
-# Both variants of the JSON generator escape all non-ASCII an control
-# characters with \uXXXX escape sequences, and support UTF-16 surrogate pairs
-# in order to be able to generate the whole range of unicode code points. This
-# means that generated JSON text is encoded as UTF-8 (because ASCII is a subset
-# of UTF-8) and at the same time avoids decoding problems for receiving
-# endpoints, that don't expect UTF-8 encoded texts. On the negative side this
-# may lead to a bit longer strings than necessarry.
-#
-# All strings, that are to be encoded as JSON strings, should be UTF-8 byte
-# sequences on the Ruby side. To encode raw binary strings, that aren't UTF-8
-# encoded, please use the to_json_raw_object method of String (which produces
-# an object, that contains a byte array) and decode the result on the receiving
-# endpoint.
-#
-# == Author
-#
-# Florian Frank <mailto:flori@ping.de>
-#
-# == License
-#
-# This software is distributed under the same license as Ruby itself, see
-# http://www.ruby-lang.org/en/LICENSE.txt.
-#
-# == Download
-#
-# The latest version of this library can be downloaded at
-#
-# * http://rubyforge.org/frs?group_id=953
-#
-# Online Documentation should be located at
-#
-# * http://json.rubyforge.org
-#
-# == Usage
-# 
-# To use JSON you can
-#   require 'json'
-# to load the installed variant (either the extension 'json' or the pure
-# variant 'json_pure'). If you have installed the extension variant, you can
-# pick either the extension variant or the pure variant by typing
-#   require 'json/ext'
-# or
-#   require 'json/pure'
-#
-# You can choose to load a set of common additions to ruby core's objects if
-# you
-#   require 'json/add/core'
-#
-# After requiring this you can, e. g., serialise/deserialise Ruby ranges:
-#
-#   JSON JSON(1..10) # => 1..10
-#
-# To find out how to add JSON support to other or your own classes, read the
-# Examples section below.
-#
-# To get the best compatibility to rails' JSON implementation, you can
-#   require 'json/add/rails'
-#
-# Both of the additions attempt to require 'json' (like above) first, if it has
-# not been required yet.
-#
-# == Speed Comparisons
-#
-# I have created some benchmark results (see the benchmarks subdir of the
-# package) for the JSON-Parser to estimate the speed up in the C extension:
-#
-# JSON::Pure::Parser::  28.90  calls/second
-# JSON::Ext::Parser::  505.50 calls/second
-#
-# This is ca. <b>17.5</b> times the speed of the pure Ruby implementation.
-#
-# I have benchmarked the JSON-Generator as well. This generates a few more
-# values, because there are different modes, that also influence the achieved
-# speed:
-#
-# * JSON::Pure::Generator:
-#   generate::        35.06 calls/second
-#   pretty_generate:: 34.00 calls/second
-#   fast_generate::   41.06 calls/second
-#
-# * JSON::Ext::Generator:
-#   generate::        492.11 calls/second
-#   pretty_generate:: 348.85 calls/second
-#   fast_generate::   541.60 calls/second
-#
-# * Speedup Ext/Pure:
-#   generate safe::   14.0 times
-#   generate pretty:: 10.3 times
-#   generate fast::   13.2 times
-#
-# The rails framework includes a generator as well, also it seems to be rather
-# slow: I measured only 23.87 calls/second which is slower than any of my pure
-# generator results. Here a comparison of the different speedups with the Rails
-# measurement as the divisor:
-#
-# * Speedup Pure/Rails:
-#   generate safe::   1.5 times
-#   generate pretty:: 1.4 times
-#   generate fast::   1.7 times
-#
-# * Speedup Ext/Rails:
-#   generate safe::   20.6 times
-#   generate pretty:: 14.6 times
-#   generate fast::   22.7 times
-#
-# To achieve the fastest JSON text output, you can use the
-# fast_generate/fast_unparse methods. Beware, that this will disable the
-# checking for circular Ruby data structures, which may cause JSON to go into
-# an infinite loop.
-#
-# == Examples
-#
-# To create a JSON text from a ruby data structure, you
-# can call JSON.generate (or JSON.unparse) like that:
-#
-#  json = JSON.generate [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#  # => "[1,2,{\"a\":3.141},false,true,null,\"4..10\"]"
-#
-# To create a valid JSON text you have to make sure, that the output is
-# embedded in either a JSON array [] or a JSON object {}. The easiest way to do
-# this, is by putting your values in a Ruby Array or Hash instance.
-#
-# To get back a ruby data structure from a JSON text, you have to call
-# JSON.parse on it:
-#
-#  JSON.parse json
-#  # => [1, 2, {"a"=>3.141}, false, true, nil, "4..10"]
-# 
-# Note, that the range from the original data structure is a simple
-# string now. The reason for this is, that JSON doesn't support ranges
-# or arbitrary classes. In this case the json library falls back to call
-# Object#to_json, which is the same as #to_s.to_json.
-#
-# It's possible to add JSON support serialization to arbitrary classes by
-# simply implementing a more specialized version of the #to_json method, that
-# should return a JSON object (a hash converted to JSON with #to_json) like
-# this (don't forget the *a for all the arguments):
-#
-#  class Range
-#    def to_json(*a)
-#      {
-#        'json_class'   => self.class.name, # = 'Range'
-#        'data'         => [ first, last, exclude_end? ]
-#      }.to_json(*a)
-#    end
-#  end
-#
-# The hash key 'json_class' is the class, that will be asked to deserialise the
-# JSON representation later. In this case it's 'Range', but any namespace of
-# the form 'A::B' or '::A::B' will do. All other keys are arbitrary and can be
-# used to store the necessary data to configure the object to be deserialised.
-#
-# If a the key 'json_class' is found in a JSON object, the JSON parser checks
-# if the given class responds to the json_create class method. If so, it is
-# called with the JSON object converted to a Ruby hash. So a range can
-# be deserialised by implementing Range.json_create like this:
-# 
-#  class Range
-#    def self.json_create(o)
-#      new(*o['data'])
-#    end
-#  end
-#
-# Now it possible to serialise/deserialise ranges as well:
-#
-#  json = JSON.generate [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#  # => "[1,2,{\"a\":3.141},false,true,null,{\"json_class\":\"Range\",\"data\":[4,10,false]}]"
-#  JSON.parse json
-#  # => [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#
-# JSON.generate always creates the shortest possible string representation of a
-# ruby data structure in one line. This good for data storage or network
-# protocols, but not so good for humans to read. Fortunately there's also
-# JSON.pretty_generate (or JSON.pretty_generate) that creates a more
-# readable output:
-#
-#  puts JSON.pretty_generate([1, 2, {"a"=>3.141}, false, true, nil, 4..10])
-#  [
-#    1,
-#    2,
-#    {
-#      "a": 3.141
-#    },
-#    false,
-#    true,
-#    null,
-#    {
-#      "json_class": "Range",
-#      "data": [
-#        4,
-#        10,
-#        false
-#      ]
-#    }
-#  ]
-#
-# There are also the methods Kernel#j for unparse, and Kernel#jj for
-# pretty_unparse output to the console, that work analogous to Core Ruby's p
-# and the pp library's pp methods.
-#
-# The script tools/server.rb contains a small example if you want to test, how
-# receiving a JSON object from a webrick server in your browser with the
-# javasript prototype library (http://www.prototypejs.org) works.
-#
 module JSON
   require 'json/version'
 
-  if VARIANT_BINARY
+  begin
     require 'json/ext'
-  else
-    begin
-      require 'json/ext'
-    rescue LoadError
-      require 'json/pure'
-    end
+  rescue LoadError
+    require 'json/pure'
   end
 end

data/lib/json/common.rb

@@ -1,4 +1,5 @@
 require 'json/version'
+require 'iconv'
 
 module JSON
   class << self
@@ -74,7 +75,7 @@ module JSON
   end
   self.create_id = 'json_class'
 
-  NaN           = (-1.0) ** 0.5
+  NaN           = 0.0/0
 
   Infinity      = 1.0/0
 
@@ -105,7 +106,7 @@ module JSON
 
   module_function
 
-  # Parse the JSON string _source_ into a Ruby data structure and return it.
+  # Parse the JSON document _source_ into a Ruby data structure and return it.
   #
   # _opts_ can have the following
   # keys:
@@ -122,9 +123,9 @@ module JSON
     JSON.parser.new(source, opts).parse
   end
 
-  # Parse the JSON string _source_ into a Ruby data structure and return it.
+  # Parse the JSON document _source_ into a Ruby data structure and return it.
   # The bang version of the parse method, defaults to the more dangerous values
-  # for the _opts_ hash, so be sure only to parse trusted _source_ strings.
+  # for the _opts_ hash, so be sure only to parse trusted _source_ documents.
   #
   # _opts_ can have the following keys:
   # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
@@ -145,9 +146,8 @@ module JSON
     JSON.parser.new(source, opts).parse
   end
 
-  # Unparse the Ruby data structure _obj_ into a single line JSON string and
-  # return it. _state_ is
-  # * a JSON::State object,
+  # Generate a JSON document from the Ruby data structure _obj_ and return
+  # it. _state_ is * a JSON::State object,
   # * or a Hash like object (responding to to_hash),
   # * an object convertible into a hash by a to_h method,
   # that is used as or to configure a State object.
@@ -180,7 +180,11 @@ module JSON
     else
       state = State.new
     end
-    obj.to_json(state)
+    result = obj.to_json(state)
+    if result !~ /\A\s*(?:\[.*\]|\{.*\})\s*\Z/m
+      raise GeneratorError, "only generation of JSON objects or arrays allowed"
+    end
+    result
   end
 
   # :stopdoc:
@@ -190,14 +194,17 @@ module JSON
   module_function :unparse
   # :startdoc:
 
-  # Unparse the Ruby data structure _obj_ into a single line JSON string and
-  # return it. This method disables the checks for circles in Ruby objects, and
-  # also generates NaN, Infinity, and, -Infinity float values.
+  # Generate a JSON document from the Ruby data structure _obj_ and return it.
+  # This method disables the checks for circles in Ruby objects.
   #
   # *WARNING*: Be careful not to pass any Ruby data structures with circles as
   # _obj_ argument, because this will cause JSON to go into an infinite loop.
   def fast_generate(obj)
-    obj.to_json(nil)
+    result = obj.to_json(nil)
+    if result !~ /\A(?:\[.*\]|\{.*\})\Z/
+      raise GeneratorError, "only generation of JSON objects or arrays allowed"
+    end
+    result
   end
 
   # :stopdoc:
@@ -206,8 +213,9 @@ module JSON
   module_function :fast_unparse
   # :startdoc:
 
-  # Unparse the Ruby data structure _obj_ into a JSON string and return it. The
-  # returned string is a prettier form of the string returned by #unparse.
+  # Generate a JSON document from the Ruby data structure _obj_ and return it.
+  # The returned document is a prettier form of the document returned by
+  # #unparse.
   #
   # The _opts_ argument can be used to configure the generator, see the
   # generate method for a more detailed explanation.
@@ -229,7 +237,11 @@ module JSON
       end
       state.configure(opts)
     end
-    obj.to_json(state)
+    result = obj.to_json(state)
+    if result !~ /\A\s*(?:\[.*\]|\{.*\})\s*\Z/m
+      raise GeneratorError, "only generation of JSON objects or arrays allowed"
+    end
+    result
   end
 
   # :stopdoc:
@@ -270,8 +282,6 @@ module JSON
       proc.call result
     end
   end
-  private :recurse_proc
-  module_function :recurse_proc
 
   alias restore load
   module_function :restore
@@ -307,9 +317,16 @@ module JSON
   rescue JSON::NestingError
     raise ArgumentError, "exceed depth limit"
   end
+
+  # Shortuct for iconv.
+  def self.iconv(to, from, string)
+    Iconv.iconv(to, from, string).first
+  end
 end
 
 module ::Kernel
+  private
+
   # Outputs _objs_ to STDOUT as JSON strings in the shortest form, that is in
   # one line.
   def j(*objs)

data/lib/json/pure.rb

@@ -10,6 +10,9 @@ module JSON
     # An iconv instance to convert from UTF16 Big Endian to UTF8.
     UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8') # :nodoc:
     UTF8toUTF16.iconv('no bom')
+  rescue LoadError
+    raise MissingUnicodeSupport,
+      "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions"
   rescue Errno::EINVAL, Iconv::InvalidEncoding
     # Iconv doesn't support big endian utf-16. Let's try to hack this manually
     # into the converters.
@@ -51,9 +54,6 @@ module JSON
     ensure
       $VERBOSE = old_verbose
     end
-  rescue LoadError
-    raise MissingUnicodeSupport,
-      "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions"
   end
 
   # Swap consecutive bytes of _string_ in place.

data/lib/json/pure/generator.rb

@@ -34,17 +34,16 @@ module JSON
     "\x1f" => '\u001f',
     '"'   =>  '\"',
     '\\'  =>  '\\\\',
-    '/'   =>  '\/',
   } # :nodoc:
 
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
-  if String.method_defined?(:force_encoding)
+  if defined?(::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.force_encoding(::Encoding::ASCII_8BIT)
+      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
       string.gsub!(/(
                       (?:
                         [\xc2-\xdf][\x80-\xbf]    |
@@ -57,14 +56,14 @@ module JSON
                       s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
                       s.gsub!(/.{4}/n, '\\\\u\&')
                     }
-      string.force_encoding(Encoding::UTF_8)
+      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 = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
       string.gsub!(/(
                       (?:
                         [\xc2-\xdf][\x80-\xbf]    |
@@ -352,13 +351,13 @@ module JSON
           def to_json(state = nil, *)
             case
             when infinite?
-              if !state || state.allow_nan?
+              if state && state.allow_nan?
                 to_s
               else
                 raise GeneratorError, "#{self} not allowed in JSON"
               end
             when nan?
-              if !state || state.allow_nan?
+              if state && state.allow_nan?
                 to_s
               else
                 raise GeneratorError, "#{self} not allowed in JSON"
@@ -370,11 +369,25 @@ module JSON
         end
 
         module String
-          # This string should be encoded with UTF-8 A call to this method
-          # returns a JSON string encoded with UTF16 big endian characters as
-          # \u????.
-          def to_json(*)
-            '"' << JSON.utf8_to_json(self) << '"'
+          if defined?(::Encoding)
+            # This string should be encoded with UTF-8 A call to this method
+            # returns a JSON string encoded with UTF16 big endian characters as
+            # \u????.
+            def to_json(*)
+              if encoding == ::Encoding::UTF_8
+                '"' << JSON.utf8_to_json(self) << '"'
+              else
+                string = encode(::Encoding::UTF_8)
+                '"' << JSON.utf8_to_json(string) << '"'
+              end
+            end
+          else
+            # This string should be encoded with UTF-8 A call to this method
+            # returns a JSON string encoded with UTF16 big endian characters as
+            # \u????.
+            def to_json(*)
+              '"' << JSON.utf8_to_json(self) << '"'
+            end
           end
 
           # Module that holds the extinding methods if, the String module is

data/lib/json/pure/parser.rb

@@ -66,7 +66,41 @@ module JSON
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
-        super
+          if defined?(::Encoding)
+            if source.encoding == Encoding::ASCII_8BIT
+              b = source[0, 4].bytes.to_a
+              source = case
+                       when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
+                         source.dup.force_encoding(Encoding::UTF_32BE).encode!(Encoding::UTF_8)
+                       when b.size >= 4 && b[0] == 0 && b[2] == 0
+                         source.dup.force_encoding(Encoding::UTF_16BE).encode!(Encoding::UTF_8)
+                       when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
+                         source.dup.force_encoding(Encoding::UTF_32LE).encode!(Encoding::UTF_8)
+                       when b.size >= 4 && b[1] == 0 && b[3] == 0
+                         source.dup.force_encoding(Encoding::UTF_16LE).encode!(Encoding::UTF_8)
+                       else
+                         source.dup
+                       end
+            else
+              source = source.encode(Encoding::UTF_8)
+            end
+            source.force_encoding(Encoding::ASCII_8BIT)
+          else
+            b = source
+            source = case
+                     when b.size >= 4 && b[0] == 0 && b[1] == 0 && b[2] == 0
+                       JSON.iconv('utf-8', 'utf-32be', b)
+                     when b.size >= 4 && b[0] == 0 && b[2] == 0
+                       JSON.iconv('utf-8', 'utf-16be', b)
+                     when b.size >= 4 && b[1] == 0 && b[2] == 0 && b[3] == 0
+                       JSON.iconv('utf-8', 'utf-32le', b)
+                     when b.size >= 4 && b[1] == 0 && b[3] == 0
+                       JSON.iconv('utf-8', 'utf-16le', b)
+                     else
+                       b
+                     end
+          end
+        super source
         if !opts.key?(:max_nesting) # defaults to 19
           @max_nesting = 19
         elsif opts[:max_nesting]
@@ -188,7 +222,7 @@ module JSON
       end
 
       def parse_array
-        raise NestingError, "nesting of #@current_nesting is to deep" if
+        raise NestingError, "nesting of #@current_nesting is too deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @array_class.new
         delim = false
@@ -220,7 +254,7 @@ module JSON
       end
 
       def parse_object
-        raise NestingError, "nesting of #@current_nesting is to deep" if
+        raise NestingError, "nesting of #@current_nesting is too deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
         result = @object_class.new
         delim = false

data/lib/json/version.rb

@@ -1,9 +1,8 @@
 module JSON
   # JSON version
-  VERSION         = '1.1.7'
+  VERSION         = '1.2.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-  VARIANT_BINARY  = false
 end

data/tests/test_jjrb_offsets.rb

@@ -226,11 +226,6 @@ EOT
     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

data/tests/test_json.rb

@@ -9,6 +9,20 @@ else             require 'json'
 end
 require 'stringio'
 
+unless Array.method_defined?(:permutation)
+  begin
+    require 'enumerator'
+    require 'permutation'
+    class Array
+      def permutation
+        Permutation.for(self).to_enum.map { |x| x.project }
+      end
+    end
+  rescue LoadError
+    warn "Skipping permutation tests."
+  end
+end
+
 class TC_JSON < Test::Unit::TestCase
   include JSON
 
@@ -94,30 +108,24 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal({ "a" => 0.23 }, parse('  {  "a"  :  0.23  }  '))
   end
 
-  begin
-    require 'permutation'
+  if Array.method_defined?(: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)
+      a.permutation.each do |perm|
+        json = pretty_generate(perm)
+        assert_equal perm, 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|
+      a.permutation.each do |perm|
         s = "a"
-        orig_obj = perm.project.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
+        orig_obj = perm.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
@@ -222,27 +230,27 @@ EOT
   def test_backslash
     data = [ '\\.(?i:gif|jpe?g|png)$' ]
     json = '["\\\\.(?i:gif|jpe?g|png)$"]'
-    assert_equal json, JSON.unparse(data)
+    assert_equal json, JSON.generate(data)
     assert_equal data, JSON.parse(json)
     #
     data = [ '\\"' ]
     json = '["\\\\\""]'
-    assert_equal json, JSON.unparse(data)
+    assert_equal json, JSON.generate(data)
     assert_equal data, JSON.parse(json)
     #
-    json = '["\/"]'
+    json = '["/"]'
     data = JSON.parse(json)
     assert_equal ['/'], data
-    assert_equal json, JSON.unparse(data)
+    assert_equal json, JSON.generate(data)
     #
     json = '["\""]'
     data = JSON.parse(json)
     assert_equal ['"'], data
-    assert_equal json, JSON.unparse(data)
+    assert_equal json, JSON.generate(data)
     json = '["\\\'"]'
     data = JSON.parse(json)
     assert_equal ["'"], data
-    assert_equal '["\'"]', JSON.unparse(data)
+    assert_equal '["\'"]', JSON.generate(data)
   end
 
   def test_wrong_inputs

data/tests/test_json_encoding.rb

@@ -0,0 +1,67 @@
+#!/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 'iconv'
+
+class TC_JSONEncoding < Test::Unit::TestCase
+  include JSON
+
+  def setup
+    @utf_8 = '["© ≠ €!"]'
+    @parsed = [ "© ≠ €!" ]
+    @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first)
+    @generated = '["\u00a9 \u2260 \u20ac!"]'
+    if defined?(::Encoding)
+      @utf_8_ascii_8bit = @utf_8.dup.force_encoding(Encoding::ASCII_8BIT)
+      @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
+      @utf_16be_ascii_8bit = @utf_16be.dup.force_encoding(Encoding::ASCII_8BIT)
+      @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
+      @utf_16le_ascii_8bit = @utf_16le.dup.force_encoding(Encoding::ASCII_8BIT)
+      @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
+      @utf_32be_ascii_8bit = @utf_32be.dup.force_encoding(Encoding::ASCII_8BIT)
+      @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
+      @utf_32le_ascii_8bit = @utf_32le.dup.force_encoding(Encoding::ASCII_8BIT)
+    else
+      @utf_8_ascii_8bit = @utf_8.dup
+      @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
+      @utf_16be_ascii_8bit = @utf_16be.dup
+      @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
+      @utf_16le_ascii_8bit = @utf_16le.dup
+      @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
+      @utf_32be_ascii_8bit = @utf_32be.dup
+      @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
+      @utf_32le_ascii_8bit = @utf_32le.dup
+    end
+  end
+
+  def test_parse
+    assert_equal @parsed, JSON.parse(@utf_8)
+    assert_equal @parsed, JSON.parse(@utf_16be)
+    assert_equal @parsed, JSON.parse(@utf_16le)
+    assert_equal @parsed, JSON.parse(@utf_32be)
+    assert_equal @parsed, JSON.parse(@utf_32le)
+  end
+
+  def test_parse_ascii_8bit
+    assert_equal @parsed, JSON.parse(@utf_8_ascii_8bit)
+    assert_equal @parsed, JSON.parse(@utf_16be_ascii_8bit)
+    assert_equal @parsed, JSON.parse(@utf_16le_ascii_8bit)
+    assert_equal @parsed, JSON.parse(@utf_32be_ascii_8bit)
+    assert_equal @parsed, JSON.parse(@utf_32le_ascii_8bit)
+  end
+
+  def test_generate
+    assert_equal @generated, JSON.generate(@parsed)
+    if defined?(::Encoding)
+      assert_equal @generated, JSON.generate(@utf_16_data)
+    else
+       assert_raises(JSON::GeneratorError) { JSON.generate(@utf_16_data) }
+    end
+  end
+end

data/tests/test_json_generate.rb

@@ -44,8 +44,8 @@ class TC_JSONGenerate < Test::Unit::TestCase
 EOT
   end
 
-  def test_unparse
-    json = unparse(@hash)
+  def test_generate
+    json = generate(@hash)
     assert_equal(JSON.parse(@json2), JSON.parse(json))
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
@@ -53,10 +53,11 @@ EOT
     assert_equal('{"1":2}', json)
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
+    assert_raise(GeneratorError) { generate(666) }
   end
 
-  def test_unparse_pretty
-    json = pretty_unparse(@hash)
+  def test_generate_pretty
+    json = pretty_generate(@hash)
     assert_equal(JSON.parse(@json3), JSON.parse(json))
     parsed_json = parse(json)
     assert_equal(@hash, parsed_json)
@@ -68,6 +69,19 @@ EOT
 EOT
     parsed_json = parse(json)
     assert_equal({"1"=>2}, parsed_json)
+    assert_raise(GeneratorError) { pretty_generate(666) }
+  end
+
+  def test_fast_generate
+    json = fast_generate(@hash)
+    assert_equal(JSON.parse(@json2), JSON.parse(json))
+    parsed_json = parse(json)
+    assert_equal(@hash, parsed_json)
+    json = fast_generate({1=>2})
+    assert_equal('{"1":2}', json)
+    parsed_json = parse(json)
+    assert_equal({"1"=>2}, parsed_json)
+    assert_raise(GeneratorError) { fast_generate(666) }
   end
 
   def test_states
@@ -89,17 +103,17 @@ EOT
   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) { 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) { 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) { fast_generate([JSON::MinusInfinity]) }
     assert_raises(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
     assert_equal "[\n  -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
   end

data/tests/test_json_rails.rb

@@ -141,6 +141,6 @@ EOT
   end
 
   def test_symbol
-    assert_equal '"foo"', JSON(:foo) #  we don't want an object here
+    assert_equal '"foo"', :foo.to_json #  we don't want an object here
   end
 end

metadata

@@ -1,104 +1,104 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: mernen+rubyforge@gmail.com
+name: json-jruby
+version: !ruby/object:Gem::Version 
+  version: 1.2.0
+platform: universal-java-1.6
+authors: 
+  - Daniel Luz
+autorequire: 
+bindir: bin
 cert_chain: []
 
-summary: A JSON implementation as a JRuby extension
-post_install_message: 
+date: 2009-11-28 00:00:00 -02:00
+default_executable: 
+dependencies: []
+
+description: 
+email: mernen+rubyforge@gmail.com
+executables: []
+
+extensions: []
+
 extra_rdoc_files: []
 
+files: 
+  - lib/json.rb
+  - lib/json/version.rb
+  - lib/json/ext.rb
+  - lib/json/pure.rb
+  - lib/json/common.rb
+  - lib/json/add/rails.rb
+  - lib/json/add/core.rb
+  - lib/json/ext/generator.jar
+  - lib/json/ext/parser.jar
+  - lib/json/pure/generator.rb
+  - lib/json/pure/parser.rb
+  - tests/test_json_generate.rb
+  - tests/test_json_unicode.rb
+  - tests/test_jjrb_offsets.rb
+  - tests/test_json_addition.rb
+  - tests/test_json_fixtures.rb
+  - tests/test_json_encoding.rb
+  - tests/test_json_rails.rb
+  - tests/test_json.rb
+  - tests/fixtures/fail20.json
+  - tests/fixtures/fail6.json
+  - tests/fixtures/fail1.json
+  - tests/fixtures/fail14.json
+  - tests/fixtures/fail9.json
+  - tests/fixtures/pass26.json
+  - tests/fixtures/fail27.json
+  - tests/fixtures/fail19.json
+  - tests/fixtures/fail5.json
+  - tests/fixtures/fail10.json
+  - tests/fixtures/fail12.json
+  - tests/fixtures/fail3.json
+  - tests/fixtures/fail13.json
+  - tests/fixtures/fail24.json
+  - tests/fixtures/pass3.json
+  - tests/fixtures/fail23.json
+  - tests/fixtures/fail7.json
+  - tests/fixtures/pass1.json
+  - tests/fixtures/fail18.json
+  - tests/fixtures/pass17.json
+  - tests/fixtures/fail11.json
+  - tests/fixtures/fail21.json
+  - tests/fixtures/fail25.json
+  - tests/fixtures/fail4.json
+  - tests/fixtures/fail8.json
+  - tests/fixtures/fail2.json
+  - tests/fixtures/pass15.json
+  - tests/fixtures/fail22.json
+  - tests/fixtures/fail28.json
+  - tests/fixtures/pass2.json
+  - tests/fixtures/pass16.json
+has_rdoc: true
 homepage: http://rubyforge.org/projects/json-jruby/
-signing_key: 
-name: json-jruby
-rdoc_options: []
-
-rubyforge_project: json-jruby
-autorequire: 
 licenses: []
 
-executables: []
+post_install_message: 
+rdoc_options: []
 
-description: 
-specification_version: 3
-default_executable: 
-files: 
-- lib/json.rb
-- lib/json/version.rb
-- lib/json/ext.rb
-- lib/json/pure.rb
-- lib/json/common.rb
-- lib/json/add/rails.rb
-- lib/json/add/core.rb
-- lib/json/ext/generator.jar
-- lib/json/ext/parser.jar
-- lib/json/pure/generator.rb
-- lib/json/pure/parser.rb
-- tests/test_json_generate.rb
-- tests/test_json_unicode.rb
-- tests/test_jjrb_offsets.rb
-- tests/test_json_addition.rb
-- tests/test_json_fixtures.rb
-- tests/test_json_rails.rb
-- tests/test_json.rb
-- tests/runner.rb
-- tests/fixtures/fail20.json
-- tests/fixtures/fail6.json
-- tests/fixtures/fail1.json
-- tests/fixtures/fail14.json
-- tests/fixtures/fail9.json
-- tests/fixtures/pass26.json
-- tests/fixtures/fail27.json
-- tests/fixtures/fail19.json
-- tests/fixtures/fail5.json
-- tests/fixtures/fail10.json
-- tests/fixtures/fail12.json
-- tests/fixtures/fail3.json
-- tests/fixtures/fail13.json
-- tests/fixtures/fail24.json
-- tests/fixtures/pass3.json
-- tests/fixtures/fail23.json
-- tests/fixtures/fail7.json
-- tests/fixtures/pass1.json
-- tests/fixtures/fail18.json
-- tests/fixtures/pass17.json
-- tests/fixtures/fail11.json
-- tests/fixtures/fail21.json
-- tests/fixtures/fail25.json
-- tests/fixtures/fail4.json
-- tests/fixtures/fail8.json
-- tests/fixtures/fail2.json
-- tests/fixtures/pass15.json
-- tests/fixtures/fail22.json
-- tests/fixtures/fail28.json
-- tests/fixtures/pass2.json
-- tests/fixtures/pass16.json
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.3
 requirements: []
 
-authors: 
-- Daniel Luz
-date: 2009-07-03 03:00:00 +00:00
-platform: universal-java-1.6
-test_files: 
-- tests/runner.rb
-version: !ruby/object:Gem::Version 
-  version: 1.1.7
-require_paths: 
-- lib
-dependencies: []
+rubyforge_project: json-jruby
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: A JSON implementation as a JRuby extension
+test_files: []
 
-bindir: bin
-has_rdoc: true

data/tests/runner.rb

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit/ui/console/testrunner'
-require 'test/unit/testsuite'
-$:.unshift File.expand_path(File.dirname($0))
-$:.unshift 'tests'
-require 'test_json'
-require 'test_json_generate'
-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
-    suite = Test::Unit::TestSuite.new name
-    suite << TC_JSONGenerate.suite
-    suite << TC_JSON.suite
-    suite << TC_JSONUnicode.suite
-    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)