added new macros page

phpdude · Mar 24, 2016 · af4ce24 · af4ce24
1 parent dcf694b
commit af4ce24
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/README.markdown b/README.markdown
@@ -15,6 +15,7 @@ month - (0?([1-9])|10|11|12)
 day - ((0|1|2)?([1-9])|[1-3]0|31)
 id - \d+
 pk - \d+
+page - \d+
 uuid - [a-fA-F0-9]{8}-?[a-fA-F0-9]{4}-?[1345][a-fA-F0-9]{3}-?[a-fA-F0-9]{4}-?[a-fA-F0-9]{12}
 ```
 

diff --git a/macrosurl/__init__.py b/macrosurl/__init__.py
@@ -5,6 +5,7 @@
 _macros_library = {
     'id': r'\d+',
     'pk': r'\d+',
+    'page': r'\d+',
     'slug': r'[\w-]+',
     'year': r'\d{4}',
     'month': r'(0?([1-9])|10|11|12)',

diff --git a/tests/urls.py b/tests/urls.py
@@ -42,6 +42,14 @@ def test_pk(self):
                          '^product/(?P<pk>\d+)/(?P<product_pk>\d+)$')
         self.assertEqual(MacroUrlPattern('product/:pk/:product_pk/:news_pk').compiled,
                          '^product/(?P<pk>\d+)/(?P<product_pk>\d+)/(?P<news_pk>\d+)$')
+
+    def test_page(self):
+        self.assertEqual(MacroUrlPattern('page/:page').compiled, '^page/(?P<page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:product_page').compiled, '^product/(?P<product_page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:page/:product_page').compiled,
+                         '^product/(?P<page>\d+)/(?P<product_page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:page/:product_page/:news_page').compiled,
+                         '^product/(?P<page>\d+)/(?P<product_page>\d+)/(?P<news_page>\d+)$')
 
     def test_slug(self):
         self.assertEqual(MacroUrlPattern('page/:slug').compiled, '^page/(?P<slug>[\w-]+)$')