Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-08-07 | 1 | -0/+7 |
| | | | | | | | | | | Reason: ActiveSupport::JSON::Variable is not used anymore internally. It was deprecated in 3-2-stable but we reverted all the deprecation for point releases. See #6536 and #6546. Conflicts: activesupport/lib/active_support/json/variable.rb | ||||
* | Remove deprecated ActiveSupport::JSON::Variable. | Erich Menge | 2012-05-30 | 1 | -2/+0 |
| | |||||
* | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-29 | 1 | -0/+6 |
| | |||||
* | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵ | David FRANCOIS | 2012-05-02 | 1 | -0/+11 |
| | | | | #6033 | ||||
* | JSON: encode BigDecimal NaN/Infinity as null. | Sebi Burkhard | 2012-05-01 | 1 | -0/+1 |
| | |||||
* | Merge pull request #2532 from ↵ | Piotr Sarnacki | 2012-04-30 | 1 | -0/+3 |
|\ | | | | | | | | | hasclass/as_json__encode_infinite_and_nan_floats_as_null JSON: Encode infinite or NaN floats as `null` to generate valid JSON. | ||||
| * | JSON: Encode infinite or NaN floats as null to generate valid JSON. | Sebi Burkhard | 2011-08-15 | 1 | -0/+3 |
| | | |||||
* | | use AS::TestCase as the base class | Aaron Patterson | 2012-01-05 | 1 | -1/+1 |
| | | |||||
* | | use #to_s to convert Range to json | Sergey Nartimov | 2012-01-01 | 1 | -0/+4 |
| | | |||||
* | | remove checks for encodings availability | Sergey Nartimov | 2011-12-25 | 1 | -2/+2 |
| | | |||||
* | | Initial pass at removing dead 1.8.x code from Active Support. | José Valim | 2011-12-20 | 1 | -17/+13 |
|/ | | | | | | There are a bunch of other implicit branches that adds 1.8.x specific code that still needs to be removed. Pull requests for those cases are welcome. | ||||
* | Removing extra requires from the test. Already loaded in abstract_unit. | Arun Agrawal | 2011-07-31 | 1 | -1/+0 |
| | |||||
* | checked all .rb files in the project tree for missing magic comments, one ↵ | Xavier Noria | 2011-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | was missing Came with this one-liner for this: find . -name '*.rb' | \ xargs chardet | \ grep -v ascii | \ cut -d: -f1 -s | \ xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i' Welcome $_. | ||||
* | Merge pull request #248 from bigfix/enumerable_as_json | José Valim | 2011-05-07 | 1 | -9/+24 |
|\ | | | | | Enumerable should pass encoding options to children in #as_json/#to_json | ||||
| * | Enumerable should pass encoding options to children in #as_json/#to_json. | John Firebaugh | 2011-04-01 | 1 | -9/+24 |
| | | |||||
* | | AS Json parse_error makes a return for backwards compatibility, although it ↵ | Josh Kalderimis | 2011-04-19 | 1 | -1/+1 |
| | | | | | | | | will return MultiJson::DecodeError | ||||
* | | removed AS backends and instead rely on MultiJson for json decoding | Josh Kalderimis | 2011-04-18 | 1 | -7/+4 |
|/ | |||||
* | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 1 | -0/+2 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | test json decoding with time parsing disabled with all backends and respect ↵ | Diego Carrion | 2011-03-22 | 1 | -4/+2 |
| | | | | | | ActiveSupport.parse_json_times when converting to yaml Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Updated the json date regex to recognize xmlschema formatted date times ↵ | Josh Kalderimis | 2011-02-12 | 1 | -0/+4 |
| | | | | | | during json decoding. [#3031 state:resolved] Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com> | ||||
* | Fixes an issue when decoding a json string which looks like a date but is ↵ | Josh Kalderimis | 2011-02-11 | 1 | -0/+2 |
| | | | | | | invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fix tests providing valid JSON | Santiago Pastorino | 2011-02-02 | 1 | -2/+2 |
| | |||||
* | Fix JSON decoding of newline character with Yaml backend [#3479 state:resolved] | Maxime RETY | 2011-02-02 | 1 | -1/+5 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | use ! " " YAML string literal syntax rather than removing both quotes | Aaron Patterson | 2011-01-21 | 1 | -3/+1 |
| | |||||
* | ordering can change depending on ruby version, so parse the JSON and verify ↵ | Aaron Patterson | 2011-01-17 | 1 | -3/+10 |
| | | | | data structure equality | ||||
* | Complex struct encoding test | Alexey Nayden | 2011-01-15 | 1 | -0/+23 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fixed various isolated test missing requires within AS. | Josh Kalderimis | 2011-01-12 | 1 | -0/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | fixed some issues with JSON encoding | Jakub Suder | 2010-09-07 | 1 | -1/+64 |
| | | | | | | | | | | | - as_json in ActiveModel should return a hash and handle :only/:except/:methods options - Array and Hash should call as_json on their elements - json methods should not modify options argument [#5374 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Removes unused vars | Santiago Pastorino | 2010-07-24 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo | Santiago Pastorino | 2010-07-02 | 1 | -2/+4 |
| | | | | | | [#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | BigDecimal#as_json does not really specify the F format, it delegates that ↵ | Xavier Noria | 2010-05-03 | 1 | -1/+3 |
| | | | | to whatever BigDecimal#to_s default format is, do the same in its test | ||||
* | Fix BigDecimal JSON encoding test. [#4495 state:resolved] | Cezary Baginski | 2010-04-28 | 1 | -3/+3 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | JSON: encode objects that don't have a native JSON representation using ↵ | Jeremy Kemper | 2010-04-26 | 1 | -2/+19 |
| | | | | to_hash, if available, instead of instance_values (the old fallback) or to_s (other encoders' default). Encode BigDecimal and Regexp encode as strings to conform with other encoders. Try to transcode non-UTF-8 strings. | ||||
* | Fix a JSON ordering issue | Yehuda Katz | 2010-02-10 | 1 | -3/+7 |
| | |||||
* | Automatically prefer Yajl or JSON backend over Yaml, if available | Jeremy Kemper | 2010-02-05 | 1 | -1/+1 |
| | |||||
* | Add yajl-ruby as a JSON parsing backend | Brian Lopez | 2010-02-05 | 1 | -0/+1 |
| | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f] | Dwayne Litzenberger | 2009-12-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | According to RFC 4627, only the following Unicode code points are allowed unescaped in JSON: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF However, ActiveSupport::JSON did not escape the range %x00-1f. This caused parse errors when trying to decode the resulting output. [#3345 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Repair time dependencies | Jeremy Kemper | 2009-11-14 | 1 | -0/+1 |
| | |||||
* | Clean up spurious JSON decoding test failure | Jeremy Kemper | 2009-09-13 | 1 | -8/+2 |
| | |||||
* | Fix that JSON parser fails to read escaped backslashes. | Daniel Sheppard | 2009-08-09 | 1 | -3/+5 |
| | | | | | | [#973 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fixed a bug in JSON decoding with Yaml backend, where a combination of ↵ | Bas Van Klinkenberg | 2009-08-08 | 1 | -1/+7 |
| | | | | | | dates, escaped or unicode encoded data and arrays would make the parser fail with a ParseError exception. [#2831 state:resolved] Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | JSON.escape returns UTF-8 strings | Jeremy Kemper | 2009-07-01 | 1 | -2/+7 |
| | | | | [#2849 state:resolved] | ||||
* | JSON: split encoding and coercion | Jeremy Kemper | 2009-06-08 | 1 | -7/+12 |
| | |||||
* | load the JSON Backend lazily. If the JSON gem is already loaded, use the ↵ | rick | 2009-05-17 | 1 | -0/+3 |
| | | | | JSONGem backend by default. | ||||
* | Privatize rails_to_json | Jeremy Kemper | 2009-04-26 | 1 | -1/+1 |
| | |||||
* | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 2 | -44/+70 |
| | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end | ||||
* | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 |
| | |||||
* | stdlib autoloads were hanging on 1.9.1 | Jeremy Kemper | 2009-04-22 | 1 | -2/+2 |
| | |||||
* | Explicit test dependencies | Jeremy Kemper | 2009-03-28 | 1 | -0/+1 |
| | |||||
* | Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON ↵ | Ubiratan Pires Alberton | 2009-03-11 | 1 | -1/+3 |
| | | | | | | | | | | decoding tests. Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |