💎 Release new version 2.2.0

add horizontal bar parameter

.travis.yml

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

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Change Log
 
+## [v2.1.1](https://github.com/apertureless/vue-chartjs/tree/v2.1.1) (2016-10-02)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v.2.1.0...v2.1.1)
+
+## [v.2.1.0](https://github.com/apertureless/vue-chartjs/tree/v.2.1.0) (2016-09-23)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/v1.1.3...v.2.1.0)
+
+## [v1.1.3](https://github.com/apertureless/vue-chartjs/tree/v1.1.3) (2016-09-08)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.2...v1.1.3)
+
+**Implemented enhancements:**
+
+- Add test [\#1](https://github.com/apertureless/vue-chartjs/issues/1)
+
+**Fixed bugs:**
+
+- Passing chart size \(width / height\) as prop doesnt resize the chart [\#8](https://github.com/apertureless/vue-chartjs/issues/8)
+
+**Merged pull requests:**
+
+- Added bubble chart type [\#9](https://github.com/apertureless/vue-chartjs/pull/9) ([jcalonso](https://github.com/jcalonso))
+
+## [1.1.2](https://github.com/apertureless/vue-chartjs/tree/1.1.2) (2016-09-07)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.1...1.1.2)
+
+**Implemented enhancements:**
+
+- Change name of the render method to ensure compatiblity with Vue 2.0 [\#4](https://github.com/apertureless/vue-chartjs/issues/4)
+
+## [1.1.1](https://github.com/apertureless/vue-chartjs/tree/1.1.1) (2016-08-23)
+[Full Changelog](https://github.com/apertureless/vue-chartjs/compare/1.1.0...1.1.1)
+
 ## [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)
 

README.md

@@ -1,9 +1,20 @@
 # 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)
+[![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
 
+### Compatibility
+
+- v1 later
+  - Vue.js 1.x
+- v2 later
+  - Vue.js 2.x
+
+After the final release of vue.js 2, you also get the v2 per default if you install vue-chartjs over npm.
+No need for the @next tag anymore. If you want the v1 you need to define the version.
+If you're looking for v1 check this [branch](https://github.com/apertureless/vue-chartjs/tree/release/1.1.3)
+
 ## Install
 
 Simply run `npm install vue-chartjs`
@@ -25,10 +36,10 @@ Just create your own component.
 // CommitChart.js
 import { Bar } from 'vue-chartjs'
 
-export default BarChart.extend({
-  ready () {
+export default Bar.extend({
+  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,10 +67,10 @@ You can overwrite the default chart options. Just pass the options object as a s
 // MonthlyIncome.js
 import { Line } from 'vue-chartjs'
 
-export default LineChart.extend({
+export default Line.extend({
   props: [data, options],
-  ready () {
-    this.render(this.data, this.options)
+  mounted () {
+    this.renderChart(this.data, this.options)
   }
 })
 ```
@@ -81,6 +92,30 @@ export default {
 </script>
 ```
 
+## Reactivity
+
+Chart.js does not update or re-render the chart if new data is passed.
+However you can simply implement this by your own or use one of the two mixins which are included.
+
+- `reactiveProp`
+- `reactiveData`
+
+The mixins automatically create `chartData` as a prop or data. And add a watcher. If data has changed, the chart will update.
+
+```javascript
+// MonthlyIncome.js
+import { Line, reactiveProp } from 'vue-chartjs'
+
+export default Line.extend({
+  mixins: [reactiveProp]
+  props: [chartData, options],
+  mounted () {
+    this.renderChart(this.chartData, this.options)
+  }
+})
+
+```
+
 ## Available Charts
 
 ### Bar Chart
@@ -107,17 +142,9 @@ export default {
 
 ![Pie](assets/polar.png)
 
-## Todo
-
-- [x] ~~Implement Bar Chart~~
-- [x] ~~Implement Line Chart~~
-- [x] ~~Implement Radar Chart~~
-- [x] ~~Implement Polar Area Chart~~
-- [x] ~~Implement Pie Chart~~
-- [x] ~~Implement Doughnut Chart~~
-- [x] ~~Make npm module~~
-- [ ] Add tests
+### Bubble
 
+![Bubble](assets/bubble.png)
 
 ## Build Setup
 

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')
     }

codecov.yml

@@ -0,0 +1,34 @@
+codecov:
+  branch: master
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project:
+      default:
+        target: auto
+        threshold: null
+        branches: null
+
+    patch:
+      default:
+        target: auto
+        branches: null
+
+    changes:
+      default:
+        branches: null
+
+  ignore:
+    - "tests/*"
+    - "src/examples/*"
+    - "src/mixins/*"
+
+
+comment:
+  layout: "header, diff, changes, sunburst, uncovered, tree"
+  branches: null
+  behavior: default

examples/App.vue

@@ -1,30 +0,0 @@
-<template>
-  <div class="container">
-    <bar-example></bar-example>
-    <line-example></line-example>
-    <doughnut-example></doughnut-example>
-    <pie-example></pie-example>
-    <radar-example></radar-example>
-    <polar-area-example></polar-area-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'
-
-  export default {
-    components: { BarExample, LineExample, DoughnutExample, PieExample, RadarExample, PolarAreaExample }
-  }
-</script>
-
-<style>
-  .container {
-    max-width: 800px;
-    margin: 0 auto;
-  }
-</style>

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.1.1",
+  "version": "2.2.0",
   "description": "Vue wrapper for chart.js",
   "author": "Jakub Juszczak <jakub@nextindex.de>",
   "repository": {
@@ -20,68 +20,71 @@
     "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.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",
+    "cross-spawn": "^4.0.2",
+    "css-loader": "^0.25.0",
+    "eslint": "^3.7.1",
+    "eslint-config-standard": "^6.2.0",
     "eslint-friendly-formatter": "^2.0.5",
     "eslint-loader": "^1.3.0",
     "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-promise": "^2.0.1",
+    "eslint-plugin-standard": "^2.0.1",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
+    "file-loader": "^0.9.0",
     "function-bind": "^1.0.2",
     "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.12.0",
+    "http-proxy-middleware": "^0.17.2",
     "inject-loader": "^2.0.1",
     "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.5.2",
     "json-loader": "^0.5.4",
-    "karma": "^0.13.15",
-    "karma-coverage": "^0.5.5",
-    "karma-mocha": "^0.2.2",
+    "karma": "^1.3.0",
+    "karma-coverage": "^1.1.1",
+    "karma-jasmine": "^1.0.2",
+    "karma-mocha": "^1.2.0",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sinon-chai": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.24",
+    "karma-spec-reporter": "0.0.26",
     "karma-webpack": "^1.7.0",
-    "lodash": "^4.15.0",
+    "lodash": "^4.16.3",
     "lolex": "^1.4.0",
-    "mocha": "^2.4.5",
-    "nightwatch": "^0.8.18",
-    "ora": "^0.2.0",
-    "phantomjs-prebuilt": "^2.1.3",
-    "selenium-server": "2.53.0",
-    "shelljs": "^0.6.0",
+    "mocha": "^3.1.0",
+    "nightwatch": "^0.9.8",
+    "ora": "^0.3.0",
+    "phantomjs-prebuilt": "^2.1.13",
+    "selenium-server": "^2.53.1",
+    "shelljs": "^0.7.4",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.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"
+    "webpack-merge": "^0.14.1"
   }
 }

src/BaseCharts/Bar.js

@@ -5,11 +5,15 @@ 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
@@ -45,12 +49,12 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options, type) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
-          type: 'bar',
+        this.$refs.canvas.getContext('2d'), {
+          type: type || 'bar',
           data: data,
           options: chartOptions
         }

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

@@ -5,11 +5,15 @@ 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
@@ -28,11 +32,11 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+        this.$refs.canvas.getContext('2d'), {
           type: 'doughnut',
           data: data,
           options: chartOptions

src/BaseCharts/Line.js

@@ -5,11 +5,15 @@ 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
@@ -43,11 +47,11 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+        this.$refs.canvas.getContext('2d'), {
           type: 'line',
           data: data,
           options: chartOptions

src/BaseCharts/Pie.js

@@ -5,11 +5,15 @@ 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
@@ -28,11 +32,11 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+        this.$refs.canvas.getContext('2d'), {
           type: 'pie',
           data: data,
           options: chartOptions

src/BaseCharts/PolarArea.js

@@ -5,11 +5,15 @@ 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
@@ -28,11 +32,11 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+        this.$refs.canvas.getContext('2d'), {
           type: 'polarArea',
           data: data,
           options: chartOptions

src/BaseCharts/Radar.js

@@ -5,11 +5,15 @@ 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
@@ -28,11 +32,11 @@ export default Vue.extend({
   },
 
   methods: {
-    render (data, options) {
+    renderChart (data, options) {
       let chartOptions = mergeOptions(this.defaultOptions, options)
 
       this._chart = new Chart(
-        this.$els.canvas.getContext('2d'), {
+        this.$refs.canvas.getContext('2d'), {
           type: 'radar',
           data: data,
           options: chartOptions

src/examples/App.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="container">
+    <bar-example></bar-example>
+    <reactive-example></reactive-example>
+    <line-example></line-example>
+    <doughnut-example></doughnut-example>
+    <pie-example></pie-example>
+    <radar-example></radar-example>
+    <polar-area-example></polar-area-example>
+    <bubble-example></bubble-example>
+  </div>
+</template>
+
+<script>
+  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'
+  import ReactiveExample from './ReactiveExample'
+  import ReactivePropExample from './ReactivePropExample'
+
+  export default {
+    components: {
+      BarExample,
+      LineExample,
+      DoughnutExample,
+      PieExample,
+      RadarExample,
+      PolarAreaExample,
+      BubbleExample,
+      ReactiveExample,
+      ReactivePropExample
+    }
+  }
+</script>
+
+<style>
+  .container {
+    max-width: 800px;
+    margin: 0 auto;
+  }
+</style>

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: [
         {
@@ -11,6 +11,6 @@ export default BarChart.extend({
           data: [40, 20, 12, 39, 10, 40, 39, 80, 40, 20, 12, 11]
         }
       ]
-    })
+    }, {responsive: true, maintainAspectRatio: false})
   }
 })

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/examples/ReactiveExample.js

@@ -0,0 +1,41 @@
+import BarChart from '../BaseCharts/Bar'
+import reactiveData from '../mixins/reactiveData'
+
+export default BarChart.extend({
+  mixins: [reactiveData],
+  data () {
+    return {
+      chartData: ''
+    }
+  },
+  created () {
+    this.fillData()
+  },
+
+  mounted () {
+    this.renderChart(this.chartData)
+
+    setInterval(() => {
+      this.fillData()
+    }, 5000)
+  },
+
+  methods: {
+    fillData () {
+      this.chartData = {
+        labels: ['January' + this.getRandomInt(), 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+        datasets: [
+          {
+            label: 'Data One',
+            backgroundColor: '#f87979',
+            data: [this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt(), this.getRandomInt()]
+          }
+        ]
+      }
+    },
+
+    getRandomInt () {
+      return Math.floor(Math.random() * (50 - 5 + 1)) + 5
+    }
+  }
+})

src/examples/ReactivePropExample.js

@@ -0,0 +1,10 @@
+import BarChart from '../BaseCharts/Bar'
+import reactiveData from '../mixins/reactiveProp'
+
+export default BarChart.extend({
+  mixins: [reactiveData],
+
+  mounted () {
+    this.renderChart(this.chartData)
+  }
+})

src/index.js

@@ -4,6 +4,9 @@ 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'
+import reactiveProp from './mixins/reactiveProp'
+import reactiveData from './mixins/reactiveData'
 
 const VueCharts = {
   Bar,
@@ -11,7 +14,10 @@ const VueCharts = {
   Line,
   Pie,
   PolarArea,
-  Radar
+  Radar,
+  Bubble,
+  reactiveProp,
+  reactiveData
 }
 
 module.exports = VueCharts

src/mixins/reactiveData.js

@@ -0,0 +1,44 @@
+module.exports = {
+  data () {
+    return {
+      chartData: null
+    }
+  },
+  watch: {
+    'chartData': {
+      handler (newData, oldData) {
+        if (oldData) {
+          let chart = this._chart
+
+          let newDataLabels = newData.datasets.map((dataset) => {
+            return dataset.label
+          })
+
+          let oldDataLabels = oldData.datasets.map((dataset) => {
+            return dataset.label
+          })
+
+          if (JSON.stringify(newDataLabels) === JSON.stringify(oldDataLabels)) {
+            this.forceUpdate(newData, chart)
+          } else {
+            this.forceRender()
+          }
+        }
+      }
+    }
+  },
+  methods: {
+    forceUpdate (newData, chart) {
+      newData.datasets.forEach((dataset, i) => {
+        chart.data.datasets[i].data = dataset.data
+      })
+
+      chart.data.labels = newData.labels
+      chart.update()
+    },
+
+    forceRender () {
+      this.renderChart(this.chartData, this.options)
+    }
+  }
+}

src/mixins/reactiveProp.js

@@ -0,0 +1,35 @@
+module.exports = {
+  props: {
+    chartData: {
+      required: true
+    }
+  },
+
+  watch: {
+    'chartData': {
+      handler (newData, oldData) {
+        if (oldData) {
+          let chart = this._chart
+
+          let newDataLabels = newData.datasets.map((dataset) => {
+            return dataset.label
+          })
+
+          let oldDataLabels = oldData.datasets.map((dataset) => {
+            return dataset.label
+          })
+
+          if (JSON.stringify(newDataLabels) === JSON.stringify(oldDataLabels)) {
+            newData.datasets.forEach((dataset, i) => {
+              chart.data.datasets[i].data = dataset.data
+            })
+            chart.data.labels = newData.labels
+            chart.update()
+          } else {
+            this.renderChart(this.chartData, this.options)
+          }
+        }
+      }
+    }
+  }
+}

test/unit/.eslintrc

@@ -4,6 +4,7 @@
   },
   "globals": {
     "expect": true,
+    "jasmine": true,
     "sinon": true
   }
 }

test/unit/karma.conf.js

@@ -54,7 +54,7 @@ module.exports = function (config) {
     //    http://karma-runner.github.io/0.13/config/browsers.html
     // 2. add it to the `browsers` array below.
     browsers: ['PhantomJS'],
-    frameworks: ['mocha', 'sinon-chai'],
+    frameworks: ['mocha', 'sinon-chai', 'jasmine'],
     reporters: ['spec', 'coverage'],
     files: ['./index.js'],
     preprocessors: {

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')
+  })
+})