Dropping ember-can

app/abilities/species.js

@@ -1,17 +0,0 @@
-import { Ability } from 'ember-can';
-
-export default Ability.extend({
-  // Only admins and writers can create a new species
-  canAdd: function() {
-    let role = this.get('session.currentUser.role');
-    return (role === 'W') || (role === 'A');
-  }.property('session.currentUser.role'),
-
-  // Only admins and the person who created can edit
-  canEdit: function() {
-    let role = this.get('session.currentUser.role');
-    let id = this.get('session.currentUser.id');
-    let author = this.get('model.createdBy');
-    return (role === 'W' && (+id === author)) || (role === 'A');
-  }.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy')
-});

app/abilities/strain.js

@@ -1,17 +0,0 @@
-import { Ability } from 'ember-can';
-
-export default Ability.extend({
-  // Only admins and writers can create a new strain
-  canAdd: function() {
-    let role = this.get('session.currentUser.role');
-    return (role === 'W') || (role === 'A');
-  }.property('session.currentUser.role'),
-
-  // Only admins and the person who created can edit
-  canEdit: function() {
-    let role = this.get('session.currentUser.role');
-    let id = this.get('session.currentUser.id');
-    let author = this.get('model.createdBy');
-    return (role === 'W' && (+id === author)) || (role === 'A');
-  }.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy')
-});

app/pods/components/add-button/component.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  canAdd: function() {
+    let role = this.get('session.currentUser.role');
+    return (role === 'W') || (role === 'A');
+  }.property('session.currentUser.role')
+});

app/pods/components/add-button/template.hbs

@@ -0,0 +1,5 @@
+{{#if canAdd}}
+  {{#link-to link class="button-gray smaller"}}
+    {{label}}
+  {{/link-to}}
+{{/if}}

app/pods/components/species-details/component.js

@@ -3,6 +3,14 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   classNames: ['grid-1'],
   isEditing: false,
+
+  canEdit: function() {
+    let role = this.get('session.currentUser.role');
+    let id = this.get('session.currentUser.id');
+    let author = this.get('species.createdBy');
+    return (role === 'W' && (+id === author)) || (role === 'A');
+  }.property('session.currentUser.role', 'session.currentUser.id', 'species.createdBy'),
+
   actions: {
     save: function() {
       this.sendAction('save');

app/pods/components/species-details/template.hbs

@@ -21,16 +21,9 @@
               {{strain.strainName}}
             {{/link-to}}
           {{/each}}
-          {{#if (can "edit species" species)}}
+          {{#unless species.isNew}}
-            {{#if species.isNew}}
+            {{add-button label="Add Strain" link="strains.new"}}
-              PENDING SAVE
+          {{/unless}}
-            {{else}}
-              <br>
-              {{#link-to 'strains.new' class="button-gray smaller"}}
-                Add Strain
-              {{/link-to}}
-            {{/if}}
-          {{/if}}
         </dd>
       </dl>
       <dl class="span-2">
@@ -78,10 +71,9 @@
     </div>
 
     {{! ROW 4 }}
-    {{#if (can "edit species" species)}}
+    {{#if canEdit}}
       <div class="grid-4">
         <div class="span-1">
-          {{! Does nothing ATM }}
           <a {{bind-attr class=":smaller isEditing:button-red:button-gray"}} {{action 'cancel'}}>
             {{#if isEditing}}Cancel{{else}}Edit{{/if}}
           </a>

app/pods/components/strain-details/component.js

@@ -3,6 +3,14 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   classNames: ['grid-1'],
   isEditing: false,
+
+  canEdit: function() {
+    let role = this.get('session.currentUser.role');
+    let id = this.get('session.currentUser.id');
+    let author = this.get('strain.createdBy');
+    return (role === 'W' && (+id === author)) || (role === 'A');
+  }.property('session.currentUser.role', 'session.currentUser.id', 'strain.createdBy'),
+
   actions: {
     save: function() {
       this.sendAction('save');

app/pods/components/strain-details/template.hbs

@@ -116,7 +116,7 @@
     </div>
 
     {{! ROW 6 }}
-    {{#if (can "edit strain" strain)}}
+    {{#if canEdit}}
       <div class="grid-4">
         <div class="span-1">
           {{! Does nothing ATM }}

app/pods/species/index/template.hbs

@@ -1,11 +1,6 @@
 <h2>{{genus-name}} Species</h2>
 <h3>Total species: {{controller.length}}</h3>
 
-{{#if (can "add species")}}
+{{add-button label="Add Species" link="species.new"}}
-  {{! Does nothing ATM }}
-  {{#link-to 'species.new' class="button-gray smaller"}}
-    Add Species
-  {{/link-to}}
-{{/if}}
 
 {{sortable-table content=model tableAttrs=tableAttrs row=row}}

app/pods/strains/index/template.hbs

@@ -1,11 +1,6 @@
 <h2>{{genus-name}} Strains</h2>
 <h3>Total strains: {{model.length}}</h3>
 
-{{#if (can "add strain")}}
+{{add-button label="Add Strain" link="strains.new"}}
-  {{! Does nothing ATM }}
-  {{#link-to 'strains.new' class="button-gray smaller"}}
-    Add Strain
-  {{/link-to}}
-{{/if}}
 
 {{sortable-table content=model tableAttrs=tableAttrs row=row}}

config/environment.js

@@ -43,11 +43,6 @@ module.exports = function(environment) {
       refreshLeeway: 300,
       timeFactor: 1
     }
-    ENV['ember-can'] = {
-      inject: {
-        session: 'simple-auth-session:main'
-      }
-    }
     ENV.apiURL = 'http://127.0.0.1:4200';
     ENV.contentSecurityPolicy = {
       'default-src': "'none'",
@@ -78,11 +73,6 @@ module.exports = function(environment) {
       refreshLeeway: 300,
       timeFactor: 1
     }
-    ENV['ember-can'] = {
-      inject: {
-        session: 'simple-auth-session:main'
-      }
-    }
     ENV.apiURL = 'https://bactdb-test.herokuapp.com';
     ENV.contentSecurityPolicy = {
       'default-src': "'none'",
@@ -117,11 +107,6 @@ module.exports = function(environment) {
       refreshLeeway: 300,
       timeFactor: 1
     }
-    ENV['ember-can'] = {
-      inject: {
-        session: 'simple-auth-session:main'
-      }
-    }
     ENV.apiURL = 'https://bactdb.herokuapp.com';
     ENV.contentSecurityPolicy = {
       'default-src': "'none'",

package.json

@@ -22,7 +22,6 @@
     "body-parser": "^1.12.2",
     "broccoli-asset-rev": "^2.0.2",
     "connect-restreamer": "^1.0.2",
-    "ember-can": "^0.4.0",
     "ember-cli": "0.2.3",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-babel": "^5.0.0",

tests/unit/pods/components/add-button/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('add-button', {
+  // Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar']
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // Creates the component instance
+  var component = this.subject();
+  assert.equal(component._state, 'preRender');
+
+  // Renders the component to the page
+  this.render();
+  assert.equal(component._state, 'inDOM');
+});