handle all escape characters listed in json spec

Author: ellemenno

lib/src/pixeldroid/json/JsonPrinter.ls

@@ -43,8 +43,17 @@ package pixeldroid.json
         {
             var result:String = s;
 
-            result = result.split('\n').join('\\n');
+            result = result.split('\\').join('\\\\'); // expand backslash before others
+
             result = result.split('"').join('\\"');
+            result = result.split('\/').join('\\/');
+            result = result.split('\b').join('\\b');
+            result = result.split('\f').join('\\f');
+            result = result.split('\f').join('\\f');
+            result = result.split('\n').join('\\n');
+            result = result.split('\r').join('\\r');
+            result = result.split('\t').join('\\t');
+            result = result.split('\u').join('\\u');
 
             return '"' +result +'"';
         }

lib/src/pixeldroid/json/YamlPrinter.ls

@@ -54,8 +54,17 @@ package pixeldroid.json
         {
             var result:String = s;
 
-            result = result.split('\n').join('\\n');
+            result = result.split('\\').join('\\\\'); // expand backslash before others
+
             result = result.split('"').join('\\"');
+            result = result.split('\/').join('\\/');
+            result = result.split('\b').join('\\b');
+            result = result.split('\f').join('\\f');
+            result = result.split('\f').join('\\f');
+            result = result.split('\n').join('\\n');
+            result = result.split('\r').join('\\r');
+            result = result.split('\t').join('\\t');
+            result = result.split('\u').join('\\u');
 
             return '"' +result +'"';
         }

test/fixtures/json.json

@@ -3,6 +3,19 @@
    "key_bool_true": true,
    "key_bool_false": false,
    "key_string": "abcdefg ABCDEFG 0123_4567",
+   "key_string_escapes": {
+      "quotation_mark":  "\"",
+      "reverse_solidus": "\\",
+      "solidus":         "\/",
+      "backspace":       "\b",
+      "formfeed":        "\f",
+      "newline":         "\n",
+      "carriage_return": "\r",
+      "horizontal_tab":  "\t",
+      "unicode_smily":   "\u263A",
+      "two_backslashes": "\\\\",
+      "quoted_backslash": "\"\\\""
+   },
    "key_number_integer": 1234,
    "key_number_real": 0.9876,
    "key_empty_array": [],

test/src/spec/JsonPrinterSpec.ls

@@ -11,15 +11,11 @@ package
     public static class JsonPrinterSpec
     {
         private static var it:Thing;
-        private static var json:Json;
+        private static var _jsonFixture:Json;
 
         public static function specify(specifier:Spec):void
         {
             it = specifier.describe('JsonPrinter');
-            var jsonFile:String = 'fixtures/json.json';
-            var jsonString:String = File.loadTextFile(jsonFile);
-
-            json = Json.fromString(jsonString);
 
             it.should('generate a valid JSON string', be_valid_json);
             it.should('generate a valid JSON string with compact formatting', be_valid_when_compact);
@@ -28,8 +24,21 @@ package
         }
 
 
+        private static function get jsonFixture():Json
+        {
+            if (!_jsonFixture)
+            {
+                var jsonFile:String = 'fixtures/json.json';
+                var jsonString:String = File.loadTextFile(jsonFile);
+                _jsonFixture = Json.fromString(jsonString);
+            }
+
+            return _jsonFixture;
+        }
+
         private static function be_valid_json():void
         {
+            var json:Json = jsonFixture;
             var prettyString:String = JsonPrinter.print(json);
 
             it.expects(prettyString).not.toBeNull();
@@ -38,20 +47,23 @@ package
 
         private static function be_valid_when_compact():void
         {
+            var json:Json = jsonFixture;
             var compact:String = JsonPrinter.print(json, JsonPrinterOptions.compact);
 
             it.expects(Json.fromString(compact)).not.toBeNull();
         }
 
         private static function be_valid_when_minified():void
         {
+            var json:Json = jsonFixture;
             var minified:String = JsonPrinter.print(json, JsonPrinterOptions.minified);
 
             it.expects(Json.fromString(minified)).not.toBeNull();
         }
 
         private static function default_to_standard_formatting():void
         {
+            var json:Json = jsonFixture;
             var prettyString:String = JsonPrinter.print(json);
             var standard:String = JsonPrinter.print(json, JsonPrinterOptions.standard);
 

test/src/spec/JsonSpec.ls

@@ -52,7 +52,7 @@ package
             var result:Json = Json.fromString(jsonString);
 
             it.asserts(result).isNotNull().or('init from string failed');
-            it.expects(result.keys.length).toEqual(13);
+            it.expects(result.keys.length).toEqual(14);
         }
 
         private static function init_from_object():void
@@ -106,7 +106,7 @@ package
             var result:Json = Json.fromJSON(j);
 
             it.asserts(result).isNotNull().or('init from Loom JSON failed');
-            it.expects(result.keys.length).toEqual(13);
+            it.expects(result.keys.length).toEqual(14);
         }
 
         private static function report_native_types():void