make new jshint happy

Author: hoegaarden

.jshintrc

@@ -1,3 +1,5 @@
 {
-    "laxcomma" : "true"
+    "laxcomma" : true
+  , "node" : true
+  , "curly" : false
 }

index.js

@@ -1,16 +1,16 @@
+"use strict";
+
 var app = require('./lib/express')
   , http = require('http')
   , https = require('https')
   , fs = require('fs')
-  , http_port = process.env.PORT_HTTP || process.env.PORT || 8080
-  , https_port = process.env.PORT_HTTPS || 4430
 ;
 
-function listening() {
+var listening = function listening() {
     var addr = this.address();
     var type = this.hasOwnProperty('key') ? 'https' : 'http';
     console.log('* listening on %s://%s:%d', type, addr.address, addr.port);
-}
+};
 
 function startHttp() {
     var port = process.env.npm_package_config_http_port;

lib/express.js

@@ -1,8 +1,11 @@
+"use strict";
+
 var express = require('express')
   , app = express()
   , routes = require('../routes')
   , ormloader = require('../models')
   , ratelimit = require('../lib/ratelimit.js')
+  , paging = require('../lib/paging.js')
 ;
 module.exports = app;
 
@@ -18,16 +21,7 @@ app.configure(function(){
     app.use(ratelimit());
     app.use(express.favicon());
     app.use(ormloader());
-
-
-    app.use(function(req, res, next){
-        req.page = {
-            limit  : Math.min( +req.query.limit || 25 , 200 )
-          , offset : +req.query.offset || 0
-        };
-        return next();
-    });
-
+    app.use(paging());
 });
 
 routes(app);

lib/hal.js

@@ -1,5 +1,6 @@
+"use strict";
 
-function addHAL(type, name, obj, force_array) {
+var addHAL = function addHAL(type, name, obj, force_array) {
     if (! this.hasOwnProperty(type) )
         this[type] = {};
 
@@ -13,7 +14,7 @@ function addHAL(type, name, obj, force_array) {
     }
 
     return this;
-}
+};
 
 
 module.exports = {

lib/paging.js

@@ -0,0 +1,31 @@
+"use strict";
+
+function sorter(a, b){
+    return (a - b);
+}
+
+function gate(val, def, min, max) {
+  var vals = [ +val || def ];
+
+  if ('undefined' !== typeof min)
+      vals.push(min);
+  if ('undefined' !== typeof max)
+      vals.push(max);
+
+  if (vals.length < 2)
+      return def;
+
+  return (vals.sort(sorter))[1];
+}
+
+module.exports = function(key) {
+    key = key || 'page';
+
+    return function(req, res, next) {
+        req[key] = {
+            limit  : gate(req.query.limit, 25, 1, 200)
+          , offset : gate(req.query.offset, 0)
+        };
+        return next();
+    };
+};

lib/ratelimit.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var limiter = require('connect-ratelimit');
 
 var default_conf = {

migrations/20130613000000-install-hstore.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports.up = function(db, cb) {
     db.runSql('create extension if not exists hstore', cb);
 };

migrations/20130613213125-init.js

@@ -1,4 +1,5 @@
-var dbm = require('db-migrate');
+"use strict";
+
 var here = require('here').here;
 var async = require('async');
 

migrations/20130629121557-add-geodata.js

@@ -1,3 +1,4 @@
+"use strict";
 
 exports.up = function(db, callback) {
     /* if location == null, it's an anon. node we have no info about yet */

migrations/20130727090718-node-upload-return-ids.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var here = require('here').here;
 
 exports.up = function(db, cb) {

models/Measurement.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var hooks = require('./hooks.js');
 
 module.exports = function(db, cb){

models/Node.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function lonlat(field) {
     return function(val) {
         if (val !== undefined) {
@@ -8,7 +10,7 @@ function lonlat(field) {
 }
 
 module.exports = function(db, cb){
-    var Node = db.define('Node', {
+    db.define('Node', {
         name     : { type: 'text',  required: true  }
       , owner    : { type: 'text',  required: true  }
       , location : { type: 'point', required: false }

models/NodeUpload.js

@@ -1,7 +1,9 @@
+"use strict";
+
 var hooks = require('./hooks.js');
 
 module.exports = function(db, cb){
-    var NodeUpload = db.define('NodeUpload', {
+    db.define('NodeUpload', {
         node_name : { type: 'text', required: true }
       , ts : { type: 'date', required: true }
       , data : { type: 'binary', required: true }

models/Upload.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(db, cb){
     var Upload = db.define('Upload', {
         ts : { type: 'date', required: true }

models/hooks.js

@@ -1,9 +1,11 @@
+"use strict";
+
 var hstore = require('pg-hstore');
 
 function hstore2json(field) {
     return function() {
         if (typeof this[field] === 'string')
-            this[field]= hstore.parse(this[field]);
+            this[field] = hstore.parse(this[field]);
     };
 }
 

models/index.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var orm = require('orm')
   , transaction = require("orm-transaction")
   , async = require('async')

routes/index.js

@@ -1,6 +1,7 @@
+"use strict";
+
 var Payload = require('dustmap-payload')
   , async = require('async')
-  , util = require('util')
   , HAL = require('../lib/hal.js')
 ;
 
@@ -42,7 +43,7 @@ module.exports = function(app) {
                 }
 
                 async.each(models_to_save, function(obj, cb){
-                    return obj.save(function(err, data){
+                    return obj.save(function(err){
                         return cb( err ? err : null );
                     });
                 }, function(err){
@@ -196,7 +197,8 @@ module.exports = function(app) {
                 async.each(uploads, handleUpload, function(err){
                     if (err)
                         res.send(400, err);
-                    res.send(node);
+
+                   res.send(node);
                 });
             });
         });

test/integration_tests/BEGIN.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var util = require('util');
 var exec = require('child_process').exec;
 var path = require('path');

test/integration_tests/webapp.test.js

@@ -1,6 +1,7 @@
+"use strict";
+
 var app = require('../../lib/express.js')
   , request = require('supertest')(app)
-  , async = require('async')
 ;