json 1.6.2-java → 1.6.3-java

data/lib/json/common.rb

@@ -313,7 +313,8 @@ module JSON
       source = source.to_io.read
     elsif source.respond_to?(:read)
       source = source.read
-    elsif source.nil? && opts[:quirks_mode]
+    end
+    if opts[:quirks_mode] && (source.nil? || source.empty?)
       source = 'null'
     end
     result = parse(source, opts)

data/lib/json/version.rb

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

@@ -427,6 +427,7 @@ EOT
     stringio.rewind
     assert_equal @hash, JSON.load(stringio)
     assert_equal nil, JSON.load(nil)
+    assert_equal nil, JSON.load('')
   end
 
   def test_dump

metadata

@@ -2,7 +2,7 @@
 name: json
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.2
+  version: 1.6.3
 platform: java
 authors: 
   - Daniel Luz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: []
 
 description: A JSON implementation as a JRuby extension.
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: json-jruby
-rubygems_version: 1.8.9
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: JSON implementation for JRuby