Merge branch 'pods'

* pods:
  Sortable table component
  Pods, pods, everywhere

.ember-cli

@@ -1,9 +1,4 @@
 {
-  /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
-  */
-  "disableAnalytics": true
+  "disableAnalytics": true,
+  "usePods": true
 }

app/controllers/characteristics/index.js

@@ -1,5 +0,0 @@
-import SortableController from '../sortable';
-
-export default SortableController.extend({
-  sortBy: 'characteristicName',
-});

app/controllers/measurements/index.js

@@ -1,5 +0,0 @@
-import SortableController from '../sortable';
-
-export default SortableController.extend({
-  sortBy: 'characteristic',
-});

app/controllers/strains/index.js

@@ -1,5 +0,0 @@
-import SortableController from '../sortable';
-
-export default SortableController.extend({
-  sortBy: 'fullName',
-});

app/pods/application/adapter.js

@@ -1,6 +1,6 @@
 import DS from 'ember-data';
 import Ember from 'ember';
-import config from '../config/environment';
+import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
   namespace: 'api/' + config.genus,

app/pods/characteristics/route.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('characteristic');
+  },
+  setupController: function(controller, model) {
+    var tableAttrs = [
+      { name: 'Name', attr: 'characteristicName' },
+      { name: 'Type', attr: 'characteristicType' }
+    ];
+    controller.set('model', model);
+    controller.set('tableAttrs', tableAttrs);
+    controller.set('row', 'characteristic-index-row');
+  },
+});

app/pods/characteristics/template.hbs

@@ -0,0 +1,4 @@
+<h2>{{genus-name}} Characteristics</h2>
+<h3>Total characteristics: {{model.length}}</h3>
+
+{{sortable-table content=model tableAttrs=tableAttrs row=row}}

app/pods/components/characteristic-index-row/component.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
+  tagName: 'tr',
 });

app/pods/components/characteristic-index-row/template.hbs

@@ -0,0 +1,6 @@
+<td>
+  {{data.characteristicName}}
+</td>
+<td>
+  {{data.characteristicType}}
+</td>

app/pods/components/genus-name/component.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import config from '../config/environment';
+import config from '../../../config/environment';
 
 export default Ember.Component.extend({
   tagName: 'em',

app/pods/components/scientific-name/component.js

@@ -1,8 +1,6 @@
 import Ember from 'ember';
-import layout from '../templates/components/scientific-name';
 
 export default Ember.Component.extend({
-  layout: layout,
   tagName: 'span',
   strain: null, // passed in
 });

app/pods/components/sortable-table-header/component.js

@@ -0,0 +1,13 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'th',
+  upArrow: '&#9650',
+  downArrow: '&#9660',
+
+  actions: {
+    sortBy: function(sortProperty, ascending) {
+      this.sendAction('action', sortProperty, ascending);
+    }
+  },
+});

app/pods/components/sortable-table-header/template.hbs

@@ -0,0 +1,3 @@
+{{title}}
+<span {{action 'sortBy' sortProperty true}}>{{{upArrow}}}</span>
+<span {{action 'sortBy' sortProperty false}}>{{{downArrow}}}</span>

app/pods/components/sortable-table/component.js

@@ -0,0 +1,13 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend(Ember.SortableMixin, {
+  tagName: 'table',
+  classNames: ['flakes-table'],
+
+  actions: {
+    sortBy: function(property, ascending) {
+      this.set('sortAscending', ascending);
+      this.set('sortProperties', [property]);
+    }
+  },
+});

app/pods/components/sortable-table/template.hbs

