dont modify the name var in exports.static

nko · Aug 28, 2010 · 2074e8c · 2074e8c
1 parent 20a67fd
commit 2074e8c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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()