Skip to content

Commit

Permalink
Merge pull request #42 from hillct/master
Browse files Browse the repository at this point in the history
Fixed trailing slash URL bug and relative path issues
  • Loading branch information
mansilladev committed Sep 20, 2012
2 parents 76f900b + 41e7dd3 commit c67a665
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions app.js
Expand Up @@ -70,7 +70,7 @@ db.on("error", function(err) {
// Load API Configs // Load API Configs
// //
var apisConfig; var apisConfig;
fs.readFile('public/data/apiconfig.json', 'utf-8', function(err, data) { fs.readFile(__dirname +'/public/data/apiconfig.json', 'utf-8', function(err, data) {
if (err) throw err; if (err) throw err;
apisConfig = JSON.parse(data); apisConfig = JSON.parse(data);
if (config.debug) { if (config.debug) {
Expand Down Expand Up @@ -620,7 +620,7 @@ app.dynamicHelpers({
if (!req.params.api) { if (!req.params.api) {
pathName = req.url.replace('/',''); pathName = req.url.replace('/','');
// Is it a valid API - if there's a config file we can assume so // Is it a valid API - if there's a config file we can assume so
fs.stat('public/data/' + pathName + '.json', function (error, stats) { fs.stat(__dirname + '/public/data/' + pathName + '.json', function (error, stats) {
if (stats) { if (stats) {
req.params.api = pathName; req.params.api = pathName;
} }
Expand All @@ -647,7 +647,7 @@ app.dynamicHelpers({
}, },
apiDefinition: function(req, res) { apiDefinition: function(req, res) {
if (req.params.api) { if (req.params.api) {
var data = fs.readFileSync('public/data/' + req.params.api + '.json'); var data = fs.readFileSync(__dirname + '/public/data/' + req.params.api + '.json');
return JSON.parse(data); return JSON.parse(data);
} }
} }
Expand Down Expand Up @@ -692,6 +692,7 @@ app.post('/upload', function(req, res) {


// API shortname, all lowercase // API shortname, all lowercase
app.get('/:api([^\.]+)', function(req, res) { app.get('/:api([^\.]+)', function(req, res) {
req.params.api=req.params.api.replace(/\/$/,'');
res.render('api'); res.render('api');
}); });


Expand Down

0 comments on commit c67a665

Please sign in to comment.