Update urls.js to match fireplace/commonplace

mozilla · Mar 17, 2014 · 7565545 · 7565545
1 parent 0562892
commit 7565545
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 14 deletions.
diff --git a/src/media/js/urls.js b/src/media/js/urls.js
@@ -2,7 +2,7 @@ define('urls',
     ['format', 'routes_api', 'routes_api_args', 'settings', 'user', 'utils'],
     function(format, api_endpoints, api_args, settings, user) {
 
-    var group_pattern = /\(.+\)/;
+    var group_pattern = /\([^\)]+\)/;
     var optional_pattern = /(\(.*\)|\[.*\]|.)\?/g;
     var reverse = function(view_name, args) {
         args = args || [];
@@ -43,16 +43,29 @@ define('urls',
             if (user.logged_in()) {
                 args._user = user.get_token();
             }
-            var blacklist = settings.api_param_blacklist || [];
-            for (var key in args) {
-                if (!args[key] || blacklist.indexOf(key) !== -1) {
-                    delete args[key];
-                }
-            }
+            _removeBlacklistedParams(args);
+            return require('utils').urlparams(out, args);
+        };
+    }
+
+    function _anonymousArgs(func) {
+        return function() {
+            var out = func.apply(this, arguments);
+            var args = api_args();
+            _removeBlacklistedParams(args);
             return require('utils').urlparams(out, args);
         };
     }
 
+    function _removeBlacklistedParams(args) {
+        var blacklist = settings.api_param_blacklist || [];
+        for (var key in args) {
+            if (!args[key] || blacklist.indexOf(key) !== -1) {
+                delete args[key];
+            }
+        }
+    }
+
     function api(endpoint, args, params) {
         if (!(endpoint in api_endpoints)) {
             console.error('Invalid API endpoint: ' + endpoint);
@@ -86,7 +99,12 @@ define('urls',
             url: _userArgs(api),
             params: _userArgs(apiParams),
             sign: _userArgs(function(url) {return url;}),
+            unsign: _anonymousArgs(function(url) {return url;}),
             unsigned: {
+                url: _anonymousArgs(api),
+                params: _anonymousArgs(apiParams)
+            },
+            base: {
                 url: api,
                 params: apiParams
             }

diff --git a/src/media/js/views/collection.js b/src/media/js/views/collection.js
@@ -252,7 +252,7 @@ define('views/collection',
                 // Rewrite the cache to remove the collection.
                 collection_model.del(collection.id);
                 cache.bust(urls.api.url('collection', [collection.id]));
-                var list_endpoint = urls.api.unsigned.url('collections');
+                var list_endpoint = urls.api.base.url('collections');
                 cache.attemptRewrite(
                     function(key) {
                         return utils.baseurl(key) == list_endpoint;

diff --git a/src/media/js/views/new_collection.js b/src/media/js/views/new_collection.js
@@ -26,7 +26,7 @@ define('views/new_collection',
             data.description[navigator.l10n.language] = orig_data.description;
 
             collection_model.cast(data);
-            var list_endpoint = urls.api.unsigned.url('collections');
+            var list_endpoint = urls.api.base.url('collections');
             cache.attemptRewrite(
                 function(key) {
                     if (utils.baseurl(key) !== list_endpoint) return false;

diff --git a/src/tests/urls.js b/src/tests/urls.js
@@ -61,6 +61,16 @@ test('reverse too many args', function(done, fail) {
     }, fail);
 });
 
+test('reverse multiple args', function(done, fail) {
+    mock_routes([
+        {pattern: '^/apps/([0-9]+)/reviews/([0-9]+)$', view_name: 'two_args'},
+    ], function() {
+        var reversed = urls.reverse('two_args', [10, 20]);
+        eq_('/apps/10/reviews/20', reversed);
+        done();
+    }, fail);
+});
+
 test('api url', function(done, fail) {
     mock(
         'urls',
@@ -86,13 +96,25 @@ test('api url signage', function(done, fail) {
             capabilities: {firefoxOS: true, widescreen: function() { return false; }, touch: 'foo'},
             routes_api: {'homepage': '/foo/homepage'},
             routes_api_args: function() {return function() {return function() {return {foo: 'bar'};};};},  // Functions get pre-evaluated.
-            settings: {api_url: 'api:'}
+            settings: {api_url: 'api:'},
+            user: {
+                logged_in: function() { return true; },
+                get_setting: function(x) {},
+                get_token: function() { return 'mytoken';}
+            }
         }, function(urls) {
-            var homepage_url = urls.api.unsigned.url('homepage');
+            var homepage_url, homepage_base_url = urls.api.base.url('homepage');
+
+            homepage_url = homepage_base_url;
             eq_(homepage_url, 'api:/foo/homepage');
-            eq_(urls.api.sign(homepage_url), urls.api.url('homepage'));
-            disincludes(homepage_url, 'foo=bar');
-            contains(urls.api.sign(homepage_url), 'foo=bar');
+
+            homepage_url = urls.api.url('homepage');
+            eq_(homepage_url, urls.api.sign(homepage_base_url));
+            contains(homepage_url, '_user=mytoken');
+
+            homepage_url = urls.api.unsigned.url('homepage');
+            eq_(homepage_url, urls.api.unsign(homepage_base_url));
+            disincludes(homepage_url, '_user=mytoken');
             done();
         },
         fail