Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds babel and starts adding flow to the code base #506

Open
wants to merge 2 commits into
base: Grand-Prix-Cycliste-de-Québec-3.3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["flow", "env"],
"comments": false
}
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"env": {
"parser": "babel-eslint",
"plugins": [
"flowtype"
],
"extends": [
"plugin:flowtype/recommended"
],
"env": {
"browser": true,
"node": true,
"es6": true
Expand Down
11 changes: 11 additions & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[ignore]

[include]

[libs]

[lints]

[options]

[strict]
23 changes: 11 additions & 12 deletions bin/lint.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
#!/usr/bin/env node
'use strict';

const eslint = require('eslint')
, CLIEngine = eslint.CLIEngine
, linter = new CLIEngine({
useEslintrc: true,
})
, report = linter.executeOnFiles([
'./utils/**/*.js'
, '!./utils/**/*_test.js'
, './routes/**/*.js'
, '!./routes/**/*_test.js'
, './security/**/*.js'
, '!./security/**/*_test.js'
, './web-sockets/**/*.js'
, '!./web-sockets/**/*_test.js'
, '*.js'
, '!*_test.js'
, '!gulpfile.js' ])
'./src/utils/**/*.js'
, '!./src/utils/**/*.test.js'
, './src/routes/**/*.js'
, '!./src/routes/**/*.test.js'
, './src/security/**/*.js'
, '!./src/security/**/*.test.js'
, './src/web-sockets/**/*.js'
, '!./src/web-sockets/**/*.test.js'
, './src/*.js'
, '!./src/*.test.js'
])
, formatter = linter.getFormatter()
, errorCheck = (errorCount, file) => {
return errorCount + file.errorCount;
Expand Down
59 changes: 59 additions & 0 deletions built/index.http2.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@


const test = require('ava'),
servers = [],
events = require('harken'),
http2 = require('http2'),
fs = require('fs'),
path = require('path'),
semver = require('semver'),
configStore = require('./utils/config');

test.beforeEach(() => {
configStore.reset();
});

test.afterEach(() => {
const shutDownEvents = events.required(['complete'], () => {});

servers.forEach((server, i) => {
shutDownEvents.add(`server:${i}`);
server.close(() => {
events.emit(`server:${i}`);
});
});

events.emit('complete');
});

test.cb('should return an http2 server when http2 and correct params are passed in', t => {
const http2App = require('./index');

http2App.server({
routeJSONPath: './test_stubs/routes_stub.json',
templatePath: './test_stubs/templates',
routePath: './test_stubs',
compress: false,
server: http2,
port: 9996,
serverOptions: {
cert: fs.readFileSync(path.join(__dirname, './test_stubs/certs/test.crt')),
key: fs.readFileSync(path.join(__dirname, './test_stubs/certs/tests.key'))
},
log: {
log: () => {}
}
});

http2App.events.once('server:started', settings => {
servers.push(settings.server);

if (semver.lt(process.versions.node, '8.8.0')) {
t.true(settings.server instanceof http2.Server);
} else {
t.is(settings.server.constructor.name, 'Http2Server');
}

t.end();
});
});
44 changes: 44 additions & 0 deletions built/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@


const events = require('harken'),
pkg = require('./package.json'),
parser = require('./utils/parser'),
webSockets = require('./web-sockets'),
uuid = require('uuid'),
config = require('./utils/config'),
setup = require('./utils').setup,
routeStore = require('./routes/routeStore'),
wrapper = configIn => {
const configObj = config.set(configIn),
logger = configObj.log,
routes = require(configObj.routeJSONPath);

events.once('setup:complete', () => {
const server = require('./routes/index').server(configObj.server, routes, configObj);

server.listen(configObj.port);

if (configIn.webSockets !== false) {
webSockets(server, configIn.webSockets);
}

logger.info(`monument v${pkg.version} up and running on port: ${configObj.port}`);
events.emit('server:started', {
version: pkg.version,
port: configObj.port,
server: server
});
});

setup(configObj);
};

module.exports = {
server: wrapper,
events: events,
parser: parser,
routes: routeStore,
createUUID: () => {
return uuid.v4();
}
};
53 changes: 53 additions & 0 deletions built/index.spdy.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@


const test = require('ava'),
servers = [],
events = require('harken'),
spdy = require('spdy'),
fs = require('fs'),
path = require('path'),
configStore = require('./utils/config');

test.beforeEach(() => {
configStore.reset();
});

test.afterEach(() => {
const shutDownEvents = events.required(['complete'], () => {});

servers.forEach((server, i) => {
shutDownEvents.add(`server:${i}`);
server.close(() => {
events.emit(`server:${i}`);
});
});

events.emit('complete');
});

test.cb('should return an spdy server when spdy and correct params are passed in', t => {
const spdyApp = require('./index');

spdyApp.server({
routeJSONPath: './test_stubs/routes_stub.json',
templatePath: './test_stubs/templates',
routePath: './test_stubs',
compress: false,
server: spdy,
port: 9995,
serverOptions: {
cert: fs.readFileSync(path.join(__dirname, './test_stubs/certs/test.crt')),
key: fs.readFileSync(path.join(__dirname, './test_stubs/certs/tests.key')),
ca: fs.readFileSync(path.join(__dirname, './test_stubs/certs/rootCA.key'))
},
log: {
log: () => {}
}
});

spdyApp.events.once('server:started', settings => {
servers.push(settings.server);
t.true(settings.server instanceof spdy.Server);
t.end();
});
});
109 changes: 109 additions & 0 deletions built/index.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@


const test = require('ava'),
app = require('./index'),
http = require('http'),
servers = [],
events = require('harken'),
configStore = require('./utils/config');

test.beforeEach(() => {
configStore.reset();
});

test.afterEach(() => {
const shutDownEvents = events.required(['complete'], () => {});

servers.forEach((server, i) => {
shutDownEvents.add(`server:${i}`);
server.close(() => {
events.emit(`server:${i}`);
});
});

events.emit('complete');
});

test('should be correctly defined', t => {
t.is(typeof app.server, 'function');
t.is(typeof app.parser, 'function');
t.is(typeof app.routes, 'object');
t.is(typeof app.events, 'object');
});

test('should have a parser method', t => {
t.is(typeof app.parser, 'function');
});

test.cb('should return a server when run', t => {
app.server({
routeJSONPath: './test_stubs/routes_stub.json',
routePath: './test_stubs',
templatePath: './test_stubs/templates',
port: 9999,
log: {
log: () => {}
}
});

app.events.once('server:started', settings => {
servers.push(settings.server);
t.true(settings.server instanceof http.Server);
t.end();
});
});

test.cb('should return a server when run and no port passed in', t => {
const noPortApp = require('./index');

noPortApp.server({
routeJSONPath: './test_stubs/routes_stub.json',
templatePath: './test_stubs/templates',
routePath: './test_stubs',
port: 9998,
log: {
log: () => {}
}
});

noPortApp.events.once('server:started', settings => {
servers.push(settings.server);
t.true(settings.server instanceof http.Server);
t.end();
});
});

test.cb('should return a server when run and compress passed in', t => {
const compressApp = require('./index');

compressApp.server({
routeJSONPath: './test_stubs/routes_stub.json',
templatePath: './test_stubs/templates',
compress: false,
routePath: './test_stubs',
port: 9997,
log: {
log: () => {}
}
});

compressApp.events.once('server:started', settings => {
servers.push(settings.server);
t.true(settings.server instanceof http.Server);
t.end();
});
});

test('should have a createUUID function', t => {
t.is(typeof app.createUUID, 'function');
});

test('should return a uuid when called', t => {
const regex = /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i;

t.true(regex.test(app.createUUID()));
});

test('should not return the same uuid when called multiple times', t => {
t.not(app.createUUID(), app.createUUID());
});
Loading