Filter for PascalCase words

2 files changed, 9 insertions, 10 deletions

diff --git a/model.py b/model.py
index a69ed99..b4147e1 100644
--- a/model.py
+++ b/model.py
@@ -1,6 +1,5 @@
 import sqlite3
 from datetime import datetime
-import re
 
 import inflection
 import markdown
@@ -41,10 +40,6 @@ class Page(object):
     def render(self):
         return markdown.markdown(self.content)
 
-    def validate(self):
-        if self.name != inflection.camelize(self.name):
-            raise ValueError("Invalid page name, must be CamelCase")
-
     @property
     def title(self):
         pretty = inflection.titleize(self.name)
diff --git a/wiki.py b/wiki.py
index 2c4eef9..6c1cf04 100644
--- a/wiki.py
+++ b/wiki.py
@@ -30,22 +30,26 @@ if DEV:
         return static_file(filename, root="static/")
 
 
+# check two words pascal case
+app.router.add_filter('pc', lambda conf: (r'[A-Z][a-z]+[A-Z][a-z]*', None, None))
+
+
 @app.route("/")
 def index():
     redirect("/WikiHome")
 
 
-@app.route("/<name>")
+@app.route("/<name:pc>")
 def page(db, name):
     return template("page", dict(page=model.get_page(db, name)))
 
 
-@app.get("/edit/<name>")
+@app.get("/edit/<name:pc>")
 def edit(db, name):
     return template("edit", dict(page=model.get_page(db, name)))
 
 
-@app.get("/history/<name>")
+@app.get("/history/<name:pc>")
 def history(db, name):
     return template(
         "history",
@@ -56,7 +60,7 @@ def history(db, name):
     )
 
 
-@app.get("/history/<name>/<version>")
+@app.get("/history/<name:pc>/<version>")
 def history_view(db, name, version):
     return template(
         "page",
@@ -66,7 +70,7 @@ def history_view(db, name, version):
     )
 
 
-@app.post("/edit/<name>")
+@app.post("/edit/<name:pc>")
 def edit_save(db, name):
     page = model.get_page(db, name)