Update wheat to run on latest version of Connect.

loarabia · Jul 8, 2010 · 929f797 · 929f797
1 parent 1ec2a1a
commit 929f797
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 56 deletions.
diff --git a/install.sh b/install.sh
diff --git a/lib/wheat.js b/lib/wheat.js
@@ -46,22 +46,22 @@ function handleRoute(req, res, next, renderer, match) {
   renderer.apply(null, match.concat([callback]));
 }
 
-module.exports = {
-  setup: function () {
-    // Initialize the Git Filesystem
-    Git(this.repo || process.cwd());
-    // Set up our routes
-    addRoute(/^\/()$/, Renderers.index);
-    addRoute(/^\/()feed.xml$/, Renderers.feed);
-    addRoute(/^\/([a-f0-9]{40})\/([a-z0-9_-]+)$/, Renderers.article);
-    addRoute(/^\/([a-f0-9]{40})\/(.+\.dot)$/, Renderers.dotFile);
-    addRoute(/^\/([a-f0-9]{40})\/(.+\.[a-z]{2,4})$/, Renderers.staticFile);
-    addRoute(/^\/()([a-z0-9_-]+)$/, Renderers.article);
-    addRoute(/^\/()(.+\.dot)$/, Renderers.dotFile);
-    addRoute(/^\/()(.+\.[a-z]{2,4})$/, Renderers.staticFile);
-  },
-  
-  handle: function (req, res, next) {
+module.exports = function setup(repo) {
+
+  // Initialize the Git Filesystem
+  Git(repo || process.cwd());
+  // Set up our routes
+  addRoute(/^\/()$/, Renderers.index);
+  addRoute(/^\/()feed.xml$/, Renderers.feed);
+  addRoute(/^\/([a-f0-9]{40})\/([a-z0-9_-]+)$/, Renderers.article);
+  addRoute(/^\/([a-f0-9]{40})\/(.+\.dot)$/, Renderers.dotFile);
+  addRoute(/^\/([a-f0-9]{40})\/(.+\.[a-z]{2,4})$/, Renderers.staticFile);
+  addRoute(/^\/()([a-z0-9_-]+)$/, Renderers.article);
+  addRoute(/^\/()(.+\.dot)$/, Renderers.dotFile);
+  addRoute(/^\/()(.+\.[a-z]{2,4})$/, Renderers.staticFile);
+
+
+  return function handle(req, res, next) {
     var url = Url.parse(req.url);
     for (var i = 0, l = routes.length; i < l; i++) {
       var route = routes[i];

diff --git a/lib/wheat/data.js b/lib/wheat/data.js
@@ -1,6 +1,6 @@
-var Git = require('./git'),
+var Git = require('git'),
     Path = require('path'),
-    Step = require('./step');
+    Step = require('step');
 
 function preProcessMarkdown(markdown) {
   if (!(typeof markdown === 'string')) {

diff --git a/lib/wheat/renderers.js b/lib/wheat/renderers.js
@@ -1,12 +1,12 @@
-var Git = require('./git'),
+var Git = require('git'),
     Data = require('./data'),
     Tools = require('./tools'),
     Buffer = require('buffer').Buffer,
     Prettify = require('./prettify'),
     MD5 = require('./md5'),
     ChildProcess = require('child_process'),
-    Mime = require('./mime'),
-    Step = require('./step');
+    Mime = require('connect/utils').mime,
+    Step = require('step');
 
 // Execute a child process, feed it a buffer and get a new buffer filtered.
 function execPipe(command, args, data, callback) {

diff --git a/lib/wheat/tools.js b/lib/wheat/tools.js
@@ -1,10 +1,10 @@
 var Sys = require('sys'),
-    Step = require('./step'),
-    Haml = require('./haml'),
+    Step = require('step'),
+    Haml = require('haml'),
     Markdown = require('./markdown'),
     MD5 = require('./md5'),
     Buffer = require('buffer').Buffer,
-    Git = require('./git');
+    Git = require('git');
 
 function pad(num) {
   return num < 10 ? "0" + num : num;