Merge pull request #32 from ahmetemrekilinc/master

2.0.0
tubitak-bilgem-yte · Jan 30, 2018 · 4498cac · 4498cac
2 parents a024482 + c1688c1
commit 4498cac
Show file tree

Hide file tree

Showing 34 changed files with 1,455 additions and 516 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,10 +4,54 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
 };
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "4"
+  - "7"
 
 sudo: false
 dist: trusty
@@ -12,41 +12,36 @@ addons:
   chrome: stable
 
 cache:
-  directories:
-    - $HOME/.npm
-
-
-addons:
-  code_climate:
-    repo_token: a0abb57473b09b2720bafaf462b967f49c365444a854f5deece7c62df7048319
-
-
+  yarn: true
 
 env:
-  # we recommend new addons test the current and previous LTS
-  # as well as latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.8
-  - EMBER_TRY_SCENARIO=ember-lts-2.12
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  matrix:
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g npm@4
-  - npm --version
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+
+install:
+  - yarn install --no-lockfile --non-interactive
 
 script:
+  - yarn lint:js
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
-
-after_script:
-  - codeclimate-test-reporter < lcov.info
-
diff --git a/addon/components/data-filterer.js b/addon/components/data-filterer.js
@@ -1,7 +1,11 @@
-import Ember from 'ember';
+import { A } from '@ember/array';
+import Component from '@ember/component';
+import { isEmpty } from '@ember/utils';
+import { get, computed } from '@ember/object';
 import layout from '../templates/data-filterer';
