[BUGFIX beta] remove trailing whitespace from model blueprint

[sbatson5]

Addresses: #4306

This ensures that if attrs are present when generating a model, we indent them properly. If no attrs are present, there should be no trailing whitespace.

[pangratz]

I personally think that using an if here, might make this more readable:

export default Model.extend({
<% if (attrs) { %>
  <%= attrs %>
<% } %>
});

What do you think?

---

Another possibility would be to prepend the empty string within blueprints/model/index.js. We are already doing that for the needs statement, so I think this would be fine for attrs too...

[sbatson5]

@pangratz Thanks for the feedback!

The problem I run into with the if condition is that if I do pass in attrs
ember g model foo --attrs name, title
I get empty lines surrounding them:

export default Model.extend({

  name,: attr(),
  title: attr()

});

The ternary doesn't have that issue. I tried the suggestion found here: #4306 (comment) using -%> but received an Unexpected token error no matter where I used it (both for the closing if and <%= attrs -%>).

I saw that ternary used here https://github.com/emberjs/data/blob/master/blueprints/model-test/qunit-files/tests/unit/__path__/__test__.js#L5 so went that route. But I agree that it isn't that readable.

[pangratz]

Ah, ok. Thanks for the heads up @sbatson5. Let's leave it then the way it is, we can always change this later on.

[pangratz]

I left a tiny nitpick comment, apart from that: thank you very much for fixing this @sbatson5 🚀 !

Can you also prefix with [BUGFIX beta] so it is ensured that this is fixed in the next beta release (not sure if there will be one before the next stable release, but just to be sure 😉 )?

[pangratz]

Thank you kindly!