Merge pull request #72 from martndemus/upgrade-setup

Upgrade Ember + deps

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.jshintrc

@@ -27,6 +27,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }

.travis.yml

@@ -1,21 +1,23 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "stable"
 
-sudo: false
+sudo: required
+dist: trusty
 
 cache:
   directories:
     - node_modules
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower
-  - npm install phantomjs-prebuilt
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - "npm config set progress false"
 
 install:
-  - npm install
+  - npm install -g bower
+  - npm install --no-optional
   - bower install
 
 script:

addon/components/admin-input.js

@@ -10,13 +10,13 @@ const {
 export default TextField.extend({
   value: computed('columnValue', {
     get() {
-      const columnValue = get(this, 'columnValue');
-      const record = get(this, 'record');
+      let columnValue = get(this, 'columnValue');
+      let record = get(this, 'record');
       return get(record, `model.${columnValue}`);
     },
     set(key, value) {
-      const columnValue = get(this, 'columnValue');
-      const record = get(this, 'record');
+      let columnValue = get(this, 'columnValue');
+      let record = get(this, 'record');
       set(record, `model.${columnValue}`, value);
       return value;
     }

addon/components/model-records-table.js

@@ -3,6 +3,8 @@ import ColumnsMixin from 'ember-admin/mixins/model-records/columns';
 
 const {
   get,
+  set,
+  isBlank,
   isNone,
   computed,
   getOwner,
@@ -11,20 +13,23 @@ const {
 
 export default Component.extend(ColumnsMixin, {
   includedColumns: ['id'],
-  layout: computed(function() {
+  didReceiveAttrs() {
+    this._super(...arguments);
+
+    let owner = getOwner(this);
     let templatePath = `admin/index/${get(this, 'recordType')}`;
-    if (!getOwner(this).lookup(`template:${templatePath}`)) {
+    if (!owner.resolveRegistration(`template:${templatePath}`)) {
       templatePath = 'admin/index/default';
     }
 
-    return getOwner(this).lookup(`template:${templatePath}`);
-  }),
+    set(this, 'layout', owner.resolveRegistration(`template:${templatePath}`));
+  },
   filteredRecords: computed('records', 'filter', function() {
-    if (Ember.isBlank(get(this, 'filter'))) {
+    if (isBlank(get(this, 'filter'))) {
       return get(this, 'records');
     } else {
-      const filter = get(this, 'filter').toLowerCase();
-      const columns = get(this, 'filteredColumns');
+      let filter = get(this, 'filter').toLowerCase();
+      let columns = get(this, 'filteredColumns');
       return get(this, 'records').filter(function(record) {
         let value;
 
@@ -42,17 +47,17 @@ export default Component.extend(ColumnsMixin, {
     return get(this, 'relationshipName') && get(this, 'relationshipId');
   }),
   hideCreate: computed('relationshipName', 'relationshipId', function() {
-    const relationshipName = get(this, 'relationshipName');
-    const relationshipId = get(this, 'relationshipId');
+    let relationshipName = get(this, 'relationshipName');
+    let relationshipId = get(this, 'relationshipId');
 
     if (relationshipId) {
       if (isNone(relationshipName)) {
         return true;
       } else {
-        const { store } = this.admin;
-        const constructor = store.modelFor(get(this, 'recordType'));
-        const inverseFor = constructor.inverseFor(relationshipName, store);
-        const { kind } = inverseFor;
+        let { store } = this.admin;
+        let constructor = store.modelFor(get(this, 'recordType'));
+        let inverseFor = constructor.inverseFor(relationshipName, store);
+        let { kind } = inverseFor;
 
         if (kind && kind === 'belongsTo' && get(this, 'records.length') > 0) {
           return true;

addon/components/property-print.js

@@ -2,17 +2,18 @@ import Ember from 'ember';
 import layout from '../templates/property-print';
 
 const {
+  Component,
   on,
   get,
   set,
   observer,
   addObserver
 } = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   setupCellObsever: observer('record', 'column', on('init', function() {
-    const record = get(this, 'record');
-    const column = get(this, 'column');
+    let record = get(this, 'record');
+    let column = get(this, 'column');
 
     if (!record || !column) {
       return;
@@ -23,9 +24,9 @@ export default Ember.Component.extend({
   })),
 
   _updateCell() {
-    const record = get(this, 'record');
-    const column = get(this, 'column');
-    const value = get(record, column);
+    let record = get(this, 'record');
+    let column = get(this, 'column');
+    let value = get(record, column);
 
     set(this, 'cellValue', value);
   },

addon/controllers/admin.js

@@ -10,7 +10,7 @@ const {
 
 export default Controller.extend({
   filteredModels: computed(function() {
-    const {
+    let {
       includedModels,
       excludedModels
     } = this.admin;

addon/controllers/model-records/edit.js

@@ -3,6 +3,10 @@ import RelationshipsMixin from 'ember-admin/mixins/model-records/relationships';
 import RecordTypeMixin from 'ember-admin/mixins/model-records/record-type';
 import ColumnsMixin from 'ember-admin/mixins/model-records/columns';
 
-export default Ember.Controller.extend(RecordTypeMixin, ColumnsMixin, RelationshipsMixin, {
+const {
+  Controller
+} = Ember;
+
+export default Controller.extend(RecordTypeMixin, ColumnsMixin, RelationshipsMixin, {
   excludedColumns: ['id']
 });

addon/controllers/model-records/index.js

@@ -1,4 +1,8 @@
 import Ember from 'ember';
 import RecordTypeMixin from 'ember-admin/mixins/model-records/record-type';
 
-export default Ember.Controller.extend(RecordTypeMixin);
+const {
+  Controller
+} = Ember;
+
+export default Controller.extend(RecordTypeMixin);

addon/controllers/model-records/new.js

@@ -16,11 +16,11 @@ export default Controller.extend(RecordTypeMixin, ColumnsMixin, {
   'relationship-id': null,
 
   setupRelation: observer('model', function() {
-    const name = get(this, 'relationship-name');
-    const id   = get(this, 'relationship-id');
+    let name = get(this, 'relationship-name');
+    let id   = get(this, 'relationship-id');
 
     if (name && id) {
-      const meta = get(this, 'model').constructor.metaForProperty(name);
+      let meta = get(this, 'model').constructor.metaForProperty(name);
 
       this.admin.store.find(meta.type, id).then((model) => {
         if (meta.kind && meta.kind === 'hasMany') {

addon/mixins/model-records/columns.js

@@ -3,6 +3,8 @@ import RecordTypeMixin from 'ember-admin/mixins/model-records/model-record';
 import { contains } from 'ember-admin/utils/array';
 
 const {
+  Mixin,
+  A: emberArray,
   get,
   computed,
   computed: { filter },
@@ -13,14 +15,14 @@ function columnContains(columnType, parameter) {
   return columnType && contains(columnType, parameter);
 }
 
-export default Ember.Mixin.create(RecordTypeMixin, {
+export default Mixin.create(RecordTypeMixin, {
   columns: computed('model', function() {
-    const adapter = getOwner(this).lookup('data-adapter:main');
-    const recordType = this.get('recordType');
-    const type = adapter.getModelTypes().findBy('name', recordType);
-    const { klass } = type;
+    let adapter = getOwner(this).lookup('data-adapter:main');
+    let recordType = this.get('recordType');
+    let type = adapter.getModelTypes().findBy('name', recordType);
+    let { klass } = type;
 
-    const keys = Ember.A(['id']);
+    let keys = emberArray(['id']);
 
     klass.eachAttribute(function(key) {
       keys.push(key);
@@ -30,11 +32,11 @@ export default Ember.Mixin.create(RecordTypeMixin, {
   }),
 
   filteredColumns: filter('columns', function(name) {
-    const modelName = get(this, 'model-record.name');
+    let modelName = get(this, 'model-record.name');
     let allowColumn = true;
 
     /*jshint -W024 */
-    const {
+    let {
       admin: {
         includedColumns: adminIncludedColumns,
         excludedColumns: adminExcludedColumns

addon/mixins/model-records/model-record.js

@@ -1,15 +1,16 @@
 import Ember from 'ember';
 
 const {
+  computed,
   get,
   getOwner,
   Mixin
 } = Ember;
 
 export default Mixin.create({
-  'model-record': Ember.computed('recordType', function() {
-    const adapter = getOwner(this).lookup('data-adapter:main');
-    const type    = adapter.getModelTypes().findBy('name', get(this, 'recordType'));
+  'model-record': computed('recordType', function() {
+    let adapter = getOwner(this).lookup('data-adapter:main');
+    let type    = adapter.getModelTypes().findBy('name', get(this, 'recordType'));
     return adapter.wrapModelType(type.klass, get(this, 'recordType'));
   })
 });

addon/mixins/model-records/relationships.js

@@ -26,10 +26,10 @@ function relationshipMacro(type) {
           records = emberArray([records]);
         }
 
-        const store = getOwner(this).lookup('store:admin');
-        const constructor = get(this, 'model.constructor');
-        const inverse = constructor.inverseFor(property, store);
-        const meta = constructor.metaForProperty(property);
+        let store = getOwner(this).lookup('store:admin');
+        let constructor = get(this, 'model.constructor');
+        let inverse = constructor.inverseFor(property, store);
+        let meta = constructor.metaForProperty(property);
 
         pushObject(relationships, {
           name:    property,

addon/mixins/model-records/write.js

@@ -9,8 +9,8 @@ const {
 
 export default Mixin.create(EmberDataRouteMixin, {
   renderTemplate() {
-    const templatePath = `${this.templateAdminPath}/${this.paramsFor('model-records').name}`;
-    const defaultTemplatePath = `${this.templateAdminPath}/default`;
+    let templatePath = `${this.templateAdminPath}/${this.paramsFor('model-records').name}`;
+    let defaultTemplatePath = `${this.templateAdminPath}/default`;
 
     if (getOwner(this).lookup(`template:${templatePath}`)) {
       this.render(templatePath);
@@ -20,7 +20,7 @@ export default Mixin.create(EmberDataRouteMixin, {
   },
   actions: {
     save(callback) {
-      const promise = get(this, 'controller.model').save();
+      let promise = get(this, 'controller.model').save();
       callback(promise);
 
       promise.then(() => {

addon/routes/model-records/edit.js

@@ -14,7 +14,7 @@ export default Route.extend(WriteMixin, {
   templateAdminPath: 'admin/edit',
   actions: {
     destroyRecord(callback) {
-      const canDestroy = window.confirm('Are you sure you want to destroy this record?');
+      let canDestroy = window.confirm('Are you sure you want to destroy this record?');
       let promise;
 
       if (canDestroy) {

addon/stores/admin.js

@@ -17,8 +17,8 @@ export default Store.extend({
     }
     if (!this.typeAdapter[type]) {
       let namespaces = [];
-      const adapter = this._super(type);
-      const adminService = getOwner(this).lookup('service:admin');
+      let adapter = this._super(type);
+      let adminService = getOwner(this).lookup('service:admin');
 
       if (adapter.namespace) {
         namespaces = adapter.namespace.split('/');
@@ -33,7 +33,7 @@ export default Store.extend({
         namespace = undefined;
       }
 
-      const AdminAdapter = adapter.constructor.extend({
+      let AdminAdapter = adapter.constructor.extend({
         namespace
       });
 

addon/utils/array.js

@@ -8,7 +8,7 @@ const {
   contains: _contains,
   pushObject: _pushObject,
   removeObject: _removeObject
-} = Ember.A();
+} = emberArray();
 
 export function contains(array, ...values) {
   return _contains.apply(emberArray(array), values);

bower.json

@@ -1,9 +1,8 @@
 {
   "name": "ember-admin",
   "dependencies": {
-    "ember": "~2.5.0",
+    "ember": "~2.7.0",
     "ember-cli-shims": "0.1.1",
-    "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
     "pretender": "~0.10.0"
   }