Merge pull request #27 from tbranyen/address-matjas-feedback

Address feedback from Mathias.

bower.json

@@ -6,7 +6,7 @@
     "mocha": "~1.18.2",
     "requirejs": "~2.1.10",
     "assert": "~0.1.0",
-    "json2": "*"
+    "json3": "~3.3.1"
   },
   "ignore": [
     "build",

build/tasks/karma.coffee

@@ -63,7 +63,7 @@ module.exports = ->
 
       files: [
         "bower_components/assert/assert.js"
-        "bower_components/json2/json2.js"
+        "bower_components/json3/lib/json3.js"
         "bower_components/requirejs/require.js"
         "test/runner.js"
 

lib/shared/encode.js

@@ -27,7 +27,7 @@ define(function(require, exports, module) {
 
     // Identifies all characters in the unicode range: 00A0-9999, ampersands,
     // greater & less than) with their respective html entity.
-    return raw.replace(/[\u00A0-\u9999<>\&]/gm, function(match) {
+    return raw.replace(/["&'<>`]/g, function(match) {
        return "&#" + match.charCodeAt(0) + ";";
     });
   }

test/index.html

@@ -18,7 +18,7 @@
   <!-- Testing libraries. -->
   <script src="../bower_components/mocha/mocha.js"></script>
   <script src="../bower_components/assert/assert.js"></script>
-  <script src="../bower_components/json2/json2.js"></script>
+  <script src="../bower_components/json3/lib/json3.js"></script>
   <script src="../bower_components/requirejs/require.js"></script>
 
   <!-- Run the test harness. -->

test/tests/properties.js

@@ -48,6 +48,13 @@ define(function(require, exports, module) {
       assert.equal(output, "test\ttest\ntest\rtest\r\ntest   test");
     });
 
+    it("does not lose data with encoding", function() {
+      var tmpl = combyne("{{test}}");
+      var output = tmpl.render({ test: "\u1D306" });
+
+      assert.equal(output, "\u1D306");
+    });
+
     it("can handle unicode characters", function() {
       var tmpl = combyne("{{{test}}}");
       var output = tmpl.render({ test: "\u2C64" });