Adding file to the upload

Author: Pablo Cantero

examples/progress/index.html

@@ -16,6 +16,7 @@
 						$('#upload_percent').text(data.percent);
 						$('#upload_status').text(data.status);
 						$('#upload_filename').text(data.fileName);
+						$('#upload_filepath').text(data.filePath);
 					}).error(function(){clearInterval(intervalID)});
 				}, 250);
 				return true;
@@ -31,7 +32,8 @@ <h1>Super Upload</h1>
 			<input type="file" name="upload" id="upload"><br>
 			<span id="upload_percent"></span><br/>
 			<span id="upload_status"></span><br/>
-			<span id="upload_filename"></span>
+			<span id="upload_filename"></span><br/>
+			<span id="upload_filepath"></span>
 		</p>
 		<p>
 			<input type="submit" value="Upload">

lib/node-upload-progress.coffee

@@ -26,10 +26,11 @@ class UploadHandler
 		func.call @
 
 	formOnFile: (upload, field, file) ->
-		upload.fileName = file.name
+		upload.file = file
 		if @uploadDir
 			fs.rename file.path, "#{@uploadDir}/#{file.name}"
-			
+			file.path = "#{@uploadDir}/#{file.name}"
+	
 	formOnProgress: (upload, bytesReceived, bytesExpected) ->
 		upload.updateProgress bytesReceived, bytesExpected
 

lib/node-upload-progress.js

@@ -24,9 +24,10 @@
     };
 
     UploadHandler.prototype.formOnFile = function(upload, field, file) {
-      upload.fileName = file.name;
+      upload.file = file;
       if (this.uploadDir) {
-        return fs.rename(file.path, "" + this.uploadDir + "/" + file.name);
+        fs.rename(file.path, "" + this.uploadDir + "/" + file.name);
+        return file.path = "" + this.uploadDir + "/" + file.name;
       }
     };
 

lib/upload.coffee

@@ -1,5 +1,7 @@
 class Upload
-	constructor: (@fileName='', @bytesReceived=0, @bytesExpected=0) ->
+	@file = null
+	
+	constructor: (@bytesReceived=0, @bytesExpected=0) ->
 
 	isDone: ->
 		@bytesReceived == @bytesExpected
@@ -13,7 +15,8 @@ class Upload
 			bytesExpected: @bytesExpected
 			percent: @percent()
 			status: @status()
-			fileName: @fileName
+			fileName: @file.name if @file
+			filePath: @file.path if @file
 
 	status: ->
 		return 'done' if @isDone() and @fileName

lib/upload.js

@@ -3,8 +3,9 @@
 
   Upload = (function() {
 
-    function Upload(fileName, bytesReceived, bytesExpected) {
-      this.fileName = fileName != null ? fileName : '';
+    Upload.file = null;
+
+    function Upload(bytesReceived, bytesExpected) {
       this.bytesReceived = bytesReceived != null ? bytesReceived : 0;
       this.bytesExpected = bytesExpected != null ? bytesExpected : 0;
     }
@@ -23,7 +24,8 @@
         bytesExpected: this.bytesExpected,
         percent: this.percent(),
         status: this.status(),
-        fileName: this.fileName
+        fileName: this.file ? this.file.name : void 0,
+        filePath: this.file ? this.file.path : void 0
       });
     };
 

test/unit/upload_test.coffee

@@ -17,7 +17,12 @@ describe 'Upload', ->
 
 		it 'should return JSON', ->
 			$.upload.updateProgress 1, 10
-			$.upload.toJSON().should.equal '{"bytesReceived":1,"bytesExpected":10,"percent":10,"status":"uploading","fileName":""}'
+			$.upload.file = name: 'hello.txt', path: "#{__dirname}/hello.txt"
+			$.upload.toJSON().should.equal '{"bytesReceived":1,"bytesExpected":10,"percent":10,"status":"uploading","fileName":"hello.txt","filePath":"' + __dirname + '/hello.txt"}'
+			
+		it 'should return JSON without file', ->
+			$.upload.updateProgress 1, 10
+			$.upload.toJSON().should.equal '{"bytesReceived":1,"bytesExpected":10,"percent":10,"status":"uploading"}'
 
 	describe 'percent', ->
 		it 'should return 100%', ->