Adds support for 1.13, upgrades deps, fixes fragile tests

.editorconfig

@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
@@ -29,5 +30,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false

.npmignore

@@ -0,0 +1,15 @@
+bower_components/
+tests/
+tmp/
+dist/
+
+.bowerrc
+.editorconfig
+.ember-cli
+.travis.yml
+.npmignore
+**/.gitkeep
+bower.json
+ember-cli-build.js
+Brocfile.js
+testem.json

.travis.yml

@@ -3,6 +3,22 @@ language: node_js
 
 sudo: false
 
+env:
+  global:
+    - EMBER_VERSION='default'
+    - TESTEM_LAUNCHER='PhantomJS'
+  matrix:
+    - EMBER_TRY_SCENARIO=default
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-beta
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 cache:
   directories:
     - node_modules
@@ -17,4 +33,4 @@ install:
   - bower install
 
 script:
-  - npm test
+  - ember try $EMBER_TRY_SCENARIO test --port=8080 --launch=${TESTEM_LAUNCHER} --skip-cleanup

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}

Brocfile.js

@@ -4,9 +4,9 @@
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 var app = new EmberAddon({
-    vendorFiles: {
-        'handlebars.js': null
-    }
+  'ember-moment': {
+    includeTimezone: 'all'
+  }
 });
 
 // Use `app.import` to add additional libraries to the generated