@@ -0,0 +1,13 @@
+<thead>
+  <tr>
+    {{#each a in tableAttrs}}
+      {{sortable-table-header title=a.name sortProperty=a.attr action="sortBy"}}
+    {{/each}}
+  </tr>
+</thead>
+
+<tbody>
+  {{#each item in arrangedContent}}
+    {{component row data=item}}
+  {{/each}}
+</tbody>

app/pods/components/species-index-row/component.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+});

app/pods/components/species-index-row/template.hbs

@@ -0,0 +1,13 @@
+<td>
+  {{#link-to 'species.show' data}}
+    {{data.speciesName}}
+  {{/link-to}}
+</td>
+<td>
+  {{#each data.strains as |strain index|}}
+    {{if index ","}}
+    {{#link-to 'strains.show' strain.id}}
+      {{strain.strainName}}
+    {{/link-to}}
+  {{/each}}
+</td>

app/pods/components/strain-index-row/component.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+});

app/pods/components/strain-index-row/template.hbs

@@ -0,0 +1,8 @@
+<td>
+  {{#link-to 'strains.show' data.id}}
+    {{scientific-name strain=data}}
+  {{/link-to}}
+</td>
+<td>
+  {{data.totalMeasurements}}
+</td>

app/pods/species/index/controller.js

@@ -1,4 +1,4 @@
-import SortableController from '../sortable';
+import SortableController from '../../../controllers/sortable';
 
 export default SortableController.extend({
   sortBy: 'speciesName',

app/pods/species/index/route.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('species');
+  },
+  setupController: function(controller, model) {
+    var tableAttrs = [
+      { name: 'Name', attr: 'speciesName' },
+      { name: 'Strains', attr: 'totalStrains' }
+    ];
+    controller.set('model', model);
+    controller.set('tableAttrs', tableAttrs);
+    controller.set('row', 'species-index-row');
+  },
+});

app/pods/species/index/template.hbs

@@ -0,0 +1,11 @@
+<h2>{{genus-name}} Species</h2>
+<h3>Total species: {{controller.length}}</h3>
+
+{{#if (can "add species")}}
+  {{! 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/species/new/template.hbs

@@ -1,5 +1,5 @@
 {{
-  species/species-details
+  species-details
   species=model
   isEditing=true
   save="save"

app/pods/species/show/template.hbs

@@ -1,5 +1,5 @@
 {{
-  species/species-details
+  species-details
   species=model
   isEditing=isEditing
   save="save"

app/pods/strains/index/route.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('strain');
+  },
+  setupController: function(controller, model) {
+    var tableAttrs = [
+      { name: 'Name', attr: 'fullName' },
+      { name: 'Total Measurements', attr: 'totalMeasurements' }
+    ];
+    controller.set('model', model);
+    controller.set('tableAttrs', tableAttrs);
+    controller.set('row', 'strain-index-row');
+  },
+});

app/pods/strains/index/template.hbs

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

app/pods/strains/new/template.hbs

@@ -1,5 +1,5 @@
 {{
-  strains/strain-details
+  strain-details
   strain=strain
   species=species
   isEditing=true

app/pods/strains/show/template.hbs

@@ -1,12 +1,8 @@
 {{
-  strains/strain-details
+  strain-details
   strain=strain
   species=species
   isEditing=isEditing
   save="save"
   cancel="cancel"
 }}
-
-<div class="measurements-container">
-  {{outlet}}
-</div>

app/pods/user/adapter.js

@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import config from '../config/environment';
+import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
   namespace: 'api',

app/pods/users/route.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('user');
+  }
+});

app/router.js

@@ -8,18 +8,18 @@ var Router = Ember.Router.extend({
 Router.map(function() {
   this.route('login');
   this.route('about');
-  this.resource('species', function() {
+  this.route('characteristics');
+  this.route('users');
+
+  this.route('species', function() {
+    this.route('new');
     this.route('show', { path: ':species_id' });
-    this.route('new');
   });
-  this.resource('strains', function() {
+  this.route('strains', function() {
     this.route('new');
-    this.route('show', { path: ':strain_id' }, function() {
-      this.resource('measurements', function() {});
-    });
+    this.route('show', { path: ':strain_id' });
   });
-  this.resource('characteristics', function() {});
-  this.resource('users', function() {});
+
 });
 
 export default Router;

app/routes/characteristics/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.store.findAll('characteristic');
-  }
-});

app/routes/index.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/measurements/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.modelFor('strains/show').strain.get('measurements');
-  }
-});

app/routes/species.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/species/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.store.findAll('species');
-  }
-});

app/routes/strains.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/strains/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.store.findAll('strain');
-  }
-});

app/routes/users.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/users/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.store.findAll('user');
-  }
-});

app/styles/app.css

@@ -2,7 +2,7 @@
   padding: 2em 0em 0em 0em;
 }
 
-.flakes-table thead tr {
+.flakes-table thead tr th span {
   cursor: pointer;
 }
 

app/templates/characteristics/index.hbs

@@ -1,19 +0,0 @@
-<h2>{{genus-name}} Characteristics</h2>
-<h3>Total characteristics: {{controller.length}}</h3>
-
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th {{action "setSortBy" "characteristicName"}}>Name</th>
-      <th {{action "setSortBy" "characteristicType"}}>Type</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each characteristic in controller}}
-      <tr>
-        <td>{{characteristic.characteristicName}}</td>
-        <td>{{characteristic.characteristicType}}</td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>

