Merge pull request #3 from mobify/PROD-1722-cache-breaker

PROD-1722: Add support for cache breaker option
mobify · Mar 24, 2014 · d86b79d · d86b79d
2 parents 133ec86 + 812db1b
commit d86b79d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,12 +1,14 @@
 machine:
     node:
         version: 0.10.22
+
 dependencies:
     pre:
         - npm install -g grunt-cli bower
     override:
         - npm install
         - bower install
+
 test:
     override:
-        - grunt test
+        - grunt test
diff --git a/jazzcat.js b/jazzcat.js
@@ -546,9 +546,10 @@
         var options = Utils.extend({}, Jazzcat.defaults, options || {});
         return options.base +
                (options.projectName ? '/project-' + options.projectName : '') +
+               (options.cacheBreaker ? '/cb' + options.cacheBreaker : '') +
                '/' + options.responseType +
                (options.responseType === 'jsonp' ? '/' + options.loadCallback : '') +
-               '/' + encodeURIComponent(JSON.stringify(urls.slice().sort())); // TODO only sort for jsonp
+               '/' + encodeURIComponent(JSON.stringify(urls.slice().sort()));
     };
 
     var scriptSplitRe = /(<\/scr)(ipt\s*>)/ig;

diff --git a/tests/index.html b/tests/index.html
@@ -578,11 +578,12 @@
                 try {
                     var projectName = "qux";
                     var callback = "bar";
-                    expected = "//jazzcat.mobify.com/project-qux/jsonp/bar/%5B%22%2F%2Fajax.googleapis.com%2Fajax%2Flibs%2Fangularjs%2F1.0.5%2Fangular.min.js%22%2C%22%2F%2Fajax.googleapis.com%2Fajax%2Flibs%2Fjquery%2F1.9.1%2Fjquery.min.js%22%5D";
+                    expected = "//jazzcat.mobify.com/project-qux/cb1234/jsonp/bar/%5B%22%2F%2Fajax.googleapis.com%2Fajax%2Flibs%2Fangularjs%2F1.0.5%2Fangular.min.js%22%2C%22%2F%2Fajax.googleapis.com%2Fajax%2Flibs%2Fjquery%2F1.9.1%2Fjquery.min.js%22%5D";
 
                     equal(Jazzcat.getURL(urls, {
                         loadCallback: callback,
-                        projectName: projectName
+                        projectName: projectName,
+                        cacheBreaker: 1234
                     }), expected);
                 // Reset projectName
                 } finally {