aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json
Commit message (Collapse)AuthorAgeFilesLines
* Merge docrailsPratik Naik2009-01-183-3/+3
|
* Properly quote json keys.Michael Koziarski2009-01-161-2/+2
| | | | | According to the RFC and the json.org site all json keys must be strings, and those strings must be quoted with double quotes. [#1755 state:committed]
* Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵Pratik Naik2009-01-071-1/+1
| | | | Strother]
* Simpler and clearer to just explicitly require the JSON encodersJeremy Kemper2008-11-261-9/+15
|
* Eliminate thread-local circular reference stack by passing it as an argument ↵Jeremy Kemper2008-11-231-20/+8
| | | | instead
* Merge with docrails.Pratik Naik2008-07-163-7/+28
|
* Slightly faster DateTime#to_json. [#598 state:resolved] [Alex Zepeda]Pratik Naik2008-07-141-1/+1
|
* Merge docrails.Pratik Naik2008-05-251-1/+1
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Time#to_json: don't convert to utc before encoding. References #175gbuesing2008-05-181-1/+1
|
* Add config.active_support.escape_html_entities_in_json to allow disabling of ↵Rick Olson2008-04-082-2/+5
| | | | | | html entity escaping. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9238 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add config.active_support.use_standard_json_time_format setting so that ↵Rick Olson2008-04-013-3/+15
| | | | | | Times and Dates export to ISO 8601 dates. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Force json string encoding to ASCII-8BIT before unpacking for Ruby 1.9.Josh Peek2008-03-291-2/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9138 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Improve documentation.Pratik Naik2008-03-266-12/+24
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9093 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset ↵Geoff Buesing2008-01-231-1/+1
| | | | | | strings with cross-platform consistency git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8698 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Time#to_json uses Numeric#to_utc_offset_s to output ↵Geoff Buesing2008-01-121-1/+1
| | | | | | cross-platform-consistent representation without having to convert to DateTime. References #9750 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8636 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* remove multiple enumerations from ActiveSupport::JSON#convert_json_to_yaml ↵Rick Olson2007-12-281-5/+8
| | | | | | when dealing with date/time values. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Don't escape forward slashes with String#to_json, our unicode encoding of < ↵Michael Koziarski2007-12-021-3/+2
| | | | | | and > prevent the XSS problems. [tpope] Closes #10273 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8255 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Change JSON to encode %w(< > &) as 4 digit hex codes to be in compliance ↵Rick Olson2007-10-291-3/+4
| | | | | | with the JSON spec. Closes #9975 [josh, chuyeow, tpope] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8050 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix JSON encoding/decoding bugs dealing with /'s. Closes #9990 [Rick, ↵Rick Olson2007-10-262-10/+12
| | | | | | theamazingrando] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8026 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add an ignored options parameter to ActiveSupport::JSON::Variable#to_json to ↵Michael Koziarski2007-10-251-1/+1
| | | | | | make sure it duck-types nicely with the other JSON types. [Pascal Belloncle] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8013 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Document Enumerable and Hash #to_json. Add test for hash with integer key. ↵Jeremy Kemper2007-10-242-0/+39
| | | | | | Closes #9970. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8010 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Don't shadow local var with block varJeremy Kemper2007-10-131-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Disambiguate Time, Date, and DateTime#to_json formatting. Closes #9750.Jeremy Kemper2007-10-053-3/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7746 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Hash#to_json takes :only or :except options to specific or omit certain hash ↵Jeremy Kemper2007-10-0414-24/+28
| | | | | | keys. Enumerable#to_json passes through its options to each element. Closes #9751. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed JSON encoding to use quoted keys according to the JSON standard ↵David Heinemeier Hansson2007-09-303-15/+1
| | | | | | (closes #8762) [choonkat/chuyeow] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* JSON decoding Ruby 1.9 compat. Mark a section that's unnecessarily slow.Jeremy Kemper2007-09-291-5/+6
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Decode json strings as Dates/Times if they're using a YAML-compatible ↵Rick Olson2007-09-241-5/+18
| | | | | | format. Closes #9614 [Rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7613 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix JSON decoder with nested quotes and commas. Closes #9579.Jeremy Kemper2007-09-171-4/+9
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7506 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* escape <'s and >'s in JSON strings. #8371 [Rick]Rick Olson2007-05-291-2/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6893 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Date, Time, and DateTime#to_json. Closes #8399.Jeremy Kemper2007-05-183-0/+15
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6773 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Silence some warnings.Jeremy Kemper2007-05-181-2/+7
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6772 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Refactor ActiveSupport::JSON to be less obtuse. Add support for JSON ↵Sam Stephenson2007-03-1815-93/+179
| | | | | | decoding by way of Syck with ActiveSupport::JSON.decode(json_string). Prevent hash keys that are JavaScript reserved words from being unquoted during encoding. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers.Sam Stephenson2006-11-111-2/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix unicode JSON regexp for Onigurama compatibility. Closes #6494.Jeremy Kemper2006-11-051-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5432 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Greatly increased performance of String.to_json, which speeds up RJS ↵Thomas Fuchs2006-08-181-16/+17
| | | | | | considerably on large pages, fixes #3473 [Shugo Maeda] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4787 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fixed docsDavid Heinemeier Hansson2006-03-281-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4081 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* RJS now does enumerations, baby! (closes #3876) [Rick Olson]David Heinemeier Hansson2006-03-031-0/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3754 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add ActiveSupport::JSON and Object#to_json for converting Ruby objects to ↵Sam Stephenson2005-12-272-0/+86
JSON strings git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3356 5ecf4fe2-1ee6-0310-87b1-e25e094e27de