update to cli 0.2.2, ember 1.11 and convert syntax to work with disable-prototype-extensions

Author: aomran

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) [year] [fullname]
+Copyright (c) 2015
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/aomra015/ember-cli-chart.svg)](https://travis-ci.org/aomra015/ember-cli-chart)
 
-This is an Ember CLI addon for adding a [ChartJS](http://www.chartjs.org/) component. This addon is tested on Ember-CLI v0.2.1 and uses the `ember-try` addon to test against multiple Ember versions.
+This is an Ember CLI addon for adding a [ChartJS](http://www.chartjs.org/) component. This addon is tested on Ember-CLI v0.2.2 and uses the `ember-try` addon to test against multiple Ember versions.
 
 ### Installation
 

addon/components/ember-chart.js

@@ -6,10 +6,10 @@ export default Ember.Component.extend({
   tagName: 'canvas',
   attributeBindings: ['width', 'height'],
 
-  renderChart: function(){
+  didInsertElement: function(){
     var context = this.get('element').getContext('2d');
     var data = this.get('data');
-    var type = this.get('type').classify();
+    var type = Ember.String.classify(this.get('type'));
     var options = Ember.merge({}, this.get('options'));
 
     var chart = new Chart(context)[type](data, options);
@@ -20,17 +20,17 @@ export default Ember.Component.extend({
     }
 
     this.set('chart', chart);
-  }.on('didInsertElement'),
+  },
 
-  destroyChart: function(){
+  willDestroyElement: function(){
     if (this.get('legend')) {
       this.$().parent().children('[class$=legend]').remove();
     }
 
     this.get('chart').destroy();
-  }.on('willDestroyElement'),
+  },
 
-  updateChart: function(){
+  updateChart: Ember.observer('data', 'data.[]', 'options', function(){
     var chart = this.get('chart');
     var data = this.get('data');
     var needUpdate = ChartDataUpdater.create({
@@ -39,5 +39,5 @@ export default Ember.Component.extend({
     }).updateByType();
 
     if (needUpdate) { chart.update(); }
-  }.observes('data', 'data.[]', 'options')
+  })
 });

bower.json

@@ -2,14 +2,14 @@
   "name": "ember-cli-chart",
   "dependencies": {
     "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.16",
-    "ember-resolver": "~0.1.14",
+    "ember": "1.11.0",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-qunit": "0.3.0",
     "ember-qunit-notifications": "0.0.7",
     "qunit": "~1.17.1",
     "chartjs": "1.0.1"

package.json

@@ -31,7 +31,7 @@
   "homepage": "https://github.com/aomra015/ember-cli-chart",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "^0.2.1",
+    "ember-cli": "0.2.2",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
@@ -40,9 +40,10 @@
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.9",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.1"
+    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-try": "0.0.4"
   },
   "dependencies": {
     "ember-cli-babel": "^4.0.0"

tests/dummy/app/controllers/application.js

@@ -4,7 +4,7 @@ export default Ember.Controller.extend({
   pieValue1: 300,
   pieValue2: 50,
   pieValue3: 100,
-  pieData: function(){
+  pieData: Ember.computed('pieValue1', 'pieValue2', 'pieValue3', function(){
     return [
       {
         value: parseInt(this.get('pieValue1')),
@@ -25,10 +25,10 @@ export default Ember.Controller.extend({
         label: "Yellow"
       }
     ];
-  }.property('pieValue1', 'pieValue2', 'pieValue3'),
-    lineValue1: 65,
+  }),
+  lineValue1: 65,
   lineValue2: 59,
-  lineData: function(){
+  lineData: Ember.computed('lineValue1', 'lineValue2', function(){
     return {
         labels: ["January", "February", "March", "April", "May", "June", "July"],
         datasets: [
@@ -54,8 +54,8 @@ export default Ember.Controller.extend({
             }
         ]
     };
-  }.property('lineValue1', 'lineValue2'),
-    barData: {
+  }),
+  barData: {
     labels: ["January", "February", "March", "April", "May", "June", "July"],
     datasets: [
         {
@@ -75,8 +75,8 @@ export default Ember.Controller.extend({
             data: [28, 48, 40, 19, 86, 27, 90]
         }
     ]
-},
-    radarData: {
+  },
+  radarData: {
     labels: ["Eating", "Drinking", "Sleeping", "Designing", "Coding", "Cycling", "Running"],
     datasets: [
         {
@@ -100,8 +100,8 @@ export default Ember.Controller.extend({
             data: [28, 48, 40, 19, 96, 27, 100]
         }
     ]
-},
-    polarAreaData: [
+  },
+  polarAreaData: [
     {
         value: 300,
         color:"#F7464A",
@@ -133,5 +133,5 @@ export default Ember.Controller.extend({
         label: "Dark Grey"
     }
 
-]
+  ]
 });

tests/dummy/app/router.js

@@ -5,7 +5,5 @@ var Router = Ember.Router.extend({
   location: config.locationType
 });
 
-Router.map(function() {
+export default Router.map(function() {
 });
-
-export default Router;

tests/unit/components/ember-chart-test.js

@@ -11,7 +11,7 @@ var ChartTestData = Ember.Object.extend({
   pieValue1: 300,
   pieValue2: 50,
   pieValue3: 100,
-  pieData: function(){
+  pieData: Ember.computed('pieValue1', 'pieValue2', 'pieValue3', function(){
     return [
       {
         value: parseInt(this.get('pieValue1')),
@@ -32,9 +32,9 @@ var ChartTestData = Ember.Object.extend({
         label: "Yellow"
       }
     ];
-  }.property('pieValue1', 'pieValue2', 'pieValue3'),
+  }),
 
-  pieData2: function(){
+  pieData2: Ember.computed(function(){
     return [
       {
         value: 300,
@@ -61,11 +61,11 @@ var ChartTestData = Ember.Object.extend({
         label: "Black"
       }
     ];
-  }.property(),
+  }),
 
   lineValue1: 65,
   lineValue2: 59,
-  lineData: function(){
+  lineData: Ember.computed('lineValue1', 'lineValue2', function(){
     return {
         labels: ["January", "February", "March", "April", "May", "June", "July"],
         datasets: [
@@ -91,7 +91,7 @@ var ChartTestData = Ember.Object.extend({
             }
         ]
     };
-  }.property('lineValue1', 'lineValue2')
+  })
 });
 
 var testData = ChartTestData.create();