Skip to content

Keyword-based URL reversing #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ierror merged 4 commits into from
Aug 3, 2015
Merged

Keyword-based URL reversing #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0cfa2e
Fix out of bounds array access when unable to find pattern
hyperair May 14, 2015
16a9a28
Implement key-based url reversing
hyperair May 14, 2015
fad1be3
Add test-case for key-based url reversing
hyperair May 14, 2015
df1ea0a
Replace usage of Set with a standard dict
hyperair May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 58 additions & 6 deletions django_js_reverse/templates/django_js_reverse/urls_js.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,68 @@

var _get_url = function (url_pattern) {
return function () {
var index, url, url_arg, url_args, _i, _len, _ref, _ref_list;
var _arguments, index, url, url_arg, url_args, _i, _len, _ref,
_ref_list, match_ref, provided_keys, build_kwargs;

_arguments = arguments;
_ref_list = self.url_patterns[url_pattern];

if (arguments.length == 1 && typeof (arguments[0]) == "object") {
// kwargs mode
var provided_keys_list = Object.keys (arguments[0]);
provided_keys = {};
for (_i = 0; _i < provided_keys_list.length; _i++)
provided_keys[provided_keys_list[_i]] = 1;

match_ref = function (ref)
{
var _i;

// Verify that they have the same number of arguments
if (ref[1].length != provided_keys_list.length)
return false;

for (_i = 0;
_i < ref[1].length && ref[1][_i] in provided_keys;
_i++);

// If for loop completed, we have all keys
return _i == ref[1].length;
}

build_kwargs = function (keys) {return _arguments[0];}

} else {
// args mode
match_ref = function (ref)
{
return ref[1].length == _arguments.length;
}

build_kwargs = function (keys) {
var kwargs = {};

for (var i = 0; i < keys.length; i++) {
kwargs[keys[i]] = _arguments[i];
}

return kwargs;
}
}

for (_i = 0;
_ref = _ref_list[_i], _ref[1].length != arguments.length;
_i < _ref_list.length && !match_ref (_ref_list[_i]);
_i++);

url = _ref[0], url_args = _ref[1];
for (index = _i = 0, _len = url_args.length; _i < _len; index = ++_i) {
url_arg = url_args[index];
url = url.replace("%(" + url_arg + ")s", arguments[index] || '');
// can't find a match
if (_i == _ref_list.length)
return null;

_ref = _ref_list[_i];
url = _ref[0], url_args = build_kwargs (_ref[1]);
for (url_arg in url_args) {
url = url.replace("%(" + url_arg + ")s",
url_args[url_arg] || '');
}
return '{{url_prefix|escapejs}}' + url;
};
Expand Down
5 changes: 4 additions & 1 deletion tests/test_urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ def dummy_view(*args, **kwargs):
url(r'^test_duplicate_name/(?P<arg_one>[-\w]+)/$', dummy_view,
name='test_duplicate_name'),
url(r'^test_duplicate_name/(?P<arg_one>[-\w]+)-(?P<arg_two>[-\w]+)/$', dummy_view,
name='test_duplicate_name'))
name='test_duplicate_name'),
url(r'^test_duplicate_argcount/(?P<arg_one>[-\w]+)?-(?P<arg_two>[-\w]+)?/$', dummy_view,
name='test_duplicate_argcount'),
)

urlpatterns = copy(basic_patterns)

Expand Down
10 changes: 9 additions & 1 deletion tests/unit_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,21 @@ def test_script_prefix(self):
with script_prefix('/foobarlala/'):
self.assertEqualJSUrlEval('Urls["nestedns:ns1:test_two_url_args"]("arg_one", "arg_two")',
'/foobarlala/nestedns/ns1/test_two_url_args/arg_one-arg_two/')

def test_duplicate_name(self):
self.assertEqualJSUrlEval('Urls.test_duplicate_name("arg_one")',
'/test_duplicate_name/arg_one/')
self.assertEqualJSUrlEval('Urls.test_duplicate_name("arg_one", "arg_two")',
'/test_duplicate_name/arg_one-arg_two/')

def test_duplicate_argcount(self):
self.assertEqualJSUrlEval('Urls.test_duplicate_argcount ({arg_one: "arg_one"})',
'/test_duplicate_argcount/arg_one-/')
self.assertEqualJSUrlEval('Urls.test_duplicate_argcount ({arg_two: "arg_two"})',
'/test_duplicate_argcount/-arg_two/')
self.assertEqualJSUrlEval('Urls.test_duplicate_argcount ({arg_one: "arg_one", arg_two: "arg_two"})',
'/test_duplicate_argcount/arg_one-arg_two/')


@override_settings(JS_REVERSE_JS_MINIFY=False)
class JSReverseViewTestCaseNotMinified(JSReverseViewTestCaseMinified):
Expand Down