categories now url-escaped by default

thegreatape · Oct 30, 2010 · e5438a4 · e5438a4
1 parent b5851b8
commit e5438a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/wheat.js b/lib/wheat.js
@@ -59,7 +59,7 @@ module.exports = function setup(repo) {
   addRoute(/^\/()([a-z0-9_-]+)$/, Renderers.article);
   addRoute(/^\/()(.+\.dot)$/, Renderers.dotFile);
   addRoute(/^\/()(.+\.[a-z]{2,4})$/, Renderers.staticFile);
-	addRoute(/^\/()category\/([a-z0-9_-]+)$/,  Renderers.categoryIndex);
+  addRoute(/^\/()category\/([\%\.a-z0-9_-]+)$/,  Renderers.categoryIndex);
 
 
   return function handle(req, res, next) {

diff --git a/lib/wheat/data.js b/lib/wheat/data.js
@@ -2,7 +2,8 @@ var Git = require('git-fs'),
     Path = require('path'),
     Step = require('step'),
     sys = require('sys'),
-    Script = process.binding('evals').Script;
+    Script = process.binding('evals').Script,
+    QueryString = require('querystring');
 
 function preProcessMarkdown(markdown) {
   if (!(typeof markdown === 'string')) {
@@ -208,7 +209,7 @@ var Data = module.exports = {
 
         if(props.categories != undefined){
           props.categories = props.categories.split(',').map(function(element){ 
-            return element.trim();
+            return QueryString.escape(element.trim());
           });
         }
         return props;