Merge pull request #70 from mickr/modify-cdnify-for-webdav

BIG-24959 - Add webdav support to cdn helper

Author: Mick Ryan

index.js

@@ -53,7 +53,7 @@ module.exports = function (assembler) {
     };
 
     /**
-     * Load Partials/Templates 
+     * Load Partials/Templates
      * @param  {Object}   templates
      * @param  {Function} callback
      */
@@ -95,7 +95,7 @@ module.exports = function (assembler) {
      * @return {Object}
      */
     self.loadTemplatesSync = function(templates) {
-        _.each(templates, function (content, fileName) {          
+        _.each(templates, function (content, fileName) {
             self.handlebars.templates[fileName] = self.handlebars.compile(content, self.options);
         });
 
@@ -138,6 +138,16 @@ module.exports = function (assembler) {
             return path;
         }
 
+        if (path.substr(0, 7) === 'webdav:') {
+            path = path.slice(7, path.length);
+
+            if (path[0] === '/') {
+                path = path.slice(1, path.length);
+            }
+
+            return [cdnUrl, 'content', path].join('/');
+        }
+
         if (path[0] !== '/') {
             path = '/' + path;
         }

test/helpers/cdn.js

@@ -17,7 +17,7 @@ describe('cdn helper', function() {
             theme_version_id: '123',
             theme_config_id: '3245',
         }
-    }
+    };
 
     it('should render the css cdn url', function(done) {
         expect(c('{{cdn "assets/css/style.css"}}', context))
@@ -70,4 +70,15 @@ describe('cdn helper', function() {
 
         done();
     });
+
+    it('should return a webDav asset if webdav protocol specified', function(done) {
+
+        expect(c('{{cdn "webdav:img/image.jpg"}}', context))
+            .to.be.equal('https://cdn.bcapp/3dsf74g/content/img/image.jpg');
+
+        expect(c('{{cdn "webdav:/img/image.jpg"}}', context))
+            .to.be.equal('https://cdn.bcapp/3dsf74g/content/img/image.jpg');
+
+        done();
+    });
 });