Skip to content
This repository was archived by the owner on Jan 22, 2026. It is now read-only.

Commit 76fc159

Browse files
committed
Update jsonapi-model blueprint to use plural name for has-many attr
1 parent ab820fb commit 76fc159

5 files changed

Lines changed: 16 additions & 25 deletions

File tree

blueprints/ember-jsonapi-resources/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ module.exports = {
44
normalizeEntityName: function () {},
55

66
afterInstall: function () {
7-
return this.addBowerPackageToProject('fetch').then(function() {
8-
return this.addBowerPackageToProject('es6-promise');
9-
}.bind(this));
7+
return this.addBowerPackagesToProject([
8+
{ name: 'fetch' },
9+
{ name: 'es6-promise' }
10+
]);
1011
}
1112
};

blueprints/jsonapi-model/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ module.exports = {
2929
var dasherizedType = stringUtils.dasherize(type);
3030
var dasherizedForeignModel = stringUtils.dasherize(foreignModel);
3131
var dasherizedForeignModelSingular = inflection.singularize(dasherizedForeignModel);
32+
var dasherizedForeignModelPlural = inflection.pluralize(dasherizedForeignModel);
3233

3334
var attr;
3435
if (/has-many/.test(dasherizedType)) {
3536
var dasherizedNamePlural = inflection.pluralize(dasherizedName);
36-
attr = resourceAttr(dasherizedForeignModelSingular, dasherizedType);
37+
attr = resourceAttr(dasherizedForeignModelPlural, dasherizedType);
3738
attrs.push('"' + dasherizedNamePlural + '": ' + attr);
3839
} else if (/has-one/.test(dasherizedType)) {
39-
attr = resourceAttr(dasherizedForeignModel, dasherizedType);
40+
attr = resourceAttr(dasherizedForeignModelSingular, dasherizedType);
4041
attrs.push('"' + dasherizedName + '": ' + attr);
4142
} else {
4243
attr = resourceAttr(dasherizedName, dasherizedType);

blueprints/jsonapi-resource/index.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,6 @@ module.exports = {
1717
return this._process('uninstall', options);
1818
},
1919

20-
/*locals: function(options) {
21-
var resource = options.entity.name || options.args[1];
22-
return {
23-
entity: stringUtil.dasherize(inflection.singularize(resource)),
24-
resource: stringUtil.dasherize(inflection.pluralize(resource))
25-
};
26-
},
27-
28-
fileMapTokens: function() {
29-
return {
30-
__resource__: function(options) {
31-
return inflection.pluralize(options.locals.resource);
32-
}
33-
};
34-
},*/
35-
3620
_processBlueprint: function(type, name, options) {
3721
var mainBlueprint = Blueprint.lookup(name, {
3822
ui: this.ui,

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"ember-resolver": "~0.1.20",
1111
"jquery": "^1.11.3",
1212
"loader.js": "ember-cli/loader.js#3.4.0",
13-
"fetch": "~0.9.0",
14-
"es6-promise": "~2.2.0",
13+
"fetch": "~0.10.1",
14+
"es6-promise": "~3.0.2",
1515
"blanket": "~1.1.5"
1616
},
1717
"devDependencies": {

index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ module.exports = {
1818
afterInstall: function() {
1919
return this.addPackagesToProject([
2020
{ name : 'inflection', version : '~1.7.1' },
21-
{ name : 'lodash', version : '~1.0.3' },
22-
{ name : 'ember-inflector', version : '^1.6.2' }
21+
{ name : 'lodash', version : '~3.10.1' },
22+
{ name : 'ember-inflector', version : '^1.6.2' },
23+
{ name : 'ember-cli-string-utils', version: '^1.0.0' },
24+
{ name : 'ember-cli-path-utils', version: '^1.0.0' },
25+
{ name : 'ember-cli-test-info', version: '^1.0.0' },
26+
{ name : 'ember-cli-get-dependency-depth', version: '^1.0.0' },
27+
{ name : 'silent-error', version: '^1.0.0' }
2328
]);
2429
}
2530
};

0 commit comments

Comments
 (0)