Skip to content
This repository was archived by the owner on Jun 23, 2019. It is now read-only.

Commit b2aed8d

Browse files
pksunkarapksunkara
committed
chore: Move to peasant 1
1 parent abcddcf commit b2aed8d

20 files changed

+124
-103
lines changed

Diff for: ‎.babelrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Generated by Peasant
2+
{
3+
"presets": ["latest"],
4+
"plugins": ["transform-runtime"]
5+
}

Diff for: ‎.eslintrc

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// Generated by Peasant
22
{
3-
"extends": "airbnb/base"
3+
"extends": "airbnb/base",
4+
"env": {
5+
"mocha": true
6+
}
47
}

Diff for: ‎.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ node_js:
88
script:
99
- npm run ci
1010
after_script:
11-
- npm run coveralls
11+
- npm install -g codeclimate-test-reporter
12+
- npm run cover
13+
- codeclimate-test-reporter < lcov.info
1214
notifications:
1315
email: false
1416
slack:

Diff for: ‎package.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"url": "https://github.com/refractproject/minim-api-description.git"
99
},
1010
"scripts": {
11-
"coveralls": "npm run cover && coveralls <coverage/lcov.info",
1211
"test": "peasant test",
1312
"ci": "peasant -s lint test build",
1413
"prepublish": "npm run ci",
@@ -17,13 +16,12 @@
1716
"lint": "peasant lint"
1817
},
1918
"dependencies": {
20-
"babel-runtime": "^5.8.20"
19+
"babel-runtime": "^6.23.0"
2120
},
2221
"devDependencies": {
2322
"chai": "^3.2.0",
24-
"coveralls": "^2.11.2",
2523
"minim": "^0.14.0",
26-
"peasant": "^0.5.2"
24+
"peasant": "^1.0.0"
2725
},
2826
"author": "Apiary.io <[email protected]>",
2927
"license": "MIT"

Diff for: ‎src/api-description.js

+26-13
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,32 @@
2020
* + Data structure
2121
*/
2222

23+
import httpHeaders from './elements/http-headers';
24+
import hrefVariables from './elements/href-variables';
25+
import asset from './elements/asset';
26+
import httpMessagePayload from './elements/http-message-payload';
27+
import authScheme from './elements/auth-scheme';
28+
import httpTransaction from './elements/http-transaction';
29+
import transition from './elements/transition';
30+
import resource from './elements/resource';
31+
import dataStructure from './elements/data-structure';
32+
import copy from './elements/copy';
33+
import category from './elements/category';
34+
import extension from './elements/extension';
35+
2336
export function namespace(options) {
24-
require('./elements/http-headers')(options.base);
25-
require('./elements/href-variables')(options.base);
26-
require('./elements/asset')(options.base);
27-
require('./elements/http-message-payload')(options.base);
28-
require('./elements/auth-scheme')(options.base);
29-
require('./elements/http-transaction')(options.base);
30-
require('./elements/transition')(options.base);
31-
require('./elements/resource')(options.base);
32-
require('./elements/data-structure')(options.base);
33-
require('./elements/copy')(options.base);
34-
require('./elements/category')(options.base);
35-
require('./elements/extension')(options.base);
37+
httpHeaders(options.base);
38+
hrefVariables(options.base);
39+
asset(options.base);
40+
httpMessagePayload(options.base);
41+
authScheme(options.base);
42+
httpTransaction(options.base);
43+
transition(options.base);
44+
resource(options.base);
45+
dataStructure(options.base);
46+
copy(options.base);
47+
category(options.base);
48+
extension(options.base);
3649
}
3750

38-
export default {namespace};
51+
export default { namespace };

