Merge pull request #36 from hiwhi/master

Updating to Ember 2.3; Removed utils/can

.npmignore

@@ -1,15 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
 ember-cli-build.js
-Brocfile.js
 testem.json

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 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/computed.js

@@ -1,7 +1,6 @@
 import Ember from 'ember';
 
-const get = Ember.get;
-const set = Ember.set;
+const { get, set } = Ember;
 
 export default {
   ability: function(type, resourceName) {
@@ -10,10 +9,9 @@ export default {
     }
 
     return Ember.computed(resourceName, function() {
-      const container = this.container;
-      const ability   = container.lookup("ability:"+type);
+      const ability = Ember.getOwner(this).lookup("ability:" + type);
 
-      Ember.assert("No ability class found for "+type, ability);
+      Ember.assert("No ability class found for " + type, ability);
 
       const resource = get(this, resourceName);
       set(ability, "model", resource);

addon/helpers/can.js

@@ -1,11 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Helper.extend({
-  can: Ember.inject.service(),
+  can: Ember.inject.service("can"),
 
   compute([name, resource], hash) {
-    const service      = this.get("can");
-    const ability      = service.build(name, resource, hash);
+    const service = this.get("can");
+    const ability = service.build(name, resource, hash);
 
     const { propertyName } = service.parse(name);
 
@@ -25,4 +25,4 @@ export default Ember.Helper.extend({
     this._ability.removeObserver(this._abilityProp, this, "recompute");
     return this._super();
   }
-});
+});

addon/helpers/cannot.js

@@ -1,10 +1,8 @@
 import Ember from 'ember';
-import canHelper from 'ember-can/helpers/can';
 
 export default Ember.Helper.extend({
   helper: Ember.computed(function() {
-    let container = this.container;
-    return canHelper.create({container});
+    return Ember.getOwner(this).lookup('helper:can');
   }),
 
   compute(params, hash) {

addon/index.js

@@ -1,5 +1,4 @@
 import Ability from './ability';
-import can from './utils/can';
 import CanMixin from './can-mixin';
 import computed from './computed';
 import CanService from './services/can';
@@ -8,6 +7,5 @@ export {
   Ability,
   CanMixin,
   CanService,
-  can,
   computed
 };

addon/services/can.js

@@ -8,9 +8,9 @@ export default Ember.Service.extend({
 
   build(abilityString, resource, properties) {
     const names   = this.parse(abilityString);
-    const ability = this.container.lookup("ability:"+names.abilityName);
+    const ability = Ember.getOwner(this).lookup("ability:" + names.abilityName);
 
-    Ember.assert("No ability type found for "+names.abilityName, ability);
+    Ember.assert("No ability type found for " + names.abilityName, ability);
 
     // see if we've been given properties instead of resource
     if (!properties && resource && !(resource instanceof Ember.Object)) {

addon/utils/normalize.js

@@ -11,7 +11,7 @@ export function normalizeCombined(str) {
 
   const abilityName = parts.pop();
 
-  const last = parts[parts.length-1];
+  const last = parts[parts.length - 1];
   if (stopwords.indexOf(last) !== -1) {
     parts.pop();
   }
@@ -24,5 +24,5 @@ export function normalizeCombined(str) {
 }
 
 function normalizeAbilityMethod(str) {
-  return 'can'+classify(str);
+  return 'can' + classify(str);
 }

bower.json

@@ -1,15 +1,9 @@
 {
   "name": "ember-can",
   "dependencies": {
-    "ember": "1.13.7",
-    "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.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
-    "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
-    "qunit": "~1.18.0"
+    "ember": "2.3.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0"
   }
-}
+}

config/ember-try.js

@@ -1,34 +1,43 @@
+/*jshint node:true*/
 module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      bower: {
+        dependencies: { }
+      }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

ember-cli-build.js

@@ -7,7 +7,7 @@ module.exports = function(defaults) {
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

package.json

@@ -15,31 +15,33 @@
     "url": "git+https://github.com/minutebase/ember-can.git"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 0.12.0"
   },
   "author": "Richard Livsey <[email protected]>",
   "contributors": [
-    "Ben Limmer <[email protected]>"
+    "Ben Limmer <[email protected]>",
+    "Miles Zimmerman <[email protected]>"
   ],
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
+    "broccoli-asset-rev": "^2.2.0",
+    "ember-cli": "2.3.0",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.0",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-sri": "^1.0.3",
+    "ember-cli-qunit": "^1.2.1",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
-    "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.6",
-    "ember-resolver": "2.0.3"
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.4",
+    "ember-disable-prototype-extensions": "^1.1.0",
+    "ember-try": "^0.1.2",
+    "ember-resolver": "^2.0.3",
+    "ember-load-initializers": "^0.5.0",
+    "loader.js": "^4.0.0"
   },
   "keywords": [
     "ember-addon",
@@ -50,7 +52,7 @@
     "abilities"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.0.0"
+    "ember-cli-babel": "^5.1.5"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"