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/core.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/core.rb')
-rw-r--r-- | activesupport/lib/active_support/json/encoders/core.rb | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/activesupport/lib/active_support/json/encoders/core.rb b/activesupport/lib/active_support/json/encoders/core.rb deleted file mode 100644 index f6cdfbcde5..0000000000 --- a/activesupport/lib/active_support/json/encoders/core.rb +++ /dev/null @@ -1,68 +0,0 @@ -module ActiveSupport - module JSON #:nodoc: - module Encoders #:nodoc: - define_encoder Object do |object| - object.instance_values.to_json - end - - define_encoder TrueClass do - 'true' - end - - define_encoder FalseClass do - 'false' - end - - define_encoder NilClass do - 'null' - end - - ESCAPED_CHARS = { - "\010" => '\b', - "\f" => '\f', - "\n" => '\n', - "\r" => '\r', - "\t" => '\t', - '"' => '\"', - '\\' => '\\\\' - } - - define_encoder String do |string| - '"' + string.gsub(/[\010\f\n\r\t"\\]/) { |s| - ESCAPED_CHARS[s] - }.gsub(/([\xC0-\xDF][\x80-\xBF]| - [\xE0-\xEF][\x80-\xBF]{2}| - [\xF0-\xF7][\x80-\xBF]{3})+/nx) { |s| - s.unpack("U*").pack("n*").unpack("H*")[0].gsub(/.{4}/, '\\\\u\&') - } + '"' - end - - define_encoder Numeric do |numeric| - numeric.to_s - end - - define_encoder Symbol do |symbol| - symbol.to_s.to_json - end - - define_encoder Enumerable do |enumerable| - "[#{enumerable.map { |value| value.to_json } * ', '}]" - end - - define_encoder Hash do |hash| - returning result = '{' do - result << hash.map do |key, value| - key = ActiveSupport::JSON::Variable.new(key.to_s) if - ActiveSupport::JSON.can_unquote_identifier?(key) - "#{key.to_json}: #{value.to_json}" - end * ', ' - result << '}' - end - end - - define_encoder Regexp do |regexp| - regexp.inspect - end - end - end -end |