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

1 files changed, 28 insertions, 0 deletions

diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
new file mode 100644
index 0000000000..77253b6dad
--- /dev/null
+++ b/activesupport/test/json/decoding_test.rb
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class TestJSONDecoding < Test::Unit::TestCase
+  TESTS = {
+    %({"returnTo":{"/categories":"/"}})        => {"returnTo" => {"/categories" => "/"}},
+    %({returnTo:{"/categories":"/"}})          => {"returnTo" => {"/categories" => "/"}},
+    %({"return\\"To\\":":{"/categories":"/"}}) => {"return\"To\":" => {"/categories" => "/"}},
+    %({"returnTo":{"/categories":1}})          => {"returnTo" => {"/categories" => 1}},
+    %({"returnTo":[1,"a"]})                    => {"returnTo" => [1, "a"]},
+    %({"returnTo":[1,"\\"a\\",", "b"]})        => {"returnTo" => [1, "\"a\",", "b"]},
+    %([])    => [],
+    %({})    => {},
+    %(1)     => 1,
+    %("")    => "",
+    %("\\"") => "\"",
+    %(null)  => nil,
+    %(true)  => true,
+    %(false) => false
+  }
+  
+  def test_json_decoding
+    TESTS.each do |json, expected|
+      assert_nothing_raised do
+        assert_equal expected, ActiveSupport::JSON.decode(json)
+      end
+    end
+  end
+end