From 2516063f61cedf4eee36036a0b4bc9fb8c443ba1 Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Sat, 11 Nov 2006 18:25:26 +0000 Subject: Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/json/encoders/core.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/json') diff --git a/activesupport/lib/active_support/json/encoders/core.rb b/activesupport/lib/active_support/json/encoders/core.rb index d8571be9c8..f6cdfbcde5 100644 --- a/activesupport/lib/active_support/json/encoders/core.rb +++ b/activesupport/lib/active_support/json/encoders/core.rb @@ -51,8 +51,10 @@ module ActiveSupport define_encoder Hash do |hash| returning result = '{' do - result << hash.map do |pair| - pair.map { |value| value.to_json } * ': ' + 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 -- cgit v1.2.3