Seich
/
Beau
mirror of https://github.com/Seich/Beau.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed redundant fields from the config class.

This commit is contained in:
David Diaz 2018-06-14 19:15:52 -06:00
parent 2560403dff
commit 7aed5f0085
5 changed files with 48 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/cli/__tests__/__snapshots__/utils.spec.js.snap
View File

@ -45,25 +45,6 @@ Config {
"HOSTS", "HOSTS",
"COOKIEJAR", "COOKIEJAR",
], ],
"defaultConfigValues": Object {
"COOKIEJAR": false,
"DEFAULTS": Object {},
"ENDPOINT": "",
"ENVIRONMENT": Object {},
"HOSTS": Array [],
"PLUGINS": Array [],
"VERSION": 1,
},
"doc": Object {
"GET /anything": Object {
"alias": "anything",
"payload": Object {
"name": "$env.params.name",
},
},
"endpoint": "https://example.org/",
"version": 1,
},
} }
`; `;

50
src/__tests__/__snapshots__/beau.spec.js.snap
View File

@ -51,31 +51,6 @@ Beau {
"HOSTS", "HOSTS",
"COOKIEJAR", "COOKIEJAR",
], ],
"defaultConfigValues": Object {
"COOKIEJAR": false,
"DEFAULTS": Object {},
"ENDPOINT": "",
"ENVIRONMENT": Object {},
"HOSTS": Array [],
"PLUGINS": Array [],
"VERSION": 1,
},
"doc": Object {
"GET /posts/1": "get-post",
"GET /user": Object {
"alias": "user",
"headers": Object {
"hello": "world",
},
},
"defaults": Object {
"headers": Object {
"authentication": "hello",
},
},
"endpoint": "http://jsonplaceholder.typicode.com",
"version": 1,
},
}, },
"requests": RequestList { "requests": RequestList {
"REQUESTS": Array [ "REQUESTS": Array [
@ -153,31 +128,6 @@ Beau {
"HOSTS", "HOSTS",
"COOKIEJAR", "COOKIEJAR",
], ],
"defaultConfigValues": Object {
"COOKIEJAR": false,
"DEFAULTS": Object {},
"ENDPOINT": "",
"ENVIRONMENT": Object {},
"HOSTS": Array [],
"PLUGINS": Array [],
"VERSION": 1,
},
"doc": Object {
"GET /posts/1": "get-post",
"GET /user": Object {
"alias": "user",
"headers": Object {
"hello": "world",
},
},
"defaults": Object {
"headers": Object {
"authentication": "hello",
},
},
"endpoint": "http://jsonplaceholder.typicode.com",
"version": 1,
},
}, },
"list": Array [ "list": Array [
Request { Request {

74
src/__tests__/__snapshots__/config.spec.js.snap
View File

@ -119,55 +119,6 @@ Config {
"HOSTS", "HOSTS",
"COOKIEJAR", "COOKIEJAR",
], ],
"defaultConfigValues": Object {
"COOKIEJAR": false,
"DEFAULTS": Object {},
"ENDPOINT": "",
"ENVIRONMENT": Object {},
"HOSTS": Array [],
"PLUGINS": Array [],
"VERSION": 1,
},
"doc": Object {
"GET /e1": "e1",
"defaults": Object {
"HEADERS": Object {
"hello": "mars",
},
},
"endpoint": "http://example.org",
"hosts": Array [
Object {
"GET /e2": "e2",
"GET /posts": "posts",
"defaults": Object {
"HEADERS": Object {
"hello": "world",
"world": "hello",
},
},
"endpoint": "http://example.com",
"host": "com",
},
Object {
"GET /e3": "e3",
"GET /posts": "posts",
"defaults": Object {
"HEADERS": Object {
"hello": "world",
"world": "bye",
},
},
"endpoint": "http://example.net",
"host": "net",
},
Object {
"GET /posts": "posts",
"endpoint": "http://example.info",
"host": "info",
},
],
},
} }
`; `;
@ -221,30 +172,5 @@ Config {
"HOSTS", "HOSTS",
"COOKIEJAR", "COOKIEJAR",
], ],
"defaultConfigValues": Object {
"COOKIEJAR": false,
"DEFAULTS": Object {},
"ENDPOINT": "",
"ENVIRONMENT": Object {},
"HOSTS": Array [],
"PLUGINS": Array [],
"VERSION": 1,
},
"doc": Object {
"GET /posts/1": "get-post",
"GET /user": Object {
"alias": "user",
"headers": Object {
"hello": "world",
},
},
"defaults": Object {
"HEADERS": Object {
"authentication": "hello",
},
},
"endpoint": "http://jsonplaceholder.typicode.com",
"version": 1,
},
} }
`; `;

1
src/__tests__/config.spec.js
View File

@ -61,6 +61,7 @@ describe('Config', () => {
it('should load multiple hosts', () => { it('should load multiple hosts', () => {
const doc = yaml.safeLoad(` const doc = yaml.safeLoad(`
version: 1
endpoint: http://example.org endpoint: http://example.org
defaults: defaults:

19
src/config.js
View File

@ -1,11 +1,12 @@
const deepMerge = require('deepmerge'); const deepMerge = require('deepmerge');
const { requestRegex, UpperCaseKeys } = require('./shared'); const { requestRegex, UpperCaseKeys } = require('./shared');
const Plugins = require('./plugins'); const Plugins = require('./plugins');
const version = parseInt(require('../package.json').version, 10);
class Config { class Config {
constructor(doc, env = {}) { constructor(doc, env = {}) {
this.defaultConfigValues = { const defaultConfigValues = {
VERSION: 1, VERSION: version,
ENDPOINT: '', ENDPOINT: '',
PLUGINS: [], PLUGINS: [],
DEFAULTS: {}, DEFAULTS: {},
@ -14,11 +15,10 @@ class Config {
COOKIEJAR: false COOKIEJAR: false
}; };
this.configKeys = Object.keys(this.defaultConfigValues); this.configKeys = Object.keys(defaultConfigValues);
this.doc = doc;
let config = this.loadConfig(doc); let config = this.loadConfig(doc);
Object.assign(this, this.defaultConfigValues, config); Object.assign(this, defaultConfigValues, config);
this.ENVIRONMENT = deepMerge(this.ENVIRONMENT, env); this.ENVIRONMENT = deepMerge(this.ENVIRONMENT, env);
@ -29,21 +29,18 @@ class Config {
ENDPOINT: this.ENDPOINT ENDPOINT: this.ENDPOINT
}); });
this.loadHosts(this.HOSTS, config); this.loadHosts(this.HOSTS, config, defaultConfigValues);
this.PLUGINS = new Plugins(this.PLUGINS); this.PLUGINS = new Plugins(this.PLUGINS);
} }
loadHosts(hosts, rootConfig) { loadHosts(hosts, rootConfig, defaultConfigValues) {
hosts.forEach(host => { hosts.forEach(host => {
if (typeof host.host === 'undefined') { if (typeof host.host === 'undefined') {
throw new Error(`Host doesn't indicate it's host name.`); throw new Error(`Host doesn't indicate it's host name.`);
} }
let config = deepMerge( let config = deepMerge(defaultConfigValues, this.loadConfig(host));
this.defaultConfigValues,
this.loadConfig(host)
);
config.DEFAULTS = deepMerge(rootConfig.DEFAULTS, config.DEFAULTS); config.DEFAULTS = deepMerge(rootConfig.DEFAULTS, config.DEFAULTS);