app/templates/measurements/index.hbs

@@ -1,16 +0,0 @@
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th {{action "setSortBy" "characteristic"}}>Characteristic</th>
-      <th {{action "setSortBy" "computedType"}}>Measurement Type</th>
-      <th {{action "setSortBy" "computedValue"}}>Measurement</th>
-      <th {{action "setSortBy" "notes"}}>Notes</th>
-      <th {{action "setSortBy" "testMethod"}}>Test Method</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each measurement in controller}}
-      {{measurements/measurement-row measurement=measurement}}
-    {{/each}}
-  </tbody>
-</table>

app/templates/species.hbs

@@ -1 +0,0 @@
-{{outlet}}

app/templates/species/index.hbs

@@ -1,37 +0,0 @@
-<h2>{{genus-name}} Species</h2>
-<h3>Total species: {{controller.length}}</h3>
-
-{{#if (can "add species")}}
-  {{! Does nothing ATM }}
-  {{#link-to 'species.new' class="button-gray smaller"}}
-    Add Species
-  {{/link-to}}
-{{/if}}
-
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th {{action "setSortBy" "speciesName"}}>Name</th>
-      <th {{action "setSortBy" "totalStrains"}}>Strains</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each species in controller}}
-      <tr>
-        <td>
-          {{#link-to 'species.show' species}}
-            {{species.speciesName}}
-          {{/link-to}}
-        </td>
-        <td>
-          {{#each species.strains as |strain index|}}
-            {{if index ","}}
-            {{#link-to 'strains.show' strain.id}}
-              {{strain.strainName}}
-            {{/link-to}}
-          {{/each}}
-        </td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>

app/templates/strains/index.hbs

@@ -1,30 +0,0 @@
-<h2>{{genus-name}} Strains</h2>
-<h3>Total strains: {{controller.length}}</h3>
-
-{{#if (can "add strain")}}
-  {{! Does nothing ATM }}
-  {{#link-to 'strains.new' class="button-gray smaller"}}
-    Add Strain
-  {{/link-to}}
-{{/if}}
-
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th {{action "setSortBy" "fullName"}}>Name</th>
-      <th {{action "setSortBy" "totalMeasurements"}}>Total Measurements</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each strain in controller}}
-      <tr>
-        <td>
-          {{#link-to 'measurements' strain.id}}
-            {{scientific-name strain=strain}}
-          {{/link-to}}
-        </td>
-        <td>{{strain.totalMeasurements}}</td>
-      </tr>
-    {{/each}}
-  </tbody>
-</table>

config/environment.js

@@ -17,6 +17,7 @@ module.exports = function(environment) {
       // when it is created
     },
     genus: 'hymenobacter',
+    podModulePrefix: 'hymenobacterdotinfo/pods',
   };
 
   if (environment === 'development') {

tests/unit/pods/components/characteristic-index-row/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('characteristic-index-row', {
+  // 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');
+});

tests/unit/pods/components/sortable-table-header/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('sortable-table-header', {
+  // 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');
+});

tests/unit/pods/components/sortable-table/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('sortable-table', {
+  // 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');
+});

tests/unit/pods/components/species-index-row/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('species-index-row', {
+  // 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');
+});

tests/unit/pods/components/strain-index-row/component-test.js

@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('strain-index-row', {
+  // 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');
+});