Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix dependencies revealed by testing in isolation | Jeremy Kemper | 2009-04-22 | 1 | -0/+2 |
| | |||||
* | stdlib autoloads were hanging on 1.9.1 | Jeremy Kemper | 2009-04-22 | 1 | -4/+2 |
| | |||||
* | Autoload YAML and StringScanner for JSON decoding | Jeremy Kemper | 2009-04-17 | 1 | -2/+2 |
| | |||||
* | Explicit dependency on Object#instance_values extension | Jeremy Kemper | 2009-03-28 | 1 | -0/+2 |
| | |||||
* | Explicit dependency on Array#wrap extension | Jeremy Kemper | 2009-03-28 | 1 | -0/+2 |
| | |||||
* | Explicit dependency on String#start_with? extension | Jeremy Kemper | 2009-03-28 | 1 | -3/+5 |
| | |||||
* | Reverted affe50105f7027a44eb6e9cfb56f5b3fc070b19b and added more JSON ↵ | Ubiratan Pires Alberton | 2009-03-11 | 1 | -1/+10 |
| | | | | | | | | | | decoding tests. Works on Ruby 1.8 and 1.9 [#1100 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Remove untested part from 9b9b2937ce3bef3bca9d22821e76c40cc74fa689 | Pratik Naik | 2009-03-10 | 1 | -10/+2 |
| | |||||
* | Properly decode \u escape sequences in JSON [#1100 state:resolved] [Tim ↵ | Tim Pope | 2009-03-10 | 1 | -3/+20 |
| | | | | | | Pope, Philip Hallstrom] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ruby 1.9 compat: fix JSON decoding to work properly with multibyte values | Akira Matsuda | 2009-02-17 | 1 | -2/+3 |
| | | | | | | [#1969 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Use Array.wrap, remove unneeded returning block | Jeremy Kemper | 2009-02-06 | 1 | -10/+9 |
| | |||||
* | Merge docrails | Pratik Naik | 2009-01-18 | 3 | -3/+3 |
| | |||||
* | Properly quote json keys. | Michael Koziarski | 2009-01-16 | 1 | -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 Naik | 2009-01-07 | 1 | -1/+1 |
| | | | | Strother] | ||||
* | Simpler and clearer to just explicitly require the JSON encoders | Jeremy Kemper | 2008-11-26 | 1 | -9/+15 |
| | |||||
* | Eliminate thread-local circular reference stack by passing it as an argument ↵ | Jeremy Kemper | 2008-11-23 | 1 | -20/+8 |
| | | | | instead | ||||
* | Merge with docrails. | Pratik Naik | 2008-07-16 | 3 | -7/+28 |
| | |||||
* | Slightly faster DateTime#to_json. [#598 state:resolved] [Alex Zepeda] | Pratik Naik | 2008-07-14 | 1 | -1/+1 |
| | |||||
* | Merge docrails. | Pratik Naik | 2008-05-25 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Time#to_json: don't convert to utc before encoding. References #175 | gbuesing | 2008-05-18 | 1 | -1/+1 |
| | |||||
* | Add config.active_support.escape_html_entities_in_json to allow disabling of ↵ | Rick Olson | 2008-04-08 | 2 | -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 Olson | 2008-04-01 | 3 | -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 Peek | 2008-03-29 | 1 | -2/+4 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9138 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Improve documentation. | Pratik Naik | 2008-03-26 | 6 | -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 Buesing | 2008-01-23 | 1 | -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 Buesing | 2008-01-12 | 1 | -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 Olson | 2007-12-28 | 1 | -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 Koziarski | 2007-12-02 | 1 | -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 Olson | 2007-10-29 | 1 | -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 Olson | 2007-10-26 | 2 | -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 Koziarski | 2007-10-25 | 1 | -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 Kemper | 2007-10-24 | 2 | -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 var | Jeremy Kemper | 2007-10-13 | 1 | -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 Kemper | 2007-10-05 | 3 | -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 Kemper | 2007-10-04 | 14 | -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 Hansson | 2007-09-30 | 3 | -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 Kemper | 2007-09-29 | 1 | -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 Olson | 2007-09-24 | 1 | -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 Kemper | 2007-09-17 | 1 | -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 Olson | 2007-05-29 | 1 | -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 Kemper | 2007-05-18 | 3 | -0/+15 |
| | | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6773 5ecf4fe2-1ee6-0310-87b1-e25e094e27de | ||||
* | Silence some warnings. | Jeremy Kemper | 2007-05-18 | 1 | -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 Stephenson | 2007-03-18 | 15 | -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 Stephenson | 2006-11-11 | 1 | -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 Kemper | 2006-11-05 | 1 | -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 Fuchs | 2006-08-18 | 1 | -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 docs | David Heinemeier Hansson | 2006-03-28 | 1 | -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 Hansson | 2006-03-03 | 1 | -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 Stephenson | 2005-12-27 | 2 | -0/+86 |
JSON strings git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3356 5ecf4fe2-1ee6-0310-87b1-e25e094e27de |