Use consistent names

Author: Ben Stahl

lib/handlers/HeadHandler.js

@@ -35,10 +35,10 @@ class HeadHandler extends BaseHandler {
                     res.setHeader('Upload-Length', file.upload_length);
                 }
 
-                if (file.defer_length) {
+                if (file.upload_defer_length) {
                     // If the size of the upload is known, the Server MUST include
                     // the Upload-Length header in the response.
-                    res.setHeader('Upload-Defer-Length', file.defer_length);
+                    res.setHeader('Upload-Defer-Length', file.upload_defer_length);
                 }
 
                 return res.end();

lib/handlers/PostHandler.js

@@ -12,26 +12,26 @@ class PostHandler extends BaseHandler {
      * @return {function}
      */
     send(req, res) {
-        const length = req.headers['upload-length'];
-        const defer_length = req.headers['upload-defer-length'];
+        const upload_length = req.headers['upload-length'];
+        const upload_defer_length = req.headers['upload-defer-length'];
         // The request MUST include a Upload-Length or Upload-Defer-Length header
-        if (length === undefined && defer_length === undefined) {
+        if (upload_length === undefined && upload_defer_length === undefined) {
             return super.send(res, 400, {}, 'Upload-Length or Upload-Defer-Length Required');
         }
 
         // The value MUST be a non-negative integer.
-        if (length && (isNaN(length) || parseInt(length, 10) < 0)) {
-            console.warn(`[PostHandler] Invalid Upload-Length: ${length}`)
+        if (upload_length && (isNaN(upload_length) || parseInt(upload_length, 10) < 0)) {
+            console.warn(`[PostHandler] Invalid Upload-Length: ${upload_length}`);
             return super.send(res, 400, {}, 'Invalid Upload-Length');
         }
 
         // The Upload-Defer-Length value MUST be 1.
-        if (defer_length && (isNaN(defer_length) || parseInt(defer_length, 10) !== 1)) {
-            console.warn(`[PostHandler] Invalid Upload-Defer-Length: ${defer_length}`)
+        if (upload_defer_length && (isNaN(upload_defer_length) || parseInt(upload_defer_length, 10) !== 1)) {
+            console.warn(`[PostHandler] Invalid Upload-Defer-Length: ${upload_defer_length}`);
             return super.send(res, 400, {}, 'Invalid Upload-Defer-Length');
         }
 
-        const file = new File(length, defer_length);
+        const file = new File(upload_length, upload_defer_length);
         return this.store.create(file)
             .then((location) => {
                 const url = `http://${req.headers.host}${this.store.path}/${file.id}`;

lib/models/File.js

@@ -9,12 +9,12 @@ const Uid = require('./Uid');
  */
 
 class File {
-    constructor(upload_length, defer_length) {
-        if (upload_length === undefined && defer_length === undefined) {
-            throw new Error('[File] constructor must be given either a upload_length or defer_length')
+    constructor(upload_length, upload_defer_length) {
+        if (upload_length === undefined && upload_defer_length === undefined) {
+            throw new Error('[File] constructor must be given either a upload_length or upload_defer_length')
         }
         this.upload_length = upload_length;
-        this.defer_length = defer_length;
+        this.upload_defer_length = upload_defer_length;
         this.id = Uid.rand();
     }
 }