Skip to content

Commit

Permalink
use semistandard style
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbeatty committed Oct 11, 2015
1 parent b73b2a2 commit 18e8e92
Show file tree
Hide file tree
Showing 88 changed files with 2,288 additions and 2,289 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "standard"
"extends": "semistandard"
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
These guidelines help keep the codebase consistent.
* All features or bugs must be tested
* Code coverage shall remain at 100% after any new feature or bug fix
* Code should pass ESLint which follows the [standard style](http://standardjs.com/)
* Code should pass ESLint which follows the [semistandard style](https://github.com/Flet/semistandard)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ npm start

## Testing

We use [lab](https://github.com/hapijs/lab) as our test utility and [code](https://github.com/hapijs/code) as our assertion library. Lab lints with [eslint](http://eslint.org/) using the [standard style](http://standardjs.com/). 100% code coverage by unit tests is required. To run the test suite:
We use [lab](https://github.com/hapijs/lab) as our test utility and [code](https://github.com/hapijs/code) as our assertion library. Lab lints with [eslint](http://eslint.org/) using the [semistandard style](https://github.com/Flet/semistandard). 100% code coverage by unit tests is required. To run the test suite:

```
# everything
Expand Down
26 changes: 13 additions & 13 deletions config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
require('dotenv').load()
require('dotenv').load();

var Confidence = require('confidence')
var _ = require('lodash')
var configLib = require('./lib/config')
var Confidence = require('confidence');
var _ = require('lodash');
var configLib = require('./lib/config');

configLib.normalizeDomain()
configLib.normalizeDomain();

var criteria = {
env: process.env.NODE_ENV,
scheme: process.env.SCHEME
}
};

var config = {
$meta: 'jsPerf.com',
Expand Down Expand Up @@ -57,15 +57,15 @@ var config = {
development: true,
$default: false
}
}
};

var store = new Confidence.Store(config)
var store = new Confidence.Store(config);

exports.get = function (key, overrides) {
_.assign(criteria, overrides)
return store.get(key, criteria)
}
_.assign(criteria, overrides);
return store.get(key, criteria);
};

exports.meta = function (key) {
return store.meta(key, criteria)
}
return store.meta(key, criteria);
};
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var Glue = require('glue')
var Manifest = require('./manifest')
var Glue = require('glue');
var Manifest = require('./manifest');

var composeOptions = {
relativeTo: __dirname
}
};

module.exports = Glue.compose.bind(Glue, Manifest.get('/'), composeOptions)
module.exports = Glue.compose.bind(Glue, Manifest.get('/'), composeOptions);
26 changes: 13 additions & 13 deletions lib/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// strings because comparing to process.env which is always strings
const HTTPS_PORT = '443'
const HTTP_PORT = '80'
const HTTPS_PORT = '443';
const HTTP_PORT = '80';

exports.normalizeDomain = function () {
// for github oauth ...
Expand All @@ -10,18 +10,18 @@ exports.normalizeDomain = function () {
// ... if someone didn't include the port in their domain ...
process.env.DOMAIN.indexOf(':') < 0 &&
(
// ... and they aren't using a default port w/ scheme ...
(
process.env.SCHEME === 'https' &&
process.env.PORT !== HTTPS_PORT
) ||
(
process.env.SCHEME === 'http' &&
process.env.PORT !== HTTP_PORT
)
// ... and they aren't using a default port w/ scheme ...
(
process.env.SCHEME === 'https' &&
process.env.PORT !== HTTPS_PORT
) ||
(
process.env.SCHEME === 'http' &&
process.env.PORT !== HTTP_PORT
)
)
) {
// ... include the port in their domain for redirect_uri
process.env.DOMAIN += ':' + process.env.PORT
process.env.DOMAIN += ':' + process.env.PORT;
}
}
};
22 changes: 11 additions & 11 deletions manifest.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
var Confidence = require('confidence')
var _ = require('lodash')
var config = require('./config')
var Confidence = require('confidence');
var _ = require('lodash');
var config = require('./config');

var criteria = {
env: process.env.NODE_ENV
}
};

var visionaryContextDefault = {
cssFile: 'main.css',
headTitle: 'jsPerf: JavaScript performance playground',
scheme: config.get('/scheme'),
domain: config.get('/domain')
}
};

var manifest = {
$meta: 'jsPerf backend',
Expand Down Expand Up @@ -83,14 +83,14 @@ var manifest = {
{'./server/web/sitemap/xml': {}},
{'./server/web/test': {}}
]
}
};

var store = new Confidence.Store(manifest)
var store = new Confidence.Store(manifest);

exports.get = function (key) {
return store.get(key, criteria)
}
return store.get(key, criteria);
};

exports.meta = function (key) {
return store.meta(key, criteria)
}
return store.meta(key, criteria);
};
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
},
"devDependencies": {
"code": "^1.4.1",
"eslint-config-standard": "^4.4.0",
"eslint-plugin-standard": "^1.3.1",
"eslint-config-semistandard": "^5.0.0",
"lab": "^5.11.1",
"nodemon": "^1.3.7",
"prompt": "^0.2.14",
Expand All @@ -58,6 +57,6 @@
},
"engines": {
"node": "4.x.x",
"npm": "2.x.x"
"npm": "3.x.x"
}
}
10 changes: 5 additions & 5 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var composer = require('./index')
var composer = require('./index');

composer(function (err, server) {
if (err) {
throw err
throw err;
}

server.start(function () {
server.log('info', 'Server running at: ' + server.info.uri)
})
})
server.log('info', 'Server running at: ' + server.info.uri);
});
});
10 changes: 5 additions & 5 deletions server/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ exports.register = function (server, options, next) {
path: '/api',
handler: function (request, reply) {
// TODO: track google analytics
reply('API')
reply('API');
}
})
});

return next()
}
return next();
};

exports.register.attributes = {
name: 'api/index'
}
};
10 changes: 5 additions & 5 deletions server/api/json.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ exports.register = function (server, options, next) {
method: 'GET',
path: '/api/json',
handler: function (request, reply) {
reply({ content: 'test' })
reply({ content: 'test' });
}
})
});

return next()
}
return next();
};

exports.register.attributes = {
name: 'api/json'
}
};
10 changes: 5 additions & 5 deletions server/api/jsonp.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ exports.register = function (server, options, next) {
method: 'GET',
path: '/api/jsonp',
handler: function (request, reply) {
reply({ content: 'test' }).header('Access-Control-Allow-Origin', '*')
reply({ content: 'test' }).header('Access-Control-Allow-Origin', '*');
}
})
});

return next()
}
return next();
};

exports.register.attributes = {
name: 'api/jsonp'
}
};
16 changes: 8 additions & 8 deletions server/lib/db.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// TODO make hapi plugin
var mysql = require('mysql')
var config = require('../../config')
var mysql = require('mysql');
var config = require('../../config');

module.exports = {
escape: mysql.escape,
genericQuery: function (query, values, cb) {
if (cb === undefined) {
cb = values
values = []
cb = values;
values = [];
}

var conn = mysql.createConnection({
Expand All @@ -18,10 +18,10 @@ module.exports = {
database: config.get('/db/name'),
// query and rows will print to stdout
debug: config.get('/debug') ? ['ComQueryPacket', 'RowDataPacket'] : false
})
});

conn.query(query, values, cb)
conn.query(query, values, cb);

conn.end()
conn.end();
}
}
};
2 changes: 1 addition & 1 deletion server/lib/regex.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ module.exports = {
'(?:/\\S*)?' + '$',
slug: '[A-Za-z0-9](?:-?[A-Za-z0-9])*',
script: '(<script[^>]*?>)([\\s\\S]*?)(<\/script>)'
}
};
24 changes: 12 additions & 12 deletions server/repositories/browserscope.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// TODO make hapi plugin
var http = require('http')
var querystring = require('querystring')
var http = require('http');
var querystring = require('querystring');

var config = require('../../config')
var config = require('../../config');

module.exports = {
addTest: function (title, description, slug, cb) {
Expand All @@ -11,22 +11,22 @@ module.exports = {
name: title,
description: description.substr(0, 60),
url: config.get('/scheme') + '://' + config.get('/domain') + '/' + slug
})
});

http.get('http://www.browserscope.org/user/tests/create?' + qs, function (res) {
var str = ''
var str = '';

res.on('data', function (chunk) {
str += chunk
})
str += chunk;
});

res.on('end', function () {
try {
cb(null, JSON.parse(str).test_key)
cb(null, JSON.parse(str).test_key);
} catch (e) {
cb(new Error('Unexpected response from browserscope.org'))
cb(new Error('Unexpected response from browserscope.org'));
}
})
}).on('error', cb)
});
}).on('error', cb);
}
}
};
12 changes: 6 additions & 6 deletions server/repositories/comments.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// TODO make hapi plugin
var debug = require('debug')('jsperf:repositories:comments')
var db = require('../lib/db')
var debug = require('debug')('jsperf:repositories:comments');
var db = require('../lib/db');

const table = 'comments'
const table = 'comments';

module.exports = {
findByPageID: function (pageID, cb) {
debug('findByPageID', arguments)
debug('findByPageID', arguments);

db.genericQuery(
'SELECT * FROM ?? WHERE pageID = ? ORDER BY published ASC',
[table, pageID],
cb
)
);
}
}
};
Loading

0 comments on commit 18e8e92

Please sign in to comment.