0
@@ -209,19 +209,19 @@ class RenderTest < Test::Unit::TestCase
0
 
0
   def test_do_with_render_json
0
     get :render_json_hello_world
0
-    assert_equal '{hello: "world"}', @response.body
0
+    assert_equal '{"hello": "world"}', @response.body
0
     assert_equal 'application/json', @response.content_type
0
   end
0
 
0
   def test_do_with_render_json_with_callback
0
     get :render_json_hello_world_with_callback
0
-    assert_equal 'alert({hello: "world"})', @response.body
0
+    assert_equal 'alert({"hello": "world"})', @response.body
0
     assert_equal 'application/json', @response.content_type
0
   end
0
 
0
   def test_do_with_render_symbol_json
0
     get :render_symbol_json
0
-    assert_equal '{hello: "world"}', @response.body
0
+    assert_equal '{"hello": "world"}', @response.body
0
     assert_equal 'application/json', @response.content_type
0
   end
0
 

0
@@ -8,9 +8,6 @@ require 'fixtures/comment'
0
 
0
 class JsonSerializationTest < Test::Unit::TestCase
0
   def setup
0
-    # Quote all keys (so that we can test against strictly valid JSON).
0
-    ActiveSupport::JSON.unquote_hash_key_identifiers = false
0
-
0
     @contact = Contact.new(
0
       :name        => 'Konata Izumi',
0
       :age         => 16,
0
@@ -70,8 +67,6 @@ class DatabaseConnectedJsonEncodingTest < Test::Unit::TestCase
0
   fixtures :authors, :posts, :comments, :tags, :taggings
0
 
0
   def setup
0
-    ActiveSupport::JSON.unquote_hash_key_identifiers = false
0
-
0
     @david = authors(:david)
0
   end
0
 

0
@@ -1,5 +1,7 @@
0
 *2.0.0 [Preview Release]* (September 29th, 2007)
0
 
0
+* Fixed JSON encoding to use quoted keys according to the JSON standard #8762 [choonkat/chuyeow]
0
+
0
 * Alias Object#send to send! for Ruby 1.9 forward compatibility.  [Jeremy Kemper]
0
 
0
 * Backport Object#instance_variable_defined? for Ruby < 1.8.6.  [Jeremy Kemper]

0
@@ -2,8 +2,6 @@ class Hash
0
   def to_json #:nodoc:
0
     returning result = '{' do
0
       result << map do |key, value|
0
-        key = ActiveSupport::JSON::Variable.new(key.to_s) if 
0
-          ActiveSupport::JSON.can_unquote_identifier?(key)
0
         "#{ActiveSupport::JSON.encode(key)}: #{ActiveSupport::JSON.encode(value)}"
0
       end * ', '
0
       result << '}'

0
@@ -10,13 +10,6 @@ end
0
 
0
 module ActiveSupport
0
   module JSON
0
-    # When +true+, Hash#to_json will omit quoting string or symbol keys
0
-    # if the keys are valid JavaScript identifiers.  Note that this is
0
-    # technically improper JSON (all object keys must be quoted), so if
0
-    # you need strict JSON compliance, set this option to +false+.
0
-    mattr_accessor :unquote_hash_key_identifiers
0
-    @@unquote_hash_key_identifiers = true
0
-
0
     class CircularReferenceError < StandardError
0
     end
0
 
0
@@ -30,11 +23,6 @@ module ActiveSupport
0
         end
0
       end
0
 
0
-      def can_unquote_identifier?(key) #:nodoc:
0
-        unquote_hash_key_identifiers && 
0
-          ActiveSupport::JSON.valid_identifier?(key)
0
-      end
0
-
0
       protected
0
         def raise_on_circular_reference(value) #:nodoc:
0
           stack = Thread.current[REFERENCE_STACK_VARIABLE] ||= []

0
@@ -1,6 +1,6 @@
0
 module ActiveSupport
0
   module JSON
0
-    # A string that returns itself as as its JSON-encoded form.
0
+    # A string that returns itself as its JSON-encoded form.
0
     class Variable < String
0
       def to_json
0
         self

0
@@ -41,21 +41,12 @@ class TestJSONEncoding < Test::Unit::TestCase
0
     end
0
   end
0
 
0
-  def setup
0
-    unquote(false)
0
-  end
0
-  
0
-  def teardown
0
-    unquote(true)
0
-  end
0
-  
0
   def test_hash_encoding
0
     assert_equal %({\"a\": \"b\"}), { :a => :b }.to_json
0
     assert_equal %({\"a\": 1}), { 'a' => 1  }.to_json
0
     assert_equal %({\"a\": [1, 2]}), { 'a' => [1,2] }.to_json
0
-    
0
-    sorted_json  = 
0
-      '{' + {:a => :b, :c => :d}.to_json[1..-2].split(', ').sort.join(', ') + '}'
0
+
0
+    sorted_json = '{' + {:a => :b, :c => :d}.to_json[1..-2].split(', ').sort.join(', ') + '}'
0
     assert_equal %({\"a\": \"b\", \"c\": \"d\"}), sorted_json
0
   end
0
 
0
@@ -72,29 +63,14 @@ class TestJSONEncoding < Test::Unit::TestCase
0
     a << a
0
     assert_raises(ActiveSupport::JSON::CircularReferenceError) { a.to_json }
0
   end
0
-  
0
-  def test_unquote_hash_key_identifiers
0
+
0
+  def test_hash_key_identifiers_are_always_quoted
0
     values = {0 => 0, 1 => 1, :_ => :_, "$" => "$", "a" => "a", :A => :A, :A0 => :A0, "A0B" => "A0B"}
0
     assert_equal %w( "$" "A" "A0" "A0B" "_" "a" 0 1 ), object_keys(values.to_json)
0
-    unquote(true) { assert_equal %w( $ 0 1 A A0 A0B _ a ), object_keys(values.to_json) }
0
   end
0
-  
0
-  def test_unquote_hash_key_identifiers_ignores_javascript_reserved_words
0
-    values = {"hello" => "world", "this" => "that", "with" => "foo"}
0
-    unquote(true) { assert_equal %w( "this" "with" hello ), object_keys(values.to_json) }
0
-  end
0
-  
0
+
0
   protected
0
-    def unquote(value)
0
-      previous_value = ActiveSupport::JSON.unquote_hash_key_identifiers
0
-      ActiveSupport::JSON.unquote_hash_key_identifiers = value
0
-      yield if block_given?
0
-    ensure
0
-      ActiveSupport::JSON.unquote_hash_key_identifiers = previous_value if block_given?
0
-    end
0
-    
0
     def object_keys(json_object)
0
       json_object[1..-2].scan(/([^{}:,\s]+):/).flatten.sort
0
     end
0
-    
0
 end