Diff for: ‎src/elements/asset.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
class Asset extends namespace.BaseElement {
3-
constructor() {
4-
super(...arguments);
3+
constructor(...args) {
4+
super(...args);
55
this.element = 'asset';
66
}
77

Diff for: ‎src/elements/auth-scheme.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const ArrayElement = namespace.getElementClass('array');
33

44
class AuthScheme extends ArrayElement {
5-
constructor() {
6-
super(...arguments);
5+
constructor(...args) {
6+
super(...args);
77
this.element = 'authScheme';
88
}
99

1010
get transitions() {
11-
return this.children((item) => item.element === 'transition');
11+
return this.children(item => item.element === 'transition');
1212
}
1313

1414
get members() {
15-
return this.children((item) => item.element === 'member');
15+
return this.children(item => item.element === 'member');
1616
}
1717
}
1818

Diff for: ‎src/elements/category.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const ArrayElement = namespace.getElementClass('array');
33

44
class Category extends ArrayElement {
5-
constructor() {
6-
super(...arguments);
5+
constructor(...args) {
6+
super(...args);
77
this.element = 'category';
88
}
99

1010
get resourceGroups() {
11-
return this.children((item) => item.classes.contains('resourceGroup'));
11+
return this.children(item => item.classes.contains('resourceGroup'));
1212
}
1313

1414
get dataStructures() {
15-
return this.children((item) => item.classes.contains('dataStructures'));
15+
return this.children(item => item.classes.contains('dataStructures'));
1616
}
1717

1818
get scenarios() {
19-
return this.children((item) => item.classes.contains('scenario'));
19+
return this.children(item => item.classes.contains('scenario'));
2020
}
2121

2222
get transitionGroups() {
23-
return this.children((item) => item.classes.contains('transitions'));
23+
return this.children(item => item.classes.contains('transitions'));
2424
}
2525

2626
get authSchemeGroups() {
27-
return this.children((item) => item.classes.contains('authSchemes'));
27+
return this.children(item => item.classes.contains('authSchemes'));
2828
}
2929

3030
get resources() {
31-
return this.children((item) => item.element === 'resource');
31+
return this.children(item => item.element === 'resource');
3232
}
3333

3434
get transitions() {
35-
return this.children((item) => item.element === 'transition');
35+
return this.children(item => item.element === 'transition');
3636
}
3737

3838
get authSchemes() {
3939
const schemes = ['Basic Authentication Scheme', 'Token Authentication Scheme', 'OAuth2 Scheme'];
40-
return this.children((item) => schemes.indexOf(item.element) !== -1);
40+
return this.children(item => schemes.indexOf(item.element) !== -1);
4141
}
4242
}
4343

Diff for: ‎src/elements/copy.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const StringElement = namespace.getElementClass('string');
33
const ArrayElement = namespace.getElementClass('array');
44

5-
ArrayElement.prototype.__defineGetter__('copy', function() {
6-
return this.children((item) => item.element === 'copy');
5+
Object.defineProperty(ArrayElement.prototype, 'copy', {
6+
get() {
7+
return this.children(item => item.element === 'copy');
8+
},
79
});
810

911
class Copy extends StringElement {
10-
constructor() {
11-
super(...arguments);
12+
constructor(...args) {
13+
super(...args);
1214
this.element = 'copy';
1315
}
1416

Diff for: ‎src/elements/data-structure.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
class DataStructure extends namespace.BaseElement {
3-
constructor() {
4-
super(...arguments);
3+
constructor(...args) {
4+
super(...args);
55
this.element = 'dataStructure';
6+
67
if (this.content !== undefined) {
78
this.content = namespace.toElement(this.content);
89
}

Diff for: ‎src/elements/extension.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
class Extension extends namespace.BaseElement {
3-
constructor() {
4-
super(...arguments);
3+
constructor(...args) {
4+
super(...args);
55
this.element = 'extension';
66
}
77

88
get profile() {
99
return this.links
10-
.filter((link) => link.relation === 'profile')
11-
.map((link) => link.href)
10+
.filter(link => link.relation === 'profile')
11+
.map(link => link.href)
1212
.shift();
1313
}
1414
}

Diff for: ‎src/elements/href-variables.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const ObjectElement = namespace.getElementClass('object');
33

44
class HrefVariables extends ObjectElement {
5-
constructor() {
6-
super(...arguments);
5+
constructor(...args) {
6+
super(...args);
77
this.element = 'hrefVariables';
88
}
99
}

Diff for: ‎src/elements/http-headers.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const ArrayElement = namespace.getElementClass('array');
33

44
class HttpHeaders extends ArrayElement {
5-
constructor() {
6-
super(...arguments);
5+
constructor(...args) {
6+
super(...args);
77
this.element = 'httpHeaders';
88
}
99

@@ -12,7 +12,7 @@ export default function(namespace) {
1212
}
1313

1414
include(name) {
15-
return this.filter(item => {
15+
return this.filter((item) => {
1616
const key = item.key.toValue();
1717

1818
// Note: this may not be a string, hence the duck-Element check below!
@@ -21,7 +21,7 @@ export default function(namespace) {
2121
}
2222

2323
exclude(name) {
24-
return this.filter(item => {
24+
return this.filter((item) => {
2525
const key = item.key.toValue();
2626

2727
// Note: this may not be a string, hence the duck-Element check below!

Diff for: ‎src/elements/http-message-payload.js

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
export default function(namespace) {
1+
import httpRequest from './http-request';
2+
import httpResponse from './http-response';
3+
4+
export default function (namespace) {
25
const ArrayElement = namespace.getElementClass('array');
36

47
class HttpMessagePayload extends ArrayElement {
5-
constructor() {
6-
super(...arguments);
7-
}
8-
98
get headers() {
109
return this.attributes.get('headers');
1110
}
@@ -19,9 +18,7 @@ export default function(namespace) {
1918
let header = null;
2019

2120
if (headers) {
22-
header = headers.include(name).map(item => {
23-
return item.value.toValue();
24-
});
21+
header = headers.include(name).map(item => item.value.toValue());
2522
}
2623

2724
return header;
@@ -43,20 +40,16 @@ export default function(namespace) {
4340
get messageBody() {
4441
// Returns the *first* message body. Only one should be defined according
4542
// to the spec, but it's possible to include more.
46-
return this.filter((item) => {
47-
return item.element === 'asset' && item.classes.contains('messageBody');
48-
}).first();
43+
return this.filter(item => item.element === 'asset' && item.classes.contains('messageBody')).first();
4944
}
5045

5146
get messageBodySchema() {
5247
// Returns the *first* message body schema. Only one should be defined
5348
// according to the spec, but it's possible to include more.
54-
return this.filter((item) => {
55-
return item.element === 'asset' && item.classes.contains('messageBodySchema');
56-
}).first();
49+
return this.filter(item => item.element === 'asset' && item.classes.contains('messageBodySchema')).first();
5750
}
5851
}
5952

60-
require('./http-request')(namespace, HttpMessagePayload);
61-
require('./http-response')(namespace, HttpMessagePayload);
53+
httpRequest(namespace, HttpMessagePayload);
54+
httpResponse(namespace, HttpMessagePayload);
6255
}

Diff for: ‎src/elements/http-request.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export default function(namespace, HttpMessagePayload) {
1+
export default function (namespace, HttpMessagePayload) {
22
class HttpRequest extends HttpMessagePayload {
3-
constructor() {
4-
super(...arguments);
3+
constructor(...args) {
4+
super(...args);
55
this.element = 'httpRequest';
66
}
77

Diff for: ‎src/elements/http-response.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
export default function(namespace, HttpMessagePayload) {
1+
export default function (namespace, HttpMessagePayload) {
22
class HttpResponse extends HttpMessagePayload {
3-
constructor() {
4-
super(...arguments);
3+
constructor(...args) {
4+
super(...args);
55
this.element = 'httpResponse';
66
}
77

Diff for: ‎src/elements/http-transaction.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
export default function(namespace) {
1+
export default function (namespace) {
22
const ArrayElement = namespace.getElementClass('array');
33
const AuthScheme = namespace.getElementClass('authScheme');
44

55
class HttpTransaction extends ArrayElement {
6-
constructor() {
7-
super(...arguments);
6+
constructor(...args) {
7+
super(...args);
88
this.element = 'httpTransaction';
99
}
1010

1111
get request() {
12-
return this.children((item) => item.element === 'httpRequest').first();
12+
return this.children(item => item.element === 'httpRequest').first();
1313
}
1414

1515
get response() {
16-
return this.children((item) => item.element === 'httpResponse').first();
16+
return this.children(item => item.element === 'httpResponse').first();
1717
}
1818

1919
get authSchemes() {
20-
return namespace.toElement(this.attributes.get('authSchemes').map((item) => {
21-
return (new AuthScheme()).fromRefract(item);
22-
}));
20+
return namespace.toElement(this.attributes.get('authSchemes').map(item => (new AuthScheme()).fromRefract(item)));
2321
}
2422
}
2523

0 commit comments

Comments
 (0)