-import {diacriticsInsensitiveMatcher as defaultMatcher} from '../util/diactricts';
-const {computed, isEmpty, get} = Ember;
+import {
+  diacriticsInsensitiveMatcher as defaultMatcher
+} from '../util/diactricts';
 
 function createFieldFilter(fieldName, filter) {
   return {fieldName: fieldName, filter: filter};
@@ -28,15 +32,15 @@ function itemFilterer(item, filterFields) {
   return satisfiedFilters.length === filterFields.length;
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'',
 
   init() {
     this._super(...arguments);
 
     if (isEmpty(this.get('fieldFilters'))) {
-      this.set('fieldFilters', Ember.A());
+      this.set('fieldFilters', A());
     }
   },
 

diff --git a/addon/components/data-paginator.js b/addon/components/data-paginator.js
@@ -1,25 +1,27 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 import layout from '../templates/data-paginator';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   currentPage:1,
   pageSize:10,
   classNames:['contextual-data-paginator'],
 
-  hasNext:Ember.computed('paginatedData.[]', 'pageSize', function(){
+  hasNext:computed('paginatedData.[]', 'pageSize', function(){
      return this.get('paginatedData').length === this.get('pageSize');
   }),
 
-  offset:Ember.computed('pageSize','currentPage', function(){
+  offset:computed('pageSize','currentPage', function(){
     let pageSize = this.get('pageSize');
     let currentPage = this.get('currentPage')-1;
     return currentPage * pageSize;
   }),
 
-  limit:Ember.computed.alias('pageSize'),
+  limit:alias('pageSize'),
 
-  paginatedData:Ember.computed('data.[]', 'pageSize', 'currentPage', function(){
+  paginatedData:computed('data.[]', 'pageSize', 'currentPage', function(){
     let data = this.get('data'); //TODO : Ember.assert 'data' is not null/undefined
     let pageSize = this.get('pageSize');
     let currentPage = this.get('currentPage')-1;

diff --git a/addon/components/data-sorter.js b/addon/components/data-sorter.js
@@ -1,5 +1,7 @@
-import Ember from 'ember';
-const {computed, isEmpty, get} = Ember;
+import { A } from '@ember/array';
+import Component from '@ember/component';
+import { isEmpty } from '@ember/utils';
+import { get, computed } from '@ember/object';
 import layout from '../templates/data-sorter';
 
 function internalSorter(data, sortFields) {
@@ -47,15 +49,15 @@ function createSortField(fieldName) {
   return {fieldName: tokens[0], isAscending: isAscending};
 }
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName: '',
 
   init() {
     this._super(...arguments);
 
     if (isEmpty(this.get('sortFields'))) {
-      this.set('sortFields', Ember.A());
+      this.set('sortFields', A());
     }
   },
 
@@ -70,7 +72,7 @@ export default Ember.Component.extend({
   }),
 
   internalSortFields: computed('sortFields.[]', function () {
-    let result = Ember.A();
+    let result = A();
 
     if (isEmpty(this.get('sortFields'))) {
       return result;

diff --git a/addon/components/data-table.js b/addon/components/data-table.js
@@ -1,30 +1,33 @@
-import Ember from 'ember';
+import { A, isArray } from '@ember/array';
+import { computed } from '@ember/object';
+import { equal, setDiff, empty } from '@ember/object/computed';
+import Component from '@ember/component';
 import layout from '../templates/data-table';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'table',
 
   showHeader:true,
   showFooter:false,
 
-  singleSelection:Ember.computed.equal('selectionMode','single'),
+  singleSelection:equal('selectionMode','single'),
 
-  notSelectedRows:Ember.computed.setDiff('data','selectedRows'),
-  isAllSelected:Ember.computed.empty('notSelectedRows'),
+  notSelectedRows:setDiff('data','selectedRows'),
+  isAllSelected:empty('notSelectedRows'),
 
   selectionChanged:function(){},
   classNames:['contextual-data-table'],
 
   rowIdPrefix:'table-row-id',
 
-  selectedRows:Ember.computed('data.[]',{
+  selectedRows:computed('data.[]',{
     get(){
-      return Ember.A();
+      return A();
     },
     set(key, value){
-      let arr = Ember.A();
-      if(Ember.isArray(value)){
+      let arr = A();
+      if(isArray(value)){
         arr.pushObjects(value);
       }
       return arr;

diff --git a/addon/components/dt-column-cell.js b/addon/components/dt-column-cell.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-column-cell';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'td',
   classNames:['contextual-cell']

diff --git a/addon/components/dt-column-footer.js b/addon/components/dt-column-footer.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-column-footer';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'td',
   classNames:['contextual-footer-cell']

diff --git a/addon/components/dt-column-header.js b/addon/components/dt-column-header.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-column-header';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'th',
   classNames:['contextual-header-cell']

diff --git a/addon/components/dt-filterable-column-base.js b/addon/components/dt-filterable-column-base.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { observer } from '@ember/object';
 import layout from '../templates/dt-filterable-column-base';
-const {observer} = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
 
   filterValueChanged:observer('filterValue', function (){

diff --git a/addon/components/dt-selection-column-footer.js b/addon/components/dt-selection-column-footer.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-selection-column-footer';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'td',
   classNames:['contextual-selection-footer-cell'],

diff --git a/addon/components/dt-selection-column-header.js b/addon/components/dt-selection-column-header.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-selection-column-header';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'th',
   classNames:['contextual-selection-header-cell'],

diff --git a/addon/components/dt-selection-column.js b/addon/components/dt-selection-column.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/dt-selection-column';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   tagName:'td',
   classNames:['contextual-selection-cell'],

diff --git a/addon/components/dt-sortable-column-base.js b/addon/components/dt-sortable-column-base.js
@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
 import layout from '../templates/dt-sortable-column-base';
-const {computed} = Ember;
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   upArrowVisible: computed('isAscending', function () {
     return this.get('isAscending') === false;

diff --git a/addon/components/empty-component.js b/addon/components/empty-component.js
@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/empty-component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName:'',
   layout
 });
diff --git a/addon/components/pager-component.js b/addon/components/pager-component.js
@@ -1,19 +1,20 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 import layout from '../templates/pager-component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   layout,
   classNames:['contextual-pager-component'],
 
-  previousDisabled: Ember.computed('currentPage',function(){
+  previousDisabled: computed('currentPage',function(){
     return (this.get('currentPage') <= 1) ;
   }),
 
-  previousButtonClass: Ember.computed('previousDisabled',function(){
+  previousButtonClass: computed('previousDisabled',function(){
     return (this.get('previousDisabled') ? 'disabled' : '') ;
   }),
 
-  nextButtonClass: Ember.computed('nextDisabled',function(){
+  nextButtonClass: computed('nextDisabled',function(){
     return (this.get('nextDisabled') ? 'disabled' : '') ;
   }),