@@ -22,14 +22,4 @@ var app = new EmberAddon({
 // please specify an object with the list of modules as keys
 // along with the exports of each module as its value.
 
-app.import(app.bowerDirectory + '/ember-cli-moment-shim/moment-shim.js', {
-  exports: {
-    moment: ['default']
-  }
-});
-
-app.import(app.bowerDirectory + '/moment-timezone/moment-timezone.js');
-
-app.import(app.bowerDirectory + '/ember/ember-template-compiler.js');
-
 module.exports = app.toTree();

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014
+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 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:
 

addon/computeds/ago.js

@@ -1,20 +1,19 @@
 import Ember from 'ember';
 import moment from 'moment';
-import { descriptorFor } from './moment';
+import isDescriptor from '../utils/is-descriptor';
 
-var get = Ember.get;
-var emberComputed = Ember.computed;
+let get = Ember.get;
+let emberComputed = Ember.computed;
 
 export default function computedAgo(date, maybeInputFormat) {
-  var args = [date];
-
-  var computed = emberComputed(date, function () {
-    var momentArgs, desc, input;
-    momentArgs = [get(this, date)];
+  let args = [date];
+
+  let computed = emberComputed(date, function () {
+    let momentArgs = [get(this, date)];
 
     if (arguments.length > 1) {
-      desc = descriptorFor.call(this, maybeInputFormat);
-      input = desc ? get(this, maybeInputFormat) : maybeInputFormat;
+      let desc = isDescriptor(this[maybeInputFormat]);
+      let input = desc ? get(this, maybeInputFormat) : maybeInputFormat;
 
       if (desc && computed._dependentKeys.indexOf(maybeInputFormat) === -1) {
         computed.property(maybeInputFormat);

addon/computeds/duration.js

@@ -1,21 +1,21 @@
 import Ember from 'ember';
 import moment from 'moment';
-import { descriptorFor } from './moment';
+import isDescriptor from '../utils/is-descriptor';
 
-var get = Ember.get;
-var emberComputed = Ember.computed;
+let get = Ember.get;
+let emberComputed = Ember.computed;
 
 export default function computedDuration(val, maybeUnits) {
-  var numArgs = arguments.length;
-  var args = [val];
+  let numArgs = arguments.length;
+  let args = [val];
+
+  let computed = emberComputed(val, function () {
+    let momentArgs, desc, input;
 
-  var computed = emberComputed(val, function () {
-    var momentArgs, desc, input;
-
     momentArgs = [get(this, val)];
 
     if (numArgs > 1) {
-      desc = descriptorFor.call(this, maybeUnits);
+      desc = isDescriptor(this[maybeUnits]);
       input = desc ? get(this, maybeUnits) : maybeUnits;
 
       if (desc && computed._dependentKeys.indexOf(maybeUnits) === -1) {

addon/computeds/moment.js

@@ -1,40 +1,28 @@
 import Ember from 'ember';
+import isDescriptor from '../utils/is-descriptor';
 import moment from 'moment';
 
-var get = Ember.get;
-var emberComputed = Ember.computed;
-var EnumerableUtils = Ember.EnumerableUtils;
-var a_slice = Array.prototype.slice;
-
-export function descriptorFor(propertyName) {
-  var meta = Ember.meta(this);
-
-  if (meta && meta.descs) {
-    return meta.descs[propertyName];
-  }
-}
+let { computed, EnumerableUtils, get, assert } = Ember;
+let a_slice = Array.prototype.slice;
 
 export default function computedMoment(date, outputFormat, maybeInputFormat) {
-  Ember.assert('More than one argument passed into moment computed', arguments.length > 1);
-
-  var args = a_slice.call(arguments);
-  var computed;
+  assert('More than one argument passed into moment computed', arguments.length > 1);
 
+  let args = a_slice.call(arguments);
+  let result;
   args.shift();
 
-  return computed = emberComputed(date, function () {
-    var desc,
-        self = this,
-        momentArgs = [get(this, date)];
+  return result = computed(date, function () {
+    let momentArgs = [get(this, date)];
 
-    var propertyValues = EnumerableUtils.map(args, function (arg) {
-      desc = descriptorFor.call(self, arg);
+    let propertyValues = EnumerableUtils.map(args, (arg) => {
+      let desc = isDescriptor(this[arg]);
 
-      if (desc && computed._dependentKeys.indexOf(arg) === -1) {
-        computed.property(arg);
+      if (desc && result._dependentKeys.indexOf(arg) === -1) {
+        result.property(arg);
       }
 
-      return desc ? get(self, arg) : arg;
+      return desc ? get(this, arg) : arg;
     });
 
     outputFormat = propertyValues[0];

addon/helpers/ago.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import moment from 'moment';
 
-var ago;
+let ago;
 
 if (Ember.HTMLBars) {
   ago = function ago(params) {
@@ -13,8 +13,8 @@ if (Ember.HTMLBars) {
   };
 } else {
   ago = function ago(value, maybeInput) {
-    var length = arguments.length;
-    var args = [value];
+    let length = arguments.length;
+    let args = [value];
 
     if (length === 1) {
       throw new TypeError('Invalid Number of arguments, expected at least 1');

addon/helpers/duration.js

@@ -1,11 +1,11 @@
 import Ember from 'ember';
 import moment from 'moment';
 
-var duration;
+let duration;
 
 if (Ember.HTMLBars) {
   duration = function duration(params) {
-    var length = params.length;
+    let length = params.length;
 
     if (length === 0 || length > 2) {
       throw new TypeError('Invalid Number of arguments, expected 1 or 2');
@@ -15,15 +15,15 @@ if (Ember.HTMLBars) {
   };
 } else {
   duration = function duration(arg1, arg2) {
-    var length = arguments.length;
+    let length = arguments.length;
 
     if (length === 1 || length > 3) {
       // there's one extra argument that handlebars adds to the end,
       // which explains the difference in what we are checking and the error we are raising
       throw new TypeError('Invalid Number of arguments, expected 1 or 2');
     }
 
-    var args = [arg1];
+    let args = [arg1];
 
     if (length === 3) {
       args.push(arg2);

addon/helpers/moment.js

@@ -1,13 +1,13 @@
 import Ember from 'ember';
 import momentjs from 'moment';
 
-var moment;
+let moment;
 
 if (Ember.HTMLBars) {
   moment = function moment(params) {
-    var length = params.length;
-    var args = [];
-    var output;
+    let length = params.length;
+    let args = [];
+    let output;
 
     if (length === 0 || length > 3) {
       throw new TypeError('Invalid Number of arguments, expected at least 1 and at most 3');
@@ -28,9 +28,9 @@ if (Ember.HTMLBars) {
   };
 } else {
   moment = function moment(value, maybeOutput, maybeInput) {
-    var length = arguments.length;
-    var args = [];
-    var output;
+    let length = arguments.length;
+    let args = [];
+    let output;
 
     if (length === 1 || length > 4) {
       // there's one extra argument that handlebars adds to the end,

addon/utils/is-descriptor.js

@@ -0,0 +1,10 @@
+import Ember from 'ember';
+let { typeOf, Descriptor } = Ember;
+
+// credit: https://github.com/cibernox/ember-cpm/blob/master/addon/utils.js#L17-L20
+function isDescriptor(prop) {
+  return typeOf(prop) === 'object' && (prop.constructor === Descriptor || // Ember < 1.11
+     prop.isDescriptor); // Ember >= 1.11.0
+}
+
+export default isDescriptor;

app/initializers/ember-moment.js

@@ -3,8 +3,8 @@ import ago from 'ember-moment/helpers/ago';
 import duration from 'ember-moment/helpers/duration';
 import Ember from 'ember';
 
-export var initialize = function(/* container, app */) {
-  var registerHelper;
+export function initialize() {
+  let registerHelper;
 
   if (Ember.HTMLBars) {
     registerHelper = function (helperName, fn) {

bower.json

@@ -1,16 +1,16 @@
 {
   "name": "ember-moment",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-resolver": "~0.1.10",
-    "loader.js": "stefanpenner/loader.js#1.0.1",
+    "ember": "1.13.3",
     "ember-cli-moment-shim": "jasonmit/ember-cli-moment-shim#0.0.3",
-    "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
-    "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.18",
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "moment": "~2.8.4",
     "moment-timezone": "~0.2.5",
     "qunit": "~1.17.1"

config/ember-try.js

@@ -0,0 +1,35 @@
+module.exports = {
+  scenarios: [
+    {
+      name: 'default',
+      dependencies: { }
+    },
+    {
+      name: 'ember-release',
+      dependencies: {
+        'ember': 'components/ember#release'
+      },
+      resolutions: {
+        'ember': 'release'
+      }
+    },
+    {
+      name: 'ember-beta',
+      dependencies: {
+        'ember': 'components/ember#beta'
+      },
+      resolutions: {
+        'ember': 'beta'
+      }
+    },
+    {
+      name: 'ember-canary',
+      dependencies: {
+        'ember': 'components/ember#canary'
+      },
+      resolutions: {
+        'ember': 'canary'
+      }
+    }
+  ]
+};