mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_floats_as_null 

JSON: Encode infinite or NaN floats as `null` to generate valid JSON.
This commit is contained in:
Piotr Sarnacki 2012-04-30 21:06:22 -07:00
parent cb5b0cf93f 7b53d1372d
commit 3cc6995e71
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activesupport/lib/active_support/json/encoding.rb
View File

@ -182,6 +182,10 @@ class Numeric
def encode_json(encoder) to_s end #:nodoc: def encode_json(encoder) to_s end #:nodoc:
end end
class Float
def as_json(options = nil) finite? ? self : NilClass::AS_JSON end #:nodoc:
end
class BigDecimal class BigDecimal
# A BigDecimal would be naturally represented as a JSON number. Most libraries, # A BigDecimal would be naturally represented as a JSON number. Most libraries,
# however, parse non-integer JSON numbers directly as floats. Clients using # however, parse non-integer JSON numbers directly as floats. Clients using

3
activesupport/test/json/encoding_test.rb
View File

@ -27,6 +27,9 @@ class TestJSONEncoding < ActiveSupport::TestCase
NilTests = [[ nil, %(null) ]] NilTests = [[ nil, %(null) ]]
NumericTests = [[ 1, %(1) ], NumericTests = [[ 1, %(1) ],
[ 2.5, %(2.5) ], [ 2.5, %(2.5) ],
[ 0.0/0.0, %(null) ],
[ 1.0/0.0, %(null) ],
[ -1.0/0.0, %(null) ],
[ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s}") ]] [ BigDecimal('2.5'), %("#{BigDecimal('2.5').to_s}") ]]
StringTests = [[ 'this is the <string>', %("this is the \\u003Cstring\\u003E")], StringTests = [[ 'this is the <string>', %("this is the \\u003Cstring\\u003E")],