json-jruby 1.4.1-universal-java-1.6 → 1.4.3-universal-java-1.6

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.4.1'
+  VERSION         = '1.4.3'
   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

@@ -173,7 +173,18 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal({'foo'=>'bar'}, parse('    { "foo"  :   "bar"   }   '))
   end
 
-  class SubHash < Hash; end
+  class SubHash < Hash
+    def to_json(*a)
+      {
+        JSON.create_id => self.class.name,
+      }.merge(self).to_json(*a)
+    end
+
+    def self.json_create(o)
+      o.delete JSON.create_id
+      new.merge(o)
+    end
+  end
 
   def test_parse_object_custom_class
     res = parse('{}', :object_class => SubHash)
@@ -181,6 +192,16 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal(SubHash, res.class)
   end
 
+  def test_generation_of_core_subclasses
+    obj = SubHash.new.merge( "foo" => SubHash.new.merge("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 obj_again['foo']['bar']
+    assert_equal obj, obj_again
+  end
+
   def test_parser_reset
     parser = Parser.new(@json)
     assert_equal(@hash, parser.parse)

data/tests/test_json_addition.rb

@@ -151,12 +151,12 @@ class TC_JSONAddition < Test::Unit::TestCase
   def test_utc_datetime
     now = Time.now
     d = DateTime.parse(now.to_s)                    # usual case
-    assert d, JSON.parse(d.to_json)
+    assert_equal d, JSON.parse(d.to_json)
     d = DateTime.parse(now.utc.to_s)                # of = 0
-    assert d, JSON.parse(d.to_json)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, 1)  # of = 1 / 12 => 1/12
-    assert d, JSON.parse(d.to_json)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, 12) # of = 12 / 12 => 12
-    assert d, JSON.parse(d.to_json)
+    assert_equal d, JSON.parse(d.to_json)
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
+    assert_equal d, JSON.parse(d.to_json)
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
+    assert_equal d, JSON.parse(d.to_json)
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 4
-    - 1
-  version: 1.4.1
+    - 3
+  version: 1.4.3
 platform: universal-java-1.6
 authors: 
   - Daniel Luz
@@ -14,12 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -03:00
+date: 2010-05-06 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
-description: 
-email: mernen+rubyforge@gmail.com
+description: A JSON implementation as a JRuby extension.
+email: dev+ruby@mernen.com
 executables: []
 
 extensions: []
@@ -78,7 +78,7 @@ files:
   - tests/fixtures/pass26.json
   - tests/fixtures/pass3.json
 has_rdoc: true
-homepage: http://rubyforge.org/projects/json-jruby/
+homepage: http://json-jruby.rubyforge.org/
 licenses: []
 
 post_install_message: 
@@ -106,6 +106,6 @@ rubyforge_project: json-jruby
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: A JSON implementation as a JRuby extension
+summary: JSON implementation for JRuby
 test_files: []