diff options
author | Sam Stephenson <sam@37signals.com> | 2007-03-18 07:05:58 +0000 |
---|---|---|
committer | Sam Stephenson <sam@37signals.com> | 2007-03-18 07:05:58 +0000 |
commit | 3202fbabe6df3591d7e2c35727ea9c8b68df8828 (patch) | |
tree | c55f19f82564280e074d9aca449ee4848a97f158 /activesupport/lib/active_support/json/encoders/hash.rb | |
parent | 3d5c947155934fb498f8788a204ae9f2e03f2f42 (diff) | |
download | rails-3202fbabe6df3591d7e2c35727ea9c8b68df8828.tar.gz rails-3202fbabe6df3591d7e2c35727ea9c8b68df8828.tar.bz2 rails-3202fbabe6df3591d7e2c35727ea9c8b68df8828.zip |
Refactor ActiveSupport::JSON to be less obtuse. Add support for JSON 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
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/hash.rb')
-rw-r--r-- | activesupport/lib/active_support/json/encoders/hash.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/encoders/hash.rb b/activesupport/lib/active_support/json/encoders/hash.rb new file mode 100644 index 0000000000..3654e10b2e --- /dev/null +++ b/activesupport/lib/active_support/json/encoders/hash.rb @@ -0,0 +1,12 @@ +class Hash + def to_json #:nodoc: + returning result = '{' do + result << map do |key, value| + key = ActiveSupport::JSON::Variable.new(key.to_s) if + ActiveSupport::JSON.can_unquote_identifier?(key) + "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(value)}" + end * ', ' + result << '}' + end + end +end |