json 1.6.2-java → 1.6.3-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of json might be problematic. Click here for more details.

Files changed (6) hide show
  1. data/lib/json/common.rb +2 -1
  2. data/lib/json/ext/generator.jar +0 -0
  3. data/lib/json/ext/parser.jar +0 -0
  4. data/lib/json/version.rb +1 -1
  5. data/tests/test_json.rb +1 -0
  6. metadata +3 -3
data/lib/json/common.rb CHANGED
@@ -313,7 +313,8 @@ module JSON
313
313
  source = source.to_io.read
314
314
  elsif source.respond_to?(:read)
315
315
  source = source.read
316
- elsif source.nil? && opts[:quirks_mode]
316
+ end
317
+ if opts[:quirks_mode] && (source.nil? || source.empty?)
317
318
  source = 'null'
318
319
  end
319
320
  result = parse(source, opts)
data/lib/json/ext/generator.jar CHANGED
Binary file
data/lib/json/ext/parser.jar CHANGED
Binary file
data/lib/json/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module JSON
2
2
  # JSON version
3
- VERSION = '1.6.2'
3
+ VERSION = '1.6.3'
4
4
  VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
5
5
  VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
6
6
  VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
data/tests/test_json.rb CHANGED
@@ -427,6 +427,7 @@ EOT
427
427
  stringio.rewind
428
428
  assert_equal @hash, JSON.load(stringio)
429
429
  assert_equal nil, JSON.load(nil)
430
+ assert_equal nil, JSON.load('')
430
431
  end
431
432
 
432
433
  def test_dump
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: json
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.6.2
5
+ version: 1.6.3
6
6
  platform: java
7
7
  authors:
8
8
  - Daniel Luz
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-11-28 00:00:00 Z
13
+ date: 2011-12-01 00:00:00 Z
14
14
  dependencies: []
15
15
 
16
16
  description: A JSON implementation as a JRuby extension.
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
106
106
  requirements: []
107
107
 
108
108
  rubyforge_project: json-jruby
109
- rubygems_version: 1.8.9
109
+ rubygems_version: 1.8.11
110
110
  signing_key:
111
111
  specification_version: 3
112
112
  summary: JSON implementation for JRuby