From 2074e8c4469df69c80343b2a04e93dd9e1b62d37 Mon Sep 17 00:00:00 2001 From: rick Date: Sat, 28 Aug 2010 13:45:23 -0700 Subject: [PATCH] dont modify the name var in exports.static --- lib/app.js | 9 +++++---- src/app.coffee | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/app.js b/lib/app.js index fabadeb..e6e3054 100644 --- a/lib/app.js +++ b/lib/app.js @@ -19,13 +19,14 @@ exports.static = function(write, dir, type, ext, name) { "Content-Type": type } })(function(write, head) { - name || (name = head.url.capture[0]); - if (path.extname(name) !== ("." + (ext))) { - name = ("" + (name) + "." + (ext)); + var filename; + filename = name || head.url.capture[0]; + if (path.extname(filename) !== ("." + (ext))) { + filename = ("" + (name) + "." + (ext)); } return fab.stream(function(stream) { var io; - io = fs.createReadStream("./" + (dir) + "/" + (name)); + io = fs.createReadStream("./" + (dir) + "/" + (filename)); io.on('data', function(s) { return stream(write(s)); }); diff --git a/src/app.coffee b/src/app.coffee index 7a4ca8b..34345fd 100644 --- a/src/app.coffee +++ b/src/app.coffee @@ -28,11 +28,11 @@ exports.redirect_to = (write, url, status) -> # Returns a fab app. exports.static = (write, dir, type, ext, name) -> write(undefined, headers: {"Content-Type": type}) (write, head) -> - name ||= head.url.capture[0] - if path.extname(name) != ".#{ext}" - name = "#{name}.#{ext}" + filename = name || head.url.capture[0] + if path.extname(filename) != ".#{ext}" + filename = "#{name}.#{ext}" fab.stream (stream) -> - io = fs.createReadStream "./#{dir}/#{name}" + io = fs.createReadStream "./#{dir}/#{filename}" io.on 'data', (s) -> stream write(s) io.on 'end', () -> stream write()