json 1.4.3-java → 1.4.4-java

data/lib/json/pure/parser.rb

@@ -70,24 +70,25 @@ module JSON
       # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
           if defined?(::Encoding)
-            if source.encoding == Encoding::ASCII_8BIT
+            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)
+                         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)
+                         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)
+                         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)
+                         source.dup.force_encoding(::Encoding::UTF_16LE).encode!(::Encoding::UTF_8)
                        else
                          source.dup
                        end
             else
-              source = source.encode(Encoding::UTF_8)
+              source = source.encode(::Encoding::UTF_8)
             end
-            source.force_encoding(Encoding::ASCII_8BIT)
+            source.force_encoding(::Encoding::ASCII_8BIT)
           else
             b = source
             source = case
@@ -180,7 +181,7 @@ module JSON
             end
           end
           if string.respond_to?(:force_encoding)
-            string.force_encoding(Encoding::UTF_8)
+            string.force_encoding(::Encoding::UTF_8)
           end
           string
         else

data/lib/json/version.rb

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

data/tests/test_json.rb

@@ -160,6 +160,20 @@ class TC_JSON < Test::Unit::TestCase
 
   class SubArray < Array; end
 
+  class SubArray2 < Array
+    def to_json(*a)
+      {
+        JSON.create_id => self.class.name,
+        'ary'          => to_a,
+      }.to_json(*a)
+    end
+
+    def self.json_create(o)
+      o.delete JSON.create_id
+      o['ary']
+    end
+  end
+
   def test_parse_array_custom_class
     res = parse('[]', :array_class => SubArray)
     assert_equal([], res)
@@ -174,6 +188,9 @@ class TC_JSON < Test::Unit::TestCase
   end
 
   class SubHash < Hash
+  end
+
+  class SubHash2 < Hash
     def to_json(*a)
       {
         JSON.create_id => self.class.name,
@@ -182,22 +199,38 @@ class TC_JSON < Test::Unit::TestCase
 
     def self.json_create(o)
       o.delete JSON.create_id
-      new.merge(o)
+      self[o]
     end
   end
 
   def test_parse_object_custom_class
-    res = parse('{}', :object_class => SubHash)
+    res = parse('{}', :object_class => SubHash2)
     assert_equal({}, res)
-    assert_equal(SubHash, res.class)
+    assert_equal(SubHash2, res.class)
+  end
+
+  def test_generation_of_core_subclasses_with_new_to_json
+    obj = SubHash2["foo" => SubHash2["bar" => true]]
+    obj_json = JSON(obj)
+    obj_again = JSON(obj_json)
+    assert_kind_of SubHash2, obj_again
+    assert_kind_of SubHash2, obj_again['foo']
+    assert obj_again['foo']['bar']
+    assert_equal obj, obj_again
+    assert_equal ["foo"], JSON(JSON(SubArray2["foo"]))
+  end
+
+  def test_generation_of_core_subclasses_with_default_to_json
+    assert_equal '{"foo":"bar"}', JSON(SubHash["foo" => "bar"])
+    assert_equal '["foo"]', JSON(SubArray["foo"])
   end
 
   def test_generation_of_core_subclasses
-    obj = SubHash.new.merge( "foo" => SubHash.new.merge("bar" => true))
+    obj = SubHash["foo" => SubHash["bar" => true]]
     obj_json = JSON(obj)
     obj_again = JSON(obj_json)
-    assert_kind_of SubHash, obj_again
-    assert_kind_of SubHash, obj_again['foo']
+    assert_kind_of Hash, obj_again
+    assert_kind_of Hash, obj_again['foo']
     assert obj_again['foo']['bar']
     assert_equal obj, obj_again
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 4
-    - 3
-  version: 1.4.3
+    - 4
+  version: 1.4.4
 platform: java
 authors: 
   - Daniel Luz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 -05:00
+date: 2010-08-06 00:00:00 -05:00
 default_executable: 
 dependencies: []