From afcf24a8d8a3808214fc70a198507139fb9a79e6 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 2 Jun 2015 14:27:23 -0800 Subject: [PATCH] Rough in species --- app/abilities/species.js | 17 +++ app/components/species/species-details.js | 20 ++++ app/models/species.js | 16 +++ app/router.js | 4 + app/routes/species.js | 4 + app/routes/species/index.js | 7 ++ app/routes/species/new.js | 12 ++ app/routes/species/show.js | 4 + app/templates/application.hbs | 3 + .../components/species/species-details.hbs | 76 ++++++++++++ app/templates/species.hbs | 1 + app/templates/species/index.hbs | 30 +++++ app/templates/species/new.hbs | 1 + app/templates/species/show.hbs | 1 + package.json | 5 +- server/mocks/species.js | 108 ++++++++++++++++++ .../species/species-details-test.js | 21 ++++ tests/unit/models/species-test.js | 15 +++ tests/unit/routes/species-test.js | 14 +++ tests/unit/routes/species/index-test.js | 14 +++ tests/unit/routes/species/new-test.js | 14 +++ tests/unit/routes/species/show-test.js | 14 +++ 22 files changed, 399 insertions(+), 2 deletions(-) create mode 100644 app/abilities/species.js create mode 100644 app/components/species/species-details.js create mode 100644 app/models/species.js create mode 100644 app/routes/species.js create mode 100644 app/routes/species/index.js create mode 100644 app/routes/species/new.js create mode 100644 app/routes/species/show.js create mode 100644 app/templates/components/species/species-details.hbs create mode 100644 app/templates/species.hbs create mode 100644 app/templates/species/index.hbs create mode 100644 app/templates/species/new.hbs create mode 100644 app/templates/species/show.hbs create mode 100644 server/mocks/species.js create mode 100644 tests/unit/components/species/species-details-test.js create mode 100644 tests/unit/models/species-test.js create mode 100644 tests/unit/routes/species-test.js create mode 100644 tests/unit/routes/species/index-test.js create mode 100644 tests/unit/routes/species/new-test.js create mode 100644 tests/unit/routes/species/show-test.js diff --git a/app/abilities/species.js b/app/abilities/species.js new file mode 100644 index 0000000..7900607 --- /dev/null +++ b/app/abilities/species.js @@ -0,0 +1,17 @@ +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') +}); diff --git a/app/components/species/species-details.js b/app/components/species/species-details.js new file mode 100644 index 0000000..3fd4f8e --- /dev/null +++ b/app/components/species/species-details.js @@ -0,0 +1,20 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + classNames: ['grid-1'], + isEditing: false, + isNew: false, + actions: { + editSpecies: function() { + this.get('species').get('errors').clear(); + if (this.get('isNew')) { + this.get('species').destroyRecord().then(this.sendAction()); + } + this.toggleProperty('isEditing'); + this.get('species').rollback(); + }, + saveSpecies: function() { + this.get('species').save().then(this.toggleProperty('isEditing')); + } + } +}); diff --git a/app/models/species.js b/app/models/species.js new file mode 100644 index 0000000..f4906c8 --- /dev/null +++ b/app/models/species.js @@ -0,0 +1,16 @@ +import DS from 'ember-data'; + +export default DS.Model.extend({ + speciesName: DS.attr('string'), + typeSpecies: DS.attr('boolean'), + etymology: DS.attr('string'), + genusName: DS.attr('string'), + strains: DS.hasMany('strain'), + totalStrains: DS.attr('number'), + createdAt: DS.attr('date'), + updatedAt: DS.attr('date'), + deletedAt: DS.attr('date'), + createdBy: DS.attr('number'), + updatedBy: DS.attr('number'), + deletedBy: DS.attr('number'), +}); diff --git a/app/router.js b/app/router.js index 2c793b1..f82a92c 100644 --- a/app/router.js +++ b/app/router.js @@ -8,6 +8,10 @@ var Router = Ember.Router.extend({ Router.map(function() { this.route('login'); this.route('about'); + this.resource('species', function() { + this.route('show', { path: ':species_id' }); + this.route('new'); + }); this.resource('strains', function() { this.route('new'); this.route('show', { path: ':strain_id' }, function() { diff --git a/app/routes/species.js b/app/routes/species.js new file mode 100644 index 0000000..5b14286 --- /dev/null +++ b/app/routes/species.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; +import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; + +export default Ember.Route.extend(AuthenticatedRouteMixin); diff --git a/app/routes/species/index.js b/app/routes/species/index.js new file mode 100644 index 0000000..8f05241 --- /dev/null +++ b/app/routes/species/index.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function() { + return this.store.findAll('species'); + } +}); diff --git a/app/routes/species/new.js b/app/routes/species/new.js new file mode 100644 index 0000000..96b0d46 --- /dev/null +++ b/app/routes/species/new.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ + model: function() { + return this.store.createRecord('species'); + }, + actions: { + cancelSpecies: function() { + this.transitionTo('species.index'); + } + } +}); diff --git a/app/routes/species/show.js b/app/routes/species/show.js new file mode 100644 index 0000000..26d9f31 --- /dev/null +++ b/app/routes/species/show.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/templates/application.hbs b/app/templates/application.hbs index f70063e..686e66b 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -4,6 +4,9 @@ {{/link-to}} {{#if session.isAuthenticated}}