Bug Fixes on file responses and authorisation handlers

Author: nerdsupremacist

index.js

@@ -45,18 +45,9 @@ Aeolus.prototype.www = function(path) {
 
 Aeolus.prototype.load = function () {
   var SmartResource = require('./util/smartResource.js');
-  var unauth = this.unauthorisedHandler;
   var getMethods = require('./util/getMethods.js');
   var methods = getMethods(this.methodPath);
 
-  var unauthorised = function(req,res) {
-    if (unauth !== null) {
-      unauth(req,res);
-    } else {
-      res.promptPassword("Please enter a Password");
-    }
-  };
-
   for (var i = 0; i < methods.length; i++) {
     var name = methods[i].name;
     var resources = methods[i].resources;
@@ -74,6 +65,7 @@ Aeolus.prototype.load = function () {
 
   var smartMethods = this.smartMethods;
   var error = this.errorHandler;
+  var aeolus = this;
 
   dispatcher.onError(function(req,res) {
     var Response = require('./util/response.js');
@@ -84,7 +76,7 @@ Aeolus.prototype.load = function () {
       return m.works(urlString,action);
     });
     if (methodsThatWork.length > 0) {
-      var f = creator(methodsThatWork[0]);
+      var f = aeolus.functionForResource(methodsThatWork[0]);
       f(req,res);
     } else {
       error(new Request(req),new Response(res));
@@ -97,6 +89,14 @@ Aeolus.prototype.functionForResource = function (resource) {
   var Response = require('./util/response.js');
   var Request = require('./util/request.js');
   var auther = this.authHandler;
+  var unauth = this.unauthorisedHandler;
+  var unauthorised = function(req,res) {
+    if (unauth !== null) {
+      unauth(req,res);
+    } else {
+      res.promptPassword("Please enter a Password");
+    }
+  };
   return function(re,r) {
       var res = new Response(r);
       var req = new Request(re,this);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aeolus",
-  "version": "1.1.22",
+  "version": "1.1.25",
   "description": "AtomicLlama's fast and problem free framework for fast NodeJS Servers.",
   "main": "index.js",
   "scripts": {

util/response.js

@@ -1,3 +1,6 @@
+var fs = require('fs');
+var path = require('path');
+
 var Response = function(res) {
   this.res = res;
 };
@@ -10,14 +13,15 @@ Response.prototype.respondJSON = function(object, status, headers) {
 };
 
 Response.prototype.respondFile = function (filename, status) {
+  filename = path.join(process.cwd(), filename);
+  var res = this.res;
   fs.readFile(filename, "binary", function(err, file) {
-    var h = headers || {};
     if(err) {
       throw err;
     } else {
-      response.writeHead(status);
-      response.write(file, "binary");
-      response.end();
+      res.writeHead(status || 200);
+      res.write(file, "binary");
+      res.end();
     }
   });
 };