💎 Release new version 2.1.0

Signed-off-by: Jakub Juszczak <netghost03@gmail.com>

.github/CONTRIBUTING.md

@@ -0,0 +1,10 @@
+Thank you for contributing vue-chartjs!
+=========================================
+
+Please follow this steps:
+
+1. Fork it ( https://github.com/apertureless/vue-chartjs/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,14 @@
+
+### Expected Behavior
+
+
+### Actual Behavior
+
+
+
+
+
+### Environment
+- OS: Write here
+- NPM Version: Write here
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+
+
+### Fix or Enhancement?
+
+
+- [ ] All tests passed
+
+
+### Environment
+- OS: Write here
+- NPM Version: Write here
+

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "6"
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -0,0 +1,25 @@
+# Change Log
+
+## [1.1.0](https://github.com/apertureless/vue-chartjs/tree/1.1.0) (2016-08-21)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.3...1.1.0)
+
+**Implemented enhancements:**
+
+- Use Vue.util.mergeOptions to merge default options with user's options [\#5](https://github.com/apertureless/vue-chartjs/issues/5)
+
+**Merged pull requests:**
+
+- Feature/merge options \#5 [\#6](https://github.com/apertureless/vue-chartjs/pull/6) ([apertureless](https://github.com/apertureless))
+
+## [1.0.3](https://github.com/apertureless/vue-chartjs/tree/1.0.3) (2016-08-20)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.0.2...1.0.3)
+
+**Implemented enhancements:**
+
+- Publish on NPM [\#2](https://github.com/apertureless/vue-chartjs/issues/2)
+- Properly destroy chartjs objects [\#3](https://github.com/apertureless/vue-chartjs/pull/3) ([LinusBorg](https://github.com/LinusBorg))
+
+## [1.0.2](https://github.com/apertureless/vue-chartjs/tree/1.0.2) (2016-07-27)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Jakub Juszczak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+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.

README.md

@@ -1,10 +1,14 @@
 # Vue-ChartJs
 
+[![npm version](https://badge.fury.io/js/vue-chartjs.svg)](https://badge.fury.io/js/vue-chartjs) ![npm dependencies](https://david-dm.org/apertureless/vue-chartjs.svg) [![codecov](https://codecov.io/gh/apertureless/vue-chartjs/branch/master/graph/badge.svg)](https://codecov.io/gh/apertureless/vue-chartjs) [![Build Status](https://travis-ci.org/apertureless/vue-chartjs.svg?branch=master)](https://travis-ci.org/apertureless/vue-chartjs)
+
 > VueJS wrapper for ChartJs
 
+# 🚧 VUE 2.0 WIP ⚠
+
 ## Install
 
-Simply run `npm install vue-chartjs`
+Simply run `npm install vue-chartjs@next`
 
 ## How to use
 
@@ -24,9 +28,9 @@ Just create your own component.
 import { Bar } from 'vue-chartjs'
 
 export default BarChart.extend({
-  ready () {
+  mounted () {
     // Overwriting base render method with actual data.
-    this.render({
+    this.renderChart({
       labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
       datasets: [
         {
@@ -56,8 +60,8 @@ import { Line } from 'vue-chartjs'
 
 export default LineChart.extend({
   props: [data, options],
-  ready () {
-    this.render(this.data, this.options)
+  mounted () {
+    this.renderChart(this.data, this.options)
   }
 })
 ```
@@ -140,3 +144,15 @@ npm test
 ```
 
 For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+
+## Contributing
+
+1. Fork it ( https://github.com/apertureless/vue-chartjs/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## License
+
+This software is distributed under [MIT license](LICENSE.txt).

build/webpack.base.conf.js

@@ -16,6 +16,7 @@ module.exports = {
     extensions: ['', '.js', '.vue'],
     fallback: [path.join(__dirname, '../node_modules')],
     alias: {
+      'vue': 'vue/dist/vue.js',
       'src': path.resolve(__dirname, '../src'),
       'BaseCharts': path.resolve(__dirname, '../src/BaseCharts')
     }

index.html

@@ -5,7 +5,9 @@
     <title>Vue-ChartJs</title>
   </head>
   <body>
+  <div id="app">
     <app></app>
+  </div>
     <!-- built files will be auto injected -->
   </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-chartjs",
-  "version": "1.0.2",
+  "version": "2.1.0",
   "description": "Vue wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@nextindex.de>",
   "repository": {
@@ -20,27 +20,31 @@
     "build": "node build/build.js",
     "unit": "karma start test/unit/karma.conf.js --single-run",
     "e2e": "node test/e2e/runner.js",
-    "test": "npm run unit && npm run e2e",
-    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
+    "test": "npm run unit",
+    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
+    "prepublish": "node build/build.js"
   },
   "dependencies": {
-    "babel-runtime": "^6.0.0",
-    "chart.js": "^2.1.6",
-    "vue": "^1.0.21"
+    "babel-runtime": "^6.11.6",
+    "chart.js": "^2.2.1",
+    "vue": "^2.0.0-rc.1"
   },
   "devDependencies": {
-    "babel-core": "^6.0.0",
+    "babel-core": "^6.10.4",
     "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.12.0",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "chromedriver": "^2.21.2",
     "connect-history-api-fallback": "^1.1.0",
+    "cross-spawn": "^2.1.5",
     "css-loader": "^0.23.0",
     "eslint": "^2.10.2",
+    "eslint-config-standard": "^5.1.0",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-html": "^1.3.0",
-    "eslint-config-standard": "^5.1.0",
     "eslint-plugin-promise": "^1.0.8",
     "eslint-plugin-standard": "^1.3.2",
     "eventsource-polyfill": "^0.9.6",
@@ -50,6 +54,8 @@
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
     "http-proxy-middleware": "^0.12.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
     "json-loader": "^0.5.4",
     "karma": "^0.13.15",
     "karma-coverage": "^0.5.5",
@@ -59,26 +65,22 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.24",
     "karma-webpack": "^1.7.0",
+    "lodash": "^4.15.0",
     "lolex": "^1.4.0",
     "mocha": "^2.4.5",
-    "chai": "^3.5.0",
+    "nightwatch": "^0.8.18",
+    "ora": "^0.2.0",
+    "phantomjs-prebuilt": "^2.1.3",
+    "selenium-server": "2.53.0",
+    "shelljs": "^0.6.0",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "phantomjs-prebuilt": "^2.1.3",
-    "chromedriver": "^2.21.2",
-    "cross-spawn": "^2.1.5",
-    "nightwatch": "^0.8.18",
-    "selenium-server": "2.53.0",
-    "ora": "^0.2.0",
-    "shelljs": "^0.6.0",
     "url-loader": "^0.5.7",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.3.0",
+    "vue-hot-reload-api": "^2.0.6",
+    "vue-html-loader": "^1.2.3",
+    "vue-loader": "^9.3.0",
     "vue-style-loader": "^1.0.0",
-    "webpack": "^1.12.2",
+    "webpack": "^1.13.2",
     "webpack-dev-middleware": "^1.4.0",
     "webpack-hot-middleware": "^2.6.0",
     "webpack-merge": "^0.8.3"

src/BaseCharts/Bar.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="bar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'bar-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,7 +26,7 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
         scales: {
           yAxes: [{
             ticks: {
@@ -44,15 +49,20 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'bar',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/BaseCharts/Bubble.js

@@ -0,0 +1,68 @@
+import Vue from 'vue'
+import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
+
+export default Vue.extend({
+  template: `
+    <div>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
+    </div>
+  `,
+
+  props: {
+    chartId: {
+      default: 'bubble-chart',
+      type: String
+    },
+    width: {
+      default: 400,
+      type: Number
+    },
+    height: {
+      default: 400,
+      type: Number
+    }
+  },
+
+  data () {
+    return {
+      defaultOptions: {
+        scales: {
+          yAxes: [{
+            ticks: {
+              beginAtZero: true
+            },
+            gridLines: {
+              display: false
+            }
+          }],
+          xAxes: [ {
+            gridLines: {
+              display: false
+            },
+            categoryPercentage: 0.5,
+            barPercentage: 0.2
+          }]
+        }
+      }
+    }
+  },
+
+  methods: {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
+          type: 'bubble',
+          data: data,
+          options: chartOptions
+        }
+      )
+      this._chart.generateLegend()
+    }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
+  }
+})

src/BaseCharts/Doughnut.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="doughnut-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'doughnut-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,21 +26,26 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
       }
     }
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'doughnut',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/BaseCharts/Line.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="line-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'line-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,7 +26,7 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
         scales: {
           yAxes: [{
             ticks: {
@@ -42,15 +47,20 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'line',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/BaseCharts/Pie.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="pie-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'pie-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,21 +26,26 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
       }
     }
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'pie',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/BaseCharts/PolarArea.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="polar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'polar-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,21 +26,26 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
       }
     }
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'polarArea',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/BaseCharts/Radar.js

@@ -1,14 +1,19 @@
 import Vue from 'vue'
 import Chart from 'chart.js'
+import { mergeOptions } from '../helpers/options'
 
 export default Vue.extend({
   template: `
     <div>
-      <canvas id="radar-chart" width=width height=height v-el:canvas></canvas>
+      <canvas :id="chartId" :width="width" :height="height" ref="canvas"></canvas>
     </div>
   `,
 
   props: {
+    chartId: {
+      default: 'radar-chart',
+      type: String
+    },
     width: {
       default: 400,
       type: Number
@@ -21,21 +26,26 @@ export default Vue.extend({
 
   data () {
     return {
-      options: {
+      defaultOptions: {
       }
     }
   },
 
   methods: {
-    render (data, options = this.options) {
-      const chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+    renderChart (data, options) {
+      let chartOptions = mergeOptions(this.defaultOptions, options)
+
+      this._chart = new Chart(
+        this.$refs.canvas.getContext('2d'), {
           type: 'radar',
           data: data,
-          options: options
+          options: chartOptions
         }
       )
-      chart.generateLegend()
+      this._chart.generateLegend()
     }
+  },
+  beforeDestroy () {
+    this._chart.destroy()
   }
 })

src/examples/App.vue

@@ -6,19 +6,21 @@
     <pie-example></pie-example>
     <radar-example></radar-example>
     <polar-area-example></polar-area-example>
+    <bubble-example></bubble-example>
   </div>
 </template>
 
 <script>
-  import BarExample from './examples/BarExample'
-  import LineExample from './examples/LineExample'
-  import DoughnutExample from './examples/DoughnutExample'
-  import PieExample from './examples/PieExample'
-  import RadarExample from './examples/RadarExample'
-  import PolarAreaExample from './examples/PolarAreaExample'
+  import BarExample from './BarExample'
+  import LineExample from './LineExample'
+  import DoughnutExample from './DoughnutExample'
+  import PieExample from './PieExample'
+  import RadarExample from './RadarExample'
+  import PolarAreaExample from './PolarAreaExample'
+  import BubbleExample from './BubbleExample'
 
   export default {
-    components: { BarExample, LineExample, DoughnutExample, PieExample, RadarExample, PolarAreaExample }
+    components: { BarExample, LineExample, DoughnutExample, PieExample, RadarExample, PolarAreaExample, BubbleExample }
   }
 </script>
 

src/examples/BarExample.js

@@ -1,8 +1,8 @@
 import BarChart from '../BaseCharts/Bar'
 
 export default BarChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
       datasets: [
         {

src/examples/BubbleExample.js

@@ -0,0 +1,52 @@
+import BubbleChart from '../BaseCharts/Bubble'
+
+export default BubbleChart.extend({
+  mounted () {
+    this.renderChart({
+      datasets: [
+        {
+          label: 'Data One',
+          backgroundColor: '#f87979',
+          data: [
+            {
+              x: 20,
+              y: 25,
+              r: 5
+            },
+            {
+              x: 40,
+              y: 10,
+              r: 10
+            },
+            {
+              x: 30,
+              y: 22,
+              r: 30
+            }
+          ]
+        },
+        {
+          label: 'Data Two',
+          backgroundColor: '#7C8CF8',
+          data: [
+            {
+              x: 10,
+              y: 30,
+              r: 15
+            },
+            {
+              x: 20,
+              y: 20,
+              r: 10
+            },
+            {
+              x: 15,
+              y: 8,
+              r: 30
+            }
+          ]
+        }
+      ]
+    })
+  }
+})

src/examples/DoughnutExample.js

@@ -1,8 +1,8 @@
 import DoughnutChart from '../BaseCharts/Doughnut'
 
 export default DoughnutChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['VueJs', 'EmberJs', 'ReactJs', 'AngularJs'],
       datasets: [
         {

src/examples/LineExample.js

@@ -1,8 +1,8 @@
 import LineChart from '../BaseCharts/Line'
 
 export default LineChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
       datasets: [
         {

src/examples/PieExample.js

@@ -1,8 +1,8 @@
 import PieChart from '../BaseCharts/Pie'
 
 export default PieChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['VueJs', 'EmberJs', 'ReactJs', 'AngularJs'],
       datasets: [
         {

src/examples/PolarAreaExample.js

@@ -1,8 +1,8 @@
 import PolarAreaChart from '../BaseCharts/PolarArea'
 
 export default PolarAreaChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
       datasets: [
         {

src/examples/RadarExample.js

@@ -1,8 +1,8 @@
 import RadarChart from '../BaseCharts/Radar'
 
 export default RadarChart.extend({
-  ready () {
-    this.render({
+  mounted () {
+    this.renderChart({
       labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
       datasets: [
         {

src/helpers/options.js

@@ -0,0 +1,5 @@
+import merge from 'lodash/fp/merge'
+
+export function mergeOptions (obj, src) {
+  return merge(obj, src)
+}

src/index.js

@@ -4,6 +4,7 @@ import Line from './BaseCharts/Line'
 import Pie from './BaseCharts/Pie'
 import PolarArea from './BaseCharts/PolarArea'
 import Radar from './BaseCharts/Radar'
+import Bubble from './BaseCharts/Bubble'
 
 const VueCharts = {
   Bar,
@@ -11,7 +12,8 @@ const VueCharts = {
   Line,
   Pie,
   PolarArea,
-  Radar
+  Radar,
+  Bubble
 }
 
 module.exports = VueCharts

test/unit/specs/Bar.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import BarChart from 'src/examples/BarExample'
+
+describe('BarChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<bar-chart></bar-chart>',
+      components: { BarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#bar-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<bar-chart chartId="barchartprop"></bar-chart>',
+      components: { BarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#barchartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/Bubble.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import BubbleChart from 'src/examples/BubbleExample'
+
+describe('BubbleChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<bubble-chart></bubble-chart>',
+      components: { BubbleChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#bubble-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<bubble-chart chartId="bubblechartprop"></bubble-chart>',
+      components: { BubbleChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#bubblechartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/Doughnut.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import DoughnutChart from 'src/examples/DoughnutExample'
+
+describe('DoughnutChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<doughnut-chart></doughnut-chart>',
+      components: { DoughnutChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#doughnut-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<doughnut-chart chartId="doughnutchartprop"></doughnut-chart>',
+      components: { DoughnutChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#doughnutchartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/Hello.spec.js

@@ -1,12 +0,0 @@
-import Vue from 'vue'
-import Hello from 'src/components/Hello'
-
-describe('Hello.vue', () => {
-  it('should render correct contents', () => {
-    const vm = new Vue({
-      template: '<div><hello></hello></div>',
-      components: { Hello }
-    }).$mount()
-    expect(vm.$el.querySelector('.hello h1').textContent).to.contain('Hello World!')
-  })
-})

test/unit/specs/Line.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import LineChart from 'src/examples/LineExample'
+
+describe('LineChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<line-chart></line-chart>',
+      components: { LineChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#line-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<line-chart chartId="linechartprop"></line-chart>',
+      components: { LineChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#linechartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/Pie.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import PieChart from 'src/examples/PieExample'
+
+describe('PieChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<pie-chart></pie-chart>',
+      components: { PieChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#pie-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<pie-chart chartId="piechartprop"></pie-chart>',
+      components: { PieChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#piechartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/PolarArea.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import PolarChart from 'src/examples/PolarAreaExample'
+
+describe('PolarChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<polar-chart></polar-chart>',
+      components: { PolarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#polar-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<polar-chart chartId="polarchartprop"></polar-chart>',
+      components: { PolarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#polarchartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/Radar.spec.js

@@ -0,0 +1,31 @@
+import Vue from 'vue'
+import RadarChart from 'src/examples/RadarExample'
+
+describe('RadarChart', () => {
+  let el
+
+  beforeEach(() => {
+    el = document.createElement('div')
+  })
+
+  it('should render a canvas', () => {
+    const vm = new Vue({
+      template: '<radar-chart></radar-chart>',
+      components: { RadarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#radar-chart')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('undefined')
+    expect(vm.$el.querySelector('canvas')).not.to.be.an('null')
+    expect(vm.$el.querySelector('canvas')).to.exist
+  })
+
+  it('should change id based on prop', () => {
+    const vm = new Vue({
+      template: '<radar-chart chartId="rodarchartprop"></radar-chart>',
+      components: { RadarChart }
+    }).$mount(el)
+
+    expect(vm.$el.querySelector('#rodarchartprop')).not.to.be.an('undefined')
+  })
+})

test/unit/specs/helpers/options.spec.js

@@ -0,0 +1,30 @@
+import { mergeOptions } from 'src/helpers/options'
+
+describe('mergeOptions.js', () => {
+  const a = {
+    a: 'a',
+    b: 'a'
+  }
+
+  const b = {
+    a: 'b',
+    b: 'b'
+  }
+
+  const c = {
+    c: 'c'
+  }
+
+  it('should replace old a and b if a and b are new', () => {
+    let ab = mergeOptions(a, b)
+    expect(ab).to.have.property('a').and.to.equal('b')
+    expect(ab).to.have.property('b').and.to.equal('b')
+  })
+
+  it('should add c if c is new', () => {
+    let ac = mergeOptions(a, c)
+    expect(ac).to.have.property('a').and.to.equal('a')
+    expect(ac).to.have.property('b').and.to.equal('a')
+    expect(ac).to.have.property('c').and.to.equal('c')
+  })
+})