updated pairBy can listen to array object changes

.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

.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 7,
+    sourceType: 'module'
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:ember-suave/recommended'
+  ],
+  env: {
+    'browser': true,
+    'es6': true
+  },
+  rules: {
+  }
+};

.jshintrc

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

.travis.yml

@@ -7,11 +7,13 @@ sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-2.4
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -22,14 +24,17 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test --skip-cleanup
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

CHANGELOG.md

@@ -1,5 +1,9 @@
 # maximum plaid changelog
 
+### HEAD (Dec 06, 2016)
+
+- Updated to Ember 2.10
+
 ### 0.1.2 (May 30, 2016)
 
 - Version bumped because of NPM conflict.

README.md

@@ -1,3 +1,5 @@
+**Deprecated: Please see (and use) [ember-primer](https://github.com/ember-visualization/ember-primer) instead, as this is no longer maintained**
+
 ![Maximum Plaid](/logo/maximum-plaid-logo.png)
 
 [![Build Status](https://travis-ci.org/ivanvanderbyl/maximum-plaid.svg?branch=master)](https://travis-ci.org/ivanvanderbyl/maximum-plaid)

addon/components/plaid-axis/component.js

@@ -43,7 +43,7 @@ export default Component.extend(GroupElement, {
 
   /**
    * The format used for the ticks for this axis.
-   * [See D3 docs for more details](https://github.com/d3/d3/wiki/SVG-Axes#tickFormat)
+   * [See D3 docs for more details](https://github.com/d3/d3-axis#axis_tickFormat)
    *
    * @public
    * @type {Function}
@@ -52,7 +52,7 @@ export default Component.extend(GroupElement, {
 
   /**
    * The inner tick size for the ticks for this axis.
-   * [See D3 docs for more details](https://github.com/d3/d3/wiki/SVG-Axes#innerTickSize)
+   * [See D3 docs for more details](https://github.com/d3/d3-axis#axis_tickSizeInner)
    *
    * @public
    * @type {Number}
@@ -61,13 +61,22 @@ export default Component.extend(GroupElement, {
 
   /**
    * The outer tick size for the ticks for this axis.
-   * [See D3 docs for more details](https://github.com/d3/d3/wiki/SVG-Axes#outerTickSize)
+   * [See D3 docs for more details](https://github.com/d3/d3-axis#axis_tickSizeOuter)
    *
    * @public
    * @type {Number}
    */
   tickSizeOuter: 8,
 
+  /**
+   * Explicit tick values for this axis.
+   * [See D3 docs for more details](https://github.com/d3/d3-axis#axis_tickValues)
+   *
+   * @public
+   * @type {Array}
+   */
+  tickValues: null,
+
   xOffset: 0,
 
   yOffset: 0,
@@ -77,13 +86,14 @@ export default Component.extend(GroupElement, {
   },
 
   drawAxis() {
-    let { y, x, xOffset, yOffset, scale, orientation, tickFormat, ticks, tickSizeInner, tickSizeOuter } =
-      this.getProperties('y', 'x', 'xOffset', 'yOffset', 'scale', 'orientation', 'tickFormat', 'ticks', 'tickSizeInner', 'tickSizeOuter');
+    let { y, x, xOffset, yOffset, scale, orientation, tickFormat, ticks, tickSizeInner, tickSizeOuter, tickValues } =
+      this.getProperties('y', 'x', 'xOffset', 'yOffset', 'scale', 'orientation', 'tickFormat', 'ticks', 'tickSizeInner', 'tickSizeOuter', 'tickValues');
 
     let axis = this.createAxis(orientation, scale);
 
     axis.tickFormat(tickFormat);
     axis.tickSize(tickSizeInner, tickSizeOuter);
+    axis.tickValues(tickValues);
     axis.scale(scale);
 
     if (ticks) {

addon/components/plaid-plot.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
 import layout from '../templates/components/plaid-plot';
-import Coordinates from '../mixins/coordinates';
+import Coordinates from 'maximum-plaid/mixins/coordinates';
+import Component from 'ember-component';
 
-const PlotComponent = Ember.Component.extend(Coordinates, {
+let PlotComponent = Component.extend(Coordinates, {
   layout,
 
   tagName: 'svg',

addon/components/plaid-symbol.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import Component from 'ember-component';
 
 import {
   symbol,
@@ -27,7 +28,7 @@ const {
  *   {{plaid-symbol "TYPE" x y}}
  */
 
-const SymbolComponent = Ember.Component.extend({
+const SymbolComponent = Component.extend({
   tagName: 'path',
   attributeBindings: [
     'symbolData:d',

addon/helpers/area.js

@@ -1,7 +1,10 @@
 import Ember from 'ember';
 import box from '../utils/box-expression';
+const { Helper } = Ember;
 
-export function area([width, height], hash) {
+export function area(params, hash) {
+  let [width, height] = params.slice();
+  hash = Object.assign({}, hash);
   let margin = hash.margin ? box(hash.margin) : { top: 0, right: 0, bottom: 0, left: 0 };
 
   return {
@@ -22,4 +25,4 @@ export function area([width, height], hash) {
   };
 }
 
-export default Ember.Helper.helper(area);
+export default Helper.helper(area);

addon/helpers/curve.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-const { isPresent, assert, String: { camelize } } = Ember;
+const { Helper, isPresent, assert, String: { camelize } } = Ember;
 
 import {
   curveBasisClosed,
@@ -58,4 +58,4 @@ export function curve([curveName], hash) {
   return curveFn;
 }
 
-export default Ember.Helper.helper(curve);
+export default Helper.helper(curve);

addon/helpers/extent.js

@@ -1,10 +1,10 @@
 import Ember from 'ember';
 import { extent as arrayExtent, max } from 'd3-array';
-const { get } = Ember;
+const { Helper, get, isPresent } = Ember;
 
 export function extent([array, accessor], options) {
 
-  if (!!accessor) {
+  if (isPresent(accessor)) {
     array = array.map((d) => get(d, accessor));
   }
 
@@ -15,4 +15,4 @@ export function extent([array, accessor], options) {
   }
 }
 
-export default Ember.Helper.helper(extent);
+export default Helper.helper(extent);

addon/helpers/format-fn.js

@@ -1,14 +1,14 @@
 import Ember from 'ember';
 import { format } from './format';
 
+const { Helper } = Ember;
+
 export function formatFn(params, hash) {
   return function formatFnHelper(value) {
-    if (!hash) {
-      hash = {};
-    }
+    hash = Object.assign({}, hash);
     hash.format = params[0];
     return format([value], hash);
   };
 }
 
-export default Ember.Helper.helper(formatFn);
+export default Helper.helper(formatFn);

addon/helpers/format.js

@@ -1,10 +1,9 @@
 import Ember from 'ember';
-import {format as d3Format} from 'd3-format';
+import { format as d3Format } from 'd3-format';
+const { Helper } = Ember;
 
 export function format([value], hash) {
-  if (!hash) {
-    hash = {};
-  }
+  hash = Object.assign({}, hash);
 
   let result;
   if (!hash.format) {
@@ -28,4 +27,4 @@ export function format([value], hash) {
   return result;
 }
 
-export default Ember.Helper.helper(format);
+export default Helper.helper(format);

addon/helpers/linear-scale.js

@@ -1,7 +1,12 @@
 import Ember from 'ember';
 import { scaleLinear } from 'd3-scale';
+const { Helper } = Ember;
+
+export function linearScale(params, hash = {}) {
+  params = params.slice();
+  let [domain, range] = params;
+  hash = Object.assign({}, hash);
 
-export function linearScale([domain, range], hash = {}) {
   let scale = scaleLinear().domain(domain);
   if (hash && hash.round) {
     scale.rangeRound(range);
@@ -12,4 +17,4 @@ export function linearScale([domain, range], hash = {}) {
   return scale;
 }
 
-export default Ember.Helper.helper(linearScale);
+export default Helper.helper(linearScale);

addon/helpers/pair-by.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-const { assert } = Ember;
+const { Helper, isArray, assert } = Ember;
 
 /**
  * @pairBy(params);
@@ -16,10 +16,11 @@ const { assert } = Ember;
  * @public
  * @return {Array[Array[2]]}
  */
-export function pairBy(params) {
+export function pairBy(args = []) {
+  let params = args.slice();
   assert('pair-by requires at least 2 arguments: key, data', params.length >= 2);
   let data = params.pop();
-  assert('last argument must be an array of objects', Ember.isArray(data));
+  assert('last argument must be an array of objects', isArray(data));
 
   let [...keys] = params;
 
@@ -31,4 +32,4 @@ export function pairBy(params) {
   });
 }
 
-export default Ember.Helper.helper(pairBy);
+export default Helper.helper(pairBy);

addon/mixins/coordinates.js

@@ -2,5 +2,7 @@ import Ember from 'ember';
 import Dimensions from './dimensions';
 import PlotArea from './plot-area';
 
-export default Ember.Mixin.create(Dimensions, PlotArea, {
+const { Mixin } = Ember;
+
+export default Mixin.create(Dimensions, PlotArea, {
 });

addon/mixins/dimensions.js

@@ -2,14 +2,16 @@ import Ember from 'ember';
 import GlobalResize from 'maximum-plaid/mixins/global-resize';
 
 const {
+  Mixin,
+  K,
   run: {
     throttle,
     next
   },
   on
 } = Ember;
 
-export default Ember.Mixin.create(GlobalResize, {
+export default Mixin.create(GlobalResize, {
 
   width: 1,
   height: 1,
@@ -18,7 +20,7 @@ export default Ember.Mixin.create(GlobalResize, {
     next(this, this.measureDimensions);
   }),
 
-  didMeasureDimensions: Ember.K,
+  didMeasureDimensions: K,
 
   didResize() {
     // window.requestAnimationFrame(this.measureDimensions.bind(this));
@@ -31,12 +33,14 @@ export default Ember.Mixin.create(GlobalResize, {
     }
 
     let rect = this.element.getBoundingClientRect();
-    this.setProperties({
-      width: rect.width,
-      height: rect.height
-    });
+    next(this, function() {
+      this.setProperties({
+        width: rect.width,
+        height: rect.height
+      });
 
-    this.trigger('didMeasureDimensions');
+      this.trigger('didMeasureDimensions');
+    });
   }
 
 });