Merge pull request #72 from bookernath/fix-json-safestring

Fix json helper to work with a nested getImage helper

Author: bookernath

helpers/json.js

@@ -1,7 +1,11 @@
 'use strict';
+const SafeString = require('handlebars').SafeString;
 
 const factory = () => {
     return function(data) {
+        if (data instanceof SafeString) {
+            data = data.toString();
+        }
         return JSON.stringify(data);
     };
 };

spec/helpers/json.js

@@ -5,7 +5,11 @@ const Lab = require('lab'),
       testRunner = require('../spec-helpers').testRunner;
 
 describe('json helper', function() {
+    const urlData_2_qs = 'https://cdn.example.com/path/to/{:size}/image.png?c=2&imbypass=on';
     const context = {
+        image_with_2_qs: {
+            data: urlData_2_qs
+        },
         object: { a: 1, b: "hello" }
     };
 
@@ -19,4 +23,12 @@ describe('json helper', function() {
             },
         ], done);
     });
+    it('should work together with getImage', function(done) {
+        runTestCases([
+            {
+                input: '{{{json (getImage image_with_2_qs)}}}',
+                output: '"https://cdn.example.com/path/to/original/image.png?c=2&imbypass=on"',
+            },
+        ], done);
+    });
 });