Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | `#as_json` isolates options when encoding a hash. Closes #8182 | Yves Senn | 2012-11-12 | 1 | -1/+1 |
| | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash. | ||||
* | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 1 | -1/+1 |
| | |||||
* | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 1 | -2/+3 |
| | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | ||||
* | update AS/json docs [ci skip] | Francesco Rodriguez | 2012-09-14 | 2 | -12/+20 |
| | |||||
* | Add back missing require | Rafael Mendonça França | 2012-08-07 | 1 | -0/+1 |
| | |||||
* | Fix the deprecation horizon. [ci skip] | Rafael Mendonça França | 2012-08-07 | 1 | -1/+1 |
| | |||||
* | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-08-07 | 1 | -0/+17 |
| | | | | | | | | | | 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 | ||||
* | fixing :nodoc:s in AS::JSON::Encoding | Francesco Rodriguez | 2012-07-21 | 1 | -15/+48 |
| | |||||
* | Document ActiveSupport::JSON.parse_error [ci skip] | Mark Rushakoff | 2012-06-05 | 1 | -0/+8 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-02 | 1 | -1/+1 |
|\ | |||||
| * | Fix typo [ci skip] | Erich Menge | 2012-05-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6554 from erichmenge/remove-json-variable | Piotr Sarnacki | 2012-05-30 | 2 | -10/+0 |
|\ \ | |/ |/| | Remove deprecated ActiveSupport::JSON::Variable. | ||||
| * | Remove deprecated ActiveSupport::JSON::Variable. | Erich Menge | 2012-05-30 | 2 | -10/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 2 | -1/+9 |
|\ \ | |/ |/| | |||||
| * | add ActiveSupport::JSON.decode documentation [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -0/+5 |
| | | |||||
| * | add example to ActiveSupport::JSON.encode [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -1/+4 |
| | | |||||
* | | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-29 | 1 | -9/+9 |
|/ | |||||
* | Since escape_html_entities_in_json was moved to 3-2-stable, make it true in ↵ | José Valim | 2012-05-14 | 1 | -1/+1 |
| | | | | AS, closes #6287 | ||||
* | BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ↵ | David FRANCOIS | 2012-05-02 | 1 | -1/+14 |
| | | | | #6033 | ||||
* | JSON: encode BigDecimal NaN/Infinity as null. | Sebi Burkhard | 2012-05-01 | 1 | -1/+3 |
| | |||||
* | Merge pull request #2532 from ↵ | Piotr Sarnacki | 2012-04-30 | 1 | -0/+4 |
|\ | | | | | | | | | 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/+4 |
| | | |||||
* | | fixed broken build after multi_json upgrade | Arun Agrawal | 2012-04-16 | 1 | -3/+3 |
| | | | | | | Multi_json also upgraded. | ||||
* | | Replaced OrderedHash usage with Ruby 1.9 Hash | Uddhava | 2012-02-09 | 1 | -3/+1 |
| | | |||||
* | | fixes in api docs | Vijay Dev | 2012-01-13 | 1 | -2/+2 |
| | | |||||
* | | Remove Array.wrap calls in ActiveSupport | Rafael Mendonça França | 2012-01-06 | 1 | -3/+2 |
| | | |||||
* | | 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 | -5/+3 |
| | | |||||
* | | Revert "Implement ArraySerializer and move old serialization API to a new ↵ | José Valim | 2011-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb | ||||
* | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The following constants were renamed: ActiveModel::Serialization => ActiveModel::Serializable ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON ActiveModel::Serializers::Xml => ActiveModel::Serializable::XML The main motivation for such a change is that `ActiveModel::Serializers::JSON` was not actually a serializer, but a module that when included allows the target to be serializable to JSON. With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer. | ||||
* | | Set the default options value for as_json in the encoder object. | José Valim | 2011-09-30 | 1 | -2/+2 |
|/ | |||||
* | Removed deprecated methods and related tests from ActiveSupport | Josh Kalderimis | 2011-05-25 | 1 | -3/+0 |
| | |||||
* | Use set data structure to speed up circular reference checks on large/deeply ↵ | Andy Lindeman | 2011-05-23 | 1 | -4/+4 |
| | | | | nested objects | ||||
* | add missing require for ordered_hash dependency | Corin Langosch | 2011-05-11 | 1 | -0/+1 |
| | |||||
* | Merge pull request #248 from bigfix/enumerable_as_json | José Valim | 2011-05-07 | 1 | -1/+3 |
|\ | | | | | 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 | -1/+3 |
| | | |||||
* | | AS Json parse_error makes a return for backwards compatibility, although it ↵ | Josh Kalderimis | 2011-04-19 | 1 | -0/+4 |
| | | | | | | | | will return MultiJson::DecodeError | ||||
* | | removed AS backends and instead rely on MultiJson for json decoding | Josh Kalderimis | 2011-04-18 | 4 | -227/+33 |
|/ | |||||
* | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 1 | -2/+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 | -3/+5 |
| | | | | | | 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 | -1/+1 |
| | | | | | | 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 | 3 | -3/+21 |
| | | | | | | 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 JSON decoding of newline character with Yaml backend [#3479 state:resolved] | Maxime RETY | 2011-02-02 | 1 | -2/+6 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | use ! " " YAML string literal syntax rather than removing both quotes | Aaron Patterson | 2011-01-21 | 1 | -4/+4 |
| | |||||
* | Complex struct encoding fix | Alexey Nayden | 2011-01-15 | 1 | -0/+6 |
| | | | | | | [#6077 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | add Psych::SyntaxError to the list of rescued YAML exceptions | Aaron Patterson | 2011-01-04 | 1 | -1/+8 |
| | |||||
* | Perf: speed up json encoding. | Emilio Tagua | 2010-09-22 | 1 | -3/+2 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | fixed some issues with JSON encoding | Jakub Suder | 2010-09-07 | 1 | -6/+44 |
| | | | | | | | | | | | - 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> | ||||
* | Move Date#xmlschema to conversions and add a missing require | Santiago Pastorino | 2010-07-04 | 1 | -0/+2 |
| |