fix model relationship name generation

[gabrielgrant]

It is not currently possible to generate a model with a relationship named differently from the model's name (despite the help indicating it should be)

This patch brings the code's behavior in line with the docs.

I've also filed ember-cli/ember-cli#4986 as a hold-over until ember-cli/ember-cli#4909 lands

(not sure how closely you monitor ED PRs, so cc: @stefanpenner )

[igorT]

Not sure what you mean, can you please explain and/or write a test?

[gabrielgrant]

To clarify, this is a bug in the new ember-cli blueprints that @stefanpenner is bringing into ED from the ember-cli repo (hence CCing him and opening the PR against this branch)

The docs for the model blueprint state that ember generate model taco filling:belongs-to:protein toppings:has-many:toppings name:string price:number misc should result in the following model:

import DS from 'ember-data';
export default DS.Model.extend({
  filling: DS.belongsTo('protein'),
  toppings: DS.hasMany('topping'),
  name: DS.attr('string'),
  price: DS.attr('number'),
  misc: DS.attr()
});

But instead, this is what that command actually generates:

import DS from 'ember-data';

export default DS.Model.extend({
  filling: DS.belongsTo('filling'),  // <------ should be 'protein'
  toppings: DS.hasMany('topping'),
  name: DS.attr('string'),
  price: DS.attr('number'),
  misc: DS.attr()
});

That is, the name of the model gets ignored, and instead just pulled from the name of the field. This patch fixes the issue in the blueprint, but is dependent on ember-cli/ember-cli#4986 to fix ember-cli's argument parsing code because it currently just throws out everything after the second : (this PR shouldn't break anything without that one, but it won't fix the issue until that lands)

Sorry for lack of tests; I don't believe ember-cli has any testing infrastructure for it's blueprint generation code, and putting that in place should probably be a separate PR.

[stefanpenner]

(not sure how closely you monitor ED PRs, so cc: @stefanpenner )

thanks for the CC, reviewing now.

[stefanpenner]

looks good, we should add tests on the ember-cli side: ember-cli/ember-cli#4986 (comment)

We are still working to extract common tests for this PR (@trabus has been doing some good job here, maybe he has some insight)