Changeset a6150a6ff96505da2602e2fff0d55e90e6acc784

Timestamp:

05/31/10 02:18:52 (3 months ago)

Author:

Jim Garrison <jim@…>

Children:

036de45e453fd3047a785de991d753fd98887461

Parents:

a9f66c816731c3fb616fd1be34a3e7e3b5ca01dd

git-committer:

Jim Garrison <jim@jimgarrison.org> / 2010-05-30T23:18:52Z-0700

Message:

reworked url scheme. got rid of duality between textwiki names and urls

Location:

ductus

Files:

• modules/textwiki/templatetags/textwiki.py (modified) (2 diffs)
• templates/robots.txt (modified) (1 diff)
• urls.py (modified) (1 diff)
• user/__init__.py (modified) (1 diff)
• wiki/__init__.py (modified) (2 diffs)
• wiki/decorators.py (modified) (2 diffs)
• wiki/models.py (modified) (1 diff)
• wiki/views.py (modified) (1 diff)

ductus/modules/textwiki/templatetags/textwiki.py

@@ -36 +36 @@
     from creoleparser.dialects import create_dialect, creole10_base
 
-    def _handle_link_abbreviations(page_name):
-        if page_name.startswith((u'urn/', u'special/')):
-            pass
-        elif page_name.startswith('~'):
-            page_name = u'user/%s' % page_name[1:]
-        else:
-            # normal wiki page
-            page_name = u'wiki/%s' % page_name
-        return page_name
-
     def wiki_links_path_func(page_name):
-        return iri_to_uri(urlquote(_handle_link_abbreviations(page_name)))
+        return iri_to_uri(urlquote(page_name))
 
     def wiki_links_class_func(page_name):
         page_name = page_name.partition('#')[0].partition('?')[0]
-        page_name = _handle_link_abbreviations(page_name)
 
         try:
@@ -68 +57 @@
     c = create_dialect(creole10_base,
                        no_wiki_monospace=True,
-                       wiki_links_base_url='/',
+                       wiki_links_base_url='/wiki/',
                        wiki_links_path_func=wiki_links_path_func,
                        wiki_links_class_func=wiki_links_class_func,

ductus/templates/robots.txt

@@ +1 @@
+# Don't index "special" pages
 User-agent: *
-Disallow: /special/
+Disallow: /+*

ductus/urls.py

@@ -8 +8 @@
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': settings.DUCTUS_FRONT_PAGE, 'permanent': False}),
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^new/(.*)', 'ductus.wiki.views.creation_view'),
     url(r'^urn/(?P<hash_type>[-_\w]+)/(?P<hash_digest>[-_\w]+)$', 'ductus.wiki.views.view_urn'),
-    url(r'^(wiki/.+)$', 'ductus.wiki.views.view_wikipage'),
-    url(r'^new/(.*)', 'ductus.wiki.views.creation_view'),
-    url(r'^(user/.*/.+)$', 'ductus.wiki.views.view_wikipage'),
-    url(r'^user/(.*)$', 'ductus.user.views.view_userpage'),
-#    url(r'^group/', include('ductus.group.urls')),
-    url(r'^special/(.*)', 'ductus.special.views.view_special_page'),
+    url(r'^wiki/\+(.*)', 'ductus.special.views.view_special_page'),
+    url(r'^wiki/~(\w+)$', 'ductus.user.views.view_userpage'),
+    url(r'^wiki/(.+)$', 'ductus.wiki.views.view_wikipage'),
     url(r'^robots\.txt$', 'django.views.generic.simple.direct_to_template', {'template': 'robots.txt', 'mimetype': 'text/plain'}),
     url(r'^login$', 'django.contrib.auth.views.login'),

ductus/user/__init__.py

@@ -15 +15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ductus.wiki.decorators import register_wiki_permission
+from ductus.wiki import register_wiki_permission
 
-@register_wiki_permission('user')
+@register_wiki_permission(u'~')
 def user_permission_func(user, pagename):
     return (user.is_authenticated()
-            and pagename.split('/', 2)[1] == user.username)
+            and pagename[1:].partition('/')[0] == user.username)
 
 from django.contrib.auth.models import User
 
 # fix User.get_absolute_url() to point to the right place
-User.get_absolute_url = lambda self: '/user/%s' % self.username
+User.get_absolute_url = lambda self: u'/wiki/~%s' % self.username

ductus/wiki/__init__.py

@@ -46 +46 @@
 
 def user_has_edit_permission(user, pagename):
-    if '/' not in pagename:
+    if not pagename:
         return False
 
-    permission_func = wiki_permissions.get(pagename.partition('/')[0],
-                                           lambda user, pagename: False)
-    return permission_func(user, pagename)
+    if pagename[-1] == u'/':
+        # pages shouldn't end with a slash
+        return False
+
+    prefix = pagename[0]
+    if prefix == u'+':
+        # can't edit (or create) special pages
+        return False
+
+    if prefix in (u'~',):
+        permission_func = __wiki_permissions[prefix]
+        return permission_func(user, pagename)
+
+    # regular wiki page; anyone can edit (for now)
+    return True
 
 def user_has_unlink_permission(user, pagename):
@@ -58 +70 @@
 registered_views = {}
 registered_creation_views = {}
-wiki_permissions = {}
+__wiki_permissions = {}
 
-wiki_permissions['wiki'] = lambda user, pagename: True
+def register_wiki_permission(prefix):
+    def _register_wiki_permission(func):
+        __wiki_permissions[prefix] = func
+        return func
+    return _register_wiki_permission

ductus/wiki/decorators.py

@@ -17 +17 @@
 from functools import wraps
 
-from ductus.wiki import registered_views, registered_creation_views, wiki_permissions
+from ductus.wiki import registered_views, registered_creation_views
 
 def register_view(model, label=None, requires=(lambda d: d.resource)):
@@ -47 +47 @@
         return response
     return wraps(func)(new_func)
-
-def register_wiki_permission(prefix):
-    def _register_wiki_permission(func):
-        wiki_permissions[prefix] = func
-        return func
-    return _register_wiki_permission

ductus/wiki/models.py

@@ -28 +28 @@
 
     def get_absolute_url(self):
-        return u'/%s' % iri_to_uri(urlquote(self.name))
+        return u'/wiki/%s' % iri_to_uri(urlquote(self.name))
 
     def get_latest_revision(self):

ductus/wiki/views.py

@@ -198 +198 @@
         # See if DUCTUS_WIKI_REMOTE has the page
         try:
-            remote_url = "%s/%s?view=urn" % (settings.DUCTUS_WIKI_REMOTE, iri_to_uri(urlquote(pagename)))
+            remote_url = "%s%s?view=urn" % (settings.DUCTUS_WIKI_REMOTE, iri_to_uri(urlquote(pagename)))
             remote_urn = json.loads(urlopen(remote_url).read(1000))["urn"]
             # we never actually save this WikiPage or WikiRevision to the database