Conditional use of addon-import blueprint via jsonapi-resource generator (#102)

* Add condition for use of addon-import blueprint via jsonapi-resource generator
* Remove sleep dependency breaks build

Author: pixelhandler

README.md

@@ -47,6 +47,7 @@ To run the app in /tests/dummy use a proxy url for a live API
 * `ember test --server`
 * `ember test --server -m 'Unit | Mixin | service cache'`
 * `ember test --server --filter 'cacheUpdate'`
+* `npm run nodetest` tests for blueprint, e.g. `jsonapi-resource`
 
 A good way to get to know more about how this addon works is to review the tests,
 see source code for the unit tests: [tests/unit](tests/unit).

blueprints/jsonapi-model/files/__root__/__path__/__name__.js

@@ -2,14 +2,14 @@ import Ember from 'ember';
 import Resource from 'ember-jsonapi-resources/models/resource';
 import { attr, hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';
 
-let <%= classifiedModuleName %> = Resource.extend({
+let <%= classifiedModuleName %>Model = Resource.extend({
   type: '<%= resource %>',
   service: Ember.inject.service('<%= resource %>'),
 
   <%= attrs %>
 });
 
-<%= classifiedModuleName %>.reopenClass({
+<%= classifiedModuleName %>Model.reopenClass({
 
   getDefaults() {
     return {
@@ -18,4 +18,4 @@ let <%= classifiedModuleName %> = Resource.extend({
   }
 });
 
-export default <%= classifiedModuleName %>;
+export default <%= classifiedModuleName %>Model;

blueprints/jsonapi-resource/index.js

@@ -57,17 +57,21 @@ module.exports = {
     var modelOptions = merge({}, options, {
       entity: {
         name: entityName ? inflection.singularize(entityName) : ''
-      }
+      },
+      originBlueprintName: 'jsonapi-model'
     });
 
     var otherOptions = merge({}, options);
-
-    return Promise.all([
+    var promises = [
       this._processBlueprint(type, 'jsonapi-model', modelOptions),
       this._processBlueprint(type, 'jsonapi-adapter', otherOptions),
       this._processBlueprint(type, 'jsonapi-serializer', otherOptions),
       this._processBlueprint(type, 'jsonapi-service', otherOptions),
       this._processBlueprint(type, 'jsonapi-initializer', otherOptions)
-    ]);
+    ];
+    if (!!options.project.pkg['ember-addon']) {
+      promies.push( this._processBlueprint(type, 'addon-import', modelOptions) );
+    }
+    return Promise.all(promises);
   }
 };