From 97076c07264f93c1f4873f280c8d84621a03e640 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 10 May 2015 19:46:50 -0400
Subject: [PATCH 01/73] Added basic components

---
 .editorconfig                               |   1 +
 .ember-cli                                  |   3 +-
 .npmignore                                  |   1 +
 .travis.yml                                 |   2 +
 Brocfile.js                                 |   6 +-
 addon/components/error-field.js             |   9 +
 addon/components/form-control.js            |  66 ++
 addon/components/hint-field.js              |   9 +
 addon/components/input-field.js             |   6 +
 addon/components/label-field.js             |   9 +
 addon/helpers/to-words.js                   |   9 +
 addon/initializers/easy-form-extensions.js  |   4 +-
 addon/services/easy-form.js                 |  11 +
 addon/templates/components/error-field.hbs  |   1 +
 addon/templates/components/form-control.hbs |   1 +
 addon/templates/components/hint-field.hbs   |   1 +
 addon/templates/components/input-field.hbs  |   1 +
 addon/templates/components/label-field.hbs  |   1 +
 app/components/error-field.js               |   3 +
 app/components/form-control.js              |   3 +
 app/components/hint-field.js                |   3 +
 app/components/input-field.js               |   3 +
 app/components/label-field.js               |   3 +
 app/helpers/to-words.js                     |   3 +
 app/services/easy-form.js                   |   3 +
 bower.json                                  |  14 +-
 index.js                                    |   9 -
 package.json                                |  20 +-
 tests/dummy/app/app.js                      |   4 +-
 tests/unit/components/error-field-test.js   |  21 +
 tests/unit/components/form-control-test.js  |  21 +
 tests/unit/components/hint-field-test.js    |  21 +
 tests/unit/components/input-field-test.js   |  21 +
 tests/unit/components/label-field-test.js   |  21 +
 tests/unit/helpers/to-words-test.js         |  12 +
 tests/unit/services/easy-form-test.js       |  15 +
 vendor/ember-easy-form.js                   | 644 --------------------
 37 files changed, 307 insertions(+), 678 deletions(-)
 create mode 100644 addon/components/error-field.js
 create mode 100644 addon/components/form-control.js
 create mode 100644 addon/components/hint-field.js
 create mode 100644 addon/components/input-field.js
 create mode 100644 addon/components/label-field.js
 create mode 100644 addon/helpers/to-words.js
 create mode 100644 addon/services/easy-form.js
 create mode 100644 addon/templates/components/error-field.hbs
 create mode 100644 addon/templates/components/form-control.hbs
 create mode 100644 addon/templates/components/hint-field.hbs
 create mode 100644 addon/templates/components/input-field.hbs
 create mode 100644 addon/templates/components/label-field.hbs
 create mode 100644 app/components/error-field.js
 create mode 100644 app/components/form-control.js
 create mode 100644 app/components/hint-field.js
 create mode 100644 app/components/input-field.js
 create mode 100644 app/components/label-field.js
 create mode 100644 app/helpers/to-words.js
 create mode 100644 app/services/easy-form.js
 create mode 100644 tests/unit/components/error-field-test.js
 create mode 100644 tests/unit/components/form-control-test.js
 create mode 100644 tests/unit/components/hint-field-test.js
 create mode 100644 tests/unit/components/input-field-test.js
 create mode 100644 tests/unit/components/label-field-test.js
 create mode 100644 tests/unit/helpers/to-words-test.js
 create mode 100644 tests/unit/services/easy-form-test.js
 delete mode 100644 vendor/ember-easy-form.js

diff --git a/.editorconfig b/.editorconfig
index 2fe4874..47c5438 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
diff --git a/.ember-cli b/.ember-cli
index 26cfcf3..ee64cfe 100644
--- a/.ember-cli
+++ b/.ember-cli
@@ -5,6 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false,
-  "liveReload": false /* Set to false for non web-socket browser debugging */
+  "disableAnalytics": false
 }
diff --git a/.npmignore b/.npmignore
index 0533b91..a28e4ab 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,6 @@
 bower_components/
 tests/
+tmp/
 
 .bowerrc
 .editorconfig
diff --git a/.travis.yml b/.travis.yml
index cf23938..70a305e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
diff --git a/Brocfile.js b/Brocfile.js
index fdce144..042a64d 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -3,11 +3,7 @@
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-var app = new EmberAddon({
-  vendorFiles: {
-      'handlebars.js': null
-  }
-});
+var app = new EmberAddon();
 
 // Use `app.import` to add additional libraries to the generated
 // output files.
diff --git a/addon/components/error-field.js b/addon/components/error-field.js
new file mode 100644
index 0000000..dacfd9c
--- /dev/null
+++ b/addon/components/error-field.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+import layout from '../templates/components/error-field';
+
+export default Ember.Component.extend({
+  classNameBindings: ['easyForm.errorClass'],
+  layout: layout,
+  tagName: 'span',
+  text: null,
+});
diff --git a/addon/components/form-control.js b/addon/components/form-control.js
new file mode 100644
index 0000000..8498e8d
--- /dev/null
+++ b/addon/components/form-control.js
@@ -0,0 +1,66 @@
+import Ember from 'ember';
+import layout from '../templates/components/form-control';
+
+var typeOf = Ember.typeOf;
+
+export default Ember.Component.extend({
+  as: null,
+  layout: layout,
+  property: null,
+  showError: false,
+
+  /* Input attributes */
+
+  collection: null,
+  optionValuePath: null,
+  optionLabelPath: null,
+  selection: null,
+  value: null,
+  multiple: null,
+  name: Ember.computed.oneWay('property'),
+  placeholder: null,
+  prompt: null,
+  disabled: null,
+
+  type: Ember.computed('as', function() {
+    var as = this.get('as');
+    var property = this.get('property');
+    var type, value;
+
+    if (!as) {
+      if (property.match(/password/)) {
+        type = 'password';
+      } else if (property.match(/email/)) {
+        type = 'email';
+      } else if (property.match(/url/)) {
+        type = 'url';
+      } else if (property.match(/color/)) {
+        type = 'color';
+      } else if (property.match(/^tel/) || property.match(/^phone/)) {
+        type = 'tel';
+      } else if (property.match(/search/)) {
+        type = 'search';
+      } else {
+        value = this.get('value');
+
+        if (typeOf(value) === 'number') {
+          type = 'number';
+        } else if (typeOf(value) === 'date') {
+          type = 'date';
+        } else if (typeOf(value) === 'boolean') {
+          type = 'checkbox';
+        }
+      }
+    } else {
+      var inputType = this.get('easyForm.inputTypes.' + property);
+
+      if (inputType) {
+        type = inputType;
+      }
+
+      type = as;
+    }
+
+    return type;
+  }),
+});
diff --git a/addon/components/hint-field.js b/addon/components/hint-field.js
new file mode 100644
index 0000000..05b00f5
--- /dev/null
+++ b/addon/components/hint-field.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+import layout from '../templates/components/hint-field';
+
+export default Ember.Component.extend({
+  classNameBindings: ['easyForm.hintClass'],
+  layout: layout,
+  tagName: 'span',
+  text: null,
+});
diff --git a/addon/components/input-field.js b/addon/components/input-field.js
new file mode 100644
index 0000000..632e57b
--- /dev/null
+++ b/addon/components/input-field.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+import layout from '../templates/components/input-field';
+
+export default Ember.Component.extend({
+  layout: layout
+});
diff --git a/addon/components/label-field.js b/addon/components/label-field.js
new file mode 100644
index 0000000..eb5a1f9
--- /dev/null
+++ b/addon/components/label-field.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+import layout from '../templates/components/label-field';
+
+export default Ember.Component.extend({
+  classNameBindings: ['easyForm.labelClass'],
+  layout: layout,
+  tagName: 'label',
+  text: Ember.computed.oneWay('parentView.property'),
+});
diff --git a/addon/helpers/to-words.js b/addon/helpers/to-words.js
new file mode 100644
index 0000000..f3cc7b4
--- /dev/null
+++ b/addon/helpers/to-words.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export function toWords(params) {
+  var string = params[0];
+
+  return string.underscore().split('_').join(' ').capitalize();
+}
+
+export default Ember.HTMLBars.makeBoundHelper(toWords);
diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index e179338..090d317 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-export function initialize(/* container, app */) {
+export function initialize(container, app) {
   var run = Ember.run;
 
   /**
@@ -109,6 +109,8 @@ export function initialize(/* container, app */) {
 
   });
 
+  app.inject('component', 'easyForm', 'service:easy-form');
+
 }
 
 export default {
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
new file mode 100644
index 0000000..4f04bf6
--- /dev/null
+++ b/addon/services/easy-form.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+
+export default Ember.Service.extend({
+  inputTypes: {},
+  errorClass: 'error',
+  hintClass: 'hint',
+  inputClass: 'input',
+  inputWrapperClass: 'input-wrapper',
+  formClass: 'form',
+  formControlsClass: 'controls'
+});
diff --git a/addon/templates/components/error-field.hbs b/addon/templates/components/error-field.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/addon/templates/components/error-field.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/addon/templates/components/form-control.hbs b/addon/templates/components/form-control.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/addon/templates/components/form-control.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/addon/templates/components/hint-field.hbs b/addon/templates/components/hint-field.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/addon/templates/components/hint-field.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/addon/templates/components/input-field.hbs b/addon/templates/components/input-field.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/addon/templates/components/input-field.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/addon/templates/components/label-field.hbs b/addon/templates/components/label-field.hbs
new file mode 100644
index 0000000..4e1ac81
--- /dev/null
+++ b/addon/templates/components/label-field.hbs
@@ -0,0 +1 @@
+{{to-words text}}
diff --git a/app/components/error-field.js b/app/components/error-field.js
new file mode 100644
index 0000000..b6630d4
--- /dev/null
+++ b/app/components/error-field.js
@@ -0,0 +1,3 @@
+import errorField from 'ember-easy-form-extensions/components/error-field';
+
+export default errorField;
diff --git a/app/components/form-control.js b/app/components/form-control.js
new file mode 100644
index 0000000..086e30a
--- /dev/null
+++ b/app/components/form-control.js
@@ -0,0 +1,3 @@
+import formControl from 'ember-easy-form-extensions/components/form-control';
+
+export default formControl;
diff --git a/app/components/hint-field.js b/app/components/hint-field.js
new file mode 100644
index 0000000..d02c4ea
--- /dev/null
+++ b/app/components/hint-field.js
@@ -0,0 +1,3 @@
+import hintField from 'ember-easy-form-extensions/components/hint-field';
+
+export default hintField;
diff --git a/app/components/input-field.js b/app/components/input-field.js
new file mode 100644
index 0000000..893ea63
--- /dev/null
+++ b/app/components/input-field.js
@@ -0,0 +1,3 @@
+import inputField from 'ember-easy-form-extensions/components/input-field';
+
+export default inputField;
diff --git a/app/components/label-field.js b/app/components/label-field.js
new file mode 100644
index 0000000..aa87bb0
--- /dev/null
+++ b/app/components/label-field.js
@@ -0,0 +1,3 @@
+import labelField from 'ember-easy-form-extensions/components/label-field';
+
+export default labelField;
diff --git a/app/helpers/to-words.js b/app/helpers/to-words.js
new file mode 100644
index 0000000..cf6d4c7
--- /dev/null
+++ b/app/helpers/to-words.js
@@ -0,0 +1,3 @@
+import toWords from 'ember-easy-form-extensions/helpers/to-words';
+
+export default toWords;
diff --git a/app/services/easy-form.js b/app/services/easy-form.js
new file mode 100644
index 0000000..8e1123d
--- /dev/null
+++ b/app/services/easy-form.js
@@ -0,0 +1,3 @@
+import easyForm from 'ember-easy-form-extensions/services/easy-form';
+
+export default easyForm;
diff --git a/bower.json b/bower.json
index b26ae82..e1a7ec3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,16 +1,16 @@
 {
   "name": "ember-easy-form-extensions",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.15",
-    "ember-resolver": "~0.1.12",
-    "loader.js": "ember-cli/loader.js#3.2.0",
+    "ember": "1.11.1",
     "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.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.1",
     "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   }
 }
\ No newline at end of file
diff --git a/index.js b/index.js
index 9a97b38..d5dcd1b 100644
--- a/index.js
+++ b/index.js
@@ -3,13 +3,4 @@
 
 module.exports = {
   name: 'ember-easy-form-extensions',
-
-  included: function(app) {
-
-    /* Because ember-easy-form isn't Ember CLI-ified */
-
-    app.import('vendor/ember-easy-form.js', {
-      type: 'vendor'
-    });
-  }
 };
diff --git a/package.json b/package.json
index 8e64d08..6b8a39b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "ember test"
+    "test": "ember try:testall"
   },
   "repository": {
     "type": "git",
@@ -21,22 +21,24 @@
   "author": "Duncan Walker <walkerdu@bc.edu>",
   "license": "MIT",
   "dependencies": {
+    "ember-cli-babel": "^5.0.0",
     "ember-validations": "2.0.0-alpha.3"
   },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.2.0",
-    "ember-cli-app-version": "0.3.2",
-    "ember-cli-babel": "^4.0.0",
-    "ember-cli-content-security-policy": "0.3.0",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli": "0.2.3",
+    "ember-cli-app-version": "0.3.3",
+    "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.9",
+    "ember-cli-qunit": "0.3.10",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.15",
-    "ember-export-application-global": "^1.0.2"
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-export-application-global": "^1.0.2",
+    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-try": "0.0.4"
   },
   "keywords": [
     "ember-addon",
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
index 757df38..8d66b95 100644
--- a/tests/dummy/app/app.js
+++ b/tests/dummy/app/app.js
@@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+var App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
new file mode 100644
index 0000000..6575a3c
--- /dev/null
+++ b/tests/unit/components/error-field-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('error-field', {
+  // 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');
+});
diff --git a/tests/unit/components/form-control-test.js b/tests/unit/components/form-control-test.js
new file mode 100644
index 0000000..4ec65ba
--- /dev/null
+++ b/tests/unit/components/form-control-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('form-control', {
+  // 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');
+});
diff --git a/tests/unit/components/hint-field-test.js b/tests/unit/components/hint-field-test.js
new file mode 100644
index 0000000..8aae867
--- /dev/null
+++ b/tests/unit/components/hint-field-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('hint-field', {
+  // 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');
+});
diff --git a/tests/unit/components/input-field-test.js b/tests/unit/components/input-field-test.js
new file mode 100644
index 0000000..7cc93ba
--- /dev/null
+++ b/tests/unit/components/input-field-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('input-field', {
+  // 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');
+});
diff --git a/tests/unit/components/label-field-test.js b/tests/unit/components/label-field-test.js
new file mode 100644
index 0000000..60b79f0
--- /dev/null
+++ b/tests/unit/components/label-field-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('label-field', {
+  // 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');
+});
diff --git a/tests/unit/helpers/to-words-test.js b/tests/unit/helpers/to-words-test.js
new file mode 100644
index 0000000..2f78fe6
--- /dev/null
+++ b/tests/unit/helpers/to-words-test.js
@@ -0,0 +1,12 @@
+import {
+  toWords
+} from '../../../helpers/to-words';
+import { module, test } from 'qunit';
+
+module('ToWordsHelper');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var result = toWords(42);
+  assert.ok(result);
+});
diff --git a/tests/unit/services/easy-form-test.js b/tests/unit/services/easy-form-test.js
new file mode 100644
index 0000000..1a13047
--- /dev/null
+++ b/tests/unit/services/easy-form-test.js
@@ -0,0 +1,15 @@
+import {
+  moduleFor,
+  test
+} from 'ember-qunit';
+
+moduleFor('service:easy-form', {
+  // Specify the other units that are required for this test.
+  // needs: ['service:foo']
+});
+
+// Replace this with your real tests.
+test('it exists', function(assert) {
+  var service = this.subject();
+  assert.ok(service);
+});
diff --git a/vendor/ember-easy-form.js b/vendor/ember-easy-form.js
deleted file mode 100644
index 15e3375..0000000
--- a/vendor/ember-easy-form.js
+++ /dev/null
@@ -1,644 +0,0 @@
-/* WARNING: This file has been edited - it is different the original Easy Form source. Some functionality has been removed to work better with ember-easy-form-extensions and changes have been made for HTMLBars compatibility. */
-
-// ==========================================================================
-// Project:   Ember EasyForm
-// Copyright: Copyright 2013 DockYard, LLC. and contributors.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-
-var EasyFormShims;
-
-(function() {
-
-  EasyFormShims = {
-
-    callHelper: function(helperName, context, params, options, env) {
-      env = env ? env : options;
-
-      return Ember.Handlebars.helpers[helperName].helperFunction.call(
-        context, params, options.hash, options, options
-      );
-    },
-
-    getBinding: function(options, propertyName) {
-      propertyName += 'Binding';
-
-      return this.getProperty(options, propertyName);
-    },
-
-    getProperty: function(options, name) {
-      var property = options.hash[name];
-
-      return options.data.view.getStream(property).value();
-    },
-
-    viewHelper: function(context, View, options) {
-      return this.callHelper('view', context, [View], options);
-    },
-
-    emberInputHelper: function(context, options) {
-      var env = options;
-
-      env.helpers = Ember.Handlebars.helpers;
-
-      return this.callHelper('ember-input', context, [], options, env);
-    },
-  }
-
-})();
-
-
-(function() {
-
-Ember.EasyForm = Ember.Namespace.create({
-  VERSION: '1.0.0.beta.1'
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Config = Ember.Namespace.create({
-  _wrappers: {
-    'default': {
-      formClass: '',
-      fieldErrorClass: 'fieldWithErrors',
-      inputClass: 'input',
-      errorClass: 'error',
-      hintClass: 'hint',
-      labelClass: '',
-      inputTemplate: 'easyForm/input',
-      errorTemplate: 'easyForm/error',
-      labelTemplate: 'easyForm/label',
-      hintTemplate: 'easyForm/hint',
-      wrapControls: false,
-      controlsWrapperClass: '',
-      buttonClass: ''
-    }
-  },
-  modulePrefix: 'appkit',
-  _inputTypes: {},
-  _templates: {},
-  registerWrapper: function(name, wrapper) {
-    this._wrappers[name] = Ember.$.extend({}, this._wrappers['default'], wrapper);
-  },
-  getWrapper: function(name) {
-    var wrapper = this._wrappers[name];
-    Ember.assert("The wrapper '" + name + "' was not registered.", wrapper);
-    return wrapper;
-  },
-  registerInputType: function(name, type){
-    this._inputTypes[name] = type;
-  },
-  getInputType: function(name) {
-    return this._inputTypes[name];
-  },
-  registerTemplate: function(name, template) {
-    this._templates[name] = template;
-  },
-  getTemplate: function(name) {
-    return this._templates[name];
-  }
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.registerHelper('error-field', function(property, options) {
-  options = Ember.EasyForm.processOptions(property, options);
-
-  if (options.hash.propertyBinding) {
-    options.hash.property = EasyFormShims.getBinding(options, 'property');
-  }
-
-  return EasyFormShims.viewHelper(this, Ember.EasyForm.Error, options);
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.registerHelper('form-for', function(object, options) {
-  options.data.keywords.formForModelPath = object;
-  return EasyFormShims.viewHelper(this, Ember.EasyForm.Form, options);
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.registerHelper('hint-field', function(property, options) {
-  options = Ember.EasyForm.processOptions(property, options);
-
-  if (options.hash.text || options.hash.textBinding) {
-    return EasyFormShims.viewHelper(this, Ember.EasyForm.Hint, options);
-  }
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.helpers['ember-input'] = Ember.Handlebars.helpers['input'];
-
-Ember.Handlebars.registerHelper('input', function(property, options) {
-  if (arguments.length === 1) {
-    options = property;
-
-    return EasyFormShims.emberInputHelper(this, options);
-  }
-
-  options = Ember.EasyForm.processOptions(property, options);
-  options.hash.isBlock = !!(options.fn);
-
-  return EasyFormShims.viewHelper(this, Ember.EasyForm.Input, options);
-});
-
-})();
-
-
-(function() {
-var get = Ember.get,
-    set = Ember.set;
-
-Ember.Handlebars.registerHelper('input-field', function(property, options) {
-  options = Ember.EasyForm.processOptions(property, options);
-
-  if (options.hash.propertyBinding) {
-    options.hash.property = EasyFormShims.getBinding(options, 'property');
-  }
-
-  if (options.hash.inputOptionsBinding) {
-    options.hash.inputOptions = EasyFormShims.getBinding(options, 'inputOptions');
-  }
-
-  var modelPath = null; // CHANGED
-
-  options.hash.modelPath = modelPath;
-
-  property = options.hash.property;
-
-  var modelPropertyPath = function(property) {
-    if(!property) { return null; }
-
-    // CHANGED
-    var startsWithKeyword = options.data.keywords && !!options.data.keywords[property.split('.')[0]];
-
-    if (startsWithKeyword) {
-      return property;
-    }
-
-    if (modelPath) {
-      return modelPath + '.' + property;
-    } else {
-      return property;
-    }
-  };
-
-  options.hash.valueBinding = modelPropertyPath(property);
-
-  var context = this,
-    propertyType = function(property) {
-      var constructor = (get(context, 'content') || context).constructor;
-
-      if (constructor.proto) {
-        return Ember.meta(constructor.proto(), false).descs[property];
-      } else {
-        return null;
-      }
-    };
-
-  options.hash.viewName = 'input-field-'+options.data.view.elementId;
-
-  if (options.hash.inputOptions) {
-    var inputOptions = options.hash.inputOptions, optionName;
-    for (optionName in inputOptions) {
-      if (inputOptions.hasOwnProperty(optionName)) {
-       options.hash[optionName] = inputOptions[optionName];
-      }
-    }
-    delete options.hash.inputOptions;
-  }
-
-  if (options.hash.as === 'text') {
-    return EasyFormShims.viewHelper(context, Ember.EasyForm.TextArea, options);
-  } else if (options.hash.as === 'select') {
-    delete(options.hash.valueBinding);
-
-    options.hash.contentBinding   = modelPropertyPath(options.hash.collection);
-    options.hash.selectionBinding = modelPropertyPath(options.hash.selection);
-    options.hash.valueBinding     = modelPropertyPath(options.hash.value);
-
-    if (Ember.isNone(options.hash.selectionBinding) && Ember.isNone(options.hash.valueBinding)) {
-      options.hash.selectionBinding = modelPropertyPath(property);
-    }
-
-    return EasyFormShims.viewHelper(context, Ember.EasyForm.Select, options);
-  } else if (options.hash.as === 'checkbox') {
-    if (Ember.isNone(options.hash.checkedBinding)) {
-      options.hash.checkedBinding = modelPropertyPath(property);
-    }
-
-    return EasyFormShims.viewHelper(context, Ember.EasyForm.Checkbox, options);
-  } else {
-    if (!options.hash.as) {
-      if (property.match(/password/)) {
-        options.hash.type = 'password';
-      } else if (property.match(/email/)) {
-        options.hash.type = 'email';
-      } else if (property.match(/url/)) {
-        options.hash.type = 'url';
-      } else if (property.match(/color/)) {
-        options.hash.type = 'color';
-      } else if (property.match(/^tel/)) {
-        options.hash.type = 'tel';
-      } else if (property.match(/search/)) {
-        options.hash.type = 'search';
-      } else {
-        if (propertyType(property) === 'number' || typeof(get(context,property)) === 'number') {
-          options.hash.type = 'number';
-        } else if (propertyType(property) === 'date' || (!Ember.isNone(get(context,property)) && get(context,property).constructor === Date)) {
-          options.hash.type = 'date';
-        } else if (propertyType(property) === 'boolean' || (!Ember.isNone(get(context,property)) && get(context,property).constructor === Boolean)) {
-          options.hash.checkedBinding = property;
-          return EasyFormShims.viewHelper(context, Ember.EasyForm.Checkbox, options);
-        }
-      }
-    } else {
-      var inputType = Ember.EasyForm.Config.getInputType(options.hash.as);
-      if (inputType) {
-        return EasyFormShims.viewHelper(context, inputType, options);
-      }
-
-      options.hash.type = options.hash.as;
-    }
-    return EasyFormShims.viewHelper(context, Ember.EasyForm.TextField, options);
-  }
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.registerHelper('label-field', function(property, options) {
-  options = Ember.EasyForm.processOptions(property, options);
-  options.hash.viewName = 'label-field-'+options.data.view.elementId;
-  return EasyFormShims.viewHelper(this, Ember.EasyForm.Label, options);
-});
-
-})();
-
-
-
-(function() {
-Ember.Handlebars.registerHelper('submit', function(value, options) {
-  if (typeof(value) === 'object') {
-    options = value;
-    value = undefined;
-  }
-  options.hash.context = this;
-  options.hash.value = value || 'Submit';
-  return (options.hash.as === 'button') ?
-    EasyFormShims.viewHelper(this, Ember.EasyForm.Button, options)
-    :
-    EasyFormShims.viewHelper(this, Ember.EasyForm.Submit, options);
-});
-
-})();
-
-
-
-(function() {
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.BaseView = Ember.View.extend({
-  // classNameBindings: ['property'],
-  wrapper: function() {
-    var wrapperView = this.nearestWithProperty('wrapper');
-    if (wrapperView) {
-      return wrapperView.get('wrapper');
-    } else {
-      return 'default';
-    }
-  }.property(),
-  wrapperConfig: function() {
-    return Ember.EasyForm.Config.getWrapper(this.get('wrapper'));
-  }.property('wrapper'),
-  templateForName: function(name) {
-    var template;
-
-    if (this.container) {
-      template = this.container.lookup('template:' + name);
-    }
-
-    return template || Ember.EasyForm.Config.getTemplate(name);
-  },
-  formForModel: function(){
-    var formForModelPath = this.get('templateData.keywords.formForModelPath');
-
-    if (formForModelPath === 'context' || formForModelPath === 'controller' || formForModelPath === 'this') {
-      return this.get('context');
-    } else if (formForModelPath) {
-      return this.get('context.' + formForModelPath);
-    } else {
-      return this.get('context');
-    }
-  }.property()
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Checkbox = Ember.Checkbox.extend();
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Error = Ember.EasyForm.BaseView.extend({
-  tagName: 'span',
-  classNameBindings: ['wrapperConfig.errorClass'],
-  init: function() {
-    this._super();
-    Ember.Binding.from('formForModel.errors.' + this.property).to('errors').connect(this);
-  },
-  templateName: Ember.computed.oneWay('wrapperConfig.errorTemplate'),
-  errorText: Ember.computed.oneWay('errors.firstObject')
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Form = Ember.EasyForm.BaseView.extend({
-  tagName: 'form',
-  attributeBindings: ['novalidate'],
-  classNameBindings: ['wrapperConfig.formClass'],
-  novalidate: 'novalidate',
-  wrapper: 'default',
-  init: function() {
-    this._super();
-    this.action = this.action || 'submit';
-  },
-  submit: function(event) {
-    var _this = this,
-        promise;
-
-    if (event) {
-      event.preventDefault();
-    }
-
-    if (Ember.isNone(this.get('formForModel.validate'))) {
-      this.get('controller').send(this.action);
-    } else {
-      if (!Ember.isNone(this.get('formForModel').validate)) {
-        promise = this.get('formForModel').validate();
-      } else {
-        promise = this.get('formForModel.content').validate();
-      }
-      promise.then(function() {
-        if (_this.get('formForModel.isValid')) {
-          _this.get('controller').send(_this.action);
-        }
-      });
-    }
-  }
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Hint = Ember.EasyForm.BaseView.extend({
-  tagName: 'span',
-  classNameBindings: ['wrapperConfig.hintClass'],
-  templateName: Ember.computed.oneWay('wrapperConfig.hintTemplate'),
-  hintText: Ember.computed.oneWay('text')
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Input = Ember.EasyForm.BaseView.extend({
-  init: function() {
-    this._super();
-    this.classNameBindings.push('showError:' + this.get('wrapperConfig.fieldErrorClass'));
-    Ember.defineProperty(this, 'showError', Ember.computed.and('canShowValidationError', 'formForModel.errors.' + this.property + '.firstObject'));
-    if (!this.isBlock) {
-      this.set('templateName', this.get('wrapperConfig.inputTemplate'));
-    }
-  },
-  setupValidationDependencies: function() {
-    var keys = this.get('formForModel._dependentValidationKeys'), key;
-    if (keys) {
-      for(key in keys) {
-        if (keys[key].contains(this.property)) {
-          this._keysForValidationDependencies.pushObject(key);
-        }
-      }
-    }
-  }.on('init'),
-  _keysForValidationDependencies: Ember.A(),
-  dependentValidationKeyCanTrigger: false,
-  tagName: 'div',
-  classNames: ['string'],
-  classNameBindings: ['wrapperConfig.inputClass'],
-  didInsertElement: function() {
-    var name = 'label-field-'+this.elementId,
-        label = this.get(name);
-    if (!label) { return; }
-    this.set(name+'.for', this.get('input-field-'+this.elementId+'.elementId'));
-  },
-  concatenatedProperties: ['inputOptions', 'bindableInputOptions'],
-  inputOptions: ['as', 'collection', 'optionValuePath', 'optionLabelPath', 'selection', 'value', 'multiple', 'name'],
-  bindableInputOptions: ['placeholder', 'prompt', 'disabled'],
-  defaultOptions: {
-    name: function(){
-      if (this.property) {
-        return this.property;
-      }
-    }
-  },
-  inputOptionsValues: function() {
-    var options = {}, i, key, keyBinding, value, inputOptions = this.inputOptions, bindableInputOptions = this.bindableInputOptions, defaultOptions = this.defaultOptions;
-    for (i = 0; i < inputOptions.length; i++) {
-      key = inputOptions[i];
-      if (this[key]) {
-        if (typeof(this[key]) === 'boolean') {
-          this[key] = key;
-        }
-
-        options[key] = this[key];
-      }
-    }
-    for (i = 0; i < bindableInputOptions.length; i++) {
-      key = bindableInputOptions[i];
-      keyBinding = key + 'Binding';
-      if (this[key] || this[keyBinding]) {
-        options[keyBinding] = 'view.' + key;
-      }
-    }
-
-    for (key in defaultOptions) {
-      if (!defaultOptions.hasOwnProperty(key)) { continue; }
-      if (options[key]) { continue; }
-
-      if (value = defaultOptions[key].apply(this)) {
-        options[key] = value;
-      }
-    }
-
-    return options;
-  }.property(),
-  focusOut: function() {
-    this.set('hasFocusedOut', true);
-    this.showValidationError();
-  },
-  showValidationError: function() {
-    if (this.get('hasFocusedOut')) {
-      if (Ember.isEmpty(this.get('formForModel.errors.' + this.property))) {
-        this.set('canShowValidationError', false);
-      } else {
-        this.set('canShowValidationError', true);
-      }
-    }
-  },
-  input: function() {
-    this._keysForValidationDependencies.forEach(function(key) {
-     this.get('parentView.childViews').forEach(function(view) {
-       if (view.property === key) {
-         view.showValidationError();
-       }
-     }, this);
-    }, this);
-  }
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Label = Ember.EasyForm.BaseView.extend({
-  tagName: 'label',
-  attributeBindings: ['for'],
-  classNameBindings: ['wrapperConfig.labelClass'],
-  labelText: function() {
-    return this.get('text') || Ember.EasyForm.humanize(this.get('property'));
-  }.property('text', 'property'),
-  templateName: Ember.computed.oneWay('wrapperConfig.labelTemplate')
-});
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Select = Ember.Select.extend();
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.Submit = Ember.EasyForm.BaseView.extend({
-  tagName: 'input',
-  attributeBindings: ['type', 'value', 'disabled'],
-  classNameBindings: ['wrapperConfig.buttonClass'],
-  type: 'submit',
-  disabled: function() {
-    return !this.get('formForModel.isValid');
-  }.property('formForModel.isValid'),
-  init: function() {
-    this._super();
-    this.set('value', this.value);
-  }
-});
-
-})();
-
-
-(function() {
-Ember.EasyForm.TextArea = Ember.TextArea.extend();
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.TextField = Ember.TextField.extend();
-
-})();
-
-
-
-(function() {
-
-})();
-
-
-(function() {
-
-})();
-
-
-
-(function() {
-Ember.EasyForm.humanize = function(string) {
-  return string.underscore().split('_').join(' ').capitalize();
-};
-
-Ember.EasyForm.eachTranslatedAttribute = function(object, fn) {
-  var isTranslatedAttribute = /(.+)Translation$/,
-      isTranslatedAttributeMatch;
-
-  for (var key in object) {
-    isTranslatedAttributeMatch = key.match(isTranslatedAttribute);
-    if (isTranslatedAttributeMatch) {
-      fn.call(object, isTranslatedAttributeMatch[1], Ember.I18n.t(object[key]));
-    }
-  }
-};
-
-Ember.EasyForm.processOptions = function(property, options) {
-  if (options) {
-    if (Ember.I18n) {
-      var eachTranslatedAttribute = Ember.I18n.eachTranslatedAttribute || Ember.EasyForm.eachTranslatedAttribute;
-      eachTranslatedAttribute(options.hash, function (attribute, translation) {
-        options.hash[attribute] = translation;
-        delete options.hash[attribute + 'Translation'];
-      });
-    }
-    options.hash.property = property;
-  } else {
-    options = property;
-  }
-
-  return options;
-};
-
-})();
-
-
-
-(function() {
-
-})();

From 09e2797a8a3d2fad1d913644dcca6760ced23bc4 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 10 May 2015 20:51:28 -0400
Subject: [PATCH 02/73] Prototype extensions removed

---
 addon/components/error-field.js               |  14 ++-
 addon/components/form-controls.js             |   8 +-
 addon/components/form-submission.js           |  14 ++-
 .../{form-control.js => input-wrapper.js}     |  47 ++++++++
 addon/initializers/easy-form-extensions.js    | 109 +-----------------
 addon/mixins/controllers/saving.js            |  37 +++---
 addon/mixins/routes/delete-record.js          |   4 +-
 addon/mixins/routes/rollback.js               |   4 +-
 addon/mixins/views/submitting.js              |   8 +-
 addon/services/easy-form.js                   |   2 +-
 addon/utils/observers/soft-assert.js          |  64 ++++++++++
 addon/utils/to-words.js                       |   3 +
 package.json                                  |   4 +-
 13 files changed, 170 insertions(+), 148 deletions(-)
 rename addon/components/{form-control.js => input-wrapper.js} (54%)
 create mode 100644 addon/utils/observers/soft-assert.js
 create mode 100644 addon/utils/to-words.js

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index dacfd9c..9952e6b 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -1,9 +1,21 @@
+import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/error-field';
+import toWords from '../utils/to-words';
 
 export default Ember.Component.extend({
   classNameBindings: ['easyForm.errorClass'],
+  error: null,
   layout: layout,
+  property: null,
   tagName: 'span',
-  text: null,
+
+  errorText: Ember.computed('errors.[]', 'value', function() {
+    var propertyName = defaultFor(
+      this.get('property'),
+      this.get('parentView.property')
+    );
+
+    return toWords(propertyName) + ' ' + this.get('error');
+  }),
 });
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 2f32d9a..c47af9b 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import softAssert from '../utils/observers/soft-assert';
 
 export default Ember.Component.extend({
   attributeBindings: ['legend'],
@@ -7,10 +8,5 @@ export default Ember.Component.extend({
   legend: null,
   tagName: 'fieldset',
 
-  checkForLegend: function() {
-    Ember.assert(
-      'You must pass a legend (description) to the form-controls component like {{#form-controls legend=\'Write a new blog post\'}}',
-      this.get('legend')
-    );
-  }.on('didInsertElement')
+  checkForLegend: softAssert('legend')
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 8af5a5f..a1a8c92 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -17,11 +17,13 @@ export default Ember.Component.extend(
     }
   },
 
-  _watchForEmptyComponent: function() {
-    Ember.warn(
-      'The {{form-submission}} component is not showing the submit or the cancel button.',
-      this.get('cancel') || this.get('submit')
-    );
-  }.observes('cancel', 'submit'),
+  _watchForEmptyComponent: Ember.observer('cancel', 'submit',
+    function() {
+      Ember.warn(
+        'The {{form-submission}} component is not showing the submit or the cancel button.',
+        this.get('cancel') || this.get('submit')
+      );
+    }
+  ),
 
 });
diff --git a/addon/components/form-control.js b/addon/components/input-wrapper.js
similarity index 54%
rename from addon/components/form-control.js
rename to addon/components/input-wrapper.js
index 8498e8d..290bac0 100644
--- a/addon/components/form-control.js
+++ b/addon/components/input-wrapper.js
@@ -2,12 +2,19 @@ import Ember from 'ember';
 import layout from '../templates/components/form-control';
 
 var typeOf = Ember.typeOf;
+var run = Ember.run;
 
 export default Ember.Component.extend({
   as: null,
   layout: layout,
   property: null,
   showError: false,
+  showValidity: false,
+
+  classNameBindings: [
+    'easyForm.inputWrapperClass',
+    'showValidity:control-valid'
+  ],
 
   /* Input attributes */
 
@@ -63,4 +70,44 @@ export default Ember.Component.extend({
 
     return type;
   }),
+
+  setInvalidToValid: Ember.observer('showError', function() {
+    // If we go from error to no error
+    if (!this.get('showError') && this.get('canShowValidationError')) {
+      run.debounce(this, function() {
+        var hasAnError = this.get('formForModel.errors.' + this.get('property') + '.length');
+
+        if (!hasAnError && !this.get('isDestroying')) {
+          this.set('showValidity', true);
+
+          run.later(this, function() {
+            if (!this.get('isDestroying')) {
+              this.set('showValidity', false);
+            }
+          }, 2000);
+        }
+      }, 50);
+    }
+  }),
+
+  /**
+  An override of easyForm's default `focusOut` method to ensure validations are not shown when the user clicks cancel.
+
+  @method focusOut
+  */
+
+  focusOut: function() {
+
+    /* Hacky - delay check so focusOut runs after the cancel action */
+
+    run.later(this, function() {
+      var cancelClicked = this.get('parentView.cancelClicked');
+      var isDestroying = this.get('isDestroying');
+
+      if (!cancelClicked && !isDestroying) {
+        this.set('hasFocusedOut', true);
+        this.showValidationError();
+      }
+    }, 100);
+  },
 });
diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index 090d317..bf8ca59 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -3,117 +3,10 @@ import Ember from 'ember';
 export function initialize(container, app) {
   var run = Ember.run;
 
-  /**
-  Default option overrides
-  */
-
-  Ember.EasyForm.Config.registerWrapper('default', {
-    errorClass: 'error',
-    errorTemplate: 'easy-form/error',
-
-    formClass: 'form',
-    fieldErrorClass: 'control-error',
-
-    hintClass: 'hint',
-    hintTemplate: 'easy-form/hint',
-
-    inputClass: 'control',
-    inputTemplate: 'easy-form/input',
-
-    labelClass: 'label',
-    labelTemplate: 'easy-form/label'
-  });
-
-  Ember.EasyForm.Checkbox.reopen({
-    attributeBindings: ['dataTest:data-test'],
-    classNames: ['input-checkbox'],
-    dataTest: Ember.computed.alias('parentView.dataTest'),
-  });
-
-  Ember.EasyForm.TextField.reopen({
-    attributeBindings: ['dataTest:data-test'],
-    classNames: ['input'],
-    dataTest: Ember.computed.alias('parentView.dataTest'),
-  });
-
-  Ember.EasyForm.TextArea.reopen({
-    attributeBindings: ['dataTest:data-test'],
-    classNames: ['input-textarea'],
-    dataTest: Ember.computed.alias('parentView.dataTest'),
-  });
-
-  /**
-  Overrides the original `errorText` property to add the property name to the error message. For example:
-
-  can't be blank --> Name can't be blank
-  must be a number --> Age must be a number
-
-  If a label is specified on the input, this will be used in place of the property name.
-  */
-
-  Ember.EasyForm.Error.reopen({
-    errorText: function() {
-      var propertyName = this.get('parentView.label') || this.get('property') || '';
-
-      return Ember.EasyForm.humanize(propertyName) + ' ' + this.get('errors.firstObject');
-    }.property('errors.[]', 'value'),
-  });
-
-  /**
-  Temporarily binds a success class the the control when the input goes from invalid to valid.
-  */
-
-  Ember.EasyForm.Input.reopen({
-    classNameBindings: ['showValidity:control-valid'],
-    showValidity: false,
-
-    setInvalidToValid: function() {
-      // If we go from error to no error
-      if (!this.get('showError') && this.get('canShowValidationError')) {
-        run.debounce(this, function() {
-          var hasAnError = this.get('formForModel.errors.' + this.get('property') + '.length');
-
-          if (!hasAnError && !this.get('isDestroying')) {
-            this.set('showValidity', true);
-
-            run.later(this, function() {
-              if (!this.get('isDestroying')) {
-                this.set('showValidity', false);
-              }
-            }, 2000);
-          }
-        }, 50);
-      }
-    }.observes('showError'),
-
-    /**
-    An override of easyForm's default `focusOut` method to ensure validations are not shown when the user clicks cancel.
-
-    @method focusOut
-    */
-
-    focusOut: function() {
-
-      /* Hacky - delay check so focusOut runs after the cancel action */
-
-      run.later(this, function() {
-        var cancelClicked = this.get('parentView.cancelClicked');
-        var isDestroying = this.get('isDestroying');
-
-        if (!cancelClicked && !isDestroying) {
-          this.set('hasFocusedOut', true);
-          this.showValidationError();
-        }
-      }, 100);
-    },
-
-  });
-
   app.inject('component', 'easyForm', 'service:easy-form');
-
 }
 
 export default {
-  name: 'easy-form-extensions',
+  name: 'easy-form',
   initialize: initialize
 };
diff --git a/addon/mixins/controllers/saving.js b/addon/mixins/controllers/saving.js
index 56ae886..347ec6f 100644
--- a/addon/mixins/controllers/saving.js
+++ b/addon/mixins/controllers/saving.js
@@ -17,13 +17,13 @@ export default Ember.Mixin.create(
     }
   },
 
-  editingModel: function() {
+  editingModel: Ember.computed(function() {
     return this.toString().indexOf('/edit:') > -1;
-  }.property().readOnly(),
+  }),
 
-  newModel: function() {
+  newModel: Ember.computed(function() {
     return this.toString().indexOf('/new:') > -1;
-  }.property().readOnly(),
+  }),
 
   showServerError: function(/* xhr */) {
     this.set('formSubmitted', false);
@@ -71,20 +71,25 @@ export default Ember.Mixin.create(
     }
   },
 
-  _revalidate: function() {
-    var _this = this;
+  // TODO - add observes revalidateFor.[]
+  _revalidate: Ember.on('routeDidTransition',
+    function() {
+      var _this = this;
 
-    _this.forEachRevalidator(function(property) {
-      _this.addObserver(property, _this.validate);
-    });
-  }.observes('revalidateFor.[]').on('routeDidTransition'),
+      _this.forEachRevalidator(function(property) {
+        _this.addObserver(property, _this.validate);
+      });
+    }
+  ),
 
-  _removeRevalidationObservers: function() {
-    var _this = this;
+  _removeRevalidationObservers: Ember.on('routeWillTransition',
+    function() {
+      var _this = this;
 
-    _this.forEachRevalidator(function(property) {
-      _this.removeObserver(property, _this.validate);
-    });
-  }.on('routeWillTransition'),
+      _this.forEachRevalidator(function(property) {
+        _this.removeObserver(property, _this.validate);
+      });
+    }
+  ),
 
 });
diff --git a/addon/mixins/routes/delete-record.js b/addon/mixins/routes/delete-record.js
index 88c4e6f..dd850bf 100644
--- a/addon/mixins/routes/delete-record.js
+++ b/addon/mixins/routes/delete-record.js
@@ -2,12 +2,12 @@ import Ember from 'ember';
 
 export default Ember.Mixin.create({
 
-  deleteRecord: function() {
+  deleteRecord: Ember.on('willTransition', function() {
     var model = this.get('controller.content');
 
     if (model.get('isDirty')) {
       model.deleteRecord();
     }
-  }.on('willTransition'),
+  }),
 
 });
diff --git a/addon/mixins/routes/rollback.js b/addon/mixins/routes/rollback.js
index 4df51de..7d1f050 100644
--- a/addon/mixins/routes/rollback.js
+++ b/addon/mixins/routes/rollback.js
@@ -2,12 +2,12 @@ import Ember from 'ember';
 
 export default Ember.Mixin.create({
 
-  rollback: function() {
+  rollback: Ember.on('willTransition', function() {
     var model = this.get('controller.content');
 
     if (model.get('isDirty')) {
       model.rollback();
     }
-  }.on('willTransition'),
+  }),
 
 });
diff --git a/addon/mixins/views/submitting.js b/addon/mixins/views/submitting.js
index f953a2a..6c90c77 100644
--- a/addon/mixins/views/submitting.js
+++ b/addon/mixins/views/submitting.js
@@ -25,13 +25,13 @@ export default Ember.Mixin.create({
 
   /* Autofocus on the first input */
 
-  autofocus: function() {
+  autofocus: Ember.on('didInsertElement', function() {
     var input = this.$().find('input').first();
 
     if (!Ember.$(input).hasClass('datepicker')) {
       input.focus();
     }
-  }.on('didInsertElement'),
+  }),
 
   /* Show validation errors on submit click */
 
@@ -55,9 +55,9 @@ export default Ember.Mixin.create({
     this._eventHandler('submit');
   },
 
-  resetForm: function() {
+  resetForm: Ember.on('willInsertElement', function() {
     this.set('formSubmitted', false);
-  }.on('willInsertElement'),
+  }),
 
   /* Private methods */
 
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index 4f04bf6..b9895bc 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -5,7 +5,7 @@ export default Ember.Service.extend({
   errorClass: 'error',
   hintClass: 'hint',
   inputClass: 'input',
-  inputWrapperClass: 'input-wrapper',
+  controlClass: 'input-wrapper',
   formClass: 'form',
   formControlsClass: 'controls'
 });
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
new file mode 100644
index 0000000..226f856
--- /dev/null
+++ b/addon/utils/observers/soft-assert.js
@@ -0,0 +1,64 @@
+/**
+Checks whether a property is present on a class and shows a warning to the developer when it is not. In production environments this does nothing.
+
+Options can be pased as a second parameter:
+
+```js
+Ember.Component.extend({
+  checkForDescription: softAssert('descriptions', {
+    eventName: 'didInsertElement', // Defaults to 'init'
+    onTrue: function() {
+      this.set('hasCorrectProperties', true);
+    },
+    onFalse: function() {
+      this.set('hasCorrectProperties', false);
+    }
+  });
+});
+```
+
+@method Utils.computed.softAssert
+@param {String} dependentKey The name of the Ember property to observe
+@param {Object} options An object containing options for your assertion
+*/
+
+import defaultFor from '../default-for';
+import Ember from 'ember';
+import ENV from 'ember-easy-form-extensions/config/environment';
+
+var macro;
+
+if (ENV.environment === 'development') {
+
+  macro = Ember.on(eventName, Ember.observer(dependentKey,
+    function(dependentKey, options) {
+      var eventName;
+
+      options = defaultFor(options, {});
+      eventName = defaultFor(options.eventName, 'init');
+
+      return function() {
+        var value = defaultFor(this.get(dependentKey), '');
+        var constructor;
+
+        if (!value) {
+          constructor = this.get('constructor').toString();
+
+          Ember.warn(
+            'You failed to pass a ' + dependentKey +' property to ' + constructor
+          );
+
+          if (options.onTrue) {
+            callbacks.onTrue().bind(this);
+          }
+        } else if (options.onFalse) {
+          callbacks.onFalse().bind(this);
+        }
+      }
+    }
+  ));
+} else {
+  macro = Ember.K
+}
+
+export default macro;
diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
new file mode 100644
index 0000000..79edaec
--- /dev/null
+++ b/addon/utils/to-words.js
@@ -0,0 +1,3 @@
+export default function() {
+  return string.underscore().split('_').join(' ').capitalize();
+}
diff --git a/package.json b/package.json
index 6b8a39b..6621836 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "ember-cli-babel": "^5.0.0",
+    "ember-cli-htmlbars": "0.7.6",
     "ember-validations": "2.0.0-alpha.3"
   },
   "devDependencies": {
@@ -30,14 +31,13 @@
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.10",
     "ember-cli-uglify": "1.0.1",
     "ember-data": "1.0.0-beta.16.1",
-    "ember-export-application-global": "^1.0.2",
     "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-export-application-global": "^1.0.2",
     "ember-try": "0.0.4"
   },
   "keywords": [

From cdda59001d89c6057c5ed1183661a51cd247b80d Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 10 May 2015 21:42:57 -0400
Subject: [PATCH 03/73] Component rendering

---
 addon/components/error-field.js               |  2 +-
 addon/components/input-wrapper.js             |  2 +-
 addon/mixins/controllers/saving.js            |  2 +-
 addon/mixins/views/walk-views.js              |  4 +-
 addon/templates/components/form-control.hbs   |  1 -
 addon/templates/components/input-wrapper.hbs  | 10 ++++
 addon/utils/observers/soft-assert.js          | 49 +++++++++----------
 app/components/form-control.js                |  3 --
 app/components/input-wrapper.js               |  3 ++
 .../app/resources/posts/new/template.hbs      |  6 +--
 10 files changed, 45 insertions(+), 37 deletions(-)
 delete mode 100644 addon/templates/components/form-control.hbs
 create mode 100644 addon/templates/components/input-wrapper.hbs
 delete mode 100644 app/components/form-control.js
 create mode 100644 app/components/input-wrapper.js

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 9952e6b..1cc61e6 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -10,7 +10,7 @@ export default Ember.Component.extend({
   property: null,
   tagName: 'span',
 
-  errorText: Ember.computed('errors.[]', 'value', function() {
+  text: Ember.computed('errors.[]', 'value', function() {
     var propertyName = defaultFor(
       this.get('property'),
       this.get('parentView.property')
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 290bac0..4fbb457 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import layout from '../templates/components/form-control';
+import layout from '../templates/components/input-wrapper';
 
 var typeOf = Ember.typeOf;
 var run = Ember.run;
diff --git a/addon/mixins/controllers/saving.js b/addon/mixins/controllers/saving.js
index 347ec6f..00c9664 100644
--- a/addon/mixins/controllers/saving.js
+++ b/addon/mixins/controllers/saving.js
@@ -10,7 +10,7 @@ export default Ember.Mixin.create(
   forEachRevalidator: function(callback) {
     var revalidateFor = this.get('revalidateFor');
 
-    if (revalidateFor.get('length')) {
+    if (revalidateFor.length) {
       revalidateFor.forEach(function(property) {
         callback(property);
       });
diff --git a/addon/mixins/views/walk-views.js b/addon/mixins/views/walk-views.js
index 4d4d0e7..6d18911 100644
--- a/addon/mixins/views/walk-views.js
+++ b/addon/mixins/views/walk-views.js
@@ -2,9 +2,9 @@ import Ember from 'ember';
 
 export default Ember.Mixin.create({
 
-  formView: function() {
+  formView: Ember.computed(function() {
     return this.walkViews(this.get('parentView'));
-  }.property(),
+  }),
 
   walkViews: function(view) {
     var parentView;
diff --git a/addon/templates/components/form-control.hbs b/addon/templates/components/form-control.hbs
deleted file mode 100644
index 889d9ee..0000000
--- a/addon/templates/components/form-control.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
new file mode 100644
index 0000000..b24fd99
--- /dev/null
+++ b/addon/templates/components/input-wrapper.hbs
@@ -0,0 +1,10 @@
+{{#if label}}
+  {{label-field}}
+{{/if}}
+
+{{yield}}
+{{log this}}
+
+{{#if error}}
+  {{error-field}}
+{{/if}}
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
index 226f856..35682a7 100644
--- a/addon/utils/observers/soft-assert.js
+++ b/addon/utils/observers/soft-assert.js
@@ -24,41 +24,40 @@ Ember.Component.extend({
 
 import defaultFor from '../default-for';
 import Ember from 'ember';
-import ENV from 'ember-easy-form-extensions/config/environment';
+// import ENV from '../../config/environment';
 
 var macro;
 
-if (ENV.environment === 'development') {
+// TODO
+// if (ENV.environment === 'development') {
 
-  macro = Ember.on(eventName, Ember.observer(dependentKey,
-    function(dependentKey, options) {
-      var eventName;
+  macro = function(dependentKey, options) {
+    var eventName;
 
-      options = defaultFor(options, {});
-      eventName = defaultFor(options.eventName, 'init');
+    options = defaultFor(options, {});
+    eventName = defaultFor(options.eventName, 'init');
 
-      return function() {
-        var value = defaultFor(this.get(dependentKey), '');
-        var constructor;
+    return Ember.on(eventName, Ember.observer(dependentKey, function() {
+      var value = defaultFor(this.get(dependentKey), '');
+      var constructor;
 
-        if (!value) {
-          constructor = this.get('constructor').toString();
+      if (!value) {
+        constructor = this.get('constructor').toString();
 
-          Ember.warn(
-            'You failed to pass a ' + dependentKey +' property to ' + constructor
-          );
+        Ember.warn(
+          'You failed to pass a ' + dependentKey +' property to ' + constructor
+        );
 
-          if (options.onTrue) {
-            callbacks.onTrue().bind(this);
-          }
-        } else if (options.onFalse) {
-          callbacks.onFalse().bind(this);
+        if (options.onTrue) {
+          callbacks.onTrue().bind(this);
         }
+      } else if (options.onFalse) {
+        callbacks.onFalse().bind(this);
       }
-    }
-  ));
-} else {
-  macro = Ember.K
-}
+    }));
+  };
+// } else {
+//   macro = Ember.K
+// }
 
 export default macro;
diff --git a/app/components/form-control.js b/app/components/form-control.js
deleted file mode 100644
index 086e30a..0000000
--- a/app/components/form-control.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import formControl from 'ember-easy-form-extensions/components/form-control';
-
-export default formControl;
diff --git a/app/components/input-wrapper.js b/app/components/input-wrapper.js
new file mode 100644
index 0000000..a842796
--- /dev/null
+++ b/app/components/input-wrapper.js
@@ -0,0 +1,3 @@
+import inputWrapper from 'ember-easy-form-extensions/components/input-wrapper';
+
+export default inputWrapper;
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 2097ecc..a71da8c 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,9 +1,9 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    {{input title}}
-    {{input description}}
-    {{input valueBinding=title}}
+    {{input-wrapper property=title}}
+    {{input-wrapper property=description}}
+    {{input-wrapper property=title}}
   {{/form-controls}}
 
   {{form-submission}}

From f1f87cc70e4c6a27451eba157258019855fe62a7 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 10 May 2015 23:02:52 -0400
Subject: [PATCH 04/73] Label component added

---
 addon/components/form-controls.js             | 23 +++++++++++++++----
 addon/components/form-wrapper.js              |  2 +-
 addon/components/input-wrapper.js             | 11 ++++++++-
 addon/components/label-field.js               |  2 +-
 addon/services/easy-form.js                   |  4 ++--
 addon/templates/components/input-wrapper.hbs  | 13 +++++++----
 addon/templates/components/label-field.hbs    |  2 +-
 addon/utils/to-words.js                       |  6 +++--
 .../app/resources/posts/new/template.hbs      |  8 ++++---
 9 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index c47af9b..4b1b602 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -1,12 +1,27 @@
 import Ember from 'ember';
 import softAssert from '../utils/observers/soft-assert';
+import WalkViews from '../mixins/views/walk-views';
+
+export default Ember.Component.extend(
+  WalkViews, {
 
-export default Ember.Component.extend({
   attributeBindings: ['legend'],
-  classNameBindings: ['className'],
-  className: 'controls',
+  classNameBindings: ['easyForm.formControlsClass'],
   legend: null,
+  model: null,
   tagName: 'fieldset',
+  checkForLegend: softAssert('legend'),
+
+  findDefaultModel: Ember.on('willInsertElement', function() {
+    var isFulfilled, modelIsAPromise;
+
+    if (!this.get('model')) {
+      isFulfilled = this.get('model.isFulfilled');
+      modelIsAPromise = Ember.typeOf(isFulfilled === 'boolean');
 
-  checkForLegend: softAssert('legend')
+      if (!modelIsAPromise) {
+        this.set('model', this.get('formView.controller.model'));
+      }
+    }
+  }),
 });
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index b6758a7..824a90d 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
   attributeBindings: ['novalidate'],
-  classNameBindings: ['className'],
+  classNameBindings: ['easyForm.formWrapperClass'],
   className: 'form',
   novalidate: true,
   tagName: 'form',
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 4fbb457..1ed3af1 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -1,5 +1,7 @@
+import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/input-wrapper';
+import toWords from '../utils/to-words';
 
 var typeOf = Ember.typeOf;
 var run = Ember.run;
@@ -7,9 +9,9 @@ var run = Ember.run;
 export default Ember.Component.extend({
   as: null,
   layout: layout,
-  property: null,
   showError: false,
   showValidity: false,
+  value: null,
 
   classNameBindings: [
     'easyForm.inputWrapperClass',
@@ -26,9 +28,14 @@ export default Ember.Component.extend({
   multiple: null,
   name: Ember.computed.oneWay('property'),
   placeholder: null,
+  property:  Ember.computed.oneWay('valueBinding._label'),
   prompt: null,
   disabled: null,
 
+  label: Ember.computed('property', function() {
+    return toWords(defaultFor(this.get('property'), ''));
+  }),
+
   type: Ember.computed('as', function() {
     var as = this.get('as');
     var property = this.get('property');
@@ -110,4 +117,6 @@ export default Ember.Component.extend({
       }
     }, 100);
   },
+
+  showValidationError: Ember.K
 });
diff --git a/addon/components/label-field.js b/addon/components/label-field.js
index eb5a1f9..247c5fc 100644
--- a/addon/components/label-field.js
+++ b/addon/components/label-field.js
@@ -3,7 +3,7 @@ import layout from '../templates/components/label-field';
 
 export default Ember.Component.extend({
   classNameBindings: ['easyForm.labelClass'],
+  label: null,
   layout: layout,
   tagName: 'label',
-  text: Ember.computed.oneWay('parentView.property'),
 });
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index b9895bc..9905f8b 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -5,7 +5,7 @@ export default Ember.Service.extend({
   errorClass: 'error',
   hintClass: 'hint',
   inputClass: 'input',
-  controlClass: 'input-wrapper',
-  formClass: 'form',
+  inputWrapperClass: 'input-wrapper',
+  formWrapperClass: 'form',
   formControlsClass: 'controls'
 });
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index b24fd99..60297ba 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -1,10 +1,15 @@
 {{#if label}}
-  {{label-field}}
+  {{label-field label=label}}
 {{/if}}
 
-{{yield}}
-{{log this}}
+{{#if template}}
+  {{!-- If block form... --}}
+  {{yield}}
+{{else}}
+  {{!-- ...else show input --}}
+  {{input}}
+{{/if}}
 
 {{#if error}}
-  {{error-field}}
+  {{error-field property=property}}
 {{/if}}
diff --git a/addon/templates/components/label-field.hbs b/addon/templates/components/label-field.hbs
index 4e1ac81..21f81c8 100644
--- a/addon/templates/components/label-field.hbs
+++ b/addon/templates/components/label-field.hbs
@@ -1 +1 @@
-{{to-words text}}
+{{label}}
diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
index 79edaec..927850e 100644
--- a/addon/utils/to-words.js
+++ b/addon/utils/to-words.js
@@ -1,3 +1,5 @@
-export default function() {
-  return string.underscore().split('_').join(' ').capitalize();
+var String = Ember.String;
+
+export default function(string) {
+  return String.capitalize(String.underscore(string).split('_').join(' '));
 }
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index a71da8c..ea24446 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,9 +1,11 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    {{input-wrapper property=title}}
-    {{input-wrapper property=description}}
-    {{input-wrapper property=title}}
+    {{input-wrapper value=title}}
+    {{!-- {{input-wrapper property=description}}
+    {{#input-wrapper property=title}}
+      hey
+    {{/input-wrapper}} --}}
   {{/form-controls}}
 
   {{form-submission}}

From 1d1a4effe1e97070bf7d8f3e47ee35f4d32b9125 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 00:06:27 -0400
Subject: [PATCH 05/73] Error observing and component templates moved to addon
 tree

---
 addon/components/error-field.js               | 24 +++++++++++++++++-
 addon/components/form-controls.js             | 25 ++++++++++---------
 addon/components/input-wrapper.js             | 18 +++++++++++--
 addon/helpers/capitalize-string.js            |  9 +++++++
 addon/helpers/to-words.js                     |  9 -------
 .../components/destroy-submission.hbs         |  0
 addon/templates/components/error-field.hbs    |  4 ++-
 .../templates/components/form-controls.hbs    |  0
 .../templates/components/form-submission.hbs  |  0
 .../templates/components/form-wrapper.hbs     |  0
 addon/templates/components/input-wrapper.hbs  | 13 +++++++---
 addon/templates/components/label-field.hbs    |  2 +-
 .../templates/components/loading-spinner.hbs  |  0
 addon/utils/to-words.js                       |  7 +++---
 app/helpers/capitalize-string.js              |  3 +++
 app/helpers/to-words.js                       |  3 ---
 app/templates/easy-form/error.hbs             |  1 -
 app/templates/easy-form/hint.hbs              |  1 -
 app/templates/easy-form/input-controls.hbs    | 15 -----------
 app/templates/easy-form/input.hbs             |  5 ----
 app/templates/easy-form/label.hbs             |  1 -
 .../app/resources/post/edit/controller.js     |  5 ++--
 .../app/resources/posts/index/controller.js   |  2 +-
 .../app/resources/posts/index/template.hbs    |  2 +-
 .../app/resources/posts/new/controller.js     |  5 ++--
 .../app/resources/posts/new/template.hbs      | 10 +++++---
 26 files changed, 94 insertions(+), 70 deletions(-)
 create mode 100644 addon/helpers/capitalize-string.js
 delete mode 100644 addon/helpers/to-words.js
 rename {app => addon}/templates/components/destroy-submission.hbs (100%)
 rename {app => addon}/templates/components/form-controls.hbs (100%)
 rename {app => addon}/templates/components/form-submission.hbs (100%)
 rename {app => addon}/templates/components/form-wrapper.hbs (100%)
 rename {app => addon}/templates/components/loading-spinner.hbs (100%)
 create mode 100644 app/helpers/capitalize-string.js
 delete mode 100644 app/helpers/to-words.js
 delete mode 100644 app/templates/easy-form/error.hbs
 delete mode 100644 app/templates/easy-form/hint.hbs
 delete mode 100644 app/templates/easy-form/input-controls.hbs
 delete mode 100644 app/templates/easy-form/input.hbs
 delete mode 100644 app/templates/easy-form/label.hbs

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 1cc61e6..3e09a30 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -2,10 +2,14 @@ import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/error-field';
 import toWords from '../utils/to-words';
+import WalkViews from '../mixins/views/walk-views';
+
+export default Ember.Component.extend(
+  WalkViews, {
 
-export default Ember.Component.extend({
   classNameBindings: ['easyForm.errorClass'],
   error: null,
+  label: Ember.computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
@@ -18,4 +22,22 @@ export default Ember.Component.extend({
 
     return toWords(propertyName) + ' ' + this.get('error');
   }),
+
+  addErrorObserver: Ember.on('init', function() {
+    var fullPropertyPath = this.get('parentView.fullPropertyPath');
+    var controller, errorPath, setError;
+
+    if (fullPropertyPath) {
+      controller = this.get('formView.controller');
+
+      errorPath = 'errors.' + fullPropertyPath + '.firstObject';
+
+      setError = function() {
+        this.set('error', controller.get(errorPath));
+      };
+
+      // TODO - Remove observer?
+      controller.addObserver(errorPath, this, setError);
+    }
+  })
 });
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 4b1b602..f80b543 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -9,19 +9,20 @@ export default Ember.Component.extend(
   classNameBindings: ['easyForm.formControlsClass'],
   legend: null,
   model: null,
+  modelPath: Ember.computed.oneWay('modelBinding._label'),
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
 
-  findDefaultModel: Ember.on('willInsertElement', function() {
-    var isFulfilled, modelIsAPromise;
-
-    if (!this.get('model')) {
-      isFulfilled = this.get('model.isFulfilled');
-      modelIsAPromise = Ember.typeOf(isFulfilled === 'boolean');
-
-      if (!modelIsAPromise) {
-        this.set('model', this.get('formView.controller.model'));
-      }
-    }
-  }),
+  // findDefaultModel: Ember.on('init', function() {
+  //   var isFulfilled, modelIsAPromise;
+  //
+  //   if (!this.get('model')) {
+  //     isFulfilled = this.get('model.isFulfilled');
+  //     modelIsAPromise = Ember.typeOf(isFulfilled === 'boolean');
+  //
+  //     if (!modelIsAPromise) {
+  //       this.set('model', this.get('formView.controller.model'));
+  //     }
+  //   }
+  // }),
 });
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 1ed3af1..484c9b5 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -9,6 +9,7 @@ var run = Ember.run;
 export default Ember.Component.extend({
   as: null,
   layout: layout,
+  property:  Ember.computed.oneWay('valueBinding._label'),
   showError: false,
   showValidity: false,
   value: null,
@@ -28,12 +29,25 @@ export default Ember.Component.extend({
   multiple: null,
   name: Ember.computed.oneWay('property'),
   placeholder: null,
-  property:  Ember.computed.oneWay('valueBinding._label'),
   prompt: null,
   disabled: null,
 
+  fullPropertyPath: Ember.computed('parentView.modelPath', 'property',
+    function() {
+      var modelPath = defaultFor(
+        this.get('parentView.modelPath'),
+        'model'
+      );
+
+      // return modelPath + '.' + this.get('property');
+      return this.get('property');
+    }
+  ),
+
   label: Ember.computed('property', function() {
-    return toWords(defaultFor(this.get('property'), ''));
+    var property = defaultFor(this.get('property'), '');
+
+    return toWords(property.replace('model.', ''));
   }),
 
   type: Ember.computed('as', function() {
diff --git a/addon/helpers/capitalize-string.js b/addon/helpers/capitalize-string.js
new file mode 100644
index 0000000..aabd69b
--- /dev/null
+++ b/addon/helpers/capitalize-string.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export function capitalizeString(params) {
+  var string = params[0];
+
+  return Ember.String.capitalize(string);
+}
+
+export default Ember.HTMLBars.makeBoundHelper(capitalizeString);
diff --git a/addon/helpers/to-words.js b/addon/helpers/to-words.js
deleted file mode 100644
index f3cc7b4..0000000
--- a/addon/helpers/to-words.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-
-export function toWords(params) {
-  var string = params[0];
-
-  return string.underscore().split('_').join(' ').capitalize();
-}
-
-export default Ember.HTMLBars.makeBoundHelper(toWords);
diff --git a/app/templates/components/destroy-submission.hbs b/addon/templates/components/destroy-submission.hbs
similarity index 100%
rename from app/templates/components/destroy-submission.hbs
rename to addon/templates/components/destroy-submission.hbs
diff --git a/addon/templates/components/error-field.hbs b/addon/templates/components/error-field.hbs
index 889d9ee..b10497a 100644
--- a/addon/templates/components/error-field.hbs
+++ b/addon/templates/components/error-field.hbs
@@ -1 +1,3 @@
-{{yield}}
+{{#if error}}
+  {{capitalize-string label}} {{error}}
+{{/if}}
diff --git a/app/templates/components/form-controls.hbs b/addon/templates/components/form-controls.hbs
similarity index 100%
rename from app/templates/components/form-controls.hbs
rename to addon/templates/components/form-controls.hbs
diff --git a/app/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
similarity index 100%
rename from app/templates/components/form-submission.hbs
rename to addon/templates/components/form-submission.hbs
diff --git a/app/templates/components/form-wrapper.hbs b/addon/templates/components/form-wrapper.hbs
similarity index 100%
rename from app/templates/components/form-wrapper.hbs
rename to addon/templates/components/form-wrapper.hbs
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index 60297ba..3ec172a 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -7,9 +7,16 @@
   {{yield}}
 {{else}}
   {{!-- ...else show input --}}
-  {{input}}
+  {{input
+    placeholder=placeholder
+    name=name
+    type=type
+    value=value
+  }}
 {{/if}}
 
-{{#if error}}
-  {{error-field property=property}}
+{{error-field property=property label=label}}
+
+{{#if hint}}
+  {{hint-field hint=hint}}
 {{/if}}
diff --git a/addon/templates/components/label-field.hbs b/addon/templates/components/label-field.hbs
index 21f81c8..fc36da3 100644
--- a/addon/templates/components/label-field.hbs
+++ b/addon/templates/components/label-field.hbs
@@ -1 +1 @@
-{{label}}
+{{capitalize-string label}}
diff --git a/app/templates/components/loading-spinner.hbs b/addon/templates/components/loading-spinner.hbs
similarity index 100%
rename from app/templates/components/loading-spinner.hbs
rename to addon/templates/components/loading-spinner.hbs
diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
index 927850e..2ceb5a5 100644
--- a/addon/utils/to-words.js
+++ b/addon/utils/to-words.js
@@ -1,5 +1,6 @@
-var String = Ember.String;
-
 export default function(string) {
-  return String.capitalize(String.underscore(string).split('_').join(' '));
+  var underscored = Ember.String.underscore(string);
+  var spaced = underscored.split('_').join(' ');
+
+  return spaced.replace('.', ' ');
 }
diff --git a/app/helpers/capitalize-string.js b/app/helpers/capitalize-string.js
new file mode 100644
index 0000000..8ee0497
--- /dev/null
+++ b/app/helpers/capitalize-string.js
@@ -0,0 +1,3 @@
+import capitalizeString from 'ember-easy-form-extensions/helpers/capitalize-string';
+
+export default capitalizeString;
diff --git a/app/helpers/to-words.js b/app/helpers/to-words.js
deleted file mode 100644
index cf6d4c7..0000000
--- a/app/helpers/to-words.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import toWords from 'ember-easy-form-extensions/helpers/to-words';
-
-export default toWords;
diff --git a/app/templates/easy-form/error.hbs b/app/templates/easy-form/error.hbs
deleted file mode 100644
index d5d3082..0000000
--- a/app/templates/easy-form/error.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{view.errorText}}
diff --git a/app/templates/easy-form/hint.hbs b/app/templates/easy-form/hint.hbs
deleted file mode 100644
index ba2337b..0000000
--- a/app/templates/easy-form/hint.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{view.hintText}}
diff --git a/app/templates/easy-form/input-controls.hbs b/app/templates/easy-form/input-controls.hbs
deleted file mode 100644
index 7b7d540..0000000
--- a/app/templates/easy-form/input-controls.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{{input-field
-  propertyBinding='view.property'
-  inputOptionsBinding='view.inputOptionsValues'
-}}
-
-{{#if view.showError}}
-  {{error-field propertyBinding='view.property'}}
-{{/if}}
-
-{{#if view.hint}}
-  {{hint-field
-    propertyBinding='view.property'
-    textBinding='view.hint'
-  }}
-{{/if}}
diff --git a/app/templates/easy-form/input.hbs b/app/templates/easy-form/input.hbs
deleted file mode 100644
index d222120..0000000
--- a/app/templates/easy-form/input.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{label-field propertyBinding='view.property' textBinding='view.label'}}
-
-<div class="input_wrapper">
-  {{partial 'easy-form/input-controls'}}
-</div>
diff --git a/app/templates/easy-form/label.hbs b/app/templates/easy-form/label.hbs
deleted file mode 100644
index f87d1de..0000000
--- a/app/templates/easy-form/label.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{view.labelText}}
diff --git a/tests/dummy/app/resources/post/edit/controller.js b/tests/dummy/app/resources/post/edit/controller.js
index 3d4ec50..b4fc9bc 100644
--- a/tests/dummy/app/resources/post/edit/controller.js
+++ b/tests/dummy/app/resources/post/edit/controller.js
@@ -1,11 +1,11 @@
 import Ember from 'ember';
 import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
 
-export default Ember.ObjectController.extend(
+export default Ember.Controller.extend(
   Saving, {
 
   validations: {
-    title: {
+    'model.title': {
       presence: true
     }
   },
@@ -23,4 +23,3 @@ export default Ember.ObjectController.extend(
   }
 
 });
-
diff --git a/tests/dummy/app/resources/posts/index/controller.js b/tests/dummy/app/resources/posts/index/controller.js
index 602325d..b461f2c 100644
--- a/tests/dummy/app/resources/posts/index/controller.js
+++ b/tests/dummy/app/resources/posts/index/controller.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
 
-export default Ember.ArrayController.extend({
+export default Ember.Controller.extend({
 
 });
diff --git a/tests/dummy/app/resources/posts/index/template.hbs b/tests/dummy/app/resources/posts/index/template.hbs
index 97fa19f..147c72c 100644
--- a/tests/dummy/app/resources/posts/index/template.hbs
+++ b/tests/dummy/app/resources/posts/index/template.hbs
@@ -1,4 +1,4 @@
-{{#each post in content}}
+{{#each post in model}}
   {{#link-to 'post.edit' post}}
     {{post.title}}
   {{/link-to}}
diff --git a/tests/dummy/app/resources/posts/new/controller.js b/tests/dummy/app/resources/posts/new/controller.js
index c6054bc..8c0777b 100644
--- a/tests/dummy/app/resources/posts/new/controller.js
+++ b/tests/dummy/app/resources/posts/new/controller.js
@@ -1,11 +1,11 @@
 import Ember from 'ember';
 import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
 
-export default Ember.ObjectController.extend(
+export default Ember.Controller.extend(
   Saving, {
 
   validations: {
-    title: {
+    'model.title': {
       presence: true
     }
   },
@@ -19,4 +19,3 @@ export default Ember.ObjectController.extend(
   }
 
 });
-
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index ea24446..1ccf760 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,9 +1,9 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    {{input-wrapper value=title}}
+    {{input-wrapper value=model.title}}
     {{!-- {{input-wrapper property=description}}
-    {{#input-wrapper property=title}}
+    {{#input-wrapper property='title'}}
       hey
     {{/input-wrapper}} --}}
   {{/form-controls}}
@@ -14,11 +14,13 @@
 
 <dl>
   <dt>Title</dt>
-  <dd>{{title}}</dd>
+  <dd>{{model.title}}</dd>
   <dt>Description</dt>
-  <dd>{{description}}</dd>
+  <dd>{{model.description}}</dd>
 </dl>
 
+{{errors.model.title.firstObject}}
+
 {{#if editing}}
   {{destroy-submission}}
 {{/if}}

From 67ece81a32117dce73e8a6e9f6aa9800fd0a6115 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 00:23:18 -0400
Subject: [PATCH 06/73] Basic label binding using id

---
 addon/components/input-wrapper.js            | 4 ++++
 addon/components/label-field.js              | 2 ++
 addon/templates/components/hint-field.hbs    | 2 +-
 addon/templates/components/input-wrapper.hbs | 6 +++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 484c9b5..daaafcd 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -44,6 +44,10 @@ export default Ember.Component.extend({
     }
   ),
 
+  inputId: Ember.computed(function() {
+    return this.get('elementId') + '-input';
+  }),
+
   label: Ember.computed('property', function() {
     var property = defaultFor(this.get('property'), '');
 
diff --git a/addon/components/label-field.js b/addon/components/label-field.js
index 247c5fc..19c244d 100644
--- a/addon/components/label-field.js
+++ b/addon/components/label-field.js
@@ -2,7 +2,9 @@ import Ember from 'ember';
 import layout from '../templates/components/label-field';
 
 export default Ember.Component.extend({
+  attributeBindings: ['for'],
   classNameBindings: ['easyForm.labelClass'],
+  for: null,
   label: null,
   layout: layout,
   tagName: 'label',
diff --git a/addon/templates/components/hint-field.hbs b/addon/templates/components/hint-field.hbs
index 889d9ee..818adfa 100644
--- a/addon/templates/components/hint-field.hbs
+++ b/addon/templates/components/hint-field.hbs
@@ -1 +1 @@
-{{yield}}
+{{capitalize-string hint}}
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index 3ec172a..0c384e0 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -1,5 +1,8 @@
 {{#if label}}
-  {{label-field label=label}}
+  {{label-field
+    for=inputId
+    label=label
+  }}
 {{/if}}
 
 {{#if template}}
@@ -8,6 +11,7 @@
 {{else}}
   {{!-- ...else show input --}}
   {{input
+    id=inputId
     placeholder=placeholder
     name=name
     type=type

From 6045a55801e307d70ac0b72570fdc88ba9fff590 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 17:49:38 -0400
Subject: [PATCH 07/73] Layouts added to components

---
 addon/components/destroy-submission.js   |  2 ++
 addon/components/form-controls.js        |  2 ++
 addon/components/form-submission.js      |  2 ++
 addon/components/form-wrapper.js         |  2 ++
 addon/components/loading-spinner.js      |  4 +++-
 addon/templates/components/test-comp.hbs |  1 +
 app/components/test-comp.js              |  3 +++
 tests/unit/components/test-comp-test.js  | 21 +++++++++++++++++++++
 8 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 addon/templates/components/test-comp.hbs
 create mode 100644 app/components/test-comp.js
 create mode 100644 tests/unit/components/test-comp-test.js

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index 48e4a80..6e7b516 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import layout from '../templates/components/destroy-submission';
 import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
 
 export default Ember.Component.extend(
@@ -8,6 +9,7 @@ export default Ember.Component.extend(
   destroyText: 'Delete',
   formSubmitted: Ember.computed.readOnly('formView.formSubmitted'),
   iconClass: 'icon-delete',
+  layout: layout,
 
   actions: {
     destroy: function() {
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index f80b543..de5cf8b 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import layout from '../templates/components/form-controls';
 import softAssert from '../utils/observers/soft-assert';
 import WalkViews from '../mixins/views/walk-views';
 
@@ -7,6 +8,7 @@ export default Ember.Component.extend(
 
   attributeBindings: ['legend'],
   classNameBindings: ['easyForm.formControlsClass'],
+  layout: layout,
   legend: null,
   model: null,
   modelPath: Ember.computed.oneWay('modelBinding._label'),
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index a1a8c92..06d1249 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import layout from '../templates/components/form-submission';
 import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
 
 export default Ember.Component.extend(
@@ -8,6 +9,7 @@ export default Ember.Component.extend(
   cancelText: 'Cancel',
   classNames: ['buttons', 'submission'],
   formSubmitted: Ember.computed.readOnly('formView.formSubmitted'),
+  layout: layout,
   submit: true,
   submitText: 'Save',
 
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 824a90d..22f3835 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -1,9 +1,11 @@
 import Ember from 'ember';
+import layout from '../templates/components/form-wrapper';
 
 export default Ember.Component.extend({
   attributeBindings: ['novalidate'],
   classNameBindings: ['easyForm.formWrapperClass'],
   className: 'form',
+  layout: layout,
   novalidate: true,
   tagName: 'form',
 });
diff --git a/addon/components/loading-spinner.js b/addon/components/loading-spinner.js
index 70afc9c..7d9d965 100644
--- a/addon/components/loading-spinner.js
+++ b/addon/components/loading-spinner.js
@@ -1,5 +1,7 @@
 import Ember from 'ember';
+import layout from '../templates/components/loading-spinner';
 
 export default Ember.Component.extend({
-  classNames: ['spinner']
+  classNames: ['spinner'],
+  layout: layout
 });
diff --git a/addon/templates/components/test-comp.hbs b/addon/templates/components/test-comp.hbs
new file mode 100644
index 0000000..889d9ee
--- /dev/null
+++ b/addon/templates/components/test-comp.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/app/components/test-comp.js b/app/components/test-comp.js
new file mode 100644
index 0000000..dc7166a
--- /dev/null
+++ b/app/components/test-comp.js
@@ -0,0 +1,3 @@
+import testComp from 'ember-easy-form-extensions/components/test-comp';
+
+export default testComp;
diff --git a/tests/unit/components/test-comp-test.js b/tests/unit/components/test-comp-test.js
new file mode 100644
index 0000000..a89d846
--- /dev/null
+++ b/tests/unit/components/test-comp-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('test-comp', {
+  // 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');
+});

From 1b79080ce8514949d54a81e51196929e98b30dac Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 21:57:37 -0400
Subject: [PATCH 08/73] Clean path property and model path property refactored

---
 addon/components/form-controls.js                |  7 +++++++
 addon/components/input-wrapper.js                | 15 +++++----------
 tests/dummy/app/resources/posts/new/template.hbs |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index de5cf8b..1d2783f 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -1,3 +1,4 @@
+import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/form-controls';
 import softAssert from '../utils/observers/soft-assert';
@@ -15,6 +16,12 @@ export default Ember.Component.extend(
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
 
+  modelPath: Ember.computed('modelBinding._label', function() {
+    var modelPath = this.get('modelBinding._label');
+
+    return defaultFor(modelPath, 'model') + '.';
+  }),
+
   // findDefaultModel: Ember.on('init', function() {
   //   var isFulfilled, modelIsAPromise;
   //
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index daaafcd..2d6daac 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -9,6 +9,7 @@ var run = Ember.run;
 export default Ember.Component.extend({
   as: null,
   layout: layout,
+  modelPath: Ember.computed.oneWay('parentView.modelPath'),
   property:  Ember.computed.oneWay('valueBinding._label'),
   showError: false,
   showValidity: false,
@@ -32,15 +33,9 @@ export default Ember.Component.extend({
   prompt: null,
   disabled: null,
 
-  fullPropertyPath: Ember.computed('parentView.modelPath', 'property',
+  cleanProperty: Ember.computed('property', 'modelPath',
     function() {
-      var modelPath = defaultFor(
-        this.get('parentView.modelPath'),
-        'model'
-      );
-
-      // return modelPath + '.' + this.get('property');
-      return this.get('property');
+      return this.get('property').replace(this.get('modelPath'));
     }
   ),
 
@@ -51,12 +46,12 @@ export default Ember.Component.extend({
   label: Ember.computed('property', function() {
     var property = defaultFor(this.get('property'), '');
 
-    return toWords(property.replace('model.', ''));
+    return toWords(property.replace(this.get('modelPath'), ''));
   }),
 
   type: Ember.computed('as', function() {
     var as = this.get('as');
-    var property = this.get('property');
+    var property = this.get('cleanProperty');
     var type, value;
 
     if (!as) {
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 1ccf760..940f9a7 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,11 +1,11 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    {{input-wrapper value=model.title}}
-    {{!-- {{input-wrapper property=description}}
+    {{input-wrapper value=model.title placeholder='Title'}}
+    {{input-wrapper value=description}}
     {{#input-wrapper property='title'}}
       hey
-    {{/input-wrapper}} --}}
+    {{/input-wrapper}}
   {{/form-controls}}
 
   {{form-submission}}

From 58223bad816ba94d783c3466191ea7f94826fdd4 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 22:44:51 -0400
Subject: [PATCH 09/73] Basic partial setup for input

---
 addon/components/form-controls.js             | 14 ----
 addon/components/input-wrapper.js             | 67 +++++++++----------
 addon/services/easy-form.js                   |  1 -
 addon/templates/components/input-wrapper.hbs  |  8 +--
 app/templates/form-inputs/default.hbs         |  7 ++
 .../app/resources/posts/new/template.hbs      |  2 +-
 6 files changed, 40 insertions(+), 59 deletions(-)
 create mode 100644 app/templates/form-inputs/default.hbs

diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 1d2783f..5edd647 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -12,7 +12,6 @@ export default Ember.Component.extend(
   layout: layout,
   legend: null,
   model: null,
-  modelPath: Ember.computed.oneWay('modelBinding._label'),
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
 
@@ -21,17 +20,4 @@ export default Ember.Component.extend(
 
     return defaultFor(modelPath, 'model') + '.';
   }),
-
-  // findDefaultModel: Ember.on('init', function() {
-  //   var isFulfilled, modelIsAPromise;
-  //
-  //   if (!this.get('model')) {
-  //     isFulfilled = this.get('model.isFulfilled');
-  //     modelIsAPromise = Ember.typeOf(isFulfilled === 'boolean');
-  //
-  //     if (!modelIsAPromise) {
-  //       this.set('model', this.get('formView.controller.model'));
-  //     }
-  //   }
-  // }),
 });
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 2d6daac..55393b0 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -7,7 +7,7 @@ var typeOf = Ember.typeOf;
 var run = Ember.run;
 
 export default Ember.Component.extend({
-  as: null,
+  inputPartial: 'form-inputs/default',
   layout: layout,
   modelPath: Ember.computed.oneWay('parentView.modelPath'),
   property:  Ember.computed.oneWay('valueBinding._label'),
@@ -35,57 +35,52 @@ export default Ember.Component.extend({
 
   cleanProperty: Ember.computed('property', 'modelPath',
     function() {
-      return this.get('property').replace(this.get('modelPath'));
+      return this.get('property').replace(this.get('modelPath'), '');
     }
   ),
 
+  formInputPartial: Ember.computed('type', function() {
+    var directory = this.get('easyForm.formInputsDirectory');
+
+    return directory + '/' + this.get('type');
+  }),
+
   inputId: Ember.computed(function() {
     return this.get('elementId') + '-input';
   }),
 
   label: Ember.computed('property', function() {
-    var property = defaultFor(this.get('property'), '');
+    var property = defaultFor(this.get('cleanProperty'), '');
 
-    return toWords(property.replace(this.get('modelPath'), ''));
+    return toWords(property);
   }),
 
-  type: Ember.computed('as', function() {
-    var as = this.get('as');
+  type: Ember.computed(function() {
     var property = this.get('cleanProperty');
     var type, value;
 
-    if (!as) {
-      if (property.match(/password/)) {
-        type = 'password';
-      } else if (property.match(/email/)) {
-        type = 'email';
-      } else if (property.match(/url/)) {
-        type = 'url';
-      } else if (property.match(/color/)) {
-        type = 'color';
-      } else if (property.match(/^tel/) || property.match(/^phone/)) {
-        type = 'tel';
-      } else if (property.match(/search/)) {
-        type = 'search';
-      } else {
-        value = this.get('value');
-
-        if (typeOf(value) === 'number') {
-          type = 'number';
-        } else if (typeOf(value) === 'date') {
-          type = 'date';
-        } else if (typeOf(value) === 'boolean') {
-          type = 'checkbox';
-        }
-      }
+    if (property.match(/password/)) {
+      type = 'password';
+    } else if (property.match(/email/)) {
+      type = 'email';
+    } else if (property.match(/url/)) {
+      type = 'url';
+    } else if (property.match(/color/)) {
+      type = 'color';
+    } else if (property.match(/^tel/) || property.match(/^phone/)) {
+      type = 'tel';
+    } else if (property.match(/search/)) {
+      type = 'search';
     } else {
-      var inputType = this.get('easyForm.inputTypes.' + property);
-
-      if (inputType) {
-        type = inputType;
+      value = this.get('value');
+
+      if (typeOf(value) === 'number') {
+        type = 'number';
+      } else if (typeOf(value) === 'date') {
+        type = 'date';
+      } else if (typeOf(value) === 'boolean') {
+        type = 'checkbox';
       }
-
-      type = as;
     }
 
     return type;
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index 9905f8b..2f468d1 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Service.extend({
-  inputTypes: {},
   errorClass: 'error',
   hintClass: 'hint',
   inputClass: 'input',
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index 0c384e0..ddf592a 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -10,13 +10,7 @@
   {{yield}}
 {{else}}
   {{!-- ...else show input --}}
-  {{input
-    id=inputId
-    placeholder=placeholder
-    name=name
-    type=type
-    value=value
-  }}
+  {{partial inputPartial}}
 {{/if}}
 
 {{error-field property=property label=label}}
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
new file mode 100644
index 0000000..588716d
--- /dev/null
+++ b/app/templates/form-inputs/default.hbs
@@ -0,0 +1,7 @@
+{{input
+  id=inputId
+  placeholder=placeholder
+  name=name
+  type=type
+  value=value
+}}
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 940f9a7..2765948 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -2,7 +2,7 @@
 
   {{#form-controls legend='Write a new post'}}
     {{input-wrapper value=model.title placeholder='Title'}}
-    {{input-wrapper value=description}}
+    {{input-wrapper value=model.description}}
     {{#input-wrapper property='title'}}
       hey
     {{/input-wrapper}}

From 36825d33c1b556ab65306cc9b7a18cde098bc49f Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 12 May 2015 23:40:48 -0400
Subject: [PATCH 10/73] Validations shown on form submisison

---
 addon/components/error-field.js              | 16 ++++--
 addon/components/input-wrapper.js            | 57 ++++++--------------
 addon/mixins/views/submitting.js             | 16 ++----
 addon/templates/components/input-wrapper.hbs |  6 ++-
 addon/templates/form-inputs/default.hbs      |  7 +++
 app/templates/form-inputs/default.hbs        |  2 +
 6 files changed, 44 insertions(+), 60 deletions(-)
 create mode 100644 addon/templates/form-inputs/default.hbs

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 3e09a30..14d6262 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -7,13 +7,20 @@ import WalkViews from '../mixins/views/walk-views';
 export default Ember.Component.extend(
   WalkViews, {
 
-  classNameBindings: ['easyForm.errorClass'],
+  shouldShowError: true,
+  classNameBindings: ['easyForm.errorClass', 'errorIsVisible:visible'],
   error: null,
   label: Ember.computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
 
+  errorIsVisible: Ember.computed('shouldShowError', 'error',
+    function() {
+      return this.get('shouldShowError') && !!this.get('error');
+    }
+  ),
+  
   text: Ember.computed('errors.[]', 'value', function() {
     var propertyName = defaultFor(
       this.get('property'),
@@ -24,13 +31,12 @@ export default Ember.Component.extend(
   }),
 
   addErrorObserver: Ember.on('init', function() {
-    var fullPropertyPath = this.get('parentView.fullPropertyPath');
+    var property = this.get('property');
     var controller, errorPath, setError;
 
-    if (fullPropertyPath) {
+    if (property) {
       controller = this.get('formView.controller');
-
-      errorPath = 'errors.' + fullPropertyPath + '.firstObject';
+      errorPath = 'errors.' + property + '.firstObject';
 
       setError = function() {
         this.set('error', controller.get(errorPath));
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 55393b0..6a6c819 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -2,17 +2,19 @@ import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/input-wrapper';
 import toWords from '../utils/to-words';
+import WalkViews from '../mixins/views/walk-views';
 
 var typeOf = Ember.typeOf;
 var run = Ember.run;
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(
+  WalkViews, {
+
   inputPartial: 'form-inputs/default',
   layout: layout,
   modelPath: Ember.computed.oneWay('parentView.modelPath'),
   property:  Ember.computed.oneWay('valueBinding._label'),
-  showError: false,
-  showValidity: false,
+  shouldShowError: false,
   value: null,
 
   classNameBindings: [
@@ -86,45 +88,16 @@ export default Ember.Component.extend({
     return type;
   }),
 
-  setInvalidToValid: Ember.observer('showError', function() {
-    // If we go from error to no error
-    if (!this.get('showError') && this.get('canShowValidationError')) {
-      run.debounce(this, function() {
-        var hasAnError = this.get('formForModel.errors.' + this.get('property') + '.length');
-
-        if (!hasAnError && !this.get('isDestroying')) {
-          this.set('showValidity', true);
-
-          run.later(this, function() {
-            if (!this.get('isDestroying')) {
-              this.set('showValidity', false);
-            }
-          }, 2000);
-        }
-      }, 50);
-    }
-  }),
-
-  /**
-  An override of easyForm's default `focusOut` method to ensure validations are not shown when the user clicks cancel.
-
-  @method focusOut
-  */
-
-  focusOut: function() {
-
-    /* Hacky - delay check so focusOut runs after the cancel action */
-
-    run.later(this, function() {
-      var cancelClicked = this.get('parentView.cancelClicked');
-      var isDestroying = this.get('isDestroying');
-
-      if (!cancelClicked && !isDestroying) {
-        this.set('hasFocusedOut', true);
-        this.showValidationError();
-      }
-    }, 100);
+  actions: {
+    showError: function() {
+      this.set('shouldShowError', true);
+    },
   },
 
-  showValidationError: Ember.K
+  listenForSubmit: Ember.on('init', function() {
+    this.get('formView').on('submission', function() {
+      this.send('showError');
+    }.bind(this));
+  }),
+
 });
diff --git a/addon/mixins/views/submitting.js b/addon/mixins/views/submitting.js
index 6c90c77..d0b7fae 100644
--- a/addon/mixins/views/submitting.js
+++ b/addon/mixins/views/submitting.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
-export default Ember.Mixin.create({
+export default Ember.Mixin.create(
+  Ember.Evented, {
+
   cancelClicked: false,
   formSubmitted: Ember.computed.alias('controller.formSubmitted'),
 
@@ -40,17 +42,7 @@ export default Ember.Mixin.create({
     event.stopPropagation();
 
     this.set('formSubmitted', true);
-
-    this.get('childViews').forEach(function(view) {
-      var viewConstructor = view.get('constructor').toString();
-
-      /* If the view is an Easy Form input, manually call focus
-      out to show the validation error */
-
-      if (viewConstructor === 'Ember.EasyForm.Input') {
-        view.focusOut();
-      }
-    });
+    this.trigger('submission');
 
     this._eventHandler('submit');
   },
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index ddf592a..38cc9a9 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -13,7 +13,11 @@
   {{partial inputPartial}}
 {{/if}}
 
-{{error-field property=property label=label}}
+{{error-field
+  shouldShowError=shouldShowError
+  label=label
+  property=property
+}}
 
 {{#if hint}}
   {{hint-field hint=hint}}
diff --git a/addon/templates/form-inputs/default.hbs b/addon/templates/form-inputs/default.hbs
new file mode 100644
index 0000000..588716d
--- /dev/null
+++ b/addon/templates/form-inputs/default.hbs
@@ -0,0 +1,7 @@
+{{input
+  id=inputId
+  placeholder=placeholder
+  name=name
+  type=type
+  value=value
+}}
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index 588716d..1e0cb55 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -4,4 +4,6 @@
   name=name
   type=type
   value=value
+  action='showError'
+  on='focus-out'
 }}

From 8a4b8047e290c401b9d74417debd70e3546f4b43 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Wed, 13 May 2015 00:02:30 -0400
Subject: [PATCH 11/73] Is newly valid class name binding

---
 addon/components/error-field.js              |  7 ++++-
 addon/components/input-wrapper.js            | 33 ++++++++++++++++++--
 addon/templates/components/input-wrapper.hbs |  2 ++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 14d6262..22b5ce8 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -20,7 +20,7 @@ export default Ember.Component.extend(
       return this.get('shouldShowError') && !!this.get('error');
     }
   ),
-  
+
   text: Ember.computed('errors.[]', 'value', function() {
     var propertyName = defaultFor(
       this.get('property'),
@@ -39,6 +39,11 @@ export default Ember.Component.extend(
       errorPath = 'errors.' + property + '.firstObject';
 
       setError = function() {
+        var error = controller.get(errorPath);
+        var parentView = this.get('parentView');
+        var isValid = !error && parentView.get('isInputWrapper');
+
+        parentView.set('isValid', isValid);
         this.set('error', controller.get(errorPath));
       };
 
diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 6a6c819..206da50 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -11,15 +11,17 @@ export default Ember.Component.extend(
   WalkViews, {
 
   inputPartial: 'form-inputs/default',
+  isInputWrapper: true, // Static
+  isNewlyValid: false,
+  isValid: true,
   layout: layout,
   modelPath: Ember.computed.oneWay('parentView.modelPath'),
   property:  Ember.computed.oneWay('valueBinding._label'),
   shouldShowError: false,
-  value: null,
 
   classNameBindings: [
     'easyForm.inputWrapperClass',
-    'showValidity:control-valid'
+    'validityClass'
   ],
 
   /* Input attributes */
@@ -88,12 +90,39 @@ export default Ember.Component.extend(
     return type;
   }),
 
+  validityClass: Ember.computed('easyForm.inputWrapperClass', 'isNewlyValid', 'isValid',
+    function() {
+      var baseClass = this.get('easyForm.inputWrapperClass');
+      var modifier;
+
+      if (this.get('isNewlyValid')) {
+        modifier = 'newly-valid';
+      } else if(this.get('isValid')) {
+        modifier = 'valid';
+      } else {
+        modifier = 'error';
+      }
+
+      return baseClass + '-' + modifier;
+    }
+  ),
+
   actions: {
     showError: function() {
       this.set('shouldShowError', true);
     },
   },
 
+  listenForNewlyValid: Ember.observer('isValid', function() {
+    if (this.get('isValid')) {
+      this.set('isNewlyValid', true);
+    }
+
+    Ember.run.later(this, function() {
+      this.set('isNewlyValid', false);
+    }, 3000);
+  }),
+
   listenForSubmit: Ember.on('init', function() {
     this.get('formView').on('submission', function() {
       this.send('showError');
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index 38cc9a9..1ede6c4 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -1,3 +1,5 @@
+.{{isNewlyValid}}.
+
 {{#if label}}
   {{label-field
     for=inputId

From a8177a4246efe4e7461e072ab15698e42f29afc5 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Wed, 13 May 2015 00:09:00 -0400
Subject: [PATCH 12/73] Controller fix

---
 addon/initializers/routing-events.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/initializers/routing-events.js b/addon/initializers/routing-events.js
index 6d82589..f9d9e83 100644
--- a/addon/initializers/routing-events.js
+++ b/addon/initializers/routing-events.js
@@ -3,11 +3,11 @@ import Ember from 'ember';
 export function initialize(/* container, app */) {
 
   /**
-  @class Ember.ControllerMixin
+  @class Ember.Controller
   @submodule controllers
   */
 
-  Ember.ControllerMixin.reopen(
+  Ember.Controller.reopen(
     Ember.Evented, {
 
   });

From 3219bd1693aa23b64bdf7a096e3473072f311812 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Wed, 13 May 2015 21:55:41 -0400
Subject: [PATCH 13/73] Select added

---
 addon/components/input-wrapper.js                 | 14 +++++++-------
 addon/services/easy-form.js                       |  6 +++++-
 addon/templates/form-inputs/default.hbs           |  7 -------
 app/templates/form-inputs/select.hbs              |  7 +++++++
 tests/dummy/app/resources/post/model.js           |  6 ++++--
 tests/dummy/app/resources/posts/new/controller.js |  5 +++++
 tests/dummy/app/resources/posts/new/template.hbs  |  8 +++++---
 7 files changed, 33 insertions(+), 20 deletions(-)
 delete mode 100644 addon/templates/form-inputs/default.hbs
 create mode 100644 app/templates/form-inputs/select.hbs

diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index 206da50..aba49ee 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -10,7 +10,6 @@ var run = Ember.run;
 export default Ember.Component.extend(
   WalkViews, {
 
-  inputPartial: 'form-inputs/default',
   isInputWrapper: true, // Static
   isNewlyValid: false,
   isValid: true,
@@ -43,16 +42,17 @@ export default Ember.Component.extend(
     }
   ),
 
-  formInputPartial: Ember.computed('type', function() {
-    var directory = this.get('easyForm.formInputsDirectory');
-
-    return directory + '/' + this.get('type');
-  }),
-
   inputId: Ember.computed(function() {
     return this.get('elementId') + '-input';
   }),
 
+  inputPartial: Ember.computed('type', function() {
+    var type = this.get('type');
+    var partialName = this.get('easyForm.inputTypePartials.' + type);
+
+    return defaultFor(partialName, 'form-inputs/default');
+  }),
+
   label: Ember.computed('property', function() {
     var property = defaultFor(this.get('cleanProperty'), '');
 
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index 2f468d1..ccec365 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -6,5 +6,9 @@ export default Ember.Service.extend({
   inputClass: 'input',
   inputWrapperClass: 'input-wrapper',
   formWrapperClass: 'form',
-  formControlsClass: 'controls'
+  formControlsClass: 'controls',
+
+  inputTypePartials: {
+    select: 'form-inputs/select'
+  }
 });
diff --git a/addon/templates/form-inputs/default.hbs b/addon/templates/form-inputs/default.hbs
deleted file mode 100644
index 588716d..0000000
--- a/addon/templates/form-inputs/default.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{input
-  id=inputId
-  placeholder=placeholder
-  name=name
-  type=type
-  value=value
-}}
diff --git a/app/templates/form-inputs/select.hbs b/app/templates/form-inputs/select.hbs
new file mode 100644
index 0000000..912b332
--- /dev/null
+++ b/app/templates/form-inputs/select.hbs
@@ -0,0 +1,7 @@
+{{view 'select'
+  id=inputId
+  content=content
+  name=name
+  value=value
+  selection=selection
+}}
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
index 671dcb7..b5b8996 100644
--- a/tests/dummy/app/resources/post/model.js
+++ b/tests/dummy/app/resources/post/model.js
@@ -5,7 +5,8 @@ var attr = DS.attr;
 
 var PostModel = DS.Model.extend({
   title: attr('string'),
-  description: attr('string')
+  description: attr('string'),
+  category: attr('string'),
 });
 
 PostModel.reopenClass({
@@ -13,7 +14,8 @@ PostModel.reopenClass({
     {
       id: 1,
       title: 'How to Ember',
-      description: 'This is an introduction on how to Ember. Wow.'
+      description: 'This is an introduction on how to Ember. Wow.',
+      category: 'ember'
     }
   ]
 });
diff --git a/tests/dummy/app/resources/posts/new/controller.js b/tests/dummy/app/resources/posts/new/controller.js
index 8c0777b..f72989b 100644
--- a/tests/dummy/app/resources/posts/new/controller.js
+++ b/tests/dummy/app/resources/posts/new/controller.js
@@ -4,9 +4,14 @@ import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
 export default Ember.Controller.extend(
   Saving, {
 
+  categories: Ember.A(['ember', 'rails', 'css']),
+
   validations: {
     'model.title': {
       presence: true
+    },
+    'model.category': {
+      presence: true
     }
   },
 
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 2765948..cff9864 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -3,9 +3,11 @@
   {{#form-controls legend='Write a new post'}}
     {{input-wrapper value=model.title placeholder='Title'}}
     {{input-wrapper value=model.description}}
-    {{#input-wrapper property='title'}}
-      hey
-    {{/input-wrapper}}
+    {{input-wrapper
+      value=model.category
+      content=categories
+      type='select'
+    }}
   {{/form-controls}}
 
   {{form-submission}}

From 6c091ef61874d53b7394f54b1cffb3745f07d217 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Wed, 13 May 2015 22:13:15 -0400
Subject: [PATCH 14/73] Added textarea

---
 addon/initializers/easy-form-extensions.js        | 2 --
 addon/services/easy-form.js                       | 3 ++-
 app/templates/form-inputs/default.hbs             | 3 +--
 app/templates/form-inputs/textarea.hbs            | 8 ++++++++
 tests/dummy/app/resources/posts/new/controller.js | 3 +++
 tests/dummy/app/resources/posts/new/template.hbs  | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 app/templates/form-inputs/textarea.hbs

diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index bf8ca59..90a3107 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -1,8 +1,6 @@
 import Ember from 'ember';
 
 export function initialize(container, app) {
-  var run = Ember.run;
-
   app.inject('component', 'easyForm', 'service:easy-form');
 }
 
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index ccec365..3a0d3fb 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -9,6 +9,7 @@ export default Ember.Service.extend({
   formControlsClass: 'controls',
 
   inputTypePartials: {
-    select: 'form-inputs/select'
+    select: 'form-inputs/select',
+    textarea: 'form-inputs/textarea'
   }
 });
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index 1e0cb55..a59dfb8 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -4,6 +4,5 @@
   name=name
   type=type
   value=value
-  action='showError'
-  on='focus-out'
+  focus-out='showError'
 }}
diff --git a/app/templates/form-inputs/textarea.hbs b/app/templates/form-inputs/textarea.hbs
new file mode 100644
index 0000000..b66ff6f
--- /dev/null
+++ b/app/templates/form-inputs/textarea.hbs
@@ -0,0 +1,8 @@
+{{textarea
+  id=inputId
+  placeholder=placeholder
+  name=name
+  type=type
+  value=value
+  focus-out='showError'
+}}
diff --git a/tests/dummy/app/resources/posts/new/controller.js b/tests/dummy/app/resources/posts/new/controller.js
index f72989b..9253fd5 100644
--- a/tests/dummy/app/resources/posts/new/controller.js
+++ b/tests/dummy/app/resources/posts/new/controller.js
@@ -10,6 +10,9 @@ export default Ember.Controller.extend(
     'model.title': {
       presence: true
     },
+    'model.description': {
+      presence: true
+    },
     'model.category': {
       presence: true
     }
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index cff9864..f916a21 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -2,7 +2,7 @@
 
   {{#form-controls legend='Write a new post'}}
     {{input-wrapper value=model.title placeholder='Title'}}
-    {{input-wrapper value=model.description}}
+    {{input-wrapper value=model.description type='textarea'}}
     {{input-wrapper
       value=model.category
       content=categories

From 853b0242593e2e6de955a4c8e86b51440a370d64 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Wed, 13 May 2015 22:46:17 -0400
Subject: [PATCH 15/73] Checkbox added

---
 addon/services/easy-form.js                      | 3 ++-
 app/templates/form-inputs/checkbox.hbs           | 8 ++++++++
 tests/dummy/app/resources/post/model.js          | 2 ++
 tests/dummy/app/resources/posts/new/template.hbs | 8 ++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/templates/form-inputs/checkbox.hbs

diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index 3a0d3fb..bd3c3bf 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -9,7 +9,8 @@ export default Ember.Service.extend({
   formControlsClass: 'controls',
 
   inputTypePartials: {
+    checkbox: 'form-inputs/checkbox',
     select: 'form-inputs/select',
-    textarea: 'form-inputs/textarea'
+    textarea: 'form-inputs/textarea',
   }
 });
diff --git a/app/templates/form-inputs/checkbox.hbs b/app/templates/form-inputs/checkbox.hbs
new file mode 100644
index 0000000..9ffe55c
--- /dev/null
+++ b/app/templates/form-inputs/checkbox.hbs
@@ -0,0 +1,8 @@
+{{input
+  id=inputId
+  placeholder=placeholder
+  name=name
+  type=type
+  checked=value
+  focus-out='showError'
+}}
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
index b5b8996..bb47fe7 100644
--- a/tests/dummy/app/resources/post/model.js
+++ b/tests/dummy/app/resources/post/model.js
@@ -7,6 +7,8 @@ var PostModel = DS.Model.extend({
   title: attr('string'),
   description: attr('string'),
   category: attr('string'),
+  views: attr('number'),
+  published: attr('boolean')
 });
 
 PostModel.reopenClass({
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index f916a21..920b83e 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -8,6 +8,14 @@
       content=categories
       type='select'
     }}
+    {{input-wrapper
+      type='number'
+      value=model.views
+    }}
+    {{input-wrapper
+      type='checkbox'
+      value=model.published
+    }}
   {{/form-controls}}
 
   {{form-submission}}

From 04cdb7643ac4502afaf9a3622bb421cf060c4a0a Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 17 May 2015 16:05:25 -0400
Subject: [PATCH 16/73] dirty record handler added and dummy app updated

---
 addon/components/input-wrapper.js             |  3 ++
 addon/mixins/routes/delete-record.js          | 13 -------
 addon/mixins/routes/dirty-record-handler.js   | 37 ++++++++++++++++++
 addon/mixins/routes/rollback.js               | 13 -------
 addon/templates/components/input-wrapper.hbs  |  2 -
 bower.json                                    |  5 ++-
 index.js                                      |  2 +-
 package.json                                  |  3 +-
 tests/.jshintrc                               |  3 +-
 tests/dummy/app/resources/post/edit/route.js  |  4 +-
 tests/dummy/app/resources/post/index/route.js |  2 +-
 tests/dummy/app/resources/post/model.js       | 22 ++++++++---
 tests/dummy/app/resources/posts/new/route.js  |  4 +-
 .../app/resources/posts/new/template.hbs      | 39 ++++++++++++++-----
 14 files changed, 100 insertions(+), 52 deletions(-)
 delete mode 100644 addon/mixins/routes/delete-record.js
 create mode 100644 addon/mixins/routes/dirty-record-handler.js
 delete mode 100644 addon/mixins/routes/rollback.js

diff --git a/addon/components/input-wrapper.js b/addon/components/input-wrapper.js
index aba49ee..8b3aecb 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-wrapper.js
@@ -26,6 +26,7 @@ export default Ember.Component.extend(
   /* Input attributes */
 
   collection: null,
+  content: null,
   optionValuePath: null,
   optionLabelPath: null,
   selection: null,
@@ -75,6 +76,8 @@ export default Ember.Component.extend(
       type = 'tel';
     } else if (property.match(/search/)) {
       type = 'search';
+    } else if (this.get('content')) {
+      type = 'select';
     } else {
       value = this.get('value');
 
diff --git a/addon/mixins/routes/delete-record.js b/addon/mixins/routes/delete-record.js
deleted file mode 100644
index dd850bf..0000000
--- a/addon/mixins/routes/delete-record.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Mixin.create({
-
-  deleteRecord: Ember.on('willTransition', function() {
-    var model = this.get('controller.content');
-
-    if (model.get('isDirty')) {
-      model.deleteRecord();
-    }
-  }),
-
-});
diff --git a/addon/mixins/routes/dirty-record-handler.js b/addon/mixins/routes/dirty-record-handler.js
new file mode 100644
index 0000000..d401116
--- /dev/null
+++ b/addon/mixins/routes/dirty-record-handler.js
@@ -0,0 +1,37 @@
+/**
+Undo changes in the store made to an existing but not-saved
+model. This should be mixed into 'edit' routes like
+`CampaignEditRoute` and `BusinessEditRoute`. All non-persisted
+changes to the model are undone.
+
+@class DireyRecordHandler
+@submodule mixins
+*/
+
+import Ember from 'ember';
+import defaultFor from 'ember-easy-form-extensions/utils/default-for';
+
+export default Ember.Mixin.create({
+
+  /**
+  If the model `isDirty` (i.e. some data has been temporarily
+  changed) rollback the record to the most recent clean version
+  in the store. If there is no clean version in the store,
+  delete the record.
+
+  @method rollbackifDirty
+  */
+
+  rollbackIfDirty: Ember.on('willTransition', function(model) {
+    model = defaultFor(model, this.get('controller.model'));
+
+    if (model.get('isDirty')) {
+      if (model.get('id')) {
+        model.rollback();
+      } else {
+        model.deleteRecord();
+      }
+    }
+  }),
+
+});
diff --git a/addon/mixins/routes/rollback.js b/addon/mixins/routes/rollback.js
deleted file mode 100644
index 7d1f050..0000000
--- a/addon/mixins/routes/rollback.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Mixin.create({
-
-  rollback: Ember.on('willTransition', function() {
-    var model = this.get('controller.content');
-
-    if (model.get('isDirty')) {
-      model.rollback();
-    }
-  }),
-
-});
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-wrapper.hbs
index 1ede6c4..38cc9a9 100644
--- a/addon/templates/components/input-wrapper.hbs
+++ b/addon/templates/components/input-wrapper.hbs
@@ -1,5 +1,3 @@
-.{{isNewlyValid}}.
-
 {{#if label}}
   {{label-field
     for=inputId
diff --git a/bower.json b/bower.json
index e1a7ec3..425d5db 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,7 @@
     "ember-resolver": "~0.1.15",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1"
+    "qunit": "~1.17.1",
+    "ember-cli-moment-shim": "~0.1.0"
   }
-}
\ No newline at end of file
+}
diff --git a/index.js b/index.js
index d5dcd1b..88ae01a 100644
--- a/index.js
+++ b/index.js
@@ -2,5 +2,5 @@
 'use strict';
 
 module.exports = {
-  name: 'ember-easy-form-extensions',
+  name: 'ember-easy-form-extensions'
 };
diff --git a/package.json b/package.json
index 6621836..18f6ce6 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.3",
+    "ember-cli": "0.2.5",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
@@ -38,6 +38,7 @@
     "ember-data": "1.0.0-beta.16.1",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
+    "ember-moment": "1.1.1",
     "ember-try": "0.0.4"
   },
   "keywords": [
diff --git a/tests/.jshintrc b/tests/.jshintrc
index ea8b88f..a197e1a 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -21,7 +21,8 @@
     "andThen",
     "currentURL",
     "currentPath",
-    "currentRouteName"
+    "currentRouteName",
+    "moment"
   ],
   "node": false,
   "browser": false,
diff --git a/tests/dummy/app/resources/post/edit/route.js b/tests/dummy/app/resources/post/edit/route.js
index da12612..d282361 100644
--- a/tests/dummy/app/resources/post/edit/route.js
+++ b/tests/dummy/app/resources/post/edit/route.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
-import Rollback from 'ember-easy-form-extensions/mixins/routes/rollback';
+import DirtyRecordHandler from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
 
 export default Ember.Route.extend(
-  Rollback, {
+  DirtyRecordHandler, {
 
   model: function() {
     return this.modelFor('post');
diff --git a/tests/dummy/app/resources/post/index/route.js b/tests/dummy/app/resources/post/index/route.js
index b5e667e..fde77e4 100644
--- a/tests/dummy/app/resources/post/index/route.js
+++ b/tests/dummy/app/resources/post/index/route.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 export default Ember.Route.extend({
 
   model: function(params) {
-    return this.store.find('post', params.id);
+    return this.modelFor('post');
   }
 
 });
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
index bb47fe7..549a0d5 100644
--- a/tests/dummy/app/resources/post/model.js
+++ b/tests/dummy/app/resources/post/model.js
@@ -4,20 +4,32 @@ import Ember from 'ember';
 var attr = DS.attr;
 
 var PostModel = DS.Model.extend({
-  title: attr('string'),
-  description: attr('string'),
   category: attr('string'),
+  description: attr('string'),
+  published: attr('boolean'),
+  title: attr('string'),
   views: attr('number'),
-  published: attr('boolean')
+  writtenOn: attr('date'),
 });
 
 PostModel.reopenClass({
   FIXTURES: [
     {
       id: 1,
-      title: 'How to Ember',
+      category: 'ember',
       description: 'This is an introduction on how to Ember. Wow.',
-      category: 'ember'
+      published: true,
+      title: 'How to Ember',
+      views: 100,
+      writtenOn: moment().subtract(2, 'days')
+    }, {
+      id: 2,
+      category: 'rails',
+      description: 'This is an introduction on how to Rails. Wow.',
+      published: false,
+      title: 'How to Rails',
+      views: 0,
+      writtenOn: moment().subtract(7, 'days')
     }
   ]
 });
diff --git a/tests/dummy/app/resources/posts/new/route.js b/tests/dummy/app/resources/posts/new/route.js
index 9f1f5da..66762d7 100644
--- a/tests/dummy/app/resources/posts/new/route.js
+++ b/tests/dummy/app/resources/posts/new/route.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
-import DeleteRecord from 'ember-easy-form-extensions/mixins/routes/delete-record';
+import DirtyRecordHandler from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
 
 export default Ember.Route.extend(
-  DeleteRecord, {
+  DirtyRecordHandler, {
 
   model: function() {
     return this.store.createRecord('post');
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 920b83e..c3ead57 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,21 +1,36 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    {{input-wrapper value=model.title placeholder='Title'}}
-    {{input-wrapper value=model.description type='textarea'}}
+    
+    {{input-wrapper
+      value=model.title
+    }}
+
+    {{input-wrapper
+      value=model.description
+      type='textarea'
+    }}
+
     {{input-wrapper
       value=model.category
       content=categories
-      type='select'
     }}
+
     {{input-wrapper
-      type='number'
       value=model.views
+      type='number'
     }}
+
     {{input-wrapper
-      type='checkbox'
       value=model.published
+      type='checkbox'
+    }}
+
+    {{input-wrapper
+      value=model.writtenOn
+      type='date'
     }}
+
   {{/form-controls}}
 
   {{form-submission}}
@@ -24,13 +39,19 @@
 
 <dl>
   <dt>Title</dt>
-  <dd>{{model.title}}</dd>
+  <dd data-test="title">{{model.title}}</dd>
   <dt>Description</dt>
-  <dd>{{model.description}}</dd>
+  <dd data-test="description">{{model.description}}</dd>
+  <dt>Category</dt>
+  <dd data-test="category">{{model.category}}</dd>
+  <dt>Views</dt>
+  <dd data-test="views">{{model.views}}</dd>
+  <dt>Published</dt>
+  <dd data-test="published">{{model.published}}</dd>
+  <dt>Written On</dt>
+  <dd data-test="written-on">{{model.writtenOn}}</dd>
 </dl>
 
-{{errors.model.title.firstObject}}
-
 {{#if editing}}
   {{destroy-submission}}
 {{/if}}

From 26f49f1fb7a1c4d8562d048bcdeb9f8a1c3f0ddb Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 18 May 2015 23:33:20 -0400
Subject: [PATCH 17/73] Documentation added and input wrapper renamed

---
 README.md                                     | 164 ++++++++++++++----
 addon/components/form-wrapper.js              |   1 -
 .../{input-wrapper.js => input-group.js}      |  14 +-
 addon/initializers/easy-form-extensions.js    |  32 ++++
 addon/mixins/routes/dirty-record-handler.js   |   2 +
 addon/services/easy-form.js                   |   2 +-
 .../{input-wrapper.hbs => input-group.hbs}    |   0
 app/acceptance-tests/form-layout.js           |   1 +
 app/templates/form-inputs/checkbox.hbs        |   5 +-
 app/templates/form-inputs/default.hbs         |  27 +++
 app/templates/form-inputs/select.hbs          |   4 +
 app/templates/form-inputs/textarea.hbs        |  16 +-
 tests/acceptance/form-layout-test.js          |  23 +++
 .../app/resources/posts/new/template.hbs      |  12 +-
 14 files changed, 256 insertions(+), 47 deletions(-)
 rename addon/components/{input-wrapper.js => input-group.js} (90%)
 rename addon/templates/components/{input-wrapper.hbs => input-group.hbs} (100%)
 create mode 100644 app/acceptance-tests/form-layout.js
 create mode 100644 tests/acceptance/form-layout-test.js

diff --git a/README.md b/README.md
index e7ab1ff..78a0080 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,12 @@ This addon extends Ember EasyForm into the view and controller layers of your Em
 
 **This is also the easiest known way to use Easy Form with Ember 1.10 and HTMLBars.**
 
+## Ember 1.11 Users
+
+Usage with Ember 1.11 and above is compatible with the 1.0.0.beta prerelease - see [here](https://github.com/sir-dunxalot/ember-easy-form-extensions/tree/ember-1.11).
+
+The `ember-1.11` branch is an evolved easy form API. It is very early stage and the API has detached form the original easy form syntax. You will need to update your templates accordingly.
+
 ## Installation
 
 Uninstall any references to `ember-easy-form` and `ember-validations`. Then:
@@ -23,8 +29,8 @@ The below code works out of the box but is also very customizable and extendible
 
 {{#form-wrapper}}
   {{#form-controls legend='Write a new post'}}
-    {{input title}}
-    {{input description as='text'}}
+    {{input value=model.title}}
+    {{input value=model.description type='textarea'}}
   {{/form-controls}}
 
   {{form-submission}}
@@ -54,7 +60,7 @@ export default Ember.ObjectController.extend(
 
   // Validations run out of the box
   validations: {
-    title: {
+    'model.title': {
       presence: true
     }
   }
@@ -251,18 +257,23 @@ export default Ember.ObjectController.extend(
 
 The `saveButtonText` could then be used in your [`{{form-submission}}` component](#form-submission).
 
-### Rollback (for routes)
+### Dirty Record Handler (for routes)
+
+The diry record handler mixin is intended for use in routes. This mixin will check to see if the model is dirty and will do one of two things:
 
-The rollback mixin is intended for use in routes where you are **editing** a model. This mixin will check to see if the model is dirty and will automatically rollback it's changes if it is. The most common reason for this to happen is the user navigates to the edit route of a resource and then clicks cancel.
+- If there is a clean version of the model in the store it will rollback to it (i.e. if the user if editing a resource)
+- If there is no clean version in the store it will delete the record (i.e. if the user is creating a new resource)
+
+The most common reason for this to happen is the user navigates to the edit or new route of a resource and then clicks cancel.
 
 ```js
 // app-name/routes/post/edit.js
 
 import Ember from 'ember';
-import Rollback from 'ember-easy-form-extensions/mixins/routes/rollback';
+import DirtyRecordHandler from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
 
 export default Ember.Route.extend(
-  Rollback, {
+  DirtyRecordHandler, {
 
   model: function(params) {
     return this.modelFor('post');
@@ -271,39 +282,34 @@ export default Ember.Route.extend(
 });
 ```
 
-### Delete Record (for routes)
+## Components
 
-The delete record is intended for use in routes where you are creating a **new** record. This mixin will check to see if the model is dirty and will automatically rollback it's changes if it is. The most common reason for this to happen is the user navigates to the new route of a resource and then clicks cancel.
+To extend the class of any components to overwrite or add functionality, just import them from this addon and then export them in your app. For example:
 
 ```js
-// app-name/routes/posts/new.js
-
-import Ember from 'ember';
-import DeleteRecord from 'ember-easy-form-extensions/mixins/routes/delete-record';
-
-export default Ember.Route.extend(
-  DeleteRecord, {
+// app-name/components/form-submissison.js
 
-  model: function() {
-    return this.store.createRecord('post');
-  }
+import FormSubmissionComponent from 'ember-easy-form-extensions/components/form-submission';
 
+export default FormSubmissionComponent.extend({
+  // Your functionality here
 });
 ```
 
-## Components
-
-To extend the class of any components just import them from this addon and then export them in your app. For example:
+To overwrite the default class names of any components, overwrite the options in the easy-form service:
 
 ```js
-// app-name/components/form-submissison.js
+// app/sevices/easy-form.js
 
-import FormSubmissionComponent from 'ember-easy-form-extensions/components/form-submission';
+import EasyFormService from 'ember-easy-form-extensions/services/easy-form';
 
-export default FormSubmissionComponent.extend({
-  // Your functionality here
-  className: ['buttons-group']
-  classNames: ['form_submission']
+export default EasyFormService.extend({
+  errorClass: 'error',
+  hintClass: 'hint',
+  inputClass: 'input',
+  inputGroupClass: 'input-wrapper',
+  formWrapperClass: 'form',
+  formControlsClass: 'controls',
 });
 ```
 
@@ -321,24 +327,24 @@ The `{{#form-wrapper}}` component wraps your code in a `<form class="form">` tag
 {{/form-wrapper}}
 ```
 
-You can use custom the base classname by passing a `className` attribute:
+You can use HTML5 validations by setting the `novalidate` attribute to false:
 
 ```hbs
 {{!--app-name/templates/posts/new.hbs--}}
 
-{{#form-wrapper className='form-static'}}
+{{#form-wrapper novalidate=false}}
   {{!--Your inputs here--}}
 
   {{form-submission}}
-{{/form-wrapper}}
+{{/form-wrappexr}}
 ```
 
-Otherwise, this component work just like any other Ember component.
-
 ### Form Controls
 
 The `{{#form-controls}}` component adds more sementicism to your templates. Use it **inside** your `{{#form-wrapper}}`:
 
+This will render a `<fieldset>` element, which groups related inputs together.
+
 ```hbs
 {{!--app-name/templates/posts/new.hbs--}}
 
@@ -351,10 +357,96 @@ The `{{#form-controls}}` component adds more sementicism to your templates. Use
 {{/form-wrapper}}
 ```
 
-Note two important things:
-- `{{form-submission}}` goes **outside** the `{{#form-controls}}`
-- `{{#form-controls}}` requires a `legend` attribute for accessibility
+`{{#form-controls}}` expects a `legend` attribute for accessibility.
+
+You can also pass a `model` attribute to the controls. By default, this `{{form-controls}}` component will assume the model is at the path `model`. However, if this fieldset is for a nested model you might prefer passing that. It will resolve your input labels correctly:
+
+```hbs
+{{!--app-name/templates/posts/new.hbs--}}
+
+{{#form-wrapper}}
+  {{#form-controls legend='Write a new post' model=model.post}}
+    {{!--Your inputs here--}}
+  {{/form-controls}}
+
+  {{form-submission}}
+{{/form-wrapper}}
+```
+
+### Input Group
+
+The heart of your form functionality is provided by the `{{input-group}}` component. This replaces Easy Form's overriding of Ember's `{{input}}` helper.
+
+Simply pass a value and optional type to render a label, input, and error (when present):
+
+```hbs
+{{input-group value=model.title}}
+{{!--Renders as...--}}
+<span class="label" for="ember234-input">Title</span>
+<input id="ember234-input">
+```
+
+#### Textareas
+
+```hbs
+{{input-group
+  value=model.description
+  type='textarea'
+}}
+```
+
+#### Selects
+
+When you pass a `content` attribute the input will automatically use a `<select>`.
+
+You can bind the `value` or `selection` for string and objects, respectively.
+
+```hbs
+{{input-group
+  content=categoryOptions
+  value=model.category {{!--Or selection--}}
+}}
+```
+
+#### Checkboxes
+
+```hbs
+{{input-group
+  value=model.published {{!--Boolean value--}}
+  type='checkbox'
+}}
+```
+
+#### Custom inputs
+
+It's very easy to add custom input types.
+
+1. Add a partial matching the format of [the default input](https://github.com/sir-dunxalot/ember-easy-form-extensions/blob/ember-1.11/app/templates/form-inputs/default.hbs) and overwrite the type-to-partial option object of the Easy Form service:
+
+```js
+// app/sevices/easy-form.js
+
+import EasyFormService from 'ember-easy-form-extensions/services/easy-form';
+
+export default EasyFormService.extend({
+  inputTypePartials: {
+    checkbox: 'form-inputs/checkbox',
+    select: 'form-inputs/select',
+    textarea: 'form-inputs/textarea',
+    date: 'form-inputs/pikaday' // Added template name
+  }
+});
+```
+
+You can extend the `{{input-wrapper}}` component to add any options you need. The input partial will have the context of the input wrapper component.
+
+#### Input styling
+
+The `{{input-wrapper}}` component has several dynamic classes, depending on the state of the input (e.g. invalid):
 
+- When `isValid` is true, the class will be affixed with `-valid`.
+- When `isInvalid` is true, the class will be affixed with `-error`.
+- When `isInvalid` *was* true and `isValid` turned true within 3000ms, the class will be affixed with `-newly-valid`. This allows you to show after-valid styling before returning to the inputs normal state.
 
 ### Form Submission
 
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 22f3835..e25ebd6 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -4,7 +4,6 @@ import layout from '../templates/components/form-wrapper';
 export default Ember.Component.extend({
   attributeBindings: ['novalidate'],
   classNameBindings: ['easyForm.formWrapperClass'],
-  className: 'form',
   layout: layout,
   novalidate: true,
   tagName: 'form',
diff --git a/addon/components/input-wrapper.js b/addon/components/input-group.js
similarity index 90%
rename from addon/components/input-wrapper.js
rename to addon/components/input-group.js
index 8b3aecb..1292b0f 100644
--- a/addon/components/input-wrapper.js
+++ b/addon/components/input-group.js
@@ -10,7 +10,9 @@ var run = Ember.run;
 export default Ember.Component.extend(
   WalkViews, {
 
+  hint: null,
   isInputWrapper: true, // Static
+  isInvalid: Ember.computed.not('isValid'),
   isNewlyValid: false,
   isValid: true,
   layout: layout,
@@ -18,8 +20,12 @@ export default Ember.Component.extend(
   property:  Ember.computed.oneWay('valueBinding._label'),
   shouldShowError: false,
 
+  attributeBindings: [
+    'dataTest:data-test'
+  ],
+
   classNameBindings: [
-    'easyForm.inputWrapperClass',
+    'easyForm.inputGroupClass',
     'validityClass'
   ],
 
@@ -43,6 +49,12 @@ export default Ember.Component.extend(
     }
   ),
 
+  dataTest: Ember.computed('cleanProperty', function() {
+    var cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
+
+    return 'input-wrapper-for-' + cleanProperty;
+  }),
+
   inputId: Ember.computed(function() {
     return this.get('elementId') + '-input';
   }),
diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index 90a3107..d4d4b23 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -1,6 +1,38 @@
 import Ember from 'ember';
 
 export function initialize(container, app) {
+
+  Ember.Checkbox.reopen({
+    attributeBindings: [
+      'checked:aria-checked',
+      'dataTest:data-test'
+    ],
+  });
+
+  Ember.TextArea.reopen({
+    attributeBindings: [
+      'dataTest:data-test',
+      'invalid:aria-invalid',
+      'required:aria-required',
+    ],
+  });
+
+  Ember.TextField.reopen({
+    attributeBindings: [
+      'dataTest:data-test',
+      'invalid:aria-invalid',
+      'required:aria-required',
+    ],
+  });
+
+  Ember.Select.reopen({
+    attributeBindings: [
+      'dataTest:data-test',
+      'invalid:aria-invalid',
+      'required:aria-required',
+    ],
+  });
+
   app.inject('component', 'easyForm', 'service:easy-form');
 }
 
diff --git a/addon/mixins/routes/dirty-record-handler.js b/addon/mixins/routes/dirty-record-handler.js
index d401116..30e17ab 100644
--- a/addon/mixins/routes/dirty-record-handler.js
+++ b/addon/mixins/routes/dirty-record-handler.js
@@ -19,6 +19,8 @@ export default Ember.Mixin.create({
   in the store. If there is no clean version in the store,
   delete the record.
 
+  TODO - add ability to stop transition and ask for transition confirm
+
   @method rollbackifDirty
   */
 
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
index bd3c3bf..96716a3 100644
--- a/addon/services/easy-form.js
+++ b/addon/services/easy-form.js
@@ -4,7 +4,7 @@ export default Ember.Service.extend({
   errorClass: 'error',
   hintClass: 'hint',
   inputClass: 'input',
-  inputWrapperClass: 'input-wrapper',
+  inputGroupClass: 'input-wrapper',
   formWrapperClass: 'form',
   formControlsClass: 'controls',
 
diff --git a/addon/templates/components/input-wrapper.hbs b/addon/templates/components/input-group.hbs
similarity index 100%
rename from addon/templates/components/input-wrapper.hbs
rename to addon/templates/components/input-group.hbs
diff --git a/app/acceptance-tests/form-layout.js b/app/acceptance-tests/form-layout.js
new file mode 100644
index 0000000..4803e90
--- /dev/null
+++ b/app/acceptance-tests/form-layout.js
@@ -0,0 +1 @@
+export { default } from 'ember-easy-form-extensions/acceptance-tests/form-layout';
\ No newline at end of file
diff --git a/app/templates/form-inputs/checkbox.hbs b/app/templates/form-inputs/checkbox.hbs
index 9ffe55c..1789acc 100644
--- a/app/templates/form-inputs/checkbox.hbs
+++ b/app/templates/form-inputs/checkbox.hbs
@@ -4,5 +4,8 @@
   name=name
   type=type
   checked=value
-  focus-out='showError'
+  disabled=disabled
+  tabindex=tabindex
+  indeterminate=indeterminate
+  form=form
 }}
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index a59dfb8..7026574 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -5,4 +5,31 @@
   type=type
   value=value
   focus-out='showError'
+  readonly=readonly
+  requir=required
+  autofocus=autofocus
+  disabled=disabled
+  size=size
+  tabindex=tabindex
+  maxlegth=maxlength
+  min=min
+  max=max
+  pattern=patterm
+  accept=accept
+  autocomplete=autocomplete
+  autosave=autosave
+  formaction=formaction
+  formenctype=formenctype
+  formmethod=formmethod
+  formnovalidate=formnovalidate
+  formtarget=formtarget
+  height=height
+  inputmode=inputmode
+  multiple=multiple
+  step=step
+  width=width
+  form=form
+  selectionDirection=selectionDirection
+  spellcheck=spellcheck
+  invalid=isInvalid
 }}
diff --git a/app/templates/form-inputs/select.hbs b/app/templates/form-inputs/select.hbs
index 912b332..601abaf 100644
--- a/app/templates/form-inputs/select.hbs
+++ b/app/templates/form-inputs/select.hbs
@@ -4,4 +4,8 @@
   name=name
   value=value
   selection=selection
+  prompt=prompt
+  disabled=disabled
+  required=required
+  invalid=isInvalid
 }}
diff --git a/app/templates/form-inputs/textarea.hbs b/app/templates/form-inputs/textarea.hbs
index b66ff6f..000dfb0 100644
--- a/app/templates/form-inputs/textarea.hbs
+++ b/app/templates/form-inputs/textarea.hbs
@@ -4,5 +4,19 @@
   name=name
   type=type
   value=value
-  focus-out='showError'
+  rows=rows
+  cols=cols
+  disabled=disabled
+  maxlength=maxLength
+  tabindex=tabIndex
+  selectionEnd=selectionEnd
+  selectionStart=selectionStart
+  selectionDirection=selectionDirection
+  wrap=wrap
+  readonly=readonly
+  autofocus=autofocus
+  form=form
+  spellcheck=spellcheck
+  required=required
+  invalid=isInvalid
 }}
diff --git a/tests/acceptance/form-layout-test.js b/tests/acceptance/form-layout-test.js
new file mode 100644
index 0000000..09193f3
--- /dev/null
+++ b/tests/acceptance/form-layout-test.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from 'ember-easy-form-extensions/tests/helpers/start-app';
+
+var application;
+
+module('Acceptance | form layout', {
+  beforeEach: function() {
+    application = startApp();
+  },
+
+  afterEach: function() {
+    Ember.run(application, 'destroy');
+  }
+});
+
+test('visiting /form-layout', function(assert) {
+  visit('/form-layout');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/form-layout');
+  });
+});
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index c3ead57..c7f1a47 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -2,31 +2,31 @@
 
   {{#form-controls legend='Write a new post'}}
     
-    {{input-wrapper
+    {{input-group
       value=model.title
     }}
 
-    {{input-wrapper
+    {{input-group
       value=model.description
       type='textarea'
     }}
 
-    {{input-wrapper
+    {{input-group
       value=model.category
       content=categories
     }}
 
-    {{input-wrapper
+    {{input-group
       value=model.views
       type='number'
     }}
 
-    {{input-wrapper
+    {{input-group
       value=model.published
       type='checkbox'
     }}
 
-    {{input-wrapper
+    {{input-group
       value=model.writtenOn
       type='date'
     }}

From 321e0018e72335fd17f42ba6575566d88cf6bf73 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 18 May 2015 23:39:14 -0400
Subject: [PATCH 18/73] version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 18f6ce6..d2e7174 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-easy-form-extensions",
-  "version": "0.2.10",
+  "version": "1.0.0.beta",
   "description": "Extends Ember EasyForm into the view and controller layers of your Ember CLI app to provide easy event and action handling using mixins and components.",
   "directories": {
     "doc": "doc",

From 66d9b1741e9c98594abddc19301c1f8c3f3454a4 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 18 May 2015 23:42:46 -0400
Subject: [PATCH 19/73] Block explanaiton added

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index 78a0080..b7fa14a 100644
--- a/README.md
+++ b/README.md
@@ -440,6 +440,16 @@ export default EasyFormService.extend({
 
 You can extend the `{{input-wrapper}}` component to add any options you need. The input partial will have the context of the input wrapper component.
 
+You can also use inputs in block form instead:
+
+```hbs
+{{#input-group value=model.dateCreated}}
+  {{input value=model.dateCreated type='date'}}
+{{/input-group}}
+```
+
+This will render labels, errors, and hints correctly.
+
 #### Input styling
 
 The `{{input-wrapper}}` component has several dynamic classes, depending on the state of the input (e.g. invalid):

From 68862fb788fafacc1f4c77d2619ee3a4b6ef84f5 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 14:50:39 +0100
Subject: [PATCH 20/73] Dependencies updated to latest Ember, Ember CLI, and
 Ember Data

---
 .editorconfig                      |  1 +
 .ember-cli                         |  3 +--
 .npmignore                         |  1 +
 .travis.yml                        | 16 +++++++++++-
 .watchmanconfig                    |  3 +++
 Brocfile.js                        | 25 ++++++------------
 bower.json                         | 16 ++++++------
 config/ember-try.js                | 35 +++++++++++++++++++++++++
 package.json                       | 41 +++++++++++++++---------------
 testem.json                        |  1 +
 tests/dummy/app/app.js             |  4 ++-
 tests/dummy/public/crossdomain.xml | 18 ++++++-------
 tests/dummy/public/robots.txt      |  1 +
 13 files changed, 106 insertions(+), 59 deletions(-)
 create mode 100644 .watchmanconfig
 create mode 100644 config/ember-try.js

diff --git a/.editorconfig b/.editorconfig
index 2fe4874..47c5438 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
diff --git a/.ember-cli b/.ember-cli
index 26cfcf3..ee64cfe 100644
--- a/.ember-cli
+++ b/.ember-cli
@@ -5,6 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false,
-  "liveReload": false /* Set to false for non web-socket browser debugging */
+  "disableAnalytics": false
 }
diff --git a/.npmignore b/.npmignore
index a28e4ab..49996f5 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,7 @@
 bower_components/
 tests/
 tmp/
+dist/
 
 .bowerrc
 .editorconfig
diff --git a/.travis.yml b/.travis.yml
index cf23938..8197d31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
@@ -7,7 +9,19 @@ cache:
   directories:
     - node_modules
 
+env:
+  - 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-canary
+
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
@@ -17,4 +31,4 @@ install:
   - bower install
 
 script:
-  - npm test
+  - ember try $EMBER_TRY_SCENARIO test
diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 0000000..5e9462c
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/Brocfile.js b/Brocfile.js
index fdce144..2a682c0 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -3,23 +3,14 @@
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-var app = new EmberAddon({
-  vendorFiles: {
-      'handlebars.js': null
-  }
-});
+/*
+  This Brocfile specifes the options for the dummy test app of this
+  addon, located in `/tests/dummy`
 
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
+  This Brocfile does *not* influence how the addon or the app using it
+  behave. You most likely want to be modifying `./index.js` or app's Brocfile
+*/
+
+var app = new EmberAddon();
 
 module.exports = app.toTree();
diff --git a/bower.json b/bower.json
index b26ae82..5def7c0 100644
--- a/bower.json
+++ b/bower.json
@@ -1,16 +1,16 @@
 {
   "name": "ember-easy-form-extensions",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-data": "1.0.0-beta.15",
-    "ember-resolver": "~0.1.12",
-    "loader.js": "ember-cli/loader.js#3.2.0",
+    "ember": "1.13.2",
     "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.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-data": "1.13.4",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.3",
     "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   }
-}
\ No newline at end of file
+}
diff --git a/config/ember-try.js b/config/ember-try.js
new file mode 100644
index 0000000..83dab0f
--- /dev/null
+++ b/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'
+      }
+    }
+  ]
+};
diff --git a/package.json b/package.json
index a1e1d5f..2c35594 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-easy-form-extensions",
-  "version": "0.2.11",
+  "version": "0.3.0",
   "description": "Extends Ember EasyForm into the view and controller layers of your Ember CLI app to provide easy event and action handling using mixins and components.",
   "directories": {
     "doc": "doc",
@@ -9,34 +9,30 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "ember test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/sir-dunxalot/ember-easy-form-extensions.git"
+    "test": "ember try:testall"
   },
+  "repository": "https://://github.com/sir-dunxalot/ember-easy-form-extensions",
   "engines": {
     "node": ">= 0.10.0"
   },
-  "author": "Duncan Walker <walkerdu@bc.edu>",
+  "author": "",
   "license": "MIT",
-  "dependencies": {
-    "ember-validations": "2.0.0-alpha.3"
-  },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.2.0",
-    "ember-cli-app-version": "0.3.2",
-    "ember-cli-babel": "^4.0.0",
-    "ember-cli-content-security-policy": "0.3.0",
-    "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.4",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli": "0.2.7",
+    "ember-cli-app-version": "0.3.3",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-dependency-checker": "^1.0.0",
+    "ember-cli-htmlbars": "0.7.6",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.9",
-    "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.15",
-    "ember-export-application-global": "^1.0.2"
+    "ember-cli-qunit": "0.3.13",
+    "ember-cli-uglify": "^1.0.1",
+    "ember-data": "1.13.4",
+    "ember-disable-proxy-controllers": "^1.0.0",
+    "ember-export-application-global": "^1.0.2",
+    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-try": "0.0.6"
   },
   "keywords": [
     "ember-addon",
@@ -52,6 +48,9 @@
     "control",
     "controls"
   ],
+  "dependencies": {
+    "ember-cli-babel": "^5.0.0"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
diff --git a/testem.json b/testem.json
index 42a4ddb..0f35392 100644
--- a/testem.json
+++ b/testem.json
@@ -1,6 +1,7 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],
diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
index 757df38..8d66b95 100644
--- a/tests/dummy/app/app.js
+++ b/tests/dummy/app/app.js
@@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+var App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
diff --git a/tests/dummy/public/crossdomain.xml b/tests/dummy/public/crossdomain.xml
index 29a035d..0c16a7a 100644
--- a/tests/dummy/public/crossdomain.xml
+++ b/tests/dummy/public/crossdomain.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>
diff --git a/tests/dummy/public/robots.txt b/tests/dummy/public/robots.txt
index 5debfa4..f591645 100644
--- a/tests/dummy/public/robots.txt
+++ b/tests/dummy/public/robots.txt
@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow:

From 0e360a96f6072b3f86c58d80c3c488af8ca99671 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 15:12:46 +0100
Subject: [PATCH 21/73] Syntax update

---
 addon/components/destroy-submission.js      |  8 +--
 addon/components/error-field.js             | 30 +++++------
 addon/components/form-controls.js           |  2 +-
 addon/components/form-submission.js         |  6 ++-
 addon/components/input-group.js             | 55 +++++++++++----------
 addon/helpers/capitalize-string.js          |  2 +-
 addon/mixins/controllers/saving.js          | 41 +++++++--------
 addon/mixins/routes/dirty-record-handler.js |  4 +-
 addon/mixins/views/submitting.js            | 16 +++---
 addon/mixins/views/walk-views.js            |  9 ++--
 addon/utils/computed/insert.js              |  7 +--
 addon/utils/to-words.js                     |  4 +-
 app/acceptance-tests/form-layout.js         |  1 -
 app/components/destroy-submission.js        |  4 +-
 app/components/error-field.js               |  4 +-
 app/components/form-controls.js             |  4 +-
 app/components/form-submission.js           |  4 +-
 app/components/form-wrapper.js              |  4 +-
 app/components/hint-field.js                |  4 +-
 app/components/input-field.js               |  4 +-
 app/components/input-wrapper.js             |  4 +-
 app/components/label-field.js               |  4 +-
 app/components/loading-spinner.js           |  4 +-
 app/components/test-comp.js                 |  4 +-
 app/helpers/capitalize-string.js            |  4 +-
 app/initializers/easy-form-extensions.js    |  4 +-
 app/initializers/routing-events.js          |  4 +-
 app/services/easy-form.js                   |  4 +-
 28 files changed, 111 insertions(+), 134 deletions(-)
 delete mode 100644 app/acceptance-tests/form-layout.js

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index 6e7b516..d46fdfa 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -1,18 +1,20 @@
 import Ember from 'ember';
-import layout from '../templates/components/destroy-submission';
 import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
+import layout from '../templates/components/destroy-submission';
+
+const { computed } = Ember;
 
 export default Ember.Component.extend(
   WalkViews, {
 
   classNames: ['buttons'],
   destroyText: 'Delete',
-  formSubmitted: Ember.computed.readOnly('formView.formSubmitted'),
+  formSubmitted: computed.readOnly('formView.formSubmitted'),
   iconClass: 'icon-delete',
   layout: layout,
 
   actions: {
-    destroy: function() {
+    destroy() {
       this.get('formView').send('destroy');
     }
   },
diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 22b5ce8..51c07db 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -1,8 +1,10 @@
-import defaultFor from '../utils/default-for';
 import Ember from 'ember';
+import WalkViews from '../mixins/views/walk-views';
+import defaultFor from '../utils/default-for';
 import layout from '../templates/components/error-field';
 import toWords from '../utils/to-words';
-import WalkViews from '../mixins/views/walk-views';
+
+const { computed } = Ember;
 
 export default Ember.Component.extend(
   WalkViews, {
@@ -10,19 +12,17 @@ export default Ember.Component.extend(
   shouldShowError: true,
   classNameBindings: ['easyForm.errorClass', 'errorIsVisible:visible'],
   error: null,
-  label: Ember.computed.oneWay('property'),
+  label: computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
 
-  errorIsVisible: Ember.computed('shouldShowError', 'error',
-    function() {
-      return this.get('shouldShowError') && !!this.get('error');
-    }
-  ),
+  errorIsVisible: computed('shouldShowError', 'error', function() {
+    return this.get('shouldShowError') && !!this.get('error');
+  }),
 
-  text: Ember.computed('errors.[]', 'value', function() {
-    var propertyName = defaultFor(
+  text: computed('errors.[]', 'value', function() {
+    const propertyName = defaultFor(
       this.get('property'),
       this.get('parentView.property')
     );
@@ -31,19 +31,19 @@ export default Ember.Component.extend(
   }),
 
   addErrorObserver: Ember.on('init', function() {
-    var property = this.get('property');
-    var controller, errorPath, setError;
+    const property = this.get('property');
 
     if (property) {
-      controller = this.get('formView.controller');
-      errorPath = 'errors.' + property + '.firstObject';
+      const controller = this.get('formView.controller');
+      const errorPath = `errors.${property}.firstObject`;
 
-      setError = function() {
+      function setError() {
         var error = controller.get(errorPath);
         var parentView = this.get('parentView');
         var isValid = !error && parentView.get('isInputWrapper');
 
         parentView.set('isValid', isValid);
+
         this.set('error', controller.get(errorPath));
       };
 
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 5edd647..063a1df 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -16,7 +16,7 @@ export default Ember.Component.extend(
   checkForLegend: softAssert('legend'),
 
   modelPath: Ember.computed('modelBinding._label', function() {
-    var modelPath = this.get('modelBinding._label');
+    const modelPath = this.get('modelBinding._label');
 
     return defaultFor(modelPath, 'model') + '.';
   }),
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 06d1249..f52aa6a 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -2,13 +2,15 @@ import Ember from 'ember';
 import layout from '../templates/components/form-submission';
 import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
 
+const { computed, observer } = Ember;
+
 export default Ember.Component.extend(
   WalkViews, {
 
   cancel: true,
   cancelText: 'Cancel',
   classNames: ['buttons', 'submission'],
-  formSubmitted: Ember.computed.readOnly('formView.formSubmitted'),
+  formSubmitted: computed.readOnly('formView.formSubmitted'),
   layout: layout,
   submit: true,
   submitText: 'Save',
@@ -19,7 +21,7 @@ export default Ember.Component.extend(
     }
   },
 
-  _watchForEmptyComponent: Ember.observer('cancel', 'submit',
+  _watchForEmptyComponent: observer('cancel', 'submit',
     function() {
       Ember.warn(
         'The {{form-submission}} component is not showing the submit or the cancel button.',
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 1292b0f..ad47e5c 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -4,20 +4,19 @@ import layout from '../templates/components/input-wrapper';
 import toWords from '../utils/to-words';
 import WalkViews from '../mixins/views/walk-views';
 
-var typeOf = Ember.typeOf;
-var run = Ember.run;
+const { computed, run, typeOf } = Ember;
 
 export default Ember.Component.extend(
   WalkViews, {
 
   hint: null,
   isInputWrapper: true, // Static
-  isInvalid: Ember.computed.not('isValid'),
+  isInvalid: computed.not('isValid'),
   isNewlyValid: false,
   isValid: true,
   layout: layout,
-  modelPath: Ember.computed.oneWay('parentView.modelPath'),
-  property:  Ember.computed.oneWay('valueBinding._label'),
+  modelPath: computed.oneWay('parentView.modelPath'),
+  property:  computed.oneWay('valueBinding._label'),
   shouldShowError: false,
 
   attributeBindings: [
@@ -38,43 +37,44 @@ export default Ember.Component.extend(
   selection: null,
   value: null,
   multiple: null,
-  name: Ember.computed.oneWay('property'),
+  name: computed.oneWay('property'),
   placeholder: null,
   prompt: null,
   disabled: null,
 
-  cleanProperty: Ember.computed('property', 'modelPath',
+  cleanProperty: computed('property', 'modelPath',
     function() {
       return this.get('property').replace(this.get('modelPath'), '');
     }
   ),
 
-  dataTest: Ember.computed('cleanProperty', function() {
-    var cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
+  dataTest: computed('cleanProperty', function() {
+    const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
 
-    return 'input-wrapper-for-' + cleanProperty;
+    return `input-wrapper-for-${cleanProperty}`;
   }),
 
-  inputId: Ember.computed(function() {
+  inputId: computed(function() {
     return this.get('elementId') + '-input';
   }),
 
-  inputPartial: Ember.computed('type', function() {
-    var type = this.get('type');
-    var partialName = this.get('easyForm.inputTypePartials.' + type);
+  inputPartial: computed('type', function() {
+    const type = this.get('type');
+    const partialName = this.get(`easyForm.inputTypePartials.${type}`);
 
     return defaultFor(partialName, 'form-inputs/default');
   }),
 
-  label: Ember.computed('property', function() {
-    var property = defaultFor(this.get('cleanProperty'), '');
+  label: computed('property', function() {
+    const property = defaultFor(this.get('cleanProperty'), '');
 
     return toWords(property);
   }),
 
-  type: Ember.computed(function() {
-    var property = this.get('cleanProperty');
-    var type, value;
+  type: computed(function() {
+    const property = this.get('cleanProperty');
+
+    let type;
 
     if (property.match(/password/)) {
       type = 'password';
@@ -91,7 +91,7 @@ export default Ember.Component.extend(
     } else if (this.get('content')) {
       type = 'select';
     } else {
-      value = this.get('value');
+      const value = this.get('value');
 
       if (typeOf(value) === 'number') {
         type = 'number';
@@ -105,10 +105,11 @@ export default Ember.Component.extend(
     return type;
   }),
 
-  validityClass: Ember.computed('easyForm.inputWrapperClass', 'isNewlyValid', 'isValid',
+  validityClass: computed('easyForm.inputWrapperClass', 'isNewlyValid', 'isValid',
     function() {
-      var baseClass = this.get('easyForm.inputWrapperClass');
-      var modifier;
+      const baseClass = this.get('easyForm.inputWrapperClass');
+
+      let modifier;
 
       if (this.get('isNewlyValid')) {
         modifier = 'newly-valid';
@@ -118,22 +119,22 @@ export default Ember.Component.extend(
         modifier = 'error';
       }
 
-      return baseClass + '-' + modifier;
+      return `${baseClass}-${modifier}`;
     }
   ),
 
   actions: {
-    showError: function() {
+    showError() {
       this.set('shouldShowError', true);
     },
   },
 
-  listenForNewlyValid: Ember.observer('isValid', function() {
+  listenForNewlyValid: observer('isValid', function() {
     if (this.get('isValid')) {
       this.set('isNewlyValid', true);
     }
 
-    Ember.run.later(this, function() {
+    run.later(this, function() {
       this.set('isNewlyValid', false);
     }, 3000);
   }),
diff --git a/addon/helpers/capitalize-string.js b/addon/helpers/capitalize-string.js
index aabd69b..6c8ed41 100644
--- a/addon/helpers/capitalize-string.js
+++ b/addon/helpers/capitalize-string.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export function capitalizeString(params) {
-  var string = params[0];
+  const string = params[0];
 
   return Ember.String.capitalize(string);
 }
diff --git a/addon/mixins/controllers/saving.js b/addon/mixins/controllers/saving.js
index 00c9664..d2758b3 100644
--- a/addon/mixins/controllers/saving.js
+++ b/addon/mixins/controllers/saving.js
@@ -1,13 +1,15 @@
 import Ember from 'ember';
 import EmberValidations from 'ember-validations';
 
+const { computed, on } = Ember;
+
 export default Ember.Mixin.create(
   EmberValidations.Mixin, {
 
   formSubmitted: false,
   revalidateFor: [],
 
-  forEachRevalidator: function(callback) {
+  forEachRevalidator(callback) {
     var revalidateFor = this.get('revalidateFor');
 
     if (revalidateFor.length) {
@@ -17,23 +19,22 @@ export default Ember.Mixin.create(
     }
   },
 
-  editingModel: Ember.computed(function() {
+  editingModel: computed(function() {
     return this.toString().indexOf('/edit:') > -1;
   }),
 
-  newModel: Ember.computed(function() {
+  newModel: computed(function() {
     return this.toString().indexOf('/new:') > -1;
   }),
 
-  showServerError: function(/* xhr */) {
+  showServerError(/* xhr */) {
     this.set('formSubmitted', false);
   },
 
-  validateAndSave: function() {
-    var _this = this;
-    var customValidationsPromise;
+  validateAndSave() {
+    const _this = this;
 
-    var resolve = function() {
+    function resolve() {
       Ember.assert(
         'You need to specify a save method on this controller',
         typeof _this.save === 'function'
@@ -42,14 +43,14 @@ export default Ember.Mixin.create(
       _this.save();
     };
 
-    var reject = function() {
+    function reject() {
       _this.set('formSubmitted', false);
     };
 
     /* If there is a custom validations method, resolve it */
 
     if (this.runCustomValidations) {
-      customValidationsPromise = this.runCustomValidations();
+      const customValidationsPromise = this.runCustomValidations();
 
       if (!customValidationsPromise.then) {
         Ember.assert(
@@ -72,23 +73,19 @@ export default Ember.Mixin.create(
   },
 
   // TODO - add observes revalidateFor.[]
-  _revalidate: Ember.on('routeDidTransition',
+  _revalidate: on('routeDidTransition',
     function() {
-      var _this = this;
-
-      _this.forEachRevalidator(function(property) {
-        _this.addObserver(property, _this.validate);
-      });
+      this.forEachRevalidator(function(property) {
+        this.addObserver(property, this.validate);
+      }.bind(this));
     }
   ),
 
-  _removeRevalidationObservers: Ember.on('routeWillTransition',
+  _removeRevalidationObservers: on('routeWillTransition',
     function() {
-      var _this = this;
-
-      _this.forEachRevalidator(function(property) {
-        _this.removeObserver(property, _this.validate);
-      });
+      this.forEachRevalidator(function(property) {
+        this.removeObserver(property, this.validate);
+      }.bind(this));
     }
   ),
 
diff --git a/addon/mixins/routes/dirty-record-handler.js b/addon/mixins/routes/dirty-record-handler.js
index 30e17ab..c722693 100644
--- a/addon/mixins/routes/dirty-record-handler.js
+++ b/addon/mixins/routes/dirty-record-handler.js
@@ -11,6 +11,8 @@ changes to the model are undone.
 import Ember from 'ember';
 import defaultFor from 'ember-easy-form-extensions/utils/default-for';
 
+const { on } = Ember;
+
 export default Ember.Mixin.create({
 
   /**
@@ -24,7 +26,7 @@ export default Ember.Mixin.create({
   @method rollbackifDirty
   */
 
-  rollbackIfDirty: Ember.on('willTransition', function(model) {
+  rollbackIfDirty: on('willTransition', function(model) {
     model = defaultFor(model, this.get('controller.model'));
 
     if (model.get('isDirty')) {
diff --git a/addon/mixins/views/submitting.js b/addon/mixins/views/submitting.js
index d0b7fae..07c2b03 100644
--- a/addon/mixins/views/submitting.js
+++ b/addon/mixins/views/submitting.js
@@ -1,14 +1,16 @@
 import Ember from 'ember';
 
+const { computed, on } = Ember;
+
 export default Ember.Mixin.create(
   Ember.Evented, {
 
   cancelClicked: false,
-  formSubmitted: Ember.computed.alias('controller.formSubmitted'),
+  formSubmitted: computed.alias('controller.formSubmitted'),
 
   actions: {
 
-    cancel: function() {
+    cancel() {
       this.setProperties({
         cancelClicked: true,
         formSubmitted: true
@@ -17,7 +19,7 @@ export default Ember.Mixin.create(
       this._eventHandler('cancel');
     },
 
-    destroy: function() {
+    destroy() {
       this.set('formSubmitted', true);
 
       this._eventHandler('destroy');
@@ -27,7 +29,7 @@ export default Ember.Mixin.create(
 
   /* Autofocus on the first input */
 
-  autofocus: Ember.on('didInsertElement', function() {
+  autofocus: on('didInsertElement', function() {
     var input = this.$().find('input').first();
 
     if (!Ember.$(input).hasClass('datepicker')) {
@@ -37,7 +39,7 @@ export default Ember.Mixin.create(
 
   /* Show validation errors on submit click */
 
-  submit: function(event) {
+  submit(event) {
     event.preventDefault();
     event.stopPropagation();
 
@@ -47,13 +49,13 @@ export default Ember.Mixin.create(
     this._eventHandler('submit');
   },
 
-  resetForm: Ember.on('willInsertElement', function() {
+  resetForm: on('willInsertElement', function() {
     this.set('formSubmitted', false);
   }),
 
   /* Private methods */
 
-  _eventHandler: function(type) {
+  _eventHandler(type) {
     var controller = this.get('controller');
     var methodName = type + 'Handler';
     var handler = this[methodName];
diff --git a/addon/mixins/views/walk-views.js b/addon/mixins/views/walk-views.js
index 6d18911..2a99075 100644
--- a/addon/mixins/views/walk-views.js
+++ b/addon/mixins/views/walk-views.js
@@ -1,18 +1,19 @@
 import Ember from 'ember';
 
+const { computed } = Ember;
+
 export default Ember.Mixin.create({
 
-  formView: Ember.computed(function() {
+  formView: computed(function() {
     return this.walkViews(this.get('parentView'));
   }),
 
-  walkViews: function(view) {
-    var parentView;
+  walkViews(view) {
 
     if (view.submit) {
       return view;
     } else {
-      parentView = view.get('parentView');
+      const parentView = view.get('parentView');
 
       if (parentView) {
         return this.walkViews(parentView);
diff --git a/addon/utils/computed/insert.js b/addon/utils/computed/insert.js
index 5e5012e..df9a183 100644
--- a/addon/utils/computed/insert.js
+++ b/addon/utils/computed/insert.js
@@ -1,4 +1,4 @@
-import Em from 'ember';
+import Ember from 'ember';
 
 /**
 Example usage:
@@ -20,9 +20,10 @@ App.SomeController = Em.Controller.extend({
 
 export default function(dependentKey, string) {
   return function() {
-    var inCorrectFormat = string.indexOf('{{value}}') > -1;
+    const inCorrectFormat = string.indexOf('{{value}}') > -1;
+
+    Ember.assert('You must pass a string in the format "Some stuff {{value}}" as the second argument of Utils.computed.insert', inCorrectFormat);
 
-    Em.assert('You must pass a string in the format "Some stuff {{value}}" as the second argument of Utils.computed.insert', inCorrectFormat);
     return string.replace('{{value}}', this.get(dependentKey));
   }.property(dependentKey);
 }
diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
index 2ceb5a5..04067de 100644
--- a/addon/utils/to-words.js
+++ b/addon/utils/to-words.js
@@ -1,6 +1,6 @@
 export default function(string) {
-  var underscored = Ember.String.underscore(string);
-  var spaced = underscored.split('_').join(' ');
+  const underscored = Ember.String.underscore(string);
+  const spaced = underscored.split('_').join(' ');
 
   return spaced.replace('.', ' ');
 }
diff --git a/app/acceptance-tests/form-layout.js b/app/acceptance-tests/form-layout.js
deleted file mode 100644
index 4803e90..0000000
--- a/app/acceptance-tests/form-layout.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-easy-form-extensions/acceptance-tests/form-layout';
\ No newline at end of file
diff --git a/app/components/destroy-submission.js b/app/components/destroy-submission.js
index f05485b..94e4f92 100644
--- a/app/components/destroy-submission.js
+++ b/app/components/destroy-submission.js
@@ -1,3 +1 @@
-import Component from 'ember-easy-form-extensions/components/destroy-submission';
-
-export default Component;
+export { default } from 'ember-easy-form-extensions/components/destroy-submission';
diff --git a/app/components/error-field.js b/app/components/error-field.js
index b6630d4..914bf7b 100644
--- a/app/components/error-field.js
+++ b/app/components/error-field.js
@@ -1,3 +1 @@
-import errorField from 'ember-easy-form-extensions/components/error-field';
-
-export default errorField;
+export { default } from 'ember-easy-form-extensions/components/error-field';
diff --git a/app/components/form-controls.js b/app/components/form-controls.js
index 8a00b28..249214e 100644
--- a/app/components/form-controls.js
+++ b/app/components/form-controls.js
@@ -1,3 +1 @@
-import Component from 'ember-easy-form-extensions/components/form-controls';
-
-export default Component;
+export { default } from 'ember-easy-form-extensions/components/form-controls';
diff --git a/app/components/form-submission.js b/app/components/form-submission.js
index fd457ea..50b238f 100644
--- a/app/components/form-submission.js
+++ b/app/components/form-submission.js
@@ -1,3 +1 @@
-import Component from 'ember-easy-form-extensions/components/form-submission';
-
-export default Component;
+export { default } from 'ember-easy-form-extensions/components/form-submission';
diff --git a/app/components/form-wrapper.js b/app/components/form-wrapper.js
index b635a84..4e7d460 100644
--- a/app/components/form-wrapper.js
+++ b/app/components/form-wrapper.js
@@ -1,3 +1 @@
-import Component from 'ember-easy-form-extensions/components/form-wrapper';
-
-export default Component;
+export { default } from 'ember-easy-form-extensions/components/form-wrapper';
diff --git a/app/components/hint-field.js b/app/components/hint-field.js
index d02c4ea..79d5c89 100644
--- a/app/components/hint-field.js
+++ b/app/components/hint-field.js
@@ -1,3 +1 @@
-import hintField from 'ember-easy-form-extensions/components/hint-field';
-
-export default hintField;
+export { default } from 'ember-easy-form-extensions/components/hint-field';
diff --git a/app/components/input-field.js b/app/components/input-field.js
index 893ea63..5cd5404 100644
--- a/app/components/input-field.js
+++ b/app/components/input-field.js
@@ -1,3 +1 @@
-import inputField from 'ember-easy-form-extensions/components/input-field';
-
-export default inputField;
+export { default } from 'ember-easy-form-extensions/components/input-field';
diff --git a/app/components/input-wrapper.js b/app/components/input-wrapper.js
index a842796..be31452 100644
--- a/app/components/input-wrapper.js
+++ b/app/components/input-wrapper.js
@@ -1,3 +1 @@
-import inputWrapper from 'ember-easy-form-extensions/components/input-wrapper';
-
-export default inputWrapper;
+export { default } from 'ember-easy-form-extensions/components/input-wrapper';
diff --git a/app/components/label-field.js b/app/components/label-field.js
index aa87bb0..b433f01 100644
--- a/app/components/label-field.js
+++ b/app/components/label-field.js
@@ -1,3 +1 @@
-import labelField from 'ember-easy-form-extensions/components/label-field';
-
-export default labelField;
+export { default } from 'ember-easy-form-extensions/components/label-field';
diff --git a/app/components/loading-spinner.js b/app/components/loading-spinner.js
index 73d82c5..c30a1d7 100644
--- a/app/components/loading-spinner.js
+++ b/app/components/loading-spinner.js
@@ -1,3 +1 @@
-import Component from 'ember-easy-form-extensions/components/loading-spinner';
-
-export default Component;
+export { default } from 'ember-easy-form-extensions/components/loading-spinner';
diff --git a/app/components/test-comp.js b/app/components/test-comp.js
index dc7166a..8140b65 100644
--- a/app/components/test-comp.js
+++ b/app/components/test-comp.js
@@ -1,3 +1 @@
-import testComp from 'ember-easy-form-extensions/components/test-comp';
-
-export default testComp;
+export { default } from 'ember-easy-form-extensions/components/test-comp';
diff --git a/app/helpers/capitalize-string.js b/app/helpers/capitalize-string.js
index 8ee0497..cbe68ac 100644
--- a/app/helpers/capitalize-string.js
+++ b/app/helpers/capitalize-string.js
@@ -1,3 +1 @@
-import capitalizeString from 'ember-easy-form-extensions/helpers/capitalize-string';
-
-export default capitalizeString;
+export { default } from 'ember-easy-form-extensions/helpers/capitalize-string';
diff --git a/app/initializers/easy-form-extensions.js b/app/initializers/easy-form-extensions.js
index b5ea7f8..4e101ea 100644
--- a/app/initializers/easy-form-extensions.js
+++ b/app/initializers/easy-form-extensions.js
@@ -1,3 +1 @@
-import Initializer from 'ember-easy-form-extensions/initializers/easy-form-extensions';
-
-export default Initializer;
+export { default } from 'ember-easy-form-extensions/initializers/easy-form-extensions';
diff --git a/app/initializers/routing-events.js b/app/initializers/routing-events.js
index 9072cd2..a122df5 100644
--- a/app/initializers/routing-events.js
+++ b/app/initializers/routing-events.js
@@ -1,3 +1 @@
-import Initializer from 'ember-easy-form-extensions/initializers/routing-events';
-
-export default Initializer;
+export { default } from 'ember-easy-form-extensions/initializers/routing-events';
diff --git a/app/services/easy-form.js b/app/services/easy-form.js
index 8e1123d..c7ce1bc 100644
--- a/app/services/easy-form.js
+++ b/app/services/easy-form.js
@@ -1,3 +1 @@
-import easyForm from 'ember-easy-form-extensions/services/easy-form';
-
-export default easyForm;
+export { default } from 'ember-easy-form-extensions/services/easy-form';

From 2175d989eb419c6749fc1c012ae7f9e3dae1137b Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 16:29:22 +0100
Subject: [PATCH 22/73] Components and mixins streamlined

---
 addon/components/destroy-submission.js        |  16 +-
 addon/components/error-field.js               |  48 +++---
 addon/components/form-controls.js             |  17 +-
 addon/components/form-submission.js           |  33 ++--
 addon/components/form-wrapper.js              |   3 +-
 addon/components/hint-field.js                |   3 +-
 addon/components/input-field.js               |   6 -
 addon/components/input-group.js               |  33 ++--
 addon/components/label-field.js               |   3 +-
 addon/components/loading-spinner.js           |   3 +-
 addon/initializers/easy-form-extensions.js    |   2 +-
 .../controllers/conditional-validations.js    |  34 ++++
 addon/mixins/controllers/form.js              | 161 ++++++++++++++++++
 addon/mixins/controllers/saving.js            |  92 ----------
 addon/mixins/views/submitting.js              | 105 ------------
 addon/mixins/views/walk-views.js              |  26 ---
 addon/services/easy-form.js                   |  16 --
 .../components/destroy-submission.hbs         |   2 +-
 .../templates/components/form-submission.hbs  |   8 +-
 addon/utils/observers/soft-assert.js          |   4 +-
 addon/utils/to-words.js                       |   2 +
 tests/dummy/app/initializers/components.js    |  15 ++
 22 files changed, 291 insertions(+), 341 deletions(-)
 delete mode 100644 addon/components/input-field.js
 create mode 100644 addon/mixins/controllers/conditional-validations.js
 create mode 100644 addon/mixins/controllers/form.js
 delete mode 100644 addon/mixins/controllers/saving.js
 delete mode 100644 addon/mixins/views/submitting.js
 delete mode 100644 addon/mixins/views/walk-views.js
 delete mode 100644 addon/services/easy-form.js
 create mode 100644 tests/dummy/app/initializers/components.js

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index d46fdfa..dd8adc2 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -1,21 +1,23 @@
 import Ember from 'ember';
-import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
 import layout from '../templates/components/destroy-submission';
 
 const { computed } = Ember;
 
-export default Ember.Component.extend(
-  WalkViews, {
-
-  classNames: ['buttons'],
+export default Ember.Component.extend({
+  className: 'destroy-submission',
+  classNameBindings: ['className'],
   destroyText: 'Delete',
-  formSubmitted: computed.readOnly('formView.formSubmitted'),
+  formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
   iconClass: 'icon-delete',
   layout: layout,
 
+  formController: computed(function() {
+    const controller = this.nearestWithProperty('isFormController');
+  }),
+
   actions: {
     destroy() {
-      this.get('formView').send('destroy');
+      this.sendAction();
     }
   },
 });
diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 51c07db..1e7059c 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -1,51 +1,45 @@
 import Ember from 'ember';
-import WalkViews from '../mixins/views/walk-views';
-import defaultFor from '../utils/default-for';
 import layout from '../templates/components/error-field';
 import toWords from '../utils/to-words';
 
-const { computed } = Ember;
-
-export default Ember.Component.extend(
-  WalkViews, {
+const { computed, on } = Ember;
 
+export default Ember.Component.extend({
   shouldShowError: true,
-  classNameBindings: ['easyForm.errorClass', 'errorIsVisible:visible'],
+  className: 'error',
+  classNameBindings: ['className', 'errorIsVisible:visible'],
   error: null,
+  errorIsVisible: computed.and('shouldShowError', 'error'),
   label: computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
 
-  errorIsVisible: computed('shouldShowError', 'error', function() {
-    return this.get('shouldShowError') && !!this.get('error');
-  }),
-
-  text: computed('errors.[]', 'value', function() {
-    const propertyName = defaultFor(
-      this.get('property'),
-      this.get('parentView.property')
+  text: computed('error', 'property', function() {
+    const { error, property } = this.getProperties(
+      [ 'error', 'property' ]
     );
+    const cleanProperty = toWords(propertyName);
 
-    return toWords(propertyName) + ' ' + this.get('error');
+    return `${cleanProperty} ${error}`;
   }),
 
-  addErrorObserver: Ember.on('init', function() {
+  addErrorObserver: on('init', function() {
     const property = this.get('property');
 
-    if (property) {
-      const controller = this.get('formView.controller');
-      const errorPath = `errors.${property}.firstObject`;
+    function setError() {
+      var error = controller.get(errorPath);
+      var parentView = this.get('parentView'); // TODO
+      var isValid = !error && parentView.get('isInputWrapper');
 
-      function setError() {
-        var error = controller.get(errorPath);
-        var parentView = this.get('parentView');
-        var isValid = !error && parentView.get('isInputWrapper');
+      parentView.set('isValid', isValid);
 
-        parentView.set('isValid', isValid);
+      this.set('error', controller.get(errorPath));
+    }
 
-        this.set('error', controller.get(errorPath));
-      };
+    if (property) {
+      const controller = this.nearestWithProperty('isFormController');
+      const errorPath = `errors.${property}.firstObject`;
 
       // TODO - Remove observer?
       controller.addObserver(errorPath, this, setError);
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 063a1df..9ac7711 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -1,23 +1,14 @@
-import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/form-controls';
 import softAssert from '../utils/observers/soft-assert';
-import WalkViews from '../mixins/views/walk-views';
-
-export default Ember.Component.extend(
-  WalkViews, {
 
+export default Ember.Component.extend({
   attributeBindings: ['legend'],
-  classNameBindings: ['easyForm.formControlsClass'],
+  className: 'controls',
+  classNameBindings: ['className'],
   layout: layout,
   legend: null,
-  model: null,
+  modelPath: 'model',
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
-
-  modelPath: Ember.computed('modelBinding._label', function() {
-    const modelPath = this.get('modelBinding._label');
-
-    return defaultFor(modelPath, 'model') + '.';
-  }),
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index f52aa6a..4ca9783 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -1,33 +1,30 @@
 import Ember from 'ember';
 import layout from '../templates/components/form-submission';
-import WalkViews from 'ember-easy-form-extensions/mixins/views/walk-views';
 
-const { computed, observer } = Ember;
-
-export default Ember.Component.extend(
-  WalkViews, {
+const { computed } = Ember;
 
+export default Ember.Component.extend({
   cancel: true,
   cancelText: 'Cancel',
-  classNames: ['buttons', 'submission'],
-  formSubmitted: computed.readOnly('formView.formSubmitted'),
+  className: 'form-submission',
+  classNameBindings: ['className'],
+  formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
   layout: layout,
   submit: true,
   submitText: 'Save',
 
+  formController: computed(function() {
+    const controller = this.nearestWithProperty('isFormController');
+  }),
+
   actions: {
     cancel: function() {
-      this.get('formView').send('cancel');
-    }
-  },
+      this.sendAction();
+    },
 
-  _watchForEmptyComponent: observer('cancel', 'submit',
-    function() {
-      Ember.warn(
-        'The {{form-submission}} component is not showing the submit or the cancel button.',
-        this.get('cancel') || this.get('submit')
-      );
-    }
-  ),
+    submit: function() {
+      this.sendAction();
+    },
+  },
 
 });
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index e25ebd6..21af901 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -3,7 +3,8 @@ import layout from '../templates/components/form-wrapper';
 
 export default Ember.Component.extend({
   attributeBindings: ['novalidate'],
-  classNameBindings: ['easyForm.formWrapperClass'],
+  className: 'form',
+  classNameBindings: ['className'],
   layout: layout,
   novalidate: true,
   tagName: 'form',
diff --git a/addon/components/hint-field.js b/addon/components/hint-field.js
index 05b00f5..e33ec39 100644
--- a/addon/components/hint-field.js
+++ b/addon/components/hint-field.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import layout from '../templates/components/hint-field';
 
 export default Ember.Component.extend({
-  classNameBindings: ['easyForm.hintClass'],
+  className: ['hint'],
+  classNameBindings: ['className'],
   layout: layout,
   tagName: 'span',
   text: null,
diff --git a/addon/components/input-field.js b/addon/components/input-field.js
deleted file mode 100644
index 632e57b..0000000
--- a/addon/components/input-field.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Ember from 'ember';
-import layout from '../templates/components/input-field';
-
-export default Ember.Component.extend({
-  layout: layout
-});
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index ad47e5c..0851923 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -2,13 +2,12 @@ import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/input-wrapper';
 import toWords from '../utils/to-words';
-import WalkViews from '../mixins/views/walk-views';
 
-const { computed, run, typeOf } = Ember;
-
-export default Ember.Component.extend(
-  WalkViews, {
+const { computed, observer, run, typeOf } = Ember;
 
+export default Ember.Component.extend({
+  className: 'input-wrapper',
+  classNameBindings: ['className'],
   hint: null,
   isInputWrapper: true, // Static
   isInvalid: computed.not('isValid'),
@@ -16,17 +15,9 @@ export default Ember.Component.extend(
   isValid: true,
   layout: layout,
   modelPath: computed.oneWay('parentView.modelPath'),
-  property:  computed.oneWay('valueBinding._label'),
+  property:  computed.oneWay('valueBinding._label'), // TODO
   shouldShowError: false,
-
-  attributeBindings: [
-    'dataTest:data-test'
-  ],
-
-  classNameBindings: [
-    'easyForm.inputGroupClass',
-    'validityClass'
-  ],
+  classNameBindings: ['validityClass'],
 
   /* Input attributes */
 
@@ -60,9 +51,9 @@ export default Ember.Component.extend(
 
   inputPartial: computed('type', function() {
     const type = this.get('type');
-    const partialName = this.get(`easyForm.inputTypePartials.${type}`);
+    const partialName = defaultFor(type, 'default');
 
-    return defaultFor(partialName, 'form-inputs/default');
+    return 'form-inputs/${partialName}';
   }),
 
   label: computed('property', function() {
@@ -105,9 +96,9 @@ export default Ember.Component.extend(
     return type;
   }),
 
-  validityClass: computed('easyForm.inputWrapperClass', 'isNewlyValid', 'isValid',
+  validityClass: computed('className', 'isNewlyValid', 'isValid',
     function() {
-      const baseClass = this.get('easyForm.inputWrapperClass');
+      const className = this.get('className');
 
       let modifier;
 
@@ -119,7 +110,7 @@ export default Ember.Component.extend(
         modifier = 'error';
       }
 
-      return `${baseClass}-${modifier}`;
+      return `${className}-${modifier}`;
     }
   ),
 
@@ -140,7 +131,7 @@ export default Ember.Component.extend(
   }),
 
   listenForSubmit: Ember.on('init', function() {
-    this.get('formView').on('submission', function() {
+    this.nearestWithProperty('isFormController').on('submission', function() {
       this.send('showError');
     }.bind(this));
   }),
diff --git a/addon/components/label-field.js b/addon/components/label-field.js
index 19c244d..521defd 100644
--- a/addon/components/label-field.js
+++ b/addon/components/label-field.js
@@ -3,7 +3,8 @@ import layout from '../templates/components/label-field';
 
 export default Ember.Component.extend({
   attributeBindings: ['for'],
-  classNameBindings: ['easyForm.labelClass'],
+  className: 'label',
+  classNameBindings: ['className'],
   for: null,
   label: null,
   layout: layout,
diff --git a/addon/components/loading-spinner.js b/addon/components/loading-spinner.js
index 7d9d965..87fcb69 100644
--- a/addon/components/loading-spinner.js
+++ b/addon/components/loading-spinner.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import layout from '../templates/components/loading-spinner';
 
 export default Ember.Component.extend({
-  classNames: ['spinner'],
+  className: 'spinner',
+  classNameBindings: ['className'],
   layout: layout
 });
diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index d4d4b23..4fad8a3 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -33,7 +33,7 @@ export function initialize(container, app) {
     ],
   });
 
-  app.inject('component', 'easyForm', 'service:easy-form');
+  app.inject('component', 'easyFormExtensions', 'service:easy-form-extensions');
 }
 
 export default {
diff --git a/addon/mixins/controllers/conditional-validations.js b/addon/mixins/controllers/conditional-validations.js
new file mode 100644
index 0000000..aebb808
--- /dev/null
+++ b/addon/mixins/controllers/conditional-validations.js
@@ -0,0 +1,34 @@
+import Ember from 'ember';
+
+export default Ember.Mixin.create({
+  revalidateFor: [],
+
+  forEachRevalidator(callback) {
+    const revalidateFor = this.get('revalidateFor');
+
+    if (revalidateFor.length) {
+      revalidateFor.forEach(function(property) {
+        callback(property);
+      });
+    }
+  },
+
+  // TODO - add observes revalidateFor.[]
+  _revalidate: on('routeDidTransition',
+    function() {
+      Ember.assert('No validate() method detected. You must use the conditional validations mixin with the form mixin.', this.validate);
+
+      this.forEachRevalidator(function(property) {
+        this.addObserver(property, this.validate);
+      }.bind(this));
+    }
+  ),
+
+  _removeRevalidationObservers: on('routeWillTransition',
+    function() {
+      this.forEachRevalidator(function(property) {
+        this.removeObserver(property, this.validate);
+      }.bind(this));
+    }
+  ),
+});
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
new file mode 100644
index 0000000..a8217ea
--- /dev/null
+++ b/addon/mixins/controllers/form.js
@@ -0,0 +1,161 @@
+import Ember from 'ember';
+import EmberValidations from 'ember-validations';
+
+const { computed, on } = Ember;
+
+export default Ember.Mixin.create(
+  EmberValidations.Mixin, {
+
+  /* Properties */
+
+  cancelClicked: false,
+  formIsSubmitted: false,
+
+  editing: computed(function() {
+    return this.toString().indexOf('/edit:') > -1;
+  }),
+
+  isFormController: computed.readOnly(function() {
+    return true;
+  }),
+
+  new: computed(function() {
+    return this.toString().indexOf('/new:') > -1;
+  }),
+
+  /* Actions */
+
+  actions: {
+
+    cancel() {
+      this.setProperties({
+        cancelClicked: true,
+        formIsSubmitted: true
+      });
+
+      this._eventHandler('cancel');
+    },
+
+    destroy() {
+      this.set('formIsSubmitted', true);
+
+      this._eventHandler('destroy');
+    },
+
+    /* Show validation errors on submit click */
+
+    submit() {
+      this.set('formIsSubmitted', true);
+      this.trigger('submission');
+
+      this._eventHandler('submit');
+    },
+
+  },
+
+  /* Methods */
+
+  /* Autofocus on the first input */
+
+  autofocus: on('didInsertElement', function() {
+    var input = this.$().find('input').first();
+
+    if (!Ember.$(input).hasClass('datepicker')) {
+      input.focus();
+    }
+  }),
+
+  resetForm: on('willInsertElement', function() {
+    this.set('formIsSubmitted', false);
+  }),
+
+  showServerError(/* xhr */) {
+    this.set('formIsSubmitted', false);
+  },
+
+  validateAndSave() {
+    const _this = this;
+
+    function resolve() {
+      Ember.assert(
+        'You need to specify a save method on this controller',
+        typeof _this.save === 'function'
+      );
+
+      _this.save();
+    }
+
+    function reject() {
+      _this.set('formIsSubmitted', false);
+    }
+
+    /* If there is a custom validations method, resolve it */
+
+    if (this.runCustomValidations) {
+      const customValidationsPromise = this.runCustomValidations();
+
+      if (!customValidationsPromise.then) {
+        Ember.assert(
+          'runCustomValidations() must return a promise (e.g. return new Ember.RSVP.Promise(...)).'
+        );
+      }
+
+      customValidationsPromise.then(resolve, reject);
+    } else {
+
+      /* Else save with normal ember-validations checks */
+
+      if (!_this.get('isValid')) {
+        reject();
+      } else {
+        resolve();
+      }
+
+    }
+  },
+
+  /* Private methods */
+
+  _eventHandler(type) {
+    const handlerMethodName = `${type}Handler`;
+    const handler = this[handlerMethodName];
+
+    function isFunction(key) {
+      return Ember.typeOf(key) === 'function';
+    }
+
+    var handlerPromise;
+
+    /* If event is submit, method is renamed */
+
+    type = type === 'submit' ? 'validateAndSave' : type;
+
+    const method = this[type];
+
+    Ember.assert(`You need to specify a ${type} method on this controller`, method && isFunction(method));
+
+    /* If handler exists, resolve the promise then call
+    the method... */
+
+    if (handler) {
+      Ember.assert(`${handlerMethodName}() must be a function`, isFunction(handler));
+
+      const handlerPromise = handler();
+
+      if (!handlerPromise.then) {
+        Ember.assert('handler() must return a promise (e.g. return new Ember.RSVP.Promise(...))');
+      }
+
+      handlerPromise.then(function() {
+        this[type]();
+      }.bind(this));
+
+    /* ...Else, just call the method */
+
+    } else {
+      controller[type]();
+    }
+
+  },
+
+});
diff --git a/addon/mixins/controllers/saving.js b/addon/mixins/controllers/saving.js
deleted file mode 100644
index d2758b3..0000000
--- a/addon/mixins/controllers/saving.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import Ember from 'ember';
-import EmberValidations from 'ember-validations';
-
-const { computed, on } = Ember;
-
-export default Ember.Mixin.create(
-  EmberValidations.Mixin, {
-
-  formSubmitted: false,
-  revalidateFor: [],
-
-  forEachRevalidator(callback) {
-    var revalidateFor = this.get('revalidateFor');
-
-    if (revalidateFor.length) {
-      revalidateFor.forEach(function(property) {
-        callback(property);
-      });
-    }
-  },
-
-  editingModel: computed(function() {
-    return this.toString().indexOf('/edit:') > -1;
-  }),
-
-  newModel: computed(function() {
-    return this.toString().indexOf('/new:') > -1;
-  }),
-
-  showServerError(/* xhr */) {
-    this.set('formSubmitted', false);
-  },
-
-  validateAndSave() {
-    const _this = this;
-
-    function resolve() {
-      Ember.assert(
-        'You need to specify a save method on this controller',
-        typeof _this.save === 'function'
-      );
-
-      _this.save();
-    };
-
-    function reject() {
-      _this.set('formSubmitted', false);
-    };
-
-    /* If there is a custom validations method, resolve it */
-
-    if (this.runCustomValidations) {
-      const customValidationsPromise = this.runCustomValidations();
-
-      if (!customValidationsPromise.then) {
-        Ember.assert(
-          'runCustomValidations() must return a promise (e.g. return new Ember.RSVP.Promise(...)).'
-        );
-      }
-
-      customValidationsPromise.then(resolve, reject);
-    } else {
-
-      /* Else save with normal ember-validations checks */
-
-      if (!_this.get('isValid')) {
-        reject();
-      } else {
-        resolve();
-      }
-
-    }
-  },
-
-  // TODO - add observes revalidateFor.[]
-  _revalidate: on('routeDidTransition',
-    function() {
-      this.forEachRevalidator(function(property) {
-        this.addObserver(property, this.validate);
-      }.bind(this));
-    }
-  ),
-
-  _removeRevalidationObservers: on('routeWillTransition',
-    function() {
-      this.forEachRevalidator(function(property) {
-        this.removeObserver(property, this.validate);
-      }.bind(this));
-    }
-  ),
-
-});
diff --git a/addon/mixins/views/submitting.js b/addon/mixins/views/submitting.js
deleted file mode 100644
index 07c2b03..0000000
--- a/addon/mixins/views/submitting.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import Ember from 'ember';
-
-const { computed, on } = Ember;
-
-export default Ember.Mixin.create(
-  Ember.Evented, {
-
-  cancelClicked: false,
-  formSubmitted: computed.alias('controller.formSubmitted'),
-
-  actions: {
-
-    cancel() {
-      this.setProperties({
-        cancelClicked: true,
-        formSubmitted: true
-      });
-
-      this._eventHandler('cancel');
-    },
-
-    destroy() {
-      this.set('formSubmitted', true);
-
-      this._eventHandler('destroy');
-    },
-
-  },
-
-  /* Autofocus on the first input */
-
-  autofocus: on('didInsertElement', function() {
-    var input = this.$().find('input').first();
-
-    if (!Ember.$(input).hasClass('datepicker')) {
-      input.focus();
-    }
-  }),
-
-  /* Show validation errors on submit click */
-
-  submit(event) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    this.set('formSubmitted', true);
-    this.trigger('submission');
-
-    this._eventHandler('submit');
-  },
-
-  resetForm: on('willInsertElement', function() {
-    this.set('formSubmitted', false);
-  }),
-
-  /* Private methods */
-
-  _eventHandler(type) {
-    var controller = this.get('controller');
-    var methodName = type + 'Handler';
-    var handler = this[methodName];
-    var controllerMethod, handlerPromise;
-
-    /* If event is submit, controller method is renamed */
-
-    type = type === 'submit' ? 'validateAndSave' : type;
-    controllerMethod = controller[type];
-
-    Ember.assert(
-      'You need to specify a ' + type + ' method on this view\'s controller',
-      controllerMethod && Ember.typeOf(controllerMethod) === 'function'
-    );
-
-    /* Don't use controller[type] variable so we keep scope */
-
-    /* Else, if handler exists, resolve the promise then call
-    the method on the controller */
-
-    if (handler) {
-      Ember.assert(
-        methodName + '() must be a function',
-        Ember.typeOf(handler) === 'function'
-      );
-
-      handlerPromise = handler();
-
-      if (!handlerPromise.then) {
-        Ember.assert(
-          'handler() must return a promise (e.g. return new Ember.RSVP.Promise(...))'
-        );
-      }
-
-      handlerPromise.then(function() {
-        controller[type]();
-      });
-
-    /* Else, just call the method on the controller */
-
-    } else {
-      controller[type]();
-    }
-
-  },
-
-});
diff --git a/addon/mixins/views/walk-views.js b/addon/mixins/views/walk-views.js
deleted file mode 100644
index 2a99075..0000000
--- a/addon/mixins/views/walk-views.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Ember from 'ember';
-
-const { computed } = Ember;
-
-export default Ember.Mixin.create({
-
-  formView: computed(function() {
-    return this.walkViews(this.get('parentView'));
-  }),
-
-  walkViews(view) {
-
-    if (view.submit) {
-      return view;
-    } else {
-      const parentView = view.get('parentView');
-
-      if (parentView) {
-        return this.walkViews(parentView);
-      } else {
-        Ember.warn('No view found with the Submitting mixin.');
-      }
-    }
-  },
-
-});
diff --git a/addon/services/easy-form.js b/addon/services/easy-form.js
deleted file mode 100644
index 96716a3..0000000
--- a/addon/services/easy-form.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Service.extend({
-  errorClass: 'error',
-  hintClass: 'hint',
-  inputClass: 'input',
-  inputGroupClass: 'input-wrapper',
-  formWrapperClass: 'form',
-  formControlsClass: 'controls',
-
-  inputTypePartials: {
-    checkbox: 'form-inputs/checkbox',
-    select: 'form-inputs/select',
-    textarea: 'form-inputs/textarea',
-  }
-});
diff --git a/addon/templates/components/destroy-submission.hbs b/addon/templates/components/destroy-submission.hbs
index 27f4fca..9bb2a45 100644
--- a/addon/templates/components/destroy-submission.hbs
+++ b/addon/templates/components/destroy-submission.hbs
@@ -1,4 +1,4 @@
-{{#if formSubmitted}}
+{{#if formIsSubmitted}}
   {{loading-spinner}}
 {{else}}
   <button
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index 96e7af3..701eea2 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -1,4 +1,4 @@
-{{#if formSubmitted}}
+{{#if formIsSubmitted}}
   {{loading-spinner}}
 {{else}}
 
@@ -13,7 +13,11 @@
   {{/if}}
 
   {{#if submit}}
-    <button class="button-primary" type="submit">
+    <button
+      {{action 'submit'}}
+      class="button-primary"
+      type="submit"
+    >
       <span class="icon-check"></span>
       <span class="text">{{submitText}}</span>
     </button>
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
index 35682a7..fb0a48b 100644
--- a/addon/utils/observers/soft-assert.js
+++ b/addon/utils/observers/soft-assert.js
@@ -49,10 +49,10 @@ var macro;
         );
 
         if (options.onTrue) {
-          callbacks.onTrue().bind(this);
+          options.callbacks.onTrue().bind(this);
         }
       } else if (options.onFalse) {
-        callbacks.onFalse().bind(this);
+        options.callbacks.onFalse().bind(this);
       }
     }));
   };
diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
index 04067de..ab8935e 100644
--- a/addon/utils/to-words.js
+++ b/addon/utils/to-words.js
@@ -1,3 +1,5 @@
+import Ember from 'ember';
+
 export default function(string) {
   const underscored = Ember.String.underscore(string);
   const spaced = underscored.split('_').join(' ');
diff --git a/tests/dummy/app/initializers/components.js b/tests/dummy/app/initializers/components.js
new file mode 100644
index 0000000..f467cad
--- /dev/null
+++ b/tests/dummy/app/initializers/components.js
@@ -0,0 +1,15 @@
+import Ember from 'ember';
+
+export function initialize(/* container, application */) {
+
+  Ember.Component.reopen({
+    attributeBindings: ['dataTest:data-test'],
+    dataTest: null,
+  });
+
+}
+
+export default {
+  name: 'components',
+  initialize: initialize
+};

From 036b0f55d94a49bbcb1c48a2b34e880a042c895d Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 16:34:01 +0100
Subject: [PATCH 23/73] Syntax and compiling errors fixed in controllers

---
 addon/components/destroy-submission.js             |  2 +-
 addon/components/error-field.js                    |  2 +-
 addon/components/form-submission.js                |  6 +++---
 addon/components/form-wrapper.js                   | 14 ++++++++++++++
 addon/components/input-group.js                    |  5 ++---
 .../mixins/controllers/conditional-validations.js  |  2 ++
 addon/mixins/controllers/form.js                   |  4 +---
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index dd8adc2..5b2d4dd 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -12,7 +12,7 @@ export default Ember.Component.extend({
   layout: layout,
 
   formController: computed(function() {
-    const controller = this.nearestWithProperty('isFormController');
+    return this.nearestWithProperty('isFormController');
   }),
 
   actions: {
diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 1e7059c..2b41376 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -19,7 +19,7 @@ export default Ember.Component.extend({
     const { error, property } = this.getProperties(
       [ 'error', 'property' ]
     );
-    const cleanProperty = toWords(propertyName);
+    const cleanProperty = toWords(property);
 
     return `${cleanProperty} ${error}`;
   }),
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 4ca9783..c1ba3b0 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -14,15 +14,15 @@ export default Ember.Component.extend({
   submitText: 'Save',
 
   formController: computed(function() {
-    const controller = this.nearestWithProperty('isFormController');
+    return this.nearestWithProperty('isFormController');
   }),
 
   actions: {
-    cancel: function() {
+    cancel() {
       this.sendAction();
     },
 
-    submit: function() {
+    submit() {
       this.sendAction();
     },
   },
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 21af901..ba007ab 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -8,4 +8,18 @@ export default Ember.Component.extend({
   layout: layout,
   novalidate: true,
   tagName: 'form',
+
+  actions: {
+    cancel() {
+      this.sendAction();
+    },
+
+    destroy() {
+      this.sendAction();
+    },
+
+    submit() {
+      this.sendAction();
+    },
+  },
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 0851923..6347bf9 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -7,7 +7,7 @@ const { computed, observer, run, typeOf } = Ember;
 
 export default Ember.Component.extend({
   className: 'input-wrapper',
-  classNameBindings: ['className'],
+  classNameBindings: ['className', 'validityClass'],
   hint: null,
   isInputWrapper: true, // Static
   isInvalid: computed.not('isValid'),
@@ -17,7 +17,6 @@ export default Ember.Component.extend({
   modelPath: computed.oneWay('parentView.modelPath'),
   property:  computed.oneWay('valueBinding._label'), // TODO
   shouldShowError: false,
-  classNameBindings: ['validityClass'],
 
   /* Input attributes */
 
@@ -53,7 +52,7 @@ export default Ember.Component.extend({
     const type = this.get('type');
     const partialName = defaultFor(type, 'default');
 
-    return 'form-inputs/${partialName}';
+    return `form-inputs/${partialName}`;
   }),
 
   label: computed('property', function() {
diff --git a/addon/mixins/controllers/conditional-validations.js b/addon/mixins/controllers/conditional-validations.js
index aebb808..d2f2ea1 100644
--- a/addon/mixins/controllers/conditional-validations.js
+++ b/addon/mixins/controllers/conditional-validations.js
@@ -1,5 +1,7 @@
 import Ember from 'ember';
 
+const { on } = Ember;
+
 export default Ember.Mixin.create({
   revalidateFor: [],
 
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index a8217ea..90575bd 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -124,8 +124,6 @@ export default Ember.Mixin.create(
       return Ember.typeOf(key) === 'function';
     }
 
-    var handlerPromise;
-
     /* If event is submit, method is renamed */
 
     type = type === 'submit' ? 'validateAndSave' : type;
@@ -153,7 +151,7 @@ export default Ember.Mixin.create(
     /* ...Else, just call the method */
 
     } else {
-      controller[type]();
+      this[type]();
     }
 
   },

From 6abc34f49bba4f58cf9bdc63aa535cc5beb3fdc6 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 16:56:47 +0100
Subject: [PATCH 24/73] property and value relationship flipped because of
 _label deprecation

---
 addon/components/error-field.js            |  6 ++----
 addon/components/form-controls.js          |  4 ++++
 addon/components/input-group.js            | 17 ++++++++++++++---
 addon/templates/components/input-field.hbs |  1 -
 addon/templates/components/test-comp.hbs   |  1 -
 app/components/input-field.js              |  1 -
 app/components/test-comp.js                |  1 -
 app/services/easy-form.js                  |  1 -
 8 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 addon/templates/components/input-field.hbs
 delete mode 100644 addon/templates/components/test-comp.hbs
 delete mode 100644 app/components/input-field.js
 delete mode 100644 app/components/test-comp.js
 delete mode 100644 app/services/easy-form.js

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 2b41376..c609b04 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -28,11 +28,9 @@ export default Ember.Component.extend({
     const property = this.get('property');
 
     function setError() {
-      var error = controller.get(errorPath);
-      var parentView = this.get('parentView'); // TODO
-      var isValid = !error && parentView.get('isInputWrapper');
+      const error = controller.get(errorPath);
 
-      parentView.set('isValid', isValid);
+      parentView.set('isValid', !error);
 
       this.set('error', controller.get(errorPath));
     }
diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 9ac7711..0b29069 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -11,4 +11,8 @@ export default Ember.Component.extend({
   modelPath: 'model',
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
+
+  isFormControls: computed.readOnly(function() {
+    return true;
+  }),
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 6347bf9..84e3735 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -14,8 +14,8 @@ export default Ember.Component.extend({
   isNewlyValid: false,
   isValid: true,
   layout: layout,
-  modelPath: computed.oneWay('parentView.modelPath'),
-  property:  computed.oneWay('valueBinding._label'), // TODO
+  modelPath: computed.oneWay('formControls.modelPath'),
+  property: null,
   shouldShowError: false,
 
   /* Input attributes */
@@ -25,7 +25,6 @@ export default Ember.Component.extend({
   optionValuePath: null,
   optionLabelPath: null,
   selection: null,
-  value: null,
   multiple: null,
   name: computed.oneWay('property'),
   placeholder: null,
@@ -55,6 +54,10 @@ export default Ember.Component.extend({
     return `form-inputs/${partialName}`;
   }),
 
+  formControls: computed.readOnly(function() {
+    return this.nearestWithProperty('isFormControls');
+  }),
+
   label: computed('property', function() {
     const property = defaultFor(this.get('cleanProperty'), '');
 
@@ -113,12 +116,20 @@ export default Ember.Component.extend({
     }
   ),
 
+  value: computed('property', function() {
+    return computed.alias(this.get('property'));
+  }),
+
+  /* Actions */
+
   actions: {
     showError() {
       this.set('shouldShowError', true);
     },
   },
 
+  /* Methods */
+
   listenForNewlyValid: observer('isValid', function() {
     if (this.get('isValid')) {
       this.set('isNewlyValid', true);
diff --git a/addon/templates/components/input-field.hbs b/addon/templates/components/input-field.hbs
deleted file mode 100644
index 889d9ee..0000000
--- a/addon/templates/components/input-field.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
diff --git a/addon/templates/components/test-comp.hbs b/addon/templates/components/test-comp.hbs
deleted file mode 100644
index 889d9ee..0000000
--- a/addon/templates/components/test-comp.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
diff --git a/app/components/input-field.js b/app/components/input-field.js
deleted file mode 100644
index 5cd5404..0000000
--- a/app/components/input-field.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-easy-form-extensions/components/input-field';
diff --git a/app/components/test-comp.js b/app/components/test-comp.js
deleted file mode 100644
index 8140b65..0000000
--- a/app/components/test-comp.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-easy-form-extensions/components/test-comp';
diff --git a/app/services/easy-form.js b/app/services/easy-form.js
deleted file mode 100644
index c7ce1bc..0000000
--- a/app/services/easy-form.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-easy-form-extensions/services/easy-form';

From 0f72ed5bc221c6ae77760860f90ece20acb9d050 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 2 Jul 2015 17:10:00 +0100
Subject: [PATCH 25/73] Dummy app update

---
 addon/initializers/easy-form-extensions.js      |  8 +-------
 tests/dummy/app/components/.gitkeep             |  0
 tests/dummy/app/controllers/.gitkeep            |  0
 tests/dummy/app/initializers/components.js      | 15 ---------------
 tests/dummy/app/initializers/test-attributes.js | 17 +++++++++++++++++
 tests/dummy/app/models/.gitkeep                 |  0
 .../application/template.hbs}                   |  0
 tests/dummy/app/router.js                       |  7 +++++--
 tests/dummy/app/routes/.gitkeep                 |  0
 tests/dummy/app/serializers/application.js      |  4 +---
 tests/dummy/app/templates/components/.gitkeep   |  0
 tests/dummy/app/views/.gitkeep                  |  0
 12 files changed, 24 insertions(+), 27 deletions(-)
 delete mode 100644 tests/dummy/app/components/.gitkeep
 delete mode 100644 tests/dummy/app/controllers/.gitkeep
 delete mode 100644 tests/dummy/app/initializers/components.js
 create mode 100644 tests/dummy/app/initializers/test-attributes.js
 delete mode 100644 tests/dummy/app/models/.gitkeep
 rename tests/dummy/app/{templates/application.hbs => resources/application/template.hbs} (100%)
 delete mode 100644 tests/dummy/app/routes/.gitkeep
 delete mode 100644 tests/dummy/app/templates/components/.gitkeep
 delete mode 100644 tests/dummy/app/views/.gitkeep

diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index 4fad8a3..38ad141 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -5,13 +5,11 @@ export function initialize(container, app) {
   Ember.Checkbox.reopen({
     attributeBindings: [
       'checked:aria-checked',
-      'dataTest:data-test'
     ],
   });
 
   Ember.TextArea.reopen({
     attributeBindings: [
-      'dataTest:data-test',
       'invalid:aria-invalid',
       'required:aria-required',
     ],
@@ -19,7 +17,6 @@ export function initialize(container, app) {
 
   Ember.TextField.reopen({
     attributeBindings: [
-      'dataTest:data-test',
       'invalid:aria-invalid',
       'required:aria-required',
     ],
@@ -27,16 +24,13 @@ export function initialize(container, app) {
 
   Ember.Select.reopen({
     attributeBindings: [
-      'dataTest:data-test',
       'invalid:aria-invalid',
       'required:aria-required',
     ],
   });
-
-  app.inject('component', 'easyFormExtensions', 'service:easy-form-extensions');
 }
 
 export default {
-  name: 'easy-form',
+  name: 'easy-form-extensions',
   initialize: initialize
 };
diff --git a/tests/dummy/app/components/.gitkeep b/tests/dummy/app/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/controllers/.gitkeep b/tests/dummy/app/controllers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/initializers/components.js b/tests/dummy/app/initializers/components.js
deleted file mode 100644
index f467cad..0000000
--- a/tests/dummy/app/initializers/components.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Ember from 'ember';
-
-export function initialize(/* container, application */) {
-
-  Ember.Component.reopen({
-    attributeBindings: ['dataTest:data-test'],
-    dataTest: null,
-  });
-
-}
-
-export default {
-  name: 'components',
-  initialize: initialize
-};
diff --git a/tests/dummy/app/initializers/test-attributes.js b/tests/dummy/app/initializers/test-attributes.js
new file mode 100644
index 0000000..6cb8834
--- /dev/null
+++ b/tests/dummy/app/initializers/test-attributes.js
@@ -0,0 +1,17 @@
+import Ember from 'ember';
+
+export function initialize(/* container, application */) {
+
+  ['Checkbox', 'Component', 'TextArea', 'TextField', 'Select'].forEach(function(instanceName) {
+    Ember[instanceName].reopen({
+      attributeBindings: ['dataTest:data-test'],
+      dataTest: null,
+    });
+  });
+
+}
+
+export default {
+  name: 'test-attributes',
+  initialize: initialize
+};
diff --git a/tests/dummy/app/models/.gitkeep b/tests/dummy/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/resources/application/template.hbs
similarity index 100%
rename from tests/dummy/app/templates/application.hbs
rename to tests/dummy/app/resources/application/template.hbs
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
index 7cfd538..cac389c 100644
--- a/tests/dummy/app/router.js
+++ b/tests/dummy/app/router.js
@@ -7,10 +7,13 @@ var Router = Ember.Router.extend({
 
 Router.map(function() {
 
-  this.resource('posts', function() {
+  this.route('posts', function() {
     this.route('new');
 
-    this.resource('post', { path: '/:post_id' }, function() {
+    this.route('post', {
+      path: '/:post_id',
+      resetNamespace: true,
+    }, function() {
       this.route('edit');
     });
 
diff --git a/tests/dummy/app/routes/.gitkeep b/tests/dummy/app/routes/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/serializers/application.js b/tests/dummy/app/serializers/application.js
index aec8f42..6257894 100644
--- a/tests/dummy/app/serializers/application.js
+++ b/tests/dummy/app/serializers/application.js
@@ -1,5 +1,3 @@
 import DS from 'ember-data';
 
-export default DS.RESTSerializer.extend({
-
-});
+export default DS.RESTSerializer.extend();
diff --git a/tests/dummy/app/templates/components/.gitkeep b/tests/dummy/app/templates/components/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/dummy/app/views/.gitkeep b/tests/dummy/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000

From 0d7e56fda728e536022ce14ca61c77b0a4aafa55 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Fri, 3 Jul 2015 12:52:46 +0100
Subject: [PATCH 26/73] Actions replacing controller bindings

---
 addon/components/form-controls.js             |   3 +
 addon/components/form-wrapper.js              |   2 +
 addon/components/input-group.js               | 234 +++++++++---------
 addon/mixins/controllers/form.js              |  16 ++
 .../utils/nearest-controller-with-property.js |  19 ++
 .../{input-wrapper.js => input-group.js}      |   2 +-
 bower.json                                    |   2 +-
 package.json                                  |   3 +-
 .../app/resources/post/edit/controller.js     |   4 +-
 .../app/resources/post/index/controller.js    |   2 +-
 tests/dummy/app/resources/post/model.js       |   8 +-
 .../app/resources/posts/new/controller.js     |  13 +-
 .../app/resources/posts/new/template.hbs      |  14 +-
 tests/dummy/app/resources/posts/new/view.js   |  15 --
 14 files changed, 190 insertions(+), 147 deletions(-)
 create mode 100644 addon/utils/nearest-controller-with-property.js
 rename app/components/{input-wrapper.js => input-group.js} (81%)
 delete mode 100644 tests/dummy/app/resources/posts/new/view.js

diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 0b29069..37a52a6 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import layout from '../templates/components/form-controls';
 import softAssert from '../utils/observers/soft-assert';
 
+const { computed } = Ember;
+
 export default Ember.Component.extend({
   attributeBindings: ['legend'],
   className: 'controls',
@@ -15,4 +17,5 @@ export default Ember.Component.extend({
   isFormControls: computed.readOnly(function() {
     return true;
   }),
+
 });
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index ba007ab..177866c 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -10,6 +10,7 @@ export default Ember.Component.extend({
   tagName: 'form',
 
   actions: {
+
     cancel() {
       this.sendAction();
     },
@@ -21,5 +22,6 @@ export default Ember.Component.extend({
     submit() {
       this.sendAction();
     },
+
   },
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 84e3735..a5d1bae 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -1,6 +1,7 @@
 import defaultFor from '../utils/default-for';
 import Ember from 'ember';
-import layout from '../templates/components/input-wrapper';
+import layout from '../templates/components/input-group';
+import nearestControllerWithProperty from 'ember-easy-form-extensions/utils/nearest-controller-with-property';
 import toWords from '../utils/to-words';
 
 const { computed, observer, run, typeOf } = Ember;
@@ -13,7 +14,7 @@ export default Ember.Component.extend({
   isInvalid: computed.not('isValid'),
   isNewlyValid: false,
   isValid: true,
-  layout: layout,
+  // layout: layout,
   modelPath: computed.oneWay('formControls.modelPath'),
   property: null,
   shouldShowError: false,
@@ -31,119 +32,126 @@ export default Ember.Component.extend({
   prompt: null,
   disabled: null,
 
-  cleanProperty: computed('property', 'modelPath',
-    function() {
-      return this.get('property').replace(this.get('modelPath'), '');
-    }
-  ),
 
-  dataTest: computed('cleanProperty', function() {
-    const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
-
-    return `input-wrapper-for-${cleanProperty}`;
-  }),
-
-  inputId: computed(function() {
-    return this.get('elementId') + '-input';
-  }),
-
-  inputPartial: computed('type', function() {
-    const type = this.get('type');
-    const partialName = defaultFor(type, 'default');
-
-    return `form-inputs/${partialName}`;
-  }),
-
-  formControls: computed.readOnly(function() {
-    return this.nearestWithProperty('isFormControls');
-  }),
-
-  label: computed('property', function() {
-    const property = defaultFor(this.get('cleanProperty'), '');
-
-    return toWords(property);
-  }),
-
-  type: computed(function() {
-    const property = this.get('cleanProperty');
-
-    let type;
-
-    if (property.match(/password/)) {
-      type = 'password';
-    } else if (property.match(/email/)) {
-      type = 'email';
-    } else if (property.match(/url/)) {
-      type = 'url';
-    } else if (property.match(/color/)) {
-      type = 'color';
-    } else if (property.match(/^tel/) || property.match(/^phone/)) {
-      type = 'tel';
-    } else if (property.match(/search/)) {
-      type = 'search';
-    } else if (this.get('content')) {
-      type = 'select';
-    } else {
-      const value = this.get('value');
-
-      if (typeOf(value) === 'number') {
-        type = 'number';
-      } else if (typeOf(value) === 'date') {
-        type = 'date';
-      } else if (typeOf(value) === 'boolean') {
-        type = 'checkbox';
-      }
-    }
-
-    return type;
+  cleanProperty: '',
+  // cleanProperty: computed('property', 'modelPath',
+  //   function() {
+  //     return this.get('property').replace(this.get('modelPath'), '');
+  //   }
+  // ),
+
+  // dataTest: computed('cleanProperty', function() {
+  //   const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
+
+  //   return `input-wrapper-for-${cleanProperty}`;
+  // }),
+
+  // inputId: computed(function() {
+  //   return this.get('elementId') + '-input';
+  // }),
+
+  // inputPartial: computed('type', function() {
+  //   const type = this.get('type');
+  //   const partialName = defaultFor(type, 'default');
+
+  //   return `form-inputs/${partialName}`;
+  // }),
+
+  // formControls: computed.readOnly(function() {
+  //   return this.nearestWithProperty('isFormControls');
+  // }),
+
+  // label: computed('property', function() {
+  //   const property = defaultFor(this.get('cleanProperty'), '');
+
+  //   return toWords(property);
+  // }),
+
+  // type: computed(function() {
+  //   const property = this.get('cleanProperty');
+
+  //   let type;
+
+  //   if (property.match(/password/)) {
+  //     type = 'password';
+  //   } else if (property.match(/email/)) {
+  //     type = 'email';
+  //   } else if (property.match(/url/)) {
+  //     type = 'url';
+  //   } else if (property.match(/color/)) {
+  //     type = 'color';
+  //   } else if (property.match(/^tel/) || property.match(/^phone/)) {
+  //     type = 'tel';
+  //   } else if (property.match(/search/)) {
+  //     type = 'search';
+  //   } else if (this.get('content')) {
+  //     type = 'select';
+  //   } else {
+  //     const value = this.get('value');
+
+  //     if (typeOf(value) === 'number') {
+  //       type = 'number';
+  //     } else if (typeOf(value) === 'date') {
+  //       type = 'date';
+  //     } else if (typeOf(value) === 'boolean') {
+  //       type = 'checkbox';
+  //     }
+  //   }
+
+  //   return type;
+  // }),
+
+  // validityClass: computed('className', 'isNewlyValid', 'isValid',
+  //   function() {
+  //     const className = this.get('className');
+
+  //     let modifier;
+
+  //     if (this.get('isNewlyValid')) {
+  //       modifier = 'newly-valid';
+  //     } else if(this.get('isValid')) {
+  //       modifier = 'valid';
+  //     } else {
+  //       modifier = 'error';
+  //     }
+
+  //     return `${className}-${modifier}`;
+  //   }
+  // ),
+
+  // value: computed('property', function() {
+  //   return computed.alias(this.get('property'));
+  // }),
+
+  // /* Actions */
+
+  // actions: {
+  //   showError() {
+  //     this.set('shouldShowError', true);
+  //   },
+  // },
+
+  // /* Methods */
+
+  // listenForNewlyValid: observer('isValid', function() {
+  //   if (this.get('isValid')) {
+  //     this.set('isNewlyValid', true);
+  //   }
+
+  //   run.later(this, function() {
+  //     this.set('isNewlyValid', false);
+  //   }, 3000);
+  // }),
+
+  registerAction: 'registerInputGroup',
+  unregisterAction: 'unregisterInputGroup',
+
+  registerWithForm: Ember.on('init', function() {
+    this.sendAction('registerAction', this);
   }),
 
-  validityClass: computed('className', 'isNewlyValid', 'isValid',
-    function() {
-      const className = this.get('className');
-
-      let modifier;
-
-      if (this.get('isNewlyValid')) {
-        modifier = 'newly-valid';
-      } else if(this.get('isValid')) {
-        modifier = 'valid';
-      } else {
-        modifier = 'error';
-      }
-
-      return `${className}-${modifier}`;
-    }
-  ),
-
-  value: computed('property', function() {
-    return computed.alias(this.get('property'));
-  }),
-
-  /* Actions */
-
-  actions: {
-    showError() {
-      this.set('shouldShowError', true);
-    },
-  },
-
-  /* Methods */
-
-  listenForNewlyValid: observer('isValid', function() {
-    if (this.get('isValid')) {
-      this.set('isNewlyValid', true);
-    }
-
-    run.later(this, function() {
-      this.set('isNewlyValid', false);
-    }, 3000);
-  }),
-
-  listenForSubmit: Ember.on('init', function() {
-    this.nearestWithProperty('isFormController').on('submission', function() {
-      this.send('showError');
-    }.bind(this));
-  }),
+  unregisterWithForm: Ember.on('willDestroyElement', function() {
+    this.sendAction('unregisterAction', this);
+  })
 
 });
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 90575bd..764cb0f 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -27,6 +27,22 @@ export default Ember.Mixin.create(
 
   actions: {
 
+    /* Actions for child input groups */
+
+    registerInputGroup(inputGroupComponent) {
+      this.on('submission', function() {
+        inputGroupComponent.send('showError');
+      });
+    },
+
+    unregisterInputGroup(ipnutGroupComponent) {
+      this.off('submission', function() {
+        inputGroupComponent.send('showError');
+      });
+    },
+
+    /* Form submisison actions */
+
     cancel() {
       this.setProperties({
         cancelClicked: true,
diff --git a/addon/utils/nearest-controller-with-property.js b/addon/utils/nearest-controller-with-property.js
new file mode 100644
index 0000000..64ba146
--- /dev/null
+++ b/addon/utils/nearest-controller-with-property.js
@@ -0,0 +1,19 @@
+import Ember from 'ember';
+
+const { get } = Ember;
+
+export default function nearestControllerWithProperty(context, property) {
+  let view = get(context, 'parentView');
+
+  while (view) {
+    const controller = get(view, 'controller');
+
+    console.log(view.toString());
+
+    if (property in controller) {
+      return controller;
+    }
+
+    view = get(view, 'parentView');
+  }
+}
diff --git a/app/components/input-wrapper.js b/app/components/input-group.js
similarity index 81%
rename from app/components/input-wrapper.js
rename to app/components/input-group.js
index be31452..886dbeb 100644
--- a/app/components/input-wrapper.js
+++ b/app/components/input-group.js
@@ -1 +1 @@
-export { default } from 'ember-easy-form-extensions/components/input-wrapper';
+export { default } from 'ember-easy-form-extensions/components/input-group';
diff --git a/bower.json b/bower.json
index 074d32b..b837c4a 100644
--- a/bower.json
+++ b/bower.json
@@ -12,6 +12,6 @@
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1",
-    "ember-cli-moment-shim": "~0.1.0"
+    "ember-cli-moment-shim": "~0.2.0"
   }
 }
diff --git a/package.json b/package.json
index 9b60859..980fb22 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,10 @@
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.13.4",
+    "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-moment": "1.2.1",
     "ember-try": "0.0.6"
   },
   "keywords": [
diff --git a/tests/dummy/app/resources/post/edit/controller.js b/tests/dummy/app/resources/post/edit/controller.js
index b4fc9bc..de47f65 100644
--- a/tests/dummy/app/resources/post/edit/controller.js
+++ b/tests/dummy/app/resources/post/edit/controller.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
+import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 
 export default Ember.Controller.extend(
-  Saving, {
+  FormMixin, {
 
   validations: {
     'model.title': {
diff --git a/tests/dummy/app/resources/post/index/controller.js b/tests/dummy/app/resources/post/index/controller.js
index e2b8e36..b461f2c 100644
--- a/tests/dummy/app/resources/post/index/controller.js
+++ b/tests/dummy/app/resources/post/index/controller.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
 
-export default Ember.ObjectController.extend({
+export default Ember.Controller.extend({
 
 });
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
index 549a0d5..312f99d 100644
--- a/tests/dummy/app/resources/post/model.js
+++ b/tests/dummy/app/resources/post/model.js
@@ -1,9 +1,9 @@
 import DS from 'ember-data';
 import Ember from 'ember';
 
-var attr = DS.attr;
+const { attr } = DS;
 
-var PostModel = DS.Model.extend({
+const PostModel = DS.Model.extend({
   category: attr('string'),
   description: attr('string'),
   published: attr('boolean'),
@@ -21,7 +21,7 @@ PostModel.reopenClass({
       published: true,
       title: 'How to Ember',
       views: 100,
-      writtenOn: moment().subtract(2, 'days')
+      writtenOn: window.moment().subtract(2, 'days')
     }, {
       id: 2,
       category: 'rails',
@@ -29,7 +29,7 @@ PostModel.reopenClass({
       published: false,
       title: 'How to Rails',
       views: 0,
-      writtenOn: moment().subtract(7, 'days')
+      writtenOn: window.moment().subtract(7, 'days')
     }
   ]
 });
diff --git a/tests/dummy/app/resources/posts/new/controller.js b/tests/dummy/app/resources/posts/new/controller.js
index 9253fd5..fd091fc 100644
--- a/tests/dummy/app/resources/posts/new/controller.js
+++ b/tests/dummy/app/resources/posts/new/controller.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
+import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 
 export default Ember.Controller.extend(
-  Saving, {
+  FormMixin, {
 
   categories: Ember.A(['ember', 'rails', 'css']),
 
@@ -24,6 +24,15 @@ export default Ember.Controller.extend(
 
   cancel: function() {
     this.transitionToRoute('index');
+  },
+
+  submitHandler: function() {
+    return new Ember.RSVP.Promise(function(resolve, reject) {
+      console.log('submit handler running');
+
+      resolve();
+    });
   }
 
+
 });
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index c7f1a47..20f1193 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -1,33 +1,33 @@
 {{#form-wrapper}}
 
   {{#form-controls legend='Write a new post'}}
-    
+
     {{input-group
-      value=model.title
+      property='model.title'
     }}
 
     {{input-group
-      value=model.description
+      property='model.description'
       type='textarea'
     }}
 
     {{input-group
-      value=model.category
+      property='model.category'
       content=categories
     }}
 
     {{input-group
-      value=model.views
+      property='model.views'
       type='number'
     }}
 
     {{input-group
-      value=model.published
+      property='model.published'
       type='checkbox'
     }}
 
     {{input-group
-      value=model.writtenOn
+      property='model.writtenOn'
       type='date'
     }}
 
diff --git a/tests/dummy/app/resources/posts/new/view.js b/tests/dummy/app/resources/posts/new/view.js
deleted file mode 100644
index 4f2a881..0000000
--- a/tests/dummy/app/resources/posts/new/view.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import Ember from 'ember';
-import Submitting from 'ember-easy-form-extensions/mixins/views/submitting';
-
-export default Ember.View.extend(
-  Submitting, {
-
-  submitHandler: function() {
-    return new Ember.RSVP.Promise(function(resolve, reject) {
-      console.log('submitting');
-
-      resolve();
-    });
-  }
-
-});

From 9d8f0d3c99ba98940d4b875966637f3dbd96bfca Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 6 Jul 2015 00:46:42 +0100
Subject: [PATCH 27/73] Values binding to controller

---
 addon/components/destroy-submission.js        |   4 +-
 addon/components/error-field.js               |  28 +-
 addon/components/form-submission.js           |   4 +-
 addon/components/form-wrapper.js              |  17 ++
 addon/components/input-group.js               | 252 ++++++++++--------
 addon/mixins/controllers/form.js              |   6 +-
 .../utils/nearest-controller-with-property.js |  19 --
 app/templates/form-inputs/date.hbs            |   1 +
 app/templates/form-inputs/number.hbs          |   1 +
 .../app/resources/application/template.hbs    |   1 +
 .../app/resources/posts/new/template.hbs      |   4 +-
 11 files changed, 181 insertions(+), 156 deletions(-)
 delete mode 100644 addon/utils/nearest-controller-with-property.js
 create mode 100644 app/templates/form-inputs/date.hbs
 create mode 100644 app/templates/form-inputs/number.hbs

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index 5b2d4dd..dc674ff 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -12,7 +12,9 @@ export default Ember.Component.extend({
   layout: layout,
 
   formController: computed(function() {
-    return this.nearestWithProperty('isFormController');
+    const hasFormController = this.nearestWithProperty('formController');
+
+    return hasFormController.get('formController');
   }),
 
   actions: {
diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index c609b04..faa6533 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -24,23 +24,23 @@ export default Ember.Component.extend({
     return `${cleanProperty} ${error}`;
   }),
 
-  addErrorObserver: on('init', function() {
-    const property = this.get('property');
+  // addErrorObserver: on('init', function() {
+  //   const property = this.get('property');
 
-    function setError() {
-      const error = controller.get(errorPath);
+  //   function setError() {
+  //     const error = controller.get(errorPath);
 
-      parentView.set('isValid', !error);
+  //     parentView.set('isValid', !error);
 
-      this.set('error', controller.get(errorPath));
-    }
+  //     this.set('error', controller.get(errorPath));
+  //   }
 
-    if (property) {
-      const controller = this.nearestWithProperty('isFormController');
-      const errorPath = `errors.${property}.firstObject`;
+  //   if (property) {
+  //     const controller = this.nearest WithProperty('isFormController');
+  //     const errorPath = `errors.${property}.firstObject`;
 
-      // TODO - Remove observer?
-      controller.addObserver(errorPath, this, setError);
-    }
-  })
+  //     // TODO - Remove observer?
+  //     controller.addObserver(errorPath, this, setError);
+  //   }
+  // })
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index c1ba3b0..2016dfe 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -14,7 +14,9 @@ export default Ember.Component.extend({
   submitText: 'Save',
 
   formController: computed(function() {
-    return this.nearestWithProperty('isFormController');
+    const hasFormController = this.nearestWithProperty('formController');
+
+    return hasFormController.get('formController');
   }),
 
   actions: {
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 177866c..3d07cd5 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 import layout from '../templates/components/form-wrapper';
 
+const { computed } = Ember;
+
 export default Ember.Component.extend({
   attributeBindings: ['novalidate'],
   className: 'form',
@@ -24,4 +26,19 @@ export default Ember.Component.extend({
     },
 
   },
+
+  /* A shim to enabled use with controller and components
+  moving forward */
+
+  formController: Ember.computed(function() {
+    const routeController = this.get('_controller');
+
+    if (this.get('isFormController')) {
+      return this;
+    } else if (routeController.get('isFormController')) {
+      return routeController;
+    } else {
+      return null;
+    }
+  }),
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index a5d1bae..119c0bf 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -1,23 +1,27 @@
 import defaultFor from '../utils/default-for';
 import Ember from 'ember';
 import layout from '../templates/components/input-group';
-import nearestControllerWithProperty from 'ember-easy-form-extensions/utils/nearest-controller-with-property';
 import toWords from '../utils/to-words';
 
 const { computed, observer, run, typeOf } = Ember;
 
 export default Ember.Component.extend({
+  bindingForValue: null, // Avoid xBinding naming convention
   className: 'input-wrapper',
   classNameBindings: ['className', 'validityClass'],
+  formControls: null,
   hint: null,
   isInputWrapper: true, // Static
   isInvalid: computed.not('isValid'),
   isNewlyValid: false,
   isValid: true,
-  // layout: layout,
+  layout: layout,
   modelPath: computed.oneWay('formControls.modelPath'),
   property: null,
+  registerAction: 'registerInputGroup',
   shouldShowError: false,
+  unregisterAction: 'unregisterInputGroup',
+  value: null,
 
   /* Input attributes */
 
@@ -32,126 +36,142 @@ export default Ember.Component.extend({
   prompt: null,
   disabled: null,
 
+  cleanProperty: computed('property', 'modelPath', function() {
+    const modelPath = this.get('modelPath');
 
-  cleanProperty: '',
-  // cleanProperty: computed('property', 'modelPath',
-  //   function() {
-  //     return this.get('property').replace(this.get('modelPath'), '');
-  //   }
-  // ),
-
-  // dataTest: computed('cleanProperty', function() {
-  //   const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
-
-  //   return `input-wrapper-for-${cleanProperty}`;
-  // }),
-
-  // inputId: computed(function() {
-  //   return this.get('elementId') + '-input';
-  // }),
-
-  // inputPartial: computed('type', function() {
-  //   const type = this.get('type');
-  //   const partialName = defaultFor(type, 'default');
-
-  //   return `form-inputs/${partialName}`;
-  // }),
-
-  // formControls: computed.readOnly(function() {
-  //   return this.nearestWithProperty('isFormControls');
-  // }),
-
-  // label: computed('property', function() {
-  //   const property = defaultFor(this.get('cleanProperty'), '');
-
-  //   return toWords(property);
-  // }),
-
-  // type: computed(function() {
-  //   const property = this.get('cleanProperty');
-
-  //   let type;
-
-  //   if (property.match(/password/)) {
-  //     type = 'password';
-  //   } else if (property.match(/email/)) {
-  //     type = 'email';
-  //   } else if (property.match(/url/)) {
-  //     type = 'url';
-  //   } else if (property.match(/color/)) {
-  //     type = 'color';
-  //   } else if (property.match(/^tel/) || property.match(/^phone/)) {
-  //     type = 'tel';
-  //   } else if (property.match(/search/)) {
-  //     type = 'search';
-  //   } else if (this.get('content')) {
-  //     type = 'select';
-  //   } else {
-  //     const value = this.get('value');
-
-  //     if (typeOf(value) === 'number') {
-  //       type = 'number';
-  //     } else if (typeOf(value) === 'date') {
-  //       type = 'date';
-  //     } else if (typeOf(value) === 'boolean') {
-  //       type = 'checkbox';
-  //     }
-  //   }
-
-  //   return type;
-  // }),
-
-  // validityClass: computed('className', 'isNewlyValid', 'isValid',
-  //   function() {
-  //     const className = this.get('className');
-
-  //     let modifier;
-
-  //     if (this.get('isNewlyValid')) {
-  //       modifier = 'newly-valid';
-  //     } else if(this.get('isValid')) {
-  //       modifier = 'valid';
-  //     } else {
-  //       modifier = 'error';
-  //     }
-
-  //     return `${className}-${modifier}`;
-  //   }
-  // ),
-
-  // value: computed('property', function() {
-  //   return computed.alias(this.get('property'));
-  // }),
-
-  // /* Actions */
-
-  // actions: {
-  //   showError() {
-  //     this.set('shouldShowError', true);
-  //   },
-  // },
-
-  // /* Methods */
-
-  // listenForNewlyValid: observer('isValid', function() {
-  //   if (this.get('isValid')) {
-  //     this.set('isNewlyValid', true);
-  //   }
-
-  //   run.later(this, function() {
-  //     this.set('isNewlyValid', false);
-  //   }, 3000);
-  // }),
+    if (modelPath) {
+      return this.get('property').replace(`${modelPath}.`, '');
+    } else {
+      return this.get('property');
+    }
+  }),
 
-  registerAction: 'registerInputGroup',
-  unregisterAction: 'unregisterInputGroup',
+  dataTest: computed('cleanProperty', function() {
+    const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
+
+    return `input-wrapper-for-${cleanProperty}`;
+  }),
+
+  formController: computed(function() {
+    const hasFormController = this.nearestWithProperty('formController');
+
+    return hasFormController.get('formController');
+  }),
+
+  inputId: computed(function() {
+    return this.get('elementId') + '-input';
+  }),
+
+  inputPartial: computed('type', function() {
+    const type = this.get('type');
+    const partialName = defaultFor(type, 'default');
+
+    return `form-inputs/${partialName}`;
+  }),
+
+  setFormControls: Ember.on('init', function() {
+    this.set('formControls', this.nearestWithProperty('isFormControls'));
+  }),
+
+  label: computed('property', function() {
+    const property = defaultFor(this.get('cleanProperty'), '');
+
+    return toWords(property);
+  }),
 
-  registerWithForm: Ember.on('init', function() {
+  type: computed(function() {
+    const property = this.get('cleanProperty');
+
+    let type;
+
+    if (property.match(/password/)) {
+      type = 'password';
+    } else if (property.match(/email/)) {
+      type = 'email';
+    } else if (property.match(/url/)) {
+      type = 'url';
+    } else if (property.match(/color/)) {
+      type = 'color';
+    } else if (property.match(/^tel/) || property.match(/^phone/)) {
+      type = 'tel';
+    } else if (property.match(/search/)) {
+      type = 'search';
+    } else if (this.get('content')) {
+      type = 'select';
+    } else {
+      const value = this.get('value');
+
+      if (typeOf(value) === 'number') {
+        type = 'number';
+      } else if (typeOf(value) === 'date') {
+        type = 'date';
+      } else if (typeOf(value) === 'boolean') {
+        type = 'checkbox';
+      }
+    }
+
+    return type;
+  }),
+
+  validityClass: computed('className', 'isNewlyValid', 'isValid',
+    function() {
+      const className = this.get('className');
+
+      let modifier;
+
+      if (this.get('isNewlyValid')) {
+        modifier = 'newly-valid';
+      } else if(this.get('isValid')) {
+        modifier = 'valid';
+      } else {
+        modifier = 'error';
+      }
+
+      return `${className}-${modifier}`;
+    }
+  ),
+
+  /* Actions */
+
+  actions: {
+    showError() {
+      this.set('shouldShowError', true);
+    },
+  },
+
+  /* Methods */
+
+  setValueObserver: Ember.on('didInitAttrs', function() {
+    const property = this.get('property');
+
+    Ember.assert('You must set a property attribute on the {{input-group}} component', property);
+
+    const binding = Ember.bind(this, 'value', `formController.${property}`);
+
+    this.set('bindingForValue', binding);
+  }),
+
+  removeValueObserver: Ember.on('willDestroyElement', function() {
+    console.log(this.get('bindingForValue'));
+    this.get('bindingForValue').disconnect(this);
+  }),
+
+  listenForNewlyValid: observer('isValid', function() {
+    if (this.get('isValid')) {
+      this.set('isNewlyValid', true);
+    }
+
+    run.later(this, function() {
+      this.set('isNewlyValid', false);
+    }, 3000);
+  }),
+
+  _registerWithFormController: Ember.on('init', function() {
     this.sendAction('registerAction', this);
   }),
 
-  unregisterWithForm: Ember.on('willDestroyElement', function() {
+  _unregisterWithFormController: Ember.on('willDestroyElement', function() {
     this.sendAction('unregisterAction', this);
-  })
+  }),
 
 });
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 764cb0f..b9adfdd 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -15,9 +15,9 @@ export default Ember.Mixin.create(
     return this.toString().indexOf('/edit:') > -1;
   }),
 
-  isFormController: computed.readOnly(function() {
+  isFormController: computed(function() {
     return true;
-  }),
+  }).readOnly(),
 
   new: computed(function() {
     return this.toString().indexOf('/new:') > -1;
@@ -35,7 +35,7 @@ export default Ember.Mixin.create(
       });
     },
 
-    unregisterInputGroup(ipnutGroupComponent) {
+    unregisterInputGroup(inputGroupComponent) {
       this.off('submission', function() {
         inputGroupComponent.send('showError');
       });
diff --git a/addon/utils/nearest-controller-with-property.js b/addon/utils/nearest-controller-with-property.js
deleted file mode 100644
index 64ba146..0000000
--- a/addon/utils/nearest-controller-with-property.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Ember from 'ember';
-
-const { get } = Ember;
-
-export default function nearestControllerWithProperty(context, property) {
-  let view = get(context, 'parentView');
-
-  while (view) {
-    const controller = get(view, 'controller');
-
-    console.log(view.toString());
-
-    if (property in controller) {
-      return controller;
-    }
-
-    view = get(view, 'parentView');
-  }
-}
diff --git a/app/templates/form-inputs/date.hbs b/app/templates/form-inputs/date.hbs
new file mode 100644
index 0000000..259e3e5
--- /dev/null
+++ b/app/templates/form-inputs/date.hbs
@@ -0,0 +1 @@
+{{partial 'form-inputs/default'}}
diff --git a/app/templates/form-inputs/number.hbs b/app/templates/form-inputs/number.hbs
new file mode 100644
index 0000000..259e3e5
--- /dev/null
+++ b/app/templates/form-inputs/number.hbs
@@ -0,0 +1 @@
+{{partial 'form-inputs/default'}}
diff --git a/tests/dummy/app/resources/application/template.hbs b/tests/dummy/app/resources/application/template.hbs
index e8a9e3c..ba62456 100644
--- a/tests/dummy/app/resources/application/template.hbs
+++ b/tests/dummy/app/resources/application/template.hbs
@@ -5,6 +5,7 @@
 </dl>
 
 <ul>
+  <li>{{#link-to 'index'}}Home{{/link-to}}</li>
   <li>{{#link-to 'posts'}}Posts{{/link-to}}</li>
   <li>{{#link-to 'posts.new'}}New post{{/link-to}}</li>
   <li>{{#link-to 'post.edit' 1}}Edit post{{/link-to}}</li>
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
index 20f1193..335daa6 100644
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ b/tests/dummy/app/resources/posts/new/template.hbs
@@ -33,7 +33,7 @@
 
   {{/form-controls}}
 
-  {{form-submission}}
+  {{form-submission formIsSubmitted=formIsSubmitted}}
 
 {{/form-wrapper}}
 
@@ -53,5 +53,5 @@
 </dl>
 
 {{#if editing}}
-  {{destroy-submission}}
+  {{destroy-submission formIsSubmitted=formIsSubmitted}}
 {{/if}}

From 5f72b24127c6ea1393cf284e5154ae70782c4f19 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 6 Jul 2015 01:42:33 +0100
Subject: [PATCH 28/73] Error binding values

---
 addon/components/error-field.js            | 36 +++++++++++++---------
 addon/components/input-group.js            |  7 ++---
 addon/templates/components/error-field.hbs |  4 +--
 addon/templates/components/input-group.hbs |  2 +-
 app/templates/form-inputs/default.hbs      |  2 +-
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index faa6533..8a8e52d 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -6,15 +6,22 @@ const { computed, on } = Ember;
 
 export default Ember.Component.extend({
   shouldShowError: true,
+  bindingForErrors: null,
   className: 'error',
   classNameBindings: ['className', 'errorIsVisible:visible'],
-  error: null,
+  errors: null,
   errorIsVisible: computed.and('shouldShowError', 'error'),
   label: computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
 
+  formController: computed(function() {
+    const hasFormController = this.nearestWithProperty('formController');
+
+    return hasFormController.get('formController');
+  }),
+
   text: computed('error', 'property', function() {
     const { error, property } = this.getProperties(
       [ 'error', 'property' ]
@@ -24,23 +31,22 @@ export default Ember.Component.extend({
     return `${cleanProperty} ${error}`;
   }),
 
-  // addErrorObserver: on('init', function() {
-  //   const property = this.get('property');
+  addBindingForErrors: on('didInitAttrs', function() {
+    const property = this.get('property');
 
-  //   function setError() {
-  //     const error = controller.get(errorPath);
+    Ember.assert('You must set a property attribute on the {{error-field}} component', property);
 
-  //     parentView.set('isValid', !error);
+    const formController = this.get('formController');
 
-  //     this.set('error', controller.get(errorPath));
-  //   }
+    if (!!formController.get('validations')[property]) {
+      const errorPath = `formController.errors.${property}`;
+      const binding = Ember.bind(this, 'errors', errorPath);
 
-  //   if (property) {
-  //     const controller = this.nearest WithProperty('isFormController');
-  //     const errorPath = `errors.${property}.firstObject`;
+      this.set('bindingForErrors', binding);
+    }
+  }),
 
-  //     // TODO - Remove observer?
-  //     controller.addObserver(errorPath, this, setError);
-  //   }
-  // })
+  removeBindingForErrors: Ember.on('willDestroyElement', function() {
+    this.get('bindingForErrors').disconnect(this);
+  }),
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 119c0bf..0c1539e 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -139,9 +139,9 @@ export default Ember.Component.extend({
     },
   },
 
-  /* Methods */
+  /* Methods - avoid xBinding syntax */
 
-  setValueObserver: Ember.on('didInitAttrs', function() {
+  setBindingForValue: Ember.on('didInitAttrs', function() {
     const property = this.get('property');
 
     Ember.assert('You must set a property attribute on the {{input-group}} component', property);
@@ -151,8 +151,7 @@ export default Ember.Component.extend({
     this.set('bindingForValue', binding);
   }),
 
-  removeValueObserver: Ember.on('willDestroyElement', function() {
-    console.log(this.get('bindingForValue'));
+  removeBindingForValue: Ember.on('willDestroyElement', function() {
     this.get('bindingForValue').disconnect(this);
   }),
 
diff --git a/addon/templates/components/error-field.hbs b/addon/templates/components/error-field.hbs
index b10497a..cc4fb35 100644
--- a/addon/templates/components/error-field.hbs
+++ b/addon/templates/components/error-field.hbs
@@ -1,3 +1,3 @@
-{{#if error}}
-  {{capitalize-string label}} {{error}}
+{{#if errors.length}}
+  {{capitalize-string label}} {{errors.firstObject}}
 {{/if}}
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index 38cc9a9..baa59bd 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -5,7 +5,7 @@
   }}
 {{/if}}
 
-{{#if template}}
+{{#if hasBlock}}
   {{!-- If block form... --}}
   {{yield}}
 {{else}}
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index 7026574..3177c15 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -6,7 +6,7 @@
   value=value
   focus-out='showError'
   readonly=readonly
-  requir=required
+  required=required
   autofocus=autofocus
   disabled=disabled
   size=size

From 74541c27091b533c90e5f5da7b8659a630607d56 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 6 Jul 2015 16:37:39 +0100
Subject: [PATCH 29/73] Default iput fallback template funcitonality

---
 addon/components/error-field.js            |  6 +++---
 addon/components/input-group.js            |  9 +++++++--
 addon/templates/components/input-group.hbs | 12 +++++++-----
 app/templates/form-inputs/date.hbs         |  1 -
 app/templates/form-inputs/number.hbs       |  1 -
 5 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 app/templates/form-inputs/date.hbs
 delete mode 100644 app/templates/form-inputs/number.hbs

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 8a8e52d..9391b17 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -5,16 +5,16 @@ import toWords from '../utils/to-words';
 const { computed, on } = Ember;
 
 export default Ember.Component.extend({
-  shouldShowError: true,
+  shouldShowError: false,
   bindingForErrors: null,
   className: 'error',
-  classNameBindings: ['className', 'errorIsVisible:visible'],
+  classNameBindings: ['className', 'visible'],
   errors: null,
-  errorIsVisible: computed.and('shouldShowError', 'error'),
   label: computed.oneWay('property'),
   layout: layout,
   property: null,
   tagName: 'span',
+  visible: computed.and('shouldShowError', 'errors.length'),
 
   formController: computed(function() {
     const hasFormController = this.nearestWithProperty('formController');
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 0c1539e..f94b74a 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -63,10 +63,15 @@ export default Ember.Component.extend({
   }),
 
   inputPartial: computed('type', function() {
+    const container = this.get('container');
+    const dir = 'form-inputs/';
     const type = this.get('type');
-    const partialName = defaultFor(type, 'default');
 
-    return `form-inputs/${partialName}`;
+    if (!!container.lookup(`template:${dir}${type}`)) {
+      return `${dir}${type}`;
+    } else {
+      return `${dir}default`;
+    }
   }),
 
   setFormControls: Ember.on('init', function() {
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index baa59bd..0a9d817 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -13,11 +13,13 @@
   {{partial inputPartial}}
 {{/if}}
 
-{{error-field
-  shouldShowError=shouldShowError
-  label=label
-  property=property
-}}
+{{#if shouldShowError}}
+  {{error-field
+    shouldShowError=shouldShowError
+    label=label
+    property=property
+  }}
+{{/if}}
 
 {{#if hint}}
   {{hint-field hint=hint}}
diff --git a/app/templates/form-inputs/date.hbs b/app/templates/form-inputs/date.hbs
deleted file mode 100644
index 259e3e5..0000000
--- a/app/templates/form-inputs/date.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{partial 'form-inputs/default'}}
diff --git a/app/templates/form-inputs/number.hbs b/app/templates/form-inputs/number.hbs
deleted file mode 100644
index 259e3e5..0000000
--- a/app/templates/form-inputs/number.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{partial 'form-inputs/default'}}

From dbdc32d5a751418fde960d346caad510383cebf5 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 6 Jul 2015 17:39:50 +0100
Subject: [PATCH 30/73] form submission actions working

---
 addon/components/error-field.js        | 14 +++++---
 addon/components/form-submission.js    | 18 +++++++---
 addon/components/form-wrapper.js       |  2 +-
 addon/components/input-group.js        | 50 ++++++++++++++------------
 addon/mixins/controllers/form.js       |  1 +
 app/templates/form-inputs/textarea.hbs |  1 +
 6 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 9391b17..e7411e9 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -26,9 +26,9 @@ export default Ember.Component.extend({
     const { error, property } = this.getProperties(
       [ 'error', 'property' ]
     );
-    const cleanProperty = toWords(property);
+    const humanizedProperty = toWords(property);
 
-    return `${cleanProperty} ${error}`;
+    return `${humanizedProperty} ${error}`;
   }),
 
   addBindingForErrors: on('didInitAttrs', function() {
@@ -37,8 +37,10 @@ export default Ember.Component.extend({
     Ember.assert('You must set a property attribute on the {{error-field}} component', property);
 
     const formController = this.get('formController');
+    const validations = formController.get('validations');
+    const validationsForProperty = !!validations[property];
 
-    if (!!formController.get('validations')[property]) {
+    if (validationsForProperty && !this.get('bindingForErrors')) {
       const errorPath = `formController.errors.${property}`;
       const binding = Ember.bind(this, 'errors', errorPath);
 
@@ -47,6 +49,10 @@ export default Ember.Component.extend({
   }),
 
   removeBindingForErrors: Ember.on('willDestroyElement', function() {
-    this.get('bindingForErrors').disconnect(this);
+    const bindingForErrors = this.get('bindingForErrors');
+
+    if (bindingForErrors) {
+      bindingForErrors.disconnect(this);
+    }
   }),
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 2016dfe..1e4b1af 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -4,14 +4,22 @@ import layout from '../templates/components/form-submission';
 const { computed } = Ember;
 
 export default Ember.Component.extend({
+
+  /* Options */
+
   cancel: true,
+  cancelAction: 'cancel',
   cancelText: 'Cancel',
   className: 'form-submission',
+  submit: true,
+  submitAction: 'submit',
+  submitText: 'Save',
+
+  /* Properties */
+
   classNameBindings: ['className'],
   formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
   layout: layout,
-  submit: true,
-  submitText: 'Save',
 
   formController: computed(function() {
     const hasFormController = this.nearestWithProperty('formController');
@@ -19,13 +27,15 @@ export default Ember.Component.extend({
     return hasFormController.get('formController');
   }),
 
+  /* Actions */
+
   actions: {
     cancel() {
-      this.sendAction();
+      this.sendAction('cancelAction');
     },
 
     submit() {
-      this.sendAction();
+      this.sendAction('submitAction');
     },
   },
 
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 3d07cd5..a852024 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -31,7 +31,7 @@ export default Ember.Component.extend({
   moving forward */
 
   formController: Ember.computed(function() {
-    const routeController = this.get('_controller');
+    const routeController = this.get('targetObject');
 
     if (this.get('isFormController')) {
       return this;
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index f94b74a..d6d30e1 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -11,7 +11,6 @@ export default Ember.Component.extend({
   classNameBindings: ['className', 'validityClass'],
   formControls: null,
   hint: null,
-  isInputWrapper: true, // Static
   isInvalid: computed.not('isValid'),
   isNewlyValid: false,
   isValid: true,
@@ -36,7 +35,7 @@ export default Ember.Component.extend({
   prompt: null,
   disabled: null,
 
-  cleanProperty: computed('property', 'modelPath', function() {
+  propertyWithoutModel: computed('property', 'modelPath', function() {
     const modelPath = this.get('modelPath');
 
     if (modelPath) {
@@ -46,10 +45,11 @@ export default Ember.Component.extend({
     }
   }),
 
-  dataTest: computed('cleanProperty', function() {
-    const cleanProperty = Ember.String.dasherize(this.get('cleanProperty'));
+  dataTest: computed('propertyWithoutModel', function() {
+    const propertyWithoutModel = this.get('propertyWithoutModel');
+    const dasherizedProperty = Ember.String.dasherize(propertyWithoutModel);
 
-    return `input-wrapper-for-${cleanProperty}`;
+    return `input-wrapper-for-${dasherizedProperty}`;
   }),
 
   formController: computed(function() {
@@ -74,18 +74,18 @@ export default Ember.Component.extend({
     }
   }),
 
-  setFormControls: Ember.on('init', function() {
-    this.set('formControls', this.nearestWithProperty('isFormControls'));
-  }),
+  isInputWrapper: computed(function() {
+    return true;
+  }).readOnly(),
 
   label: computed('property', function() {
-    const property = defaultFor(this.get('cleanProperty'), '');
+    const property = defaultFor(this.get('propertyWithoutModel'), '');
 
     return toWords(property);
   }),
 
   type: computed(function() {
-    const property = this.get('cleanProperty');
+    const property = this.get('propertyWithoutModel');
 
     let type;
 
@@ -144,7 +144,21 @@ export default Ember.Component.extend({
     },
   },
 
-  /* Methods - avoid xBinding syntax */
+  /* Public methods - avoid xBinding syntax */
+
+  listenForNewlyValid: observer('isValid', function() {
+    if (this.get('isValid')) {
+      this.set('isNewlyValid', true);
+    }
+
+    run.later(this, function() {
+      this.set('isNewlyValid', false);
+    }, 3000);
+  }),
+
+  removeBindingForValue: Ember.on('willDestroyElement', function() {
+    this.get('bindingForValue').disconnect(this);
+  }),
 
   setBindingForValue: Ember.on('didInitAttrs', function() {
     const property = this.get('property');
@@ -156,19 +170,11 @@ export default Ember.Component.extend({
     this.set('bindingForValue', binding);
   }),
 
-  removeBindingForValue: Ember.on('willDestroyElement', function() {
-    this.get('bindingForValue').disconnect(this);
+  setFormControls: Ember.on('init', function() {
+    this.set('formControls', this.nearestWithProperty('isFormControls'));
   }),
 
-  listenForNewlyValid: observer('isValid', function() {
-    if (this.get('isValid')) {
-      this.set('isNewlyValid', true);
-    }
-
-    run.later(this, function() {
-      this.set('isNewlyValid', false);
-    }, 3000);
-  }),
+  /* Private methods */
 
   _registerWithFormController: Ember.on('init', function() {
     this.sendAction('registerAction', this);
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index b9adfdd..863eec1 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -61,6 +61,7 @@ export default Ember.Mixin.create(
     /* Show validation errors on submit click */
 
     submit() {
+      console.log('here');
       this.set('formIsSubmitted', true);
       this.trigger('submission');
 
diff --git a/app/templates/form-inputs/textarea.hbs b/app/templates/form-inputs/textarea.hbs
index 000dfb0..74355ad 100644
--- a/app/templates/form-inputs/textarea.hbs
+++ b/app/templates/form-inputs/textarea.hbs
@@ -19,4 +19,5 @@
   spellcheck=spellcheck
   required=required
   invalid=isInvalid
+  focus-out='showError'
 }}

From b3d3351b480b6a94ec03ffb8b9bed45d43af2288 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 6 Jul 2015 23:05:41 +0100
Subject: [PATCH 31/73] form submission class name mixin added

---
 addon/components/destroy-submission.js        | 18 ++++++--
 addon/components/form-submission.js           |  4 +-
 addon/components/form-wrapper.js              | 18 ++++++--
 addon/components/input-group.js               | 44 +++++++++++--------
 .../components/form-submission-class-name.js  | 20 +++++++++
 addon/mixins/controllers/form.js              |  1 -
 .../mixins/form-submission-class-name-test.js | 12 +++++
 7 files changed, 89 insertions(+), 28 deletions(-)
 create mode 100644 addon/mixins/components/form-submission-class-name.js
 create mode 100644 tests/unit/mixins/form-submission-class-name-test.js

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
index dc674ff..14fd9c5 100644
--- a/addon/components/destroy-submission.js
+++ b/addon/components/destroy-submission.js
@@ -1,14 +1,22 @@
 import Ember from 'ember';
+import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import layout from '../templates/components/destroy-submission';
 
 const { computed } = Ember;
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(
+  FormSubmissionClassNameMixin, {
+
+  /* Options */
+
   className: 'destroy-submission',
-  classNameBindings: ['className'],
+  destroyAction: 'destroy',
   destroyText: 'Delete',
+
+  /* Properties*/
+
+  classNameBindings: ['className'],
   formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
-  iconClass: 'icon-delete',
   layout: layout,
 
   formController: computed(function() {
@@ -17,9 +25,11 @@ export default Ember.Component.extend({
     return hasFormController.get('formController');
   }),
 
+  /* Actions */
+
   actions: {
     destroy() {
-      this.sendAction();
+      this.sendAction('destroy');
     }
   },
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 1e4b1af..73e563c 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -1,9 +1,11 @@
 import Ember from 'ember';
+import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import layout from '../templates/components/form-submission';
 
 const { computed } = Ember;
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(
+  FormSubmissionClassNameMixin, {
 
   /* Options */
 
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index a852024..e0f52b5 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -1,14 +1,23 @@
 import Ember from 'ember';
+import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import layout from '../templates/components/form-wrapper';
 
 const { computed } = Ember;
 
-export default Ember.Component.extend({
-  attributeBindings: ['novalidate'],
+export default Ember.Component.extend(
+  FormSubmissionClassNameMixin, {
+
+  /* Options */
+
   className: 'form',
+  novalidate: true,
+
+  /* Properties */
+
+  attributeBindings: ['novalidate'],
   classNameBindings: ['className'],
+  formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
   layout: layout,
-  novalidate: true,
   tagName: 'form',
 
   actions: {
@@ -27,6 +36,8 @@ export default Ember.Component.extend({
 
   },
 
+  /* Properties */
+
   /* A shim to enabled use with controller and components
   moving forward */
 
@@ -41,4 +52,5 @@ export default Ember.Component.extend({
       return null;
     }
   }),
+
 });
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index d6d30e1..563412c 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -3,24 +3,15 @@ import Ember from 'ember';
 import layout from '../templates/components/input-group';
 import toWords from '../utils/to-words';
 
-const { computed, observer, run, typeOf } = Ember;
+const { computed, observer, on, run, typeOf } = Ember;
 
 export default Ember.Component.extend({
-  bindingForValue: null, // Avoid xBinding naming convention
+
+  /* Options */
+
   className: 'input-wrapper',
-  classNameBindings: ['className', 'validityClass'],
-  formControls: null,
   hint: null,
-  isInvalid: computed.not('isValid'),
-  isNewlyValid: false,
-  isValid: true,
-  layout: layout,
-  modelPath: computed.oneWay('formControls.modelPath'),
   property: null,
-  registerAction: 'registerInputGroup',
-  shouldShowError: false,
-  unregisterAction: 'unregisterInputGroup',
-  value: null,
 
   /* Input attributes */
 
@@ -33,7 +24,22 @@ export default Ember.Component.extend({
   name: computed.oneWay('property'),
   placeholder: null,
   prompt: null,
-  disabled: null,
+  disabled: false,
+
+  /* Properties */
+
+  bindingForValue: null, // Avoid xBinding naming convention
+  classNameBindings: ['className', 'validityClass'],
+  formControls: null,
+  isInvalid: computed.not('isValid'),
+  isNewlyValid: false,
+  isValid: true,
+  layout: layout,
+  modelPath: computed.oneWay('formControls.modelPath'),
+  registerAction: 'registerInputGroup',
+  shouldShowError: false,
+  unregisterAction: 'unregisterInputGroup',
+  value: null,
 
   propertyWithoutModel: computed('property', 'modelPath', function() {
     const modelPath = this.get('modelPath');
@@ -156,11 +162,11 @@ export default Ember.Component.extend({
     }, 3000);
   }),
 
-  removeBindingForValue: Ember.on('willDestroyElement', function() {
+  removeBindingForValue: on('willDestroyElement', function() {
     this.get('bindingForValue').disconnect(this);
   }),
 
-  setBindingForValue: Ember.on('didInitAttrs', function() {
+  setBindingForValue: on('didInitAttrs', function() {
     const property = this.get('property');
 
     Ember.assert('You must set a property attribute on the {{input-group}} component', property);
@@ -170,17 +176,17 @@ export default Ember.Component.extend({
     this.set('bindingForValue', binding);
   }),
 
-  setFormControls: Ember.on('init', function() {
+  setFormControls: on('init', function() {
     this.set('formControls', this.nearestWithProperty('isFormControls'));
   }),
 
   /* Private methods */
 
-  _registerWithFormController: Ember.on('init', function() {
+  _registerWithFormController: on('init', function() {
     this.sendAction('registerAction', this);
   }),
 
-  _unregisterWithFormController: Ember.on('willDestroyElement', function() {
+  _unregisterWithFormController: on('willDestroyElement', function() {
     this.sendAction('unregisterAction', this);
   }),
 
diff --git a/addon/mixins/components/form-submission-class-name.js b/addon/mixins/components/form-submission-class-name.js
new file mode 100644
index 0000000..0909ff5
--- /dev/null
+++ b/addon/mixins/components/form-submission-class-name.js
@@ -0,0 +1,20 @@
+import Ember from 'ember';
+
+const { computed } = Ember;
+
+export default Ember.Mixin.create({
+  classNameBindings: ['submissionClassName'],
+
+  submissionClassName: computed('className', 'formIsSubmitted',
+    function() {
+      const className = this.get('className');
+      const formIsSubmitted = this.get('formIsSubmitted');
+
+      if (formIsSubmitted) {
+        return `${className}-submitted`;
+      } else {
+        return null;
+      }
+    }
+  ),
+});
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 863eec1..b9adfdd 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -61,7 +61,6 @@ export default Ember.Mixin.create(
     /* Show validation errors on submit click */
 
     submit() {
-      console.log('here');
       this.set('formIsSubmitted', true);
       this.trigger('submission');
 
diff --git a/tests/unit/mixins/form-submission-class-name-test.js b/tests/unit/mixins/form-submission-class-name-test.js
new file mode 100644
index 0000000..783363c
--- /dev/null
+++ b/tests/unit/mixins/form-submission-class-name-test.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import FormSubmissionClassNameMixin from '../../../mixins/form-submission-class-name';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | form submission class name');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var FormSubmissionClassNameObject = Ember.Object.extend(FormSubmissionClassNameMixin);
+  var subject = FormSubmissionClassNameObject.create();
+  assert.ok(subject);
+});

From 88eb3fff3896472bae648b1aede3da27f7432f4a Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 00:33:48 +0100
Subject: [PATCH 32/73] Destroy submission in favor of form-submission

---
 addon/components/destroy-submission.js        | 35 -------------------
 addon/components/form-submission.js           | 15 +++++++-
 addon/components/loading-spinner.js           |  8 -----
 addon/initializers/routing-events.js          |  5 +--
 .../controllers/conditional-validations.js    |  5 ++-
 .../components/destroy-submission.hbs         | 12 -------
 .../templates/components/form-submission.hbs  | 16 ++++++++-
 .../templates/components/loading-spinner.hbs  |  2 --
 8 files changed, 34 insertions(+), 64 deletions(-)
 delete mode 100644 addon/components/destroy-submission.js
 delete mode 100644 addon/components/loading-spinner.js
 delete mode 100644 addon/templates/components/destroy-submission.hbs
 delete mode 100644 addon/templates/components/loading-spinner.hbs

diff --git a/addon/components/destroy-submission.js b/addon/components/destroy-submission.js
deleted file mode 100644
index 14fd9c5..0000000
--- a/addon/components/destroy-submission.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import Ember from 'ember';
-import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
-import layout from '../templates/components/destroy-submission';
-
-const { computed } = Ember;
-
-export default Ember.Component.extend(
-  FormSubmissionClassNameMixin, {
-
-  /* Options */
-
-  className: 'destroy-submission',
-  destroyAction: 'destroy',
-  destroyText: 'Delete',
-
-  /* Properties*/
-
-  classNameBindings: ['className'],
-  formIsSubmitted: computed.oneWay('formController.formIsSubmitted'),
-  layout: layout,
-
-  formController: computed(function() {
-    const hasFormController = this.nearestWithProperty('formController');
-
-    return hasFormController.get('formController');
-  }),
-
-  /* Actions */
-
-  actions: {
-    destroy() {
-      this.sendAction('destroy');
-    }
-  },
-});
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 73e563c..b4a43ec 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -9,10 +9,16 @@ export default Ember.Component.extend(
 
   /* Options */
 
+  className: 'form-submission',
+
   cancel: true,
   cancelAction: 'cancel',
   cancelText: 'Cancel',
-  className: 'form-submission',
+
+  destroy: false,
+  destroyAction: 'destroy',
+  destroyText: 'Delete',
+
   submit: true,
   submitAction: 'submit',
   submitText: 'Save',
@@ -32,13 +38,20 @@ export default Ember.Component.extend(
   /* Actions */
 
   actions: {
+
     cancel() {
       this.sendAction('cancelAction');
     },
 
+    destroy() {
+      this.sendAction('destroy');
+    },
+
     submit() {
       this.sendAction('submitAction');
     },
+
   },
 
+
 });
diff --git a/addon/components/loading-spinner.js b/addon/components/loading-spinner.js
deleted file mode 100644
index 87fcb69..0000000
--- a/addon/components/loading-spinner.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Ember from 'ember';
-import layout from '../templates/components/loading-spinner';
-
-export default Ember.Component.extend({
-  className: 'spinner',
-  classNameBindings: ['className'],
-  layout: layout
-});
diff --git a/addon/initializers/routing-events.js b/addon/initializers/routing-events.js
index f9d9e83..cca5608 100644
--- a/addon/initializers/routing-events.js
+++ b/addon/initializers/routing-events.js
@@ -17,8 +17,7 @@ export function initialize(/* container, app */) {
   @submodule routes
   */
 
-  Ember.Route.reopen(
-    Ember.Evented, {
+  Ember.Route.reopen({
 
     /**
     @ISSUE https://github.com/emberjs/ember.js/issues/5394
@@ -47,7 +46,6 @@ export function initialize(/* container, app */) {
 
       didTransition: function() {
         this.get('controller').trigger('routeDidTransition');
-        this.trigger('didTransition');
 
         return true; // So action bubbles
       },
@@ -63,7 +61,6 @@ export function initialize(/* container, app */) {
 
       willTransition: function() {
         this.get('controller').trigger('routeWillTransition');
-        this.trigger('willTransition');
 
         return true; // So action bubbles
       }
diff --git a/addon/mixins/controllers/conditional-validations.js b/addon/mixins/controllers/conditional-validations.js
index d2f2ea1..4d9bca4 100644
--- a/addon/mixins/controllers/conditional-validations.js
+++ b/addon/mixins/controllers/conditional-validations.js
@@ -15,7 +15,10 @@ export default Ember.Mixin.create({
     }
   },
 
-  // TODO - add observes revalidateFor.[]
+  /* TODO - update to new controller hooks with routable
+  components release. At that time, deprecate the routing-events
+  initializer */
+
   _revalidate: on('routeDidTransition',
     function() {
       Ember.assert('No validate() method detected. You must use the conditional validations mixin with the form mixin.', this.validate);
diff --git a/addon/templates/components/destroy-submission.hbs b/addon/templates/components/destroy-submission.hbs
deleted file mode 100644
index 9bb2a45..0000000
--- a/addon/templates/components/destroy-submission.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-{{#if formIsSubmitted}}
-  {{loading-spinner}}
-{{else}}
-  <button
-    {{action 'destroy'}}
-    class="button-secondary"
-    data-test="button-destroy"
-  >
-    <span class="icon-delete"></span>
-    <span class="text">{{destroyText}}</span>
-  </button>
-{{/if}}
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index 701eea2..78b05f6 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -1,21 +1,35 @@
 {{#if formIsSubmitted}}
-  {{loading-spinner}}
+  Submitting...
 {{else}}
 
   {{#if cancel}}
     <button
       {{action 'cancel'}}
       class="button-secondary"
+      data-test="button-secondary"
       type="reset"
     >
       {{cancelText}}
     </button>
   {{/if}}
 
+  {{#if destroy}}
+    <button
+      {{action 'destroy'}}
+      class="button-secondary"
+      data-test="button-destroy"
+      type="button"
+    >
+      <span class="icon-delete"></span>
+      <span class="text">{{destroyText}}</span>
+    </button>
+  {{/if}}
+
   {{#if submit}}
     <button
       {{action 'submit'}}
       class="button-primary"
+      data-test="button-primary"
       type="submit"
     >
       <span class="icon-check"></span>
diff --git a/addon/templates/components/loading-spinner.hbs b/addon/templates/components/loading-spinner.hbs
deleted file mode 100644
index 40f3548..0000000
--- a/addon/templates/components/loading-spinner.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<span class="icon-spinner"></span>
-<span class="hidden">Loading</span>

From 77f61b5ce2f8a53fd4d058b2aee89452a23999e6 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 01:06:53 +0100
Subject: [PATCH 33/73] Destroy renamed to delete because of Ember naming
 convention clashes

---
 addon/components/form-submission-button.js    | 23 ++++++++++
 addon/components/form-submission.js           | 10 ++---
 addon/components/form-wrapper.js              |  2 +-
 addon/mixins/controllers/form.js              |  4 +-
 .../components/form-submission-button.hbs     |  5 +++
 .../templates/components/form-submission.hbs  | 45 ++++++++-----------
 app/components/form-submission-button.js      |  1 +
 .../components/form-submission-button-test.js | 19 ++++++++
 8 files changed, 74 insertions(+), 35 deletions(-)
 create mode 100644 addon/components/form-submission-button.js
 create mode 100644 addon/templates/components/form-submission-button.hbs
 create mode 100644 app/components/form-submission-button.js
 create mode 100644 tests/unit/components/form-submission-button-test.js

diff --git a/addon/components/form-submission-button.js b/addon/components/form-submission-button.js
new file mode 100644
index 0000000..fdef472
--- /dev/null
+++ b/addon/components/form-submission-button.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import layout from '../templates/components/form-submission-button';
+
+export default Ember.Component.extend({
+
+  /* Options */
+
+  action: null,
+  className: 'button',
+  text: null,
+  type: 'button',
+
+  /* Properties */
+
+  attributeBindings: ['className:data-test', 'type'],
+  classNameBindings: ['className'],
+  layout: layout,
+  tagName: 'button',
+
+  click: function() {
+    this.sendAction();
+  },
+});
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index b4a43ec..570b7cc 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -15,9 +15,9 @@ export default Ember.Component.extend(
   cancelAction: 'cancel',
   cancelText: 'Cancel',
 
-  destroy: false,
-  destroyAction: 'destroy',
-  destroyText: 'Delete',
+  delete: false,
+  deleteAction: 'delete',
+  deleteText: 'Delete',
 
   submit: true,
   submitAction: 'submit',
@@ -43,8 +43,8 @@ export default Ember.Component.extend(
       this.sendAction('cancelAction');
     },
 
-    destroy() {
-      this.sendAction('destroy');
+    delete() {
+      this.sendAction('delete');
     },
 
     submit() {
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index e0f52b5..4a8e990 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -26,7 +26,7 @@ export default Ember.Component.extend(
       this.sendAction();
     },
 
-    destroy() {
+    delete() {
       this.sendAction();
     },
 
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index b9adfdd..145d0d8 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -52,10 +52,10 @@ export default Ember.Mixin.create(
       this._eventHandler('cancel');
     },
 
-    destroy() {
+    delete() {
       this.set('formIsSubmitted', true);
 
-      this._eventHandler('destroy');
+      this._eventHandler('delete');
     },
 
     /* Show validation errors on submit click */
diff --git a/addon/templates/components/form-submission-button.hbs b/addon/templates/components/form-submission-button.hbs
new file mode 100644
index 0000000..e347e48
--- /dev/null
+++ b/addon/templates/components/form-submission-button.hbs
@@ -0,0 +1,5 @@
+{{#if hasBlock}}
+  {{yield}}
+{{else}}
+  {{text}}
+{{/if}}
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index 78b05f6..41c4884 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -3,38 +3,29 @@
 {{else}}
 
   {{#if cancel}}
-    <button
-      {{action 'cancel'}}
-      class="button-secondary"
-      data-test="button-secondary"
-      type="reset"
-    >
-      {{cancelText}}
-    </button>
+    {{form-submission-button
+      action='cancel'
+      class='button-secondary'
+      text=cancelText
+      type='reset'
+    }}
   {{/if}}
 
-  {{#if destroy}}
-    <button
-      {{action 'destroy'}}
-      class="button-secondary"
-      data-test="button-destroy"
-      type="button"
-    >
-      <span class="icon-delete"></span>
-      <span class="text">{{destroyText}}</span>
-    </button>
+  {{#if delete}}
+    {{form-submission-button
+      action='delete'
+      class='button-secondary'
+      text=deleteText
+    }}
   {{/if}}
 
   {{#if submit}}
-    <button
-      {{action 'submit'}}
-      class="button-primary"
-      data-test="button-primary"
-      type="submit"
-    >
-      <span class="icon-check"></span>
-      <span class="text">{{submitText}}</span>
-    </button>
+    {{form-submission-button
+      action='submit'
+      class='button-primary'
+      text=submitText
+      type='submit'
+    }}
   {{/if}}
 
 {{/if}}
diff --git a/app/components/form-submission-button.js b/app/components/form-submission-button.js
new file mode 100644
index 0000000..a6503b6
--- /dev/null
+++ b/app/components/form-submission-button.js
@@ -0,0 +1 @@
+export { default } from 'ember-easy-form-extensions/components/form-submission-button';
\ No newline at end of file
diff --git a/tests/unit/components/form-submission-button-test.js b/tests/unit/components/form-submission-button-test.js
new file mode 100644
index 0000000..7f6d801
--- /dev/null
+++ b/tests/unit/components/form-submission-button-test.js
@@ -0,0 +1,19 @@
+import { moduleForComponent, test } from 'ember-qunit';
+
+moduleForComponent('form-submission-button', 'Unit | Component | form submission button', {
+  // Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar'],
+  unit: true
+});
+
+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');
+});

From 5c24dd618efd61c7f3a1dc8f937879354b3b008c Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 11:01:40 +0100
Subject: [PATCH 34/73] validateAndSave --> validateThenSave, disabled added to
 buttons

---
 addon/components/form-submission-button.js    |  8 ++-
 addon/components/form-wrapper.js              | 33 ++++++-----
 addon/mixins/controllers/form.js              | 18 ++----
 .../templates/components/form-submission.hbs  | 55 ++++++++++---------
 addon/utils/computed/insert.js                | 29 ----------
 addon/utils/observers/soft-assert.js          | 51 ++++++-----------
 package.json                                  |  1 +
 tests/dummy/app/adapters/application.js       |  3 +-
 8 files changed, 76 insertions(+), 122 deletions(-)
 delete mode 100644 addon/utils/computed/insert.js

diff --git a/addon/components/form-submission-button.js b/addon/components/form-submission-button.js
index fdef472..1f75e31 100644
--- a/addon/components/form-submission-button.js
+++ b/addon/components/form-submission-button.js
@@ -7,17 +7,21 @@ export default Ember.Component.extend({
 
   action: null,
   className: 'button',
+  disabled: false,
   text: null,
   type: 'button',
 
   /* Properties */
 
-  attributeBindings: ['className:data-test', 'type'],
+  attributeBindings: ['className:data-test', 'disabled', 'type'],
   classNameBindings: ['className'],
   layout: layout,
   tagName: 'button',
 
-  click: function() {
+  click: function(event) {
+    event.preventDefault();
+    event.stopPropagation();
+
     this.sendAction();
   },
 });
diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index 4a8e990..cafc064 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import layout from '../templates/components/form-wrapper';
 
-const { computed } = Ember;
+const { computed, on } = Ember;
 
 export default Ember.Component.extend(
   FormSubmissionClassNameMixin, {
@@ -20,22 +20,6 @@ export default Ember.Component.extend(
   layout: layout,
   tagName: 'form',
 
-  actions: {
-
-    cancel() {
-      this.sendAction();
-    },
-
-    delete() {
-      this.sendAction();
-    },
-
-    submit() {
-      this.sendAction();
-    },
-
-  },
-
   /* Properties */
 
   /* A shim to enabled use with controller and components
@@ -53,4 +37,19 @@ export default Ember.Component.extend(
     }
   }),
 
+  /* Methods */
+
+  /* Autofocus on the first input.
+
+  TODO - move to form component
+  mixin when routeable components land */
+
+  autofocus: on('didInsertElement', function() {
+    var input = this.$().find('input').first();
+
+    if (!Ember.$(input).hasClass('datepicker')) {
+      input.focus();
+    }
+  }),
+
 });
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 145d0d8..7729bb0 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -71,17 +71,7 @@ export default Ember.Mixin.create(
 
   /* Methods */
 
-  /* Autofocus on the first input */
-
-  autofocus: on('didInsertElement', function() {
-    var input = this.$().find('input').first();
-
-    if (!Ember.$(input).hasClass('datepicker')) {
-      input.focus();
-    }
-  }),
-
-  resetForm: on('willInsertElement', function() {
+  resetForm: on('routeDidTransition', function() {
     this.set('formIsSubmitted', false);
   }),
 
@@ -89,7 +79,7 @@ export default Ember.Mixin.create(
     this.set('formIsSubmitted', false);
   },
 
-  validateAndSave() {
+  validateThenSave() {
     const _this = this;
 
     function resolve() {
@@ -142,7 +132,9 @@ export default Ember.Mixin.create(
 
     /* If event is submit, method is renamed */
 
-    type = type === 'submit' ? 'validateAndSave' : type;
+    if (type === 'submit') {
+      type = 'validateThenSave';
+    }
 
     const method = this[type];
 
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index 41c4884..c6289a3 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -1,31 +1,32 @@
-{{#if formIsSubmitted}}
-  Submitting...
-{{else}}
-
-  {{#if cancel}}
-    {{form-submission-button
-      action='cancel'
-      class='button-secondary'
-      text=cancelText
-      type='reset'
-    }}
-  {{/if}}
+{{#if cancel}}
+  {{form-submission-button
+    action='cancel'
+    class='button-secondary'
+    disabled=formIsSubmitted
+    text=cancelText
+    type='reset'
+  }}
+{{/if}}
 
-  {{#if delete}}
-    {{form-submission-button
-      action='delete'
-      class='button-secondary'
-      text=deleteText
-    }}
-  {{/if}}
+{{#if delete}}
+  {{form-submission-button
+    action='delete'
+    class='button-secondary'
+    disabled=formIsSubmitted
+    text=deleteText
+  }}
+{{/if}}
 
-  {{#if submit}}
-    {{form-submission-button
-      action='submit'
-      class='button-primary'
-      text=submitText
-      type='submit'
-    }}
-  {{/if}}
+{{#if submit}}
+  {{form-submission-button
+    action='submit'
+    class='button-primary'
+    disabled=formIsSubmitted
+    text=submitText
+    type='submit'
+  }}
+{{/if}}
 
+{{#if formIsSubmitted}}
+  Submitting...
 {{/if}}
diff --git a/addon/utils/computed/insert.js b/addon/utils/computed/insert.js
deleted file mode 100644
index df9a183..0000000
--- a/addon/utils/computed/insert.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Ember from 'ember';
-
-/**
-Example usage:
-
-```
-App.SomeController = Em.Controller.extend({
-  type: 'MultipleChoice',
-  questionController: Utils.computed.insert('type', 'App.{{value}}QuestionController')
-});
-```
-
-`this.get('questionController')` will now return `App.MultipleChoiceQuestionController`.
-
-@method Utils.insert
-@param {String} dependentKey The name of the Ember property to observe
-@param {String} string The string to insert the value of `dependentKey` into
-@return A string equal to `string` but with `{{value}}` replaced by the value of `dependentKey`
-*/
-
-export default function(dependentKey, string) {
-  return function() {
-    const inCorrectFormat = string.indexOf('{{value}}') > -1;
-
-    Ember.assert('You must pass a string in the format "Some stuff {{value}}" as the second argument of Utils.computed.insert', inCorrectFormat);
-
-    return string.replace('{{value}}', this.get(dependentKey));
-  }.property(dependentKey);
-}
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
index fb0a48b..867e8ba 100644
--- a/addon/utils/observers/soft-assert.js
+++ b/addon/utils/observers/soft-assert.js
@@ -1,5 +1,5 @@
 /**
-Checks whether a property is present on a class and shows a warning to the developer when it is not. In production environments this does nothing.
+Checks whether a property is present on a class and shows a warning to the developer when it is not.
 
 Options can be pased as a second parameter:
 
@@ -22,42 +22,27 @@ Ember.Component.extend({
 @param {Object} options An object containing options for your assertion
 */
 
-import defaultFor from '../default-for';
 import Ember from 'ember';
-// import ENV from '../../config/environment';
-
-var macro;
-
-// TODO
-// if (ENV.environment === 'development') {
-
-  macro = function(dependentKey, options) {
-    var eventName;
+import defaultFor from '../default-for';
 
-    options = defaultFor(options, {});
-    eventName = defaultFor(options.eventName, 'init');
+export default function softAssert(dependentKey, options = {}) {
+  const eventName = defaultFor(options.eventName, 'init');
 
-    return Ember.on(eventName, Ember.observer(dependentKey, function() {
-      var value = defaultFor(this.get(dependentKey), '');
-      var constructor;
+  return Ember.on(eventName, function() {
+    const value = defaultFor(this.get(dependentKey), '');
 
-      if (!value) {
-        constructor = this.get('constructor').toString();
+    if (!value) {
+      const constructor = this.get('constructor').toString();
 
-        Ember.warn(
-          'You failed to pass a ' + dependentKey +' property to ' + constructor
-        );
+      Ember.warn(
+        'You failed to pass a ' + dependentKey +' property to ' + constructor
+      );
 
-        if (options.onTrue) {
-          options.callbacks.onTrue().bind(this);
-        }
-      } else if (options.onFalse) {
-        options.callbacks.onFalse().bind(this);
+      if (options.onTrue) {
+        options.callbacks.onTrue().bind(this);
       }
-    }));
-  };
-// } else {
-//   macro = Ember.K
-// }
-
-export default macro;
+    } else if (options.onFalse) {
+      options.callbacks.onFalse().bind(this);
+    }
+  });
+};
diff --git a/package.json b/package.json
index 980fb22..271e0e1 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
     "ember-data": "1.13.4",
+    "ember-data-fixture-adapter": "1.0.0",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
diff --git a/tests/dummy/app/adapters/application.js b/tests/dummy/app/adapters/application.js
index b0a4c1e..e0e672a 100644
--- a/tests/dummy/app/adapters/application.js
+++ b/tests/dummy/app/adapters/application.js
@@ -1,6 +1,7 @@
 import DS from 'ember-data';
+import FixtureAdapter from 'ember-data-fixture-adapter';
 
-export default DS.FixtureAdapter.extend({
+export default FixtureAdapter.extend({
   simulateRemoteResponse: false,
 
   /**

From bf09ced9f52cfdb62b79344b8e3f0166968fb076 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 11:56:47 +0100
Subject: [PATCH 35/73] Default value work

---
 addon/components/input-group.js         | 10 ++++++++--
 app/templates/form-inputs/checkbox.hbs  |  1 +
 app/templates/form-inputs/default.hbs   |  3 ++-
 app/templates/form-inputs/select.hbs    |  1 +
 app/templates/form-inputs/textarea.hbs  |  3 ++-
 tests/dummy/app/resources/post/model.js | 12 ++++++++++--
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 563412c..60b9a21 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -163,11 +163,17 @@ export default Ember.Component.extend({
   }),
 
   removeBindingForValue: on('willDestroyElement', function() {
-    this.get('bindingForValue').disconnect(this);
+    const bindingForValue = this.get('bindingForValue');
+
+    if (bindingForValue) {
+      bindingForValue.disconnect(this);
+    }
   }),
 
   setBindingForValue: on('didInitAttrs', function() {
-    const property = this.get('property');
+    const { property, type} = this.getProperties(
+      [ 'property', 'type' ]
+    );
 
     Ember.assert('You must set a property attribute on the {{input-group}} component', property);
 
diff --git a/app/templates/form-inputs/checkbox.hbs b/app/templates/form-inputs/checkbox.hbs
index 1789acc..e4535f9 100644
--- a/app/templates/form-inputs/checkbox.hbs
+++ b/app/templates/form-inputs/checkbox.hbs
@@ -1,5 +1,6 @@
 {{input
   id=inputId
+
   placeholder=placeholder
   name=name
   type=type
diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index 3177c15..98469d6 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -1,10 +1,11 @@
 {{input
   id=inputId
+  focus-out='showError'
+
   placeholder=placeholder
   name=name
   type=type
   value=value
-  focus-out='showError'
   readonly=readonly
   required=required
   autofocus=autofocus
diff --git a/app/templates/form-inputs/select.hbs b/app/templates/form-inputs/select.hbs
index 601abaf..0e78144 100644
--- a/app/templates/form-inputs/select.hbs
+++ b/app/templates/form-inputs/select.hbs
@@ -1,5 +1,6 @@
 {{view 'select'
   id=inputId
+
   content=content
   name=name
   value=value
diff --git a/app/templates/form-inputs/textarea.hbs b/app/templates/form-inputs/textarea.hbs
index 74355ad..88df991 100644
--- a/app/templates/form-inputs/textarea.hbs
+++ b/app/templates/form-inputs/textarea.hbs
@@ -1,5 +1,7 @@
 {{textarea
   id=inputId
+  focus-out='showError'
+
   placeholder=placeholder
   name=name
   type=type
@@ -19,5 +21,4 @@
   spellcheck=spellcheck
   required=required
   invalid=isInvalid
-  focus-out='showError'
 }}
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
index 312f99d..09f70a1 100644
--- a/tests/dummy/app/resources/post/model.js
+++ b/tests/dummy/app/resources/post/model.js
@@ -4,9 +4,17 @@ import Ember from 'ember';
 const { attr } = DS;
 
 const PostModel = DS.Model.extend({
-  category: attr('string'),
+  category: attr('string', {
+    defaultValue() {
+      return 'ember';
+    }
+  }),
   description: attr('string'),
-  published: attr('boolean'),
+  published: attr('boolean', {
+    defaultValue() {
+      return false;
+    }
+  }),
   title: attr('string'),
   views: attr('number'),
   writtenOn: attr('date'),

From b04e1c63834f271257d8758e938ddc4908539349 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 12:07:55 +0100
Subject: [PATCH 36/73] Test suite errors fixed for first tests

---
 addon/components/input-group.js               |  4 +---
 addon/helpers/capitalize-string.js            |  2 +-
 addon/initializers/easy-form-extensions.js    |  2 +-
 addon/utils/observers/soft-assert.js          |  2 +-
 tests/acceptance/form-layout-test.js          | 23 -------------------
 tests/unit/components/form-control-test.js    | 21 -----------------
 tests/unit/components/hint-field-test.js      |  3 +--
 tests/unit/components/input-field-test.js     | 21 -----------------
 tests/unit/components/label-field-test.js     |  3 +--
 tests/unit/components/test-comp-test.js       | 21 -----------------
 tests/unit/helpers/to-words-test.js           | 12 ----------
 .../mixins/form-submission-class-name-test.js |  2 +-
 tests/unit/services/easy-form-test.js         | 15 ------------
 13 files changed, 7 insertions(+), 124 deletions(-)
 delete mode 100644 tests/acceptance/form-layout-test.js
 delete mode 100644 tests/unit/components/form-control-test.js
 delete mode 100644 tests/unit/components/input-field-test.js
 delete mode 100644 tests/unit/components/test-comp-test.js
 delete mode 100644 tests/unit/helpers/to-words-test.js
 delete mode 100644 tests/unit/services/easy-form-test.js

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 60b9a21..c48a47d 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -171,9 +171,7 @@ export default Ember.Component.extend({
   }),
 
   setBindingForValue: on('didInitAttrs', function() {
-    const { property, type} = this.getProperties(
-      [ 'property', 'type' ]
-    );
+    const property = this.get('property');
 
     Ember.assert('You must set a property attribute on the {{input-group}} component', property);
 
diff --git a/addon/helpers/capitalize-string.js b/addon/helpers/capitalize-string.js
index 6c8ed41..6fcd40e 100644
--- a/addon/helpers/capitalize-string.js
+++ b/addon/helpers/capitalize-string.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export function capitalizeString(params) {
-  const string = params[0];
+  const string = params[0] || '';
 
   return Ember.String.capitalize(string);
 }
diff --git a/addon/initializers/easy-form-extensions.js b/addon/initializers/easy-form-extensions.js
index 38ad141..fa80c08 100644
--- a/addon/initializers/easy-form-extensions.js
+++ b/addon/initializers/easy-form-extensions.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-export function initialize(container, app) {
+export function initialize() {
 
   Ember.Checkbox.reopen({
     attributeBindings: [
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
index 867e8ba..13fdd5d 100644
--- a/addon/utils/observers/soft-assert.js
+++ b/addon/utils/observers/soft-assert.js
@@ -45,4 +45,4 @@ export default function softAssert(dependentKey, options = {}) {
       options.callbacks.onFalse().bind(this);
     }
   });
-};
+}
diff --git a/tests/acceptance/form-layout-test.js b/tests/acceptance/form-layout-test.js
deleted file mode 100644
index 09193f3..0000000
--- a/tests/acceptance/form-layout-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Ember from 'ember';
-import { module, test } from 'qunit';
-import startApp from 'ember-easy-form-extensions/tests/helpers/start-app';
-
-var application;
-
-module('Acceptance | form layout', {
-  beforeEach: function() {
-    application = startApp();
-  },
-
-  afterEach: function() {
-    Ember.run(application, 'destroy');
-  }
-});
-
-test('visiting /form-layout', function(assert) {
-  visit('/form-layout');
-
-  andThen(function() {
-    assert.equal(currentURL(), '/form-layout');
-  });
-});
diff --git a/tests/unit/components/form-control-test.js b/tests/unit/components/form-control-test.js
deleted file mode 100644
index 4ec65ba..0000000
--- a/tests/unit/components/form-control-test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
-
-moduleForComponent('form-control', {
-  // 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');
-});
diff --git a/tests/unit/components/hint-field-test.js b/tests/unit/components/hint-field-test.js
index 8aae867..4c35122 100644
--- a/tests/unit/components/hint-field-test.js
+++ b/tests/unit/components/hint-field-test.js
@@ -4,8 +4,7 @@ import {
 } from 'ember-qunit';
 
 moduleForComponent('hint-field', {
-  // Specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar']
+  needs: ['helper:capitalize-string'],
 });
 
 test('it renders', function(assert) {
diff --git a/tests/unit/components/input-field-test.js b/tests/unit/components/input-field-test.js
deleted file mode 100644
index 7cc93ba..0000000
--- a/tests/unit/components/input-field-test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
-
-moduleForComponent('input-field', {
-  // 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');
-});
diff --git a/tests/unit/components/label-field-test.js b/tests/unit/components/label-field-test.js
index 60b79f0..7c4dea2 100644
--- a/tests/unit/components/label-field-test.js
+++ b/tests/unit/components/label-field-test.js
@@ -4,8 +4,7 @@ import {
 } from 'ember-qunit';
 
 moduleForComponent('label-field', {
-  // Specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar']
+  needs: ['helper:capitalize-string'],
 });
 
 test('it renders', function(assert) {
diff --git a/tests/unit/components/test-comp-test.js b/tests/unit/components/test-comp-test.js
deleted file mode 100644
index a89d846..0000000
--- a/tests/unit/components/test-comp-test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
-
-moduleForComponent('test-comp', {
-  // 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');
-});
diff --git a/tests/unit/helpers/to-words-test.js b/tests/unit/helpers/to-words-test.js
deleted file mode 100644
index 2f78fe6..0000000
--- a/tests/unit/helpers/to-words-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
-  toWords
-} from '../../../helpers/to-words';
-import { module, test } from 'qunit';
-
-module('ToWordsHelper');
-
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var result = toWords(42);
-  assert.ok(result);
-});
diff --git a/tests/unit/mixins/form-submission-class-name-test.js b/tests/unit/mixins/form-submission-class-name-test.js
index 783363c..6d5e235 100644
--- a/tests/unit/mixins/form-submission-class-name-test.js
+++ b/tests/unit/mixins/form-submission-class-name-test.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import FormSubmissionClassNameMixin from '../../../mixins/form-submission-class-name';
+import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import { module, test } from 'qunit';
 
 module('Unit | Mixin | form submission class name');
diff --git a/tests/unit/services/easy-form-test.js b/tests/unit/services/easy-form-test.js
deleted file mode 100644
index 1a13047..0000000
--- a/tests/unit/services/easy-form-test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
-
-moduleFor('service:easy-form', {
-  // Specify the other units that are required for this test.
-  // needs: ['service:foo']
-});
-
-// Replace this with your real tests.
-test('it exists', function(assert) {
-  var service = this.subject();
-  assert.ok(service);
-});

From bd1f14012d6e187222c5fde2b321f43799f97646 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 13:11:49 +0100
Subject: [PATCH 37/73] Unit test for components added and working

---
 addon/components/input-group.js               |  2 +-
 addon/utils/observers/soft-assert.js          |  6 ++--
 .../helpers/setup-component-for-unit-test.js  |  9 ++++++
 tests/unit/components/error-field-test.js     | 28 ++++++++--------
 tests/unit/components/form-controls-test.js   | 22 +++++++++++++
 .../components/form-submission-button-test.js | 21 ++++++------
 tests/unit/components/form-submission-test.js | 24 ++++++++++++++
 tests/unit/components/form-wrapper-test.js    | 23 +++++++++++++
 tests/unit/components/hint-field-test.js      | 25 ++++++++-------
 tests/unit/components/input-group-test.js     | 32 +++++++++++++++++++
 tests/unit/components/label-field-test.js     | 25 +++++++++------
 11 files changed, 169 insertions(+), 48 deletions(-)
 create mode 100644 tests/helpers/setup-component-for-unit-test.js
 create mode 100644 tests/unit/components/form-controls-test.js
 create mode 100644 tests/unit/components/form-submission-test.js
 create mode 100644 tests/unit/components/form-wrapper-test.js
 create mode 100644 tests/unit/components/input-group-test.js

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index c48a47d..ede0d68 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -90,7 +90,7 @@ export default Ember.Component.extend({
     return toWords(property);
   }),
 
-  type: computed(function() {
+  type: computed('propertyWithoutModel', function() {
     const property = this.get('propertyWithoutModel');
 
     let type;
diff --git a/addon/utils/observers/soft-assert.js b/addon/utils/observers/soft-assert.js
index 13fdd5d..fb07581 100644
--- a/addon/utils/observers/soft-assert.js
+++ b/addon/utils/observers/soft-assert.js
@@ -32,11 +32,9 @@ export default function softAssert(dependentKey, options = {}) {
     const value = defaultFor(this.get(dependentKey), '');
 
     if (!value) {
-      const constructor = this.get('constructor').toString();
+      const name = this.get('className'); // TODO - Find a better way to identify component constructor
 
-      Ember.warn(
-        'You failed to pass a ' + dependentKey +' property to ' + constructor
-      );
+      Ember.warn(`You failed to pass a ${dependentKey} property to ${name}`);
 
       if (options.onTrue) {
         options.callbacks.onTrue().bind(this);
diff --git a/tests/helpers/setup-component-for-unit-test.js b/tests/helpers/setup-component-for-unit-test.js
new file mode 100644
index 0000000..45cc289
--- /dev/null
+++ b/tests/helpers/setup-component-for-unit-test.js
@@ -0,0 +1,9 @@
+import Ember from 'ember';
+
+export default function(context) {
+  return context.subject({
+    formController: Ember.Controller.create({
+      formIsSubmitted: false
+    }),
+  });
+}
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index 6575a3c..73bb16b 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -1,21 +1,23 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 
-moduleForComponent('error-field', {
-  // Specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar']
+let component;
+
+moduleForComponent('error-field', 'Unit | Component | error field', {
+  needs: ['helper:capitalize-string'],
+  unit: true,
+
+  beforeEach: function() {
+    component = this.subject();
+  },
 });
 
 test('it renders', function(assert) {
-  assert.expect(2);
 
-  // Creates the component instance
-  var component = this.subject();
-  assert.equal(component._state, 'preRender');
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
 
-  // Renders the component to the page
   this.render();
-  assert.equal(component._state, 'inDOM');
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
 });
diff --git a/tests/unit/components/form-controls-test.js b/tests/unit/components/form-controls-test.js
new file mode 100644
index 0000000..d64b270
--- /dev/null
+++ b/tests/unit/components/form-controls-test.js
@@ -0,0 +1,22 @@
+import { moduleForComponent, test } from 'ember-qunit';
+
+let component;
+
+moduleForComponent('form-controls', 'Unit | Component | form controls', {
+  unit: true,
+
+  beforeEach: function() {
+    component = this.subject();
+  },
+});
+
+test('it renders', function(assert) {
+
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
+
+  this.render();
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
+});
diff --git a/tests/unit/components/form-submission-button-test.js b/tests/unit/components/form-submission-button-test.js
index 7f6d801..f140127 100644
--- a/tests/unit/components/form-submission-button-test.js
+++ b/tests/unit/components/form-submission-button-test.js
@@ -1,19 +1,22 @@
 import { moduleForComponent, test } from 'ember-qunit';
 
+let component;
+
 moduleForComponent('form-submission-button', 'Unit | Component | form submission button', {
-  // Specify the other units that are required for this test
-  // needs: ['component:foo', 'helper:bar'],
-  unit: true
+  unit: true,
+
+  beforeEach: function() {
+    component = this.subject();
+  },
 });
 
 test('it renders', function(assert) {
-  assert.expect(2);
 
-  // Creates the component instance
-  var component = this.subject();
-  assert.equal(component._state, 'preRender');
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
 
-  // Renders the component to the page
   this.render();
-  assert.equal(component._state, 'inDOM');
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
 });
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
new file mode 100644
index 0000000..7bd91dd
--- /dev/null
+++ b/tests/unit/components/form-submission-test.js
@@ -0,0 +1,24 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+
+let component;
+
+moduleForComponent('form-submission', 'Unit | Component | form submission', {
+  needs: ['component:form-submission-button'],
+  unit: true,
+
+  beforeEach: function() {
+    component = setupComponentForUnitTest(this);
+  },
+});
+
+test('it renders', function(assert) {
+
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
+
+  this.render();
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
+});
diff --git a/tests/unit/components/form-wrapper-test.js b/tests/unit/components/form-wrapper-test.js
new file mode 100644
index 0000000..b9e3bba
--- /dev/null
+++ b/tests/unit/components/form-wrapper-test.js
@@ -0,0 +1,23 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+
+let component;
+
+moduleForComponent('form-wrapper', 'Unit | Component | form wrapper', {
+  unit: true,
+
+  beforeEach: function() {
+    component = setupComponentForUnitTest(this);
+  },
+});
+
+test('it renders', function(assert) {
+
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
+
+  this.render();
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
+});
diff --git a/tests/unit/components/hint-field-test.js b/tests/unit/components/hint-field-test.js
index 4c35122..acb6604 100644
--- a/tests/unit/components/hint-field-test.js
+++ b/tests/unit/components/hint-field-test.js
@@ -1,20 +1,23 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 
-moduleForComponent('hint-field', {
+let component;
+
+moduleForComponent('hint-field', 'Unit | Component | hint field', {
   needs: ['helper:capitalize-string'],
+  unit: true,
+
+  beforeEach: function() {
+    component = this.subject();
+  },
 });
 
 test('it renders', function(assert) {
-  assert.expect(2);
 
-  // Creates the component instance
-  var component = this.subject();
-  assert.equal(component._state, 'preRender');
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
 
-  // Renders the component to the page
   this.render();
-  assert.equal(component._state, 'inDOM');
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
 });
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
new file mode 100644
index 0000000..df4fc9a
--- /dev/null
+++ b/tests/unit/components/input-group-test.js
@@ -0,0 +1,32 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+
+let component;
+
+moduleForComponent('input-group', 'Unit | Component | input group', {
+  needs: [
+    'component:hint-field',
+    'component:error-field',
+    'component:label-field',
+    'helper:capitalize-string',
+    'template:form-inputs/default',
+  ],
+  unit: true,
+
+  beforeEach: function() {
+    component = setupComponentForUnitTest(this);
+
+    component.set('property', 'fake-property');
+  },
+});
+
+test('it renders', function(assert) {
+
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
+
+  this.render();
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
+});
diff --git a/tests/unit/components/label-field-test.js b/tests/unit/components/label-field-test.js
index 7c4dea2..9137144 100644
--- a/tests/unit/components/label-field-test.js
+++ b/tests/unit/components/label-field-test.js
@@ -1,20 +1,25 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 
-moduleForComponent('label-field', {
+let component;
+
+moduleForComponent('label-field', 'Unit | Component | label field', {
   needs: ['helper:capitalize-string'],
+  unit: true,
+
+  beforeEach: function() {
+    component = this.subject();
+  },
 });
 
 test('it renders', function(assert) {
-  assert.expect(2);
 
-  // Creates the component instance
-  var component = this.subject();
-  assert.equal(component._state, 'preRender');
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
 
-  // Renders the component to the page
   this.render();
+
   assert.equal(component._state, 'inDOM');
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
 });

From 88836d0f4c77ee3698de3b2cfd031d87a33d9f8a Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 14:05:20 +0100
Subject: [PATCH 38/73] All unit test files added

---
 tests/unit/helpers/capitalize-string-test.js  | 16 +++++++++++++
 .../initializers/easy-form-extensions-test.js | 23 +++++++++++++++++++
 .../unit/initializers/routing-events-test.js  | 23 +++++++++++++++++++
 .../form-submission-class-name-test.js        |  0
 .../conditional-validations-test.js           | 12 ++++++++++
 tests/unit/mixins/controllers/form-test.js    | 12 ++++++++++
 .../routes/dirty-record-handler-test.js       | 12 ++++++++++
 tests/unit/utils/default-for-test.js          | 10 ++++++++
 tests/unit/utils/to-words-test.js             | 10 ++++++++
 9 files changed, 118 insertions(+)
 create mode 100644 tests/unit/helpers/capitalize-string-test.js
 create mode 100644 tests/unit/initializers/easy-form-extensions-test.js
 create mode 100644 tests/unit/initializers/routing-events-test.js
 rename tests/unit/mixins/{ => components}/form-submission-class-name-test.js (100%)
 create mode 100644 tests/unit/mixins/controllers/conditional-validations-test.js
 create mode 100644 tests/unit/mixins/controllers/form-test.js
 create mode 100644 tests/unit/mixins/routes/dirty-record-handler-test.js
 create mode 100644 tests/unit/utils/default-for-test.js
 create mode 100644 tests/unit/utils/to-words-test.js

diff --git a/tests/unit/helpers/capitalize-string-test.js b/tests/unit/helpers/capitalize-string-test.js
new file mode 100644
index 0000000..ea71a18
--- /dev/null
+++ b/tests/unit/helpers/capitalize-string-test.js
@@ -0,0 +1,16 @@
+import { capitalizeString } from 'ember-easy-form-extensions/helpers/capitalize-string';
+import { module, test } from 'qunit';
+
+module('Unit | Helper | capitalize string');
+
+test('It capitalizes a string', function(assert) {
+  const resultOne = capitalizeString(['hello']);
+
+  assert.equal(resultOne, 'Hello',
+    'It should capitalize the first letter of a string');
+
+  const resultTwo = capitalizeString(['Hello']);
+
+  assert.equal(resultTwo, 'Hello',
+    'It should not change the first letter of a string');
+});
diff --git a/tests/unit/initializers/easy-form-extensions-test.js b/tests/unit/initializers/easy-form-extensions-test.js
new file mode 100644
index 0000000..6a2d564
--- /dev/null
+++ b/tests/unit/initializers/easy-form-extensions-test.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import { initialize } from 'ember-easy-form-extensions/initializers/easy-form-extensions';
+import { module, test } from 'qunit';
+
+var container, application;
+
+module('Unit | Initializer | easy form extensions', {
+  beforeEach: function() {
+    Ember.run(function() {
+      application = Ember.Application.create();
+      container = application.__container__;
+      application.deferReadiness();
+    });
+  }
+});
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  initialize(container, application);
+
+  // you would normally confirm the results of the initializer here
+  assert.ok(true);
+});
diff --git a/tests/unit/initializers/routing-events-test.js b/tests/unit/initializers/routing-events-test.js
new file mode 100644
index 0000000..7ef5319
--- /dev/null
+++ b/tests/unit/initializers/routing-events-test.js
@@ -0,0 +1,23 @@
+import Ember from 'ember';
+import { initialize } from 'ember-easy-form-extensions/initializers/routing-events';
+import { module, test } from 'qunit';
+
+var container, application;
+
+module('Unit | Initializer | routing events', {
+  beforeEach: function() {
+    Ember.run(function() {
+      application = Ember.Application.create();
+      container = application.__container__;
+      application.deferReadiness();
+    });
+  }
+});
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  initialize(container, application);
+
+  // you would normally confirm the results of the initializer here
+  assert.ok(true);
+});
diff --git a/tests/unit/mixins/form-submission-class-name-test.js b/tests/unit/mixins/components/form-submission-class-name-test.js
similarity index 100%
rename from tests/unit/mixins/form-submission-class-name-test.js
rename to tests/unit/mixins/components/form-submission-class-name-test.js
diff --git a/tests/unit/mixins/controllers/conditional-validations-test.js b/tests/unit/mixins/controllers/conditional-validations-test.js
new file mode 100644
index 0000000..8fda84f
--- /dev/null
+++ b/tests/unit/mixins/controllers/conditional-validations-test.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import ControllersConditionalValidationsMixin from 'ember-easy-form-extensions/mixins/controllers/conditional-validations';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | controllers/conditional validations');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var ControllersConditionalValidationsObject = Ember.Object.extend(ControllersConditionalValidationsMixin);
+  var subject = ControllersConditionalValidationsObject.create();
+  assert.ok(subject);
+});
diff --git a/tests/unit/mixins/controllers/form-test.js b/tests/unit/mixins/controllers/form-test.js
new file mode 100644
index 0000000..eaf0b82
--- /dev/null
+++ b/tests/unit/mixins/controllers/form-test.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import ControllersFormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | controllers/form');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var ControllersFormObject = Ember.Object.extend(ControllersFormMixin);
+  var subject = ControllersFormObject.create();
+  assert.ok(subject);
+});
diff --git a/tests/unit/mixins/routes/dirty-record-handler-test.js b/tests/unit/mixins/routes/dirty-record-handler-test.js
new file mode 100644
index 0000000..f540b78
--- /dev/null
+++ b/tests/unit/mixins/routes/dirty-record-handler-test.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import RoutesDirtyRecordHandlerMixin from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
+import { module, test } from 'qunit';
+
+module('Unit | Mixin | routes/dirty record handler');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var RoutesDirtyRecordHandlerObject = Ember.Object.extend(RoutesDirtyRecordHandlerMixin);
+  var subject = RoutesDirtyRecordHandlerObject.create();
+  assert.ok(subject);
+});
diff --git a/tests/unit/utils/default-for-test.js b/tests/unit/utils/default-for-test.js
new file mode 100644
index 0000000..e924557
--- /dev/null
+++ b/tests/unit/utils/default-for-test.js
@@ -0,0 +1,10 @@
+import defaultFor from 'ember-easy-form-extensions/utils/default-for';
+import { module, test } from 'qunit';
+
+module('Unit | Utility | default for');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var result = defaultFor();
+  assert.ok(true);
+});
diff --git a/tests/unit/utils/to-words-test.js b/tests/unit/utils/to-words-test.js
new file mode 100644
index 0000000..b7f603a
--- /dev/null
+++ b/tests/unit/utils/to-words-test.js
@@ -0,0 +1,10 @@
+import toWords from 'ember-easy-form-extensions/utils/to-words';
+import { module, test } from 'qunit';
+
+module('Unit | Utility | to words');
+
+// Replace this with your real tests.
+test('it works', function(assert) {
+  var result = toWords('fake');
+  assert.ok(result);
+});

From 5e4043253ef3d4b11c54a2e54205972b6f056f5c Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 17:59:58 +0100
Subject: [PATCH 39/73] Error field unit test

---
 addon/components/error-field.js               |  31 +++--
 bower.json                                    |   2 +-
 .../helpers/setup-component-for-unit-test.js  |   9 --
 tests/helpers/unit/component.js               |  28 +++++
 tests/unit/components/error-field-test.js     | 114 +++++++++++++++++-
 tests/unit/components/form-submission-test.js |   4 +-
 tests/unit/components/form-wrapper-test.js    |   4 +-
 tests/unit/components/input-group-test.js     |   4 +-
 8 files changed, 167 insertions(+), 29 deletions(-)
 delete mode 100644 tests/helpers/setup-component-for-unit-test.js
 create mode 100644 tests/helpers/unit/component.js

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index e7411e9..417616d 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -5,14 +5,20 @@ import toWords from '../utils/to-words';
 const { computed, on } = Ember;
 
 export default Ember.Component.extend({
+
+  /* Options */
+
+  className: 'error',
+  label: computed.oneWay('property'),
+  property: null,
+
+  /* Properties */
+
   shouldShowError: false,
   bindingForErrors: null,
-  className: 'error',
   classNameBindings: ['className', 'visible'],
   errors: null,
-  label: computed.oneWay('property'),
   layout: layout,
-  property: null,
   tagName: 'span',
   visible: computed.and('shouldShowError', 'errors.length'),
 
@@ -22,15 +28,17 @@ export default Ember.Component.extend({
     return hasFormController.get('formController');
   }),
 
-  text: computed('error', 'property', function() {
-    const { error, property } = this.getProperties(
-      [ 'error', 'property' ]
+  text: computed('error', 'label', function() {
+    const { error, label } = this.getProperties(
+      [ 'error', 'label' ]
     );
-    const humanizedProperty = toWords(property);
+    const humanizedProperty = toWords(label);
 
     return `${humanizedProperty} ${error}`;
   }),
 
+  /* Methods */
+
   addBindingForErrors: on('didInitAttrs', function() {
     const property = this.get('property');
 
@@ -42,17 +50,18 @@ export default Ember.Component.extend({
 
     if (validationsForProperty && !this.get('bindingForErrors')) {
       const errorPath = `formController.errors.${property}`;
-      const binding = Ember.bind(this, 'errors', errorPath);
+      const binding = Ember.oneWay(this, 'errors', errorPath);
 
       this.set('bindingForErrors', binding);
     }
   }),
 
   removeBindingForErrors: Ember.on('willDestroyElement', function() {
-    const bindingForErrors = this.get('bindingForErrors');
+    const property = 'bindingForErrors';
 
-    if (bindingForErrors) {
-      bindingForErrors.disconnect(this);
+    if (this.get(property)) {
+      this.get(property).disconnect(this);
+      this.set(property, null);
     }
   }),
 });
diff --git a/bower.json b/bower.json
index b837c4a..a70a2fd 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
     "ember-resolver": "~0.1.15",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1",
+    "qunit": "^1.18.0",
     "ember-cli-moment-shim": "~0.2.0"
   }
 }
diff --git a/tests/helpers/setup-component-for-unit-test.js b/tests/helpers/setup-component-for-unit-test.js
deleted file mode 100644
index 45cc289..0000000
--- a/tests/helpers/setup-component-for-unit-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-
-export default function(context) {
-  return context.subject({
-    formController: Ember.Controller.create({
-      formIsSubmitted: false
-    }),
-  });
-}
diff --git a/tests/helpers/unit/component.js b/tests/helpers/unit/component.js
new file mode 100644
index 0000000..2cd9768
--- /dev/null
+++ b/tests/helpers/unit/component.js
@@ -0,0 +1,28 @@
+import Ember from 'ember';
+import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
+
+const { run } = Ember;
+
+export function setOnController(component, properties) {
+  run(function() {
+    component.get('formController').setProperties(properties);
+  });
+}
+
+export function destroy(component) {
+  run(function() {
+    component.destroy();
+  });
+}
+
+export function initAttrs(component) {
+  run(function() {
+    component.trigger('didInitAttrs');
+  });
+}
+
+export function setupComponent(context) {
+  return context.subject({
+    formController: Ember.Controller.createWithMixins(FormMixin),
+  });
+}
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index 73bb16b..62b5357 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -1,17 +1,34 @@
+import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
+import {
+  destroy,
+  initAttrs,
+  setOnController,
+  setupComponent
+} from '../../helpers/unit/component';
+
+const { run, typeOf } = Ember;
 
 let component;
 
+function set(properties) {
+  run(function() {
+    component.setProperties(properties);
+  });
+}
+
 moduleForComponent('error-field', 'Unit | Component | error field', {
   needs: ['helper:capitalize-string'],
   unit: true,
 
   beforeEach: function() {
-    component = this.subject();
+    component = setupComponent(this);
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
+
+  assert.expect(2);
 
   assert.equal(component._state, 'preRender',
     'The component instance should be created');
@@ -21,3 +38,96 @@ test('it renders', function(assert) {
   assert.equal(component._state, 'inDOM',
     'The component should be inserted into the DOM after render');
 });
+
+test('Properties', function(assert) {
+  const property = 'bananas';
+
+  assert.expect(8);
+
+  assert.ok(!!component.get('className'),
+    'The component should have a default class name');
+
+  assert.notOk(component.get('property'),
+    'The component should not have a default property');
+
+  assert.ok(typeOf(component.get('formController')) === 'instance',
+    'The component should have a formController binding');
+
+  assert.notOk(component.get('visible'),
+    'Visible should be false by default');
+
+  set({ property });
+
+  assert.equal(component.get('property'), property,
+    'The component should have a value for property');
+
+  assert.equal(component.get('label'), property,
+    'The label should default to the value of property');
+
+  assert.ok(component.get('text').indexOf(property) > -1,
+    'The error text should contain the new property name');
+
+  const element = this.$(); // Calls render
+
+  assert.ok(element.hasClass(component.get('className')),
+    'The class name should be bound to the element');
+
+});
+
+test('Error binding', function(assert) {
+  const property = 'apples';
+
+  assert.expect(3);
+
+  assert.notOk(component.get('bindingForErrors'),
+    'The component should not have created a binding for validation errors');
+
+  this.render();
+
+  setOnController(component, {
+    'validations.apples': {
+      presence: true
+    }
+  });
+
+  set({ property });
+
+  initAttrs(component);
+
+  assert.ok(!!component.get('bindingForErrors'),
+    'The component should have created a binding for validation errors');
+
+  destroy(component);
+
+  assert.notOk(!!component.get('bindingForErrors'),
+    'The component should remove the binding for validation errors when the component is being destroyed');
+
+});
+
+test('The DOM', function(assert) {
+  const property = 'apples';
+  const error = 'should be present';
+
+  assert.expect(1);
+
+  setOnController(component, {
+    'validations.apples': {
+      presence: true
+    },
+    'errors.apples': Ember.A([
+      error
+    ]),
+  });
+
+  set({ property });
+
+  initAttrs(component);
+
+  this.render();
+
+  const layout = component.$().html().trim().toLowerCase();
+
+  assert.equal(layout, `${property} ${error}`,
+    'The component should show a user-friendly error message');
+
+});
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 7bd91dd..094d7ce 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -1,5 +1,5 @@
 import { moduleForComponent, test } from 'ember-qunit';
-import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+import { setupComponent } from '../../helpers/unit/component';
 
 let component;
 
@@ -8,7 +8,7 @@ moduleForComponent('form-submission', 'Unit | Component | form submission', {
   unit: true,
 
   beforeEach: function() {
-    component = setupComponentForUnitTest(this);
+    component = setupComponent(this);
   },
 });
 
diff --git a/tests/unit/components/form-wrapper-test.js b/tests/unit/components/form-wrapper-test.js
index b9e3bba..c270585 100644
--- a/tests/unit/components/form-wrapper-test.js
+++ b/tests/unit/components/form-wrapper-test.js
@@ -1,5 +1,5 @@
 import { moduleForComponent, test } from 'ember-qunit';
-import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+import { setupComponent } from '../../helpers/unit/component';
 
 let component;
 
@@ -7,7 +7,7 @@ moduleForComponent('form-wrapper', 'Unit | Component | form wrapper', {
   unit: true,
 
   beforeEach: function() {
-    component = setupComponentForUnitTest(this);
+    component = setupComponent(this);
   },
 });
 
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index df4fc9a..de7ec14 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -1,5 +1,5 @@
 import { moduleForComponent, test } from 'ember-qunit';
-import setupComponentForUnitTest from '../../helpers/setup-component-for-unit-test';
+import { setupComponent } from '../../helpers/unit/component';
 
 let component;
 
@@ -14,7 +14,7 @@ moduleForComponent('input-group', 'Unit | Component | input group', {
   unit: true,
 
   beforeEach: function() {
-    component = setupComponentForUnitTest(this);
+    component = setupComponent(this);
 
     component.set('property', 'fake-property');
   },

From 3fd63aa48dc1a361673c282ac31205c5d5cfbb25 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 18:21:46 +0100
Subject: [PATCH 40/73] Form controls component unit test

---
 addon/components/form-controls.js           |  4 +--
 tests/helpers/unit/component.js             |  6 ++++
 tests/unit/components/error-field-test.js   | 13 +++-----
 tests/unit/components/form-controls-test.js | 37 +++++++++++++++++++--
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/addon/components/form-controls.js b/addon/components/form-controls.js
index 37a52a6..424fd83 100644
--- a/addon/components/form-controls.js
+++ b/addon/components/form-controls.js
@@ -14,8 +14,8 @@ export default Ember.Component.extend({
   tagName: 'fieldset',
   checkForLegend: softAssert('legend'),
 
-  isFormControls: computed.readOnly(function() {
+  isFormControls: computed(function() {
     return true;
-  }),
+  }).readOnly(),
 
 });
diff --git a/tests/helpers/unit/component.js b/tests/helpers/unit/component.js
index 2cd9768..e034924 100644
--- a/tests/helpers/unit/component.js
+++ b/tests/helpers/unit/component.js
@@ -21,6 +21,12 @@ export function initAttrs(component) {
   });
 }
 
+export function setOnComponent(component, properties) {
+  run(function() {
+    component.setProperties(properties);
+  });
+}
+
 export function setupComponent(context) {
   return context.subject({
     formController: Ember.Controller.createWithMixins(FormMixin),
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index 62b5357..a019956 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -3,6 +3,7 @@ import { moduleForComponent, test } from 'ember-qunit';
 import {
   destroy,
   initAttrs,
+  setOnComponent,
   setOnController,
   setupComponent
 } from '../../helpers/unit/component';
@@ -11,12 +12,6 @@ const { run, typeOf } = Ember;
 
 let component;
 
-function set(properties) {
-  run(function() {
-    component.setProperties(properties);
-  });
-}
-
 moduleForComponent('error-field', 'Unit | Component | error field', {
   needs: ['helper:capitalize-string'],
   unit: true,
@@ -56,7 +51,7 @@ test('Properties', function(assert) {
   assert.notOk(component.get('visible'),
     'Visible should be false by default');
 
-  set({ property });
+  setOnComponent(component, { property });
 
   assert.equal(component.get('property'), property,
     'The component should have a value for property');
@@ -90,7 +85,7 @@ test('Error binding', function(assert) {
     }
   });
 
-  set({ property });
+  setOnComponent(component, { property });
 
   initAttrs(component);
 
@@ -119,7 +114,7 @@ test('The DOM', function(assert) {
     ]),
   });
 
-  set({ property });
+  setOnComponent(component, { property });
 
   initAttrs(component);
 
diff --git a/tests/unit/components/form-controls-test.js b/tests/unit/components/form-controls-test.js
index d64b270..ff0446e 100644
--- a/tests/unit/components/form-controls-test.js
+++ b/tests/unit/components/form-controls-test.js
@@ -1,4 +1,9 @@
 import { moduleForComponent, test } from 'ember-qunit';
+import {
+  setOnComponent
+} from '../../helpers/unit/component';
+
+const legend = 'This is a form';
 
 let component;
 
@@ -6,11 +11,13 @@ moduleForComponent('form-controls', 'Unit | Component | form controls', {
   unit: true,
 
   beforeEach: function() {
-    component = this.subject();
+    component = this.subject({
+      legend
+    });
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
 
   assert.equal(component._state, 'preRender',
     'The component instance should be created');
@@ -19,4 +26,30 @@ test('it renders', function(assert) {
 
   assert.equal(component._state, 'inDOM',
     'The component should be inserted into the DOM after render');
+
+});
+
+test('Properties', function(assert) {
+
+  assert.ok(component.get('isFormControls'),
+    'The component should have an isFormControls helper property');
+
+  assert.equal(component.get('modelPath'), 'model',
+    'The component should have a default modelPath property');
+
+  assert.ok(!!component.get('className'),
+    'The component should have a default class name');
+
+  setOnComponent(component, {
+    legend
+  });
+
+  const $element = this.$(); // Calls render
+
+  assert.equal($element.attr('legend'), legend,
+    'The legend attribute should be bound');
+
+  assert.equal($element.prop('tagName').toLowerCase(), 'fieldset',
+    'The component should be a fieldset');
+
 });

From ac57e7362d6cd36139f57408e5dbb85a86d810e7 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 20:58:32 +0100
Subject: [PATCH 41/73] form submission button unit test

---
 addon/components/form-submission-button.js    |  2 +
 tests/helpers/unit/component.js               | 12 +++
 tests/unit/components/error-field-test.js     | 11 +--
 tests/unit/components/form-controls-test.js   | 10 +-
 .../components/form-submission-button-test.js | 92 ++++++++++++++++++-
 5 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/addon/components/form-submission-button.js b/addon/components/form-submission-button.js
index 1f75e31..c0c1b63 100644
--- a/addon/components/form-submission-button.js
+++ b/addon/components/form-submission-button.js
@@ -22,6 +22,8 @@ export default Ember.Component.extend({
     event.preventDefault();
     event.stopPropagation();
 
+    console.log('here');
+
     this.sendAction();
   },
 });
diff --git a/tests/helpers/unit/component.js b/tests/helpers/unit/component.js
index e034924..826fa1e 100644
--- a/tests/helpers/unit/component.js
+++ b/tests/helpers/unit/component.js
@@ -21,6 +21,18 @@ export function initAttrs(component) {
   });
 }
 
+export function renderingTests(assert, context, component) {
+
+  assert.equal(component._state, 'preRender',
+    'The component instance should be created');
+
+  context.render();
+
+  assert.equal(component._state, 'inDOM',
+    'The component should be inserted into the DOM after render');
+
+}
+
 export function setOnComponent(component, properties) {
   run(function() {
     component.setProperties(properties);
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index a019956..cd1ed19 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -3,6 +3,7 @@ import { moduleForComponent, test } from 'ember-qunit';
 import {
   destroy,
   initAttrs,
+  renderingTests,
   setOnComponent,
   setOnController,
   setupComponent
@@ -25,13 +26,7 @@ test('Rendering', function(assert) {
 
   assert.expect(2);
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
-
-  this.render();
-
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  renderingTests(assert, this, component);
 });
 
 test('Properties', function(assert) {
@@ -118,8 +113,6 @@ test('The DOM', function(assert) {
 
   initAttrs(component);
 
-  this.render();
-
   const layout = component.$().html().trim().toLowerCase();
 
   assert.equal(layout, `${property} ${error}`,
diff --git a/tests/unit/components/form-controls-test.js b/tests/unit/components/form-controls-test.js
index ff0446e..3dba048 100644
--- a/tests/unit/components/form-controls-test.js
+++ b/tests/unit/components/form-controls-test.js
@@ -1,5 +1,6 @@
 import { moduleForComponent, test } from 'ember-qunit';
 import {
+  renderingTests,
   setOnComponent
 } from '../../helpers/unit/component';
 
@@ -19,14 +20,9 @@ moduleForComponent('form-controls', 'Unit | Component | form controls', {
 
 test('Rendering', function(assert) {
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
-
-  this.render();
-
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  assert.expect(2);
 
+  renderingTests(assert, this, component);
 });
 
 test('Properties', function(assert) {
diff --git a/tests/unit/components/form-submission-button-test.js b/tests/unit/components/form-submission-button-test.js
index f140127..5155f24 100644
--- a/tests/unit/components/form-submission-button-test.js
+++ b/tests/unit/components/form-submission-button-test.js
@@ -1,4 +1,10 @@
 import { moduleForComponent, test } from 'ember-qunit';
+import {
+  initAttrs,
+  renderingTests,
+  setOnComponent,
+  setOnController
+} from '../../helpers/unit/component';
 
 let component;
 
@@ -10,13 +16,89 @@ moduleForComponent('form-submission-button', 'Unit | Component | form submission
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Properties', function(assert) {
+  const $element = this.$(); // Render
+  const className = 'button-primary';
+  const type = 'reset';
+
+  assert.expect(7);
+
+  assert.strictEqual(component.get('disabled'), false,
+    'The component should not be disabled by default');
+
+  assert.equal($element.prop('tagName').toLowerCase(), 'button',
+    'The component should be a button');
+
+  assert.equal($element.attr('type'), 'button',
+    'The component should have a default type attribute');
+
+  assert.ok($element.hasClass('button'),
+    'The component should have a default button class name');
+
+  /* Update the properties to check bindings */
+
+  setOnComponent(component, {
+    className,
+    disabled: true,
+    type
+  });
+
+  assert.equal($element.attr('type'), type,
+    'The component should have the new type attribute');
+
+  assert.ok($element.attr('disabled'),
+    'The component should have the disabled attribute bound');
+
+  assert.ok($element.hasClass(className),
+    'The component should have the new button class name bound');
+
+});
+
+test('The DOM', function(assert) {
+  const text = 'Submit me!';
+
+  assert.expect(1);
+
+  setOnComponent(component, {
+    text,
+  });
+
+  initAttrs(component);
+
+  this.render();
+
+  const layout = component.$().html().trim();
+
+  assert.equal(layout, text,
+    'The component should show text on the button');
+
+});
+
+test('Actions', function(assert) {
+
+  expect(1);
+
+  setOnComponent(component, {
+    action: 'orderBigMacs',
+
+    sendAction() {
+
+      assert.ok(true,
+        'The action should call the sendAction method');
+
+    }
+  });
+
+  console.log(component.get('parentView'))
 
   this.render();
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  component.$().click();
 });

From 4a0a86c261bea7df1ad281bf56612174cae9483f Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Tue, 7 Jul 2015 23:07:43 +0100
Subject: [PATCH 42/73] Form submission unit test

---
 addon/components/form-submission-button.js    | 15 ++-
 addon/components/form-submission.js           |  2 +-
 tests/helpers/selector-for.js                 |  3 +
 tests/helpers/unit/component.js               | 10 +-
 tests/unit/components/error-field-test.js     | 15 +--
 tests/unit/components/form-controls-test.js   |  4 +-
 .../components/form-submission-button-test.js | 11 +--
 tests/unit/components/form-submission-test.js | 92 +++++++++++++++++--
 8 files changed, 125 insertions(+), 27 deletions(-)
 create mode 100644 tests/helpers/selector-for.js

diff --git a/addon/components/form-submission-button.js b/addon/components/form-submission-button.js
index c0c1b63..4f45387 100644
--- a/addon/components/form-submission-button.js
+++ b/addon/components/form-submission-button.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 import layout from '../templates/components/form-submission-button';
 
+const { computed } = Ember;
+
 export default Ember.Component.extend({
 
   /* Options */
@@ -13,17 +15,24 @@ export default Ember.Component.extend({
 
   /* Properties */
 
-  attributeBindings: ['className:data-test', 'disabled', 'type'],
+  attributeBindings: ['dataTest:data-test', 'disabled', 'type'],
   classNameBindings: ['className'],
   layout: layout,
   tagName: 'button',
 
+  dataTest: computed('action', function() {
+    const action = this.get('action') || '';
+    const dasherizedAction = Ember.String.dasherize(action);
+
+    return `button-for-${dasherizedAction}`;
+  }),
+
+  /* Methods */
+
   click: function(event) {
     event.preventDefault();
     event.stopPropagation();
 
-    console.log('here');
-
     this.sendAction();
   },
 });
diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index 570b7cc..bc56c45 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -21,7 +21,7 @@ export default Ember.Component.extend(
 
   submit: true,
   submitAction: 'submit',
-  submitText: 'Save',
+  submitText: 'Submit',
 
   /* Properties */
 
diff --git a/tests/helpers/selector-for.js b/tests/helpers/selector-for.js
new file mode 100644
index 0000000..3b09b2b
--- /dev/null
+++ b/tests/helpers/selector-for.js
@@ -0,0 +1,3 @@
+export default function(name) {
+  return `[data-test="${name}"]`;
+}
diff --git a/tests/helpers/unit/component.js b/tests/helpers/unit/component.js
index 826fa1e..e39cf94 100644
--- a/tests/helpers/unit/component.js
+++ b/tests/helpers/unit/component.js
@@ -3,7 +3,7 @@ import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 
 const { run } = Ember;
 
-export function setOnController(component, properties) {
+export function setPropertiesOnController(component, properties) {
   run(function() {
     component.get('formController').setProperties(properties);
   });
@@ -33,7 +33,13 @@ export function renderingTests(assert, context, component) {
 
 }
 
-export function setOnComponent(component, properties) {
+export function setOnComponent(component, key, value) {
+  run(function() {
+    component.set(key, value);
+  });
+}
+
+export function setPropertiesOnComponent(component, properties) {
   run(function() {
     component.setProperties(properties);
   });
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index cd1ed19..4ad4833 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -5,7 +5,8 @@ import {
   initAttrs,
   renderingTests,
   setOnComponent,
-  setOnController,
+  setPropertiesOnComponent,
+  setPropertiesOnController,
   setupComponent
 } from '../../helpers/unit/component';
 
@@ -46,7 +47,7 @@ test('Properties', function(assert) {
   assert.notOk(component.get('visible'),
     'Visible should be false by default');
 
-  setOnComponent(component, { property });
+  setPropertiesOnComponent(component, { property });
 
   assert.equal(component.get('property'), property,
     'The component should have a value for property');
@@ -74,13 +75,13 @@ test('Error binding', function(assert) {
 
   this.render();
 
-  setOnController(component, {
+  setPropertiesOnController(component, {
     'validations.apples': {
       presence: true
     }
   });
 
-  setOnComponent(component, { property });
+  setPropertiesOnComponent(component, { property });
 
   initAttrs(component);
 
@@ -100,7 +101,7 @@ test('The DOM', function(assert) {
 
   assert.expect(1);
 
-  setOnController(component, {
+  setPropertiesOnController(component, {
     'validations.apples': {
       presence: true
     },
@@ -109,10 +110,12 @@ test('The DOM', function(assert) {
     ]),
   });
 
-  setOnComponent(component, { property });
+  setPropertiesOnComponent(component, { property });
 
   initAttrs(component);
 
+  this.render();
+
   const layout = component.$().html().trim().toLowerCase();
 
   assert.equal(layout, `${property} ${error}`,
diff --git a/tests/unit/components/form-controls-test.js b/tests/unit/components/form-controls-test.js
index 3dba048..31d564c 100644
--- a/tests/unit/components/form-controls-test.js
+++ b/tests/unit/components/form-controls-test.js
@@ -1,7 +1,7 @@
 import { moduleForComponent, test } from 'ember-qunit';
 import {
   renderingTests,
-  setOnComponent
+  setPropertiesOnComponent
 } from '../../helpers/unit/component';
 
 const legend = 'This is a form';
@@ -36,7 +36,7 @@ test('Properties', function(assert) {
   assert.ok(!!component.get('className'),
     'The component should have a default class name');
 
-  setOnComponent(component, {
+  setPropertiesOnComponent(component, {
     legend
   });
 
diff --git a/tests/unit/components/form-submission-button-test.js b/tests/unit/components/form-submission-button-test.js
index 5155f24..fb63135 100644
--- a/tests/unit/components/form-submission-button-test.js
+++ b/tests/unit/components/form-submission-button-test.js
@@ -2,8 +2,7 @@ import { moduleForComponent, test } from 'ember-qunit';
 import {
   initAttrs,
   renderingTests,
-  setOnComponent,
-  setOnController
+  setPropertiesOnComponent,
 } from '../../helpers/unit/component';
 
 let component;
@@ -44,7 +43,7 @@ test('Properties', function(assert) {
 
   /* Update the properties to check bindings */
 
-  setOnComponent(component, {
+  setPropertiesOnComponent(component, {
     className,
     disabled: true,
     type
@@ -66,7 +65,7 @@ test('The DOM', function(assert) {
 
   assert.expect(1);
 
-  setOnComponent(component, {
+  setPropertiesOnComponent(component, {
     text,
   });
 
@@ -85,7 +84,7 @@ test('Actions', function(assert) {
 
   expect(1);
 
-  setOnComponent(component, {
+  setPropertiesOnComponent(component, {
     action: 'orderBigMacs',
 
     sendAction() {
@@ -96,8 +95,6 @@ test('Actions', function(assert) {
     }
   });
 
-  console.log(component.get('parentView'))
-
   this.render();
 
   component.$().click();
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 094d7ce..1f0bf42 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -1,5 +1,12 @@
 import { moduleForComponent, test } from 'ember-qunit';
-import { setupComponent } from '../../helpers/unit/component';
+import {
+  renderingTests,
+  setupComponent,
+  setOnComponent
+} from '../../helpers/unit/component';
+import selectorFor from '../../helpers/selector-for';
+
+const { typeOf } = Ember;
 
 let component;
 
@@ -12,13 +19,86 @@ moduleForComponent('form-submission', 'Unit | Component | form submission', {
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
+
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Properties', function(assert) {
+
+  assert.expect(15);
+
+  /* Check default properties */
+
+  assert.strictEqual(component.get('formIsSubmitted'), false,
+    'Form is submitted should be false by default');
+
+  assert.ok(typeOf(component.get('formController')) === 'instance',
+    'The component should have a formController binding');
+
+  /* Check cancel, cancelAction, and cancelText, etc */
+
+  ['cancel', 'delete', 'submit'].forEach(function(buttonType) {
+    const actionProperty = `${buttonType}Action`;
+    const existsByDefault = buttonType !== 'delete';
+    const expectedButtonText = Ember.String.capitalize(buttonType);
+    const textProperty = `${buttonType}Text`;
+
+    assert.equal(component.get(buttonType), existsByDefault,
+      `The ${buttonType} property should be ${existsByDefault} by default`);
+
+    assert.equal(component.get(actionProperty), buttonType,
+      `The ${actionProperty} property should refer to the ${buttonType} action`);
+
+    assert.equal(component.get(textProperty), expectedButtonText,
+      `The ${textProperty} property should be ${expectedButtonText}`);
+
+    assert.ok(typeOf(component.get(`_actions.${buttonType}`)) === 'function',
+      `The ${buttonType} action should exist on the component`);
+
+  });
+
+  this.render();
+
+  assert.ok(this.$().hasClass(component.get('className')),
+    'The class name should be bound to the element');
+
+});
+
+test('The DOM', function(assert) {
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  assert.expect(9);
 
   this.render();
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  /* Check in button in turn */
+
+  ['cancel', 'delete', 'submit'].forEach(function(action) {
+    const selector = selectorFor(`button-for-${action}`);
+
+    setOnComponent(component, action, true);
+
+    setOnComponent(component, `_actions.${action}`, function() {
+
+      assert.ok(true,
+        `The ${action} action should be called after clicking the button`);
+
+    });
+
+    const $button = this.$(selector);
+
+    assert.ok(!!$button,
+      'The ${action} button should exist in the template');
+
+    $button.click();
+
+    setOnComponent(component, action, false);
+
+    assert.notOk(this.$(selector).length,
+      'The ${action} button should no longer exist in the template');
+
+  }, this);
+
 });

From 99dc8db4465fa8449a0fe56165f9bbd20fc0e21b Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 9 Jul 2015 14:25:58 +0100
Subject: [PATCH 43/73] Template unit test for form submisison

---
 tests/unit/components/form-submission-test.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 1f0bf42..83f945d 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -68,11 +68,17 @@ test('Properties', function(assert) {
 });
 
 test('The DOM', function(assert) {
+  const submittingText = 'Submitting...';
 
-  assert.expect(9);
+  assert.expect(11);
 
   this.render();
 
+  /* Check the template before any submitting */
+
+  assert.ok(this.$().html().indexOf(submittingText) === -1,
+    'The template should reflect that the form has not been submitted');
+
   /* Check in button in turn */
 
   ['cancel', 'delete', 'submit'].forEach(function(action) {
@@ -101,4 +107,11 @@ test('The DOM', function(assert) {
 
   }, this);
 
+  /* Fake submisiosn and check the template */
+
+  setOnComponent(component, 'formIsSubmitted', true);
+
+  assert.ok(this.$().html().indexOf(submittingText) > -1,
+    'The template should reflect that the form is submitting');
+
 });

From f86ab95a7ba6d8dfd52291e2459fbc278d98d47b Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 9 Jul 2015 14:49:38 +0100
Subject: [PATCH 44/73] Unit test for form wrapper component"

---
 tests/unit/components/form-wrapper-test.js | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/tests/unit/components/form-wrapper-test.js b/tests/unit/components/form-wrapper-test.js
index c270585..584c62f 100644
--- a/tests/unit/components/form-wrapper-test.js
+++ b/tests/unit/components/form-wrapper-test.js
@@ -1,5 +1,8 @@
+import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
-import { setupComponent } from '../../helpers/unit/component';
+import { renderingTests } from '../../helpers/unit/component';
+
+const { typeOf } = Ember;
 
 let component;
 
@@ -11,13 +14,36 @@ moduleForComponent('form-wrapper', 'Unit | Component | form wrapper', {
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
+
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Properties', function(assert) {
+
+  assert.expect(5);
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  assert.notOk(component.get('novalidate'),
+    'The novalidate property should be false by default because Ember Validation provides client-side validations');
+
+  assert.ok(!!compoennt.get('className'),
+    'The component should have a default class name');
+
+  assert.ok(typeOf(component.get('formIsSubmitted')) === 'boolean',
+    'The component should have a boolean formIsSubmitted property bound for ease of use');
+
+  assert.ok(typeOf(component.get('formController')) === 'instance',
+    'The component should have a formController instance bound');
 
   this.render();
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  assert.ok(component.$().hasClass(component.get('className')),
+    'The className property should be bound');
+
 });
+
+test('Methods', function() {
+    /* TODO - use inline template compiler to check autofocus functionality */
+  });

From b45fd2cb05ccb0112a04692ef4a63cd5b1fac1c8 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 9 Jul 2015 14:57:09 +0100
Subject: [PATCH 45/73] Fixes for form wrapper test and hint field unit test

---
 addon/templates/components/hint-field.hbs  |  2 +-
 tests/unit/components/form-wrapper-test.js | 18 ++++++++++-----
 tests/unit/components/hint-field-test.js   | 27 ++++++++++++++++++----
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/addon/templates/components/hint-field.hbs b/addon/templates/components/hint-field.hbs
index 818adfa..bea1f81 100644
--- a/addon/templates/components/hint-field.hbs
+++ b/addon/templates/components/hint-field.hbs
@@ -1 +1 @@
-{{capitalize-string hint}}
+{{capitalize-string text}}
diff --git a/tests/unit/components/form-wrapper-test.js b/tests/unit/components/form-wrapper-test.js
index 584c62f..a81d068 100644
--- a/tests/unit/components/form-wrapper-test.js
+++ b/tests/unit/components/form-wrapper-test.js
@@ -1,6 +1,9 @@
 import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
-import { renderingTests } from '../../helpers/unit/component';
+import {
+  renderingTests,
+  setupComponent
+} from '../../helpers/unit/component';
 
 const { typeOf } = Ember;
 
@@ -25,10 +28,10 @@ test('Properties', function(assert) {
 
   assert.expect(5);
 
-  assert.notOk(component.get('novalidate'),
+  assert.ok(component.get('novalidate'),
     'The novalidate property should be false by default because Ember Validation provides client-side validations');
 
-  assert.ok(!!compoennt.get('className'),
+  assert.ok(!!component.get('className'),
     'The component should have a default class name');
 
   assert.ok(typeOf(component.get('formIsSubmitted')) === 'boolean',
@@ -44,6 +47,9 @@ test('Properties', function(assert) {
 
 });
 
-test('Methods', function() {
-    /* TODO - use inline template compiler to check autofocus functionality */
-  });
+test('Methods', function(assert) {
+
+  assert.expect(0);
+
+  /* TODO - use inline template compiler to check autofocus functionality */
+});
diff --git a/tests/unit/components/hint-field-test.js b/tests/unit/components/hint-field-test.js
index acb6604..fa9c7d8 100644
--- a/tests/unit/components/hint-field-test.js
+++ b/tests/unit/components/hint-field-test.js
@@ -1,4 +1,8 @@
 import { moduleForComponent, test } from 'ember-qunit';
+import {
+  renderingTests,
+  setOnComponent
+} from '../../helpers/unit/component';
 
 let component;
 
@@ -11,13 +15,26 @@ moduleForComponent('hint-field', 'Unit | Component | hint field', {
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Properties', function(assert) {
+  const hintText = 'This field is required';
+
+  assert.expect(2);
 
   this.render();
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  assert.ok(component.$().hasClass(component.get('className')),
+    'The className property should be bound');
+
+  setOnComponent(component, 'text', hintText);
+
+  assert.equal(component.$().html().trim(), hintText,
+    'The hint text property should appear in the template');
+
 });

From b391294cb4e4a91d926153c55bf754b5193acfcd Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Thu, 9 Jul 2015 15:15:34 -0400
Subject: [PATCH 46/73] Unit test for input group 50% done

---
 addon/components/error-field.js            |  25 +--
 addon/components/input-group.js            |  41 ++--
 addon/templates/components/error-field.hbs |   4 +-
 addon/templates/components/input-group.hbs |  15 +-
 tests/helpers/unit/component.js            |  60 +++++-
 tests/unit/components/hint-field-test.js   |   6 +-
 tests/unit/components/input-group-test.js  | 228 ++++++++++++++++++++-
 7 files changed, 330 insertions(+), 49 deletions(-)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 417616d..8cbc30c 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import layout from '../templates/components/error-field';
 import toWords from '../utils/to-words';
 
-const { computed, on } = Ember;
+const { computed, observer, on } = Ember;
 
 export default Ember.Component.extend({
 
@@ -14,13 +14,15 @@ export default Ember.Component.extend({
 
   /* Properties */
 
-  shouldShowError: false,
   bindingForErrors: null,
-  classNameBindings: ['className', 'visible'],
+  classNameBindings: ['className', 'showError'],
   errors: null,
+  invalidAction: 'setGroupAsInvalid',
   layout: layout,
   tagName: 'span',
-  visible: computed.and('shouldShowError', 'errors.length'),
+  validAction: 'setGroupAsValid',
+  showError: false,
+  text: computed.oneWay('errors.firstObject'),
 
   formController: computed(function() {
     const hasFormController = this.nearestWithProperty('formController');
@@ -28,16 +30,15 @@ export default Ember.Component.extend({
     return hasFormController.get('formController');
   }),
 
-  text: computed('error', 'label', function() {
-    const { error, label } = this.getProperties(
-      [ 'error', 'label' ]
-    );
-    const humanizedProperty = toWords(label);
+  /* Methods */
 
-    return `${humanizedProperty} ${error}`;
-  }),
+  // TODO - update from observer to event when possible
 
-  /* Methods */
+  notifyChangeInValidity: observer('showError', function() {
+    const actionProperty = this.get('showError') ? 'invalidAction' : 'validAction';
+
+    this.sendAction(actionProperty);
+  }),
 
   addBindingForErrors: on('didInitAttrs', function() {
     const property = this.get('property');
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index ede0d68..ff2bf43 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -12,6 +12,7 @@ export default Ember.Component.extend({
   className: 'input-wrapper',
   hint: null,
   property: null,
+  newlyValidDuration: 3000,
 
   /* Input attributes */
 
@@ -28,6 +29,7 @@ export default Ember.Component.extend({
 
   /* Properties */
 
+  attributeBindings: ['dataTest:data-test'],
   bindingForValue: null, // Avoid xBinding naming convention
   classNameBindings: ['className', 'validityClass'],
   formControls: null,
@@ -37,7 +39,7 @@ export default Ember.Component.extend({
   layout: layout,
   modelPath: computed.oneWay('formControls.modelPath'),
   registerAction: 'registerInputGroup',
-  shouldShowError: false,
+  showError: false,
   unregisterAction: 'unregisterInputGroup',
   value: null,
 
@@ -90,12 +92,14 @@ export default Ember.Component.extend({
     return toWords(property);
   }),
 
-  type: computed('propertyWithoutModel', function() {
+  type: computed('content', 'propertyWithoutModel', function() {
     const property = this.get('propertyWithoutModel');
 
     let type;
 
-    if (property.match(/password/)) {
+    if (this.get('content')) {
+      type = 'select';
+    else if (property.match(/password/)) {
       type = 'password';
     } else if (property.match(/email/)) {
       type = 'email';
@@ -107,8 +111,6 @@ export default Ember.Component.extend({
       type = 'tel';
     } else if (property.match(/search/)) {
       type = 'search';
-    } else if (this.get('content')) {
-      type = 'select';
     } else {
       const value = this.get('value');
 
@@ -132,22 +134,36 @@ export default Ember.Component.extend({
 
       if (this.get('isNewlyValid')) {
         modifier = 'newly-valid';
-      } else if(this.get('isValid')) {
+      } else if (this.get('isValid')) {
         modifier = 'valid';
       } else {
         modifier = 'error';
       }
 
-      return `${className}-${modifier}`;
+      if (modifier) {
+        return `${className}-${modifier}`;
+      } else {
+        return className;
+      }
     }
   ),
 
   /* Actions */
 
   actions: {
+
     showError() {
-      this.set('shouldShowError', true);
+      this.set('showError', true);
     },
+
+    setGroupAsInvalid() {
+      this.set('isValid', false);
+    },
+
+    setGroupAsValid() {
+      this.set('isValid', true);
+    },
+
   },
 
   /* Public methods - avoid xBinding syntax */
@@ -159,14 +175,15 @@ export default Ember.Component.extend({
 
     run.later(this, function() {
       this.set('isNewlyValid', false);
-    }, 3000);
+    }, this.get('newlyValidDuration'));
   }),
 
   removeBindingForValue: on('willDestroyElement', function() {
-    const bindingForValue = this.get('bindingForValue');
+    const property = 'bindingForValue';
 
-    if (bindingForValue) {
-      bindingForValue.disconnect(this);
+    if (this.get(property)) {
+      this.get(property).disconnect(this);
+      this.set(property, null);
     }
   }),
 
diff --git a/addon/templates/components/error-field.hbs b/addon/templates/components/error-field.hbs
index cc4fb35..30af83a 100644
--- a/addon/templates/components/error-field.hbs
+++ b/addon/templates/components/error-field.hbs
@@ -1,3 +1,5 @@
 {{#if errors.length}}
-  {{capitalize-string label}} {{errors.firstObject}}
+  {{#if showError}}
+    {{capitalize-string label}} {{text}}
+  {{/if}}
 {{/if}}
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index 0a9d817..c13fd56 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -3,6 +3,7 @@
     for=inputId
     label=label
   }}
+  {{!-- TODO - change label to text? --}}
 {{/if}}
 
 {{#if hasBlock}}
@@ -13,14 +14,12 @@
   {{partial inputPartial}}
 {{/if}}
 
-{{#if shouldShowError}}
-  {{error-field
-    shouldShowError=shouldShowError
-    label=label
-    property=property
-  }}
-{{/if}}
+{{error-field
+  label=label
+  property=property
+  showError=showError
+}}
 
 {{#if hint}}
-  {{hint-field hint=hint}}
+  {{hint-field text=hint}}
 {{/if}}
diff --git a/tests/helpers/unit/component.js b/tests/helpers/unit/component.js
index e39cf94..90ba5e7 100644
--- a/tests/helpers/unit/component.js
+++ b/tests/helpers/unit/component.js
@@ -3,10 +3,15 @@ import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 
 const { run } = Ember;
 
-export function setPropertiesOnController(component, properties) {
-  run(function() {
-    component.get('formController').setProperties(properties);
-  });
+export function testClassNameBinding(assert, component) {
+
+  Ember.assert(
+    'No element was found for the component. You must call this.render() before testClassNameBinding. Perhaps you forgot to pass assert as the first param?',
+    component && component.$()
+  );
+
+  assertClass(assert, component, component.get('className'));
+
 }
 
 export function destroy(component) {
@@ -33,20 +38,61 @@ export function renderingTests(assert, context, component) {
 
 }
 
+export function sendAction(component, action) {
+  run(function() {
+    component.send(action);
+  });
+}
+
 export function setOnComponent(component, key, value) {
   run(function() {
     component.set(key, value);
   });
 }
 
+export function setOnController(component, key, value) {
+  const formController = component.get('formController');
+
+  Ember.assert('No formController was found on the component. You must use setupComponent() in the beforeEach hook', formController);
+
+  run(function() {
+    component.set(`formController.${key}`, value);
+  });
+}
+
 export function setPropertiesOnComponent(component, properties) {
   run(function() {
     component.setProperties(properties);
   });
 }
 
-export function setupComponent(context) {
-  return context.subject({
-    formController: Ember.Controller.createWithMixins(FormMixin),
+export function setPropertiesOnController(component, properties) {
+  const formController = component.get('formController');
+
+  Ember.assert('No formController was found on the component. You must use setupComponent() in the beforeEach hook', formController);
+
+  run(function() {
+    component.get('formController').setProperties(properties);
   });
 }
+
+export function setupComponent(context, options) {
+  let componentProperties = {
+    formController: Ember.Controller.createWithMixins(FormMixin),
+  };
+
+  if (options) {
+    componentProperties = Ember.merge(componentProperties, options);
+  }
+
+  return context.subject(componentProperties);
+}
+
+export function assertClass(assert, component, expectedClassName) {
+
+  Ember.assert('No element was found for the component. You must call this.render() before testClassNameBinding', component.$());
+
+  assert.ok(component.$().hasClass(expectedClassName),
+    `The ${expectedClassName} class should be bound on the element`);
+
+}
diff --git a/tests/unit/components/hint-field-test.js b/tests/unit/components/hint-field-test.js
index fa9c7d8..8cb5854 100644
--- a/tests/unit/components/hint-field-test.js
+++ b/tests/unit/components/hint-field-test.js
@@ -1,7 +1,8 @@
 import { moduleForComponent, test } from 'ember-qunit';
 import {
   renderingTests,
-  setOnComponent
+  setOnComponent,
+  testClassNameBinding,
 } from '../../helpers/unit/component';
 
 let component;
@@ -29,8 +30,7 @@ test('Properties', function(assert) {
 
   this.render();
 
-  assert.ok(component.$().hasClass(component.get('className')),
-    'The className property should be bound');
+  testClassNameBinding(assert, component);
 
   setOnComponent(component, 'text', hintText);
 
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index de7ec14..d7bde6b 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -1,5 +1,19 @@
+import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
-import { setupComponent } from '../../helpers/unit/component';
+import {
+  assertClass,
+  destroy,
+  initAttrs,
+  renderingTests,
+  sendAction,
+  setOnController,
+  setOnComponent,
+  setPropertiesOnComponent,
+  setupComponent,
+  testClassNameBinding
+} from '../../helpers/unit/component';
+
+const { typeOf, run } = Ember;
 
 let component;
 
@@ -20,13 +34,215 @@ moduleForComponent('input-group', 'Unit | Component | input group', {
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
+
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Basic properties', function(assert) {
+  const modelPath = 'gazumbo';
+  const newClassName = 'control-group';
+  const propertyName = 'height';
+  const property = `${modelPath}.${propertyName}`;
+
+  function checkType(key, type) {
+    return typeOf(component.get(key) === type);
+  }
+
+  assert.expect(5);
+
+  assert.ok(checkType('formController', 'instance'),
+    'The component should have a formController binding');
+
+  assert.ok(checkType('newlyValidDuration', 'number'),
+    'The component should have a newlyValidDuration binding in milliseconds');
+
+  setPropertiesOnComponent(component, {
+    modelPath,
+    property,
+  });
+
+  assert.equal(component.get('propertyWithoutModel'), propertyName,
+    "The 'cleaned' property should be a relative reference from the model path");
+
+  this.render();
+
+  testClassNameBinding(assert, component);
+
+  setOnComponent(component, 'className', newClassName);
+
+  assert.ok(component.$().hasClass(newClassName),
+    'The component should have the new class name bound');
+
+});
+
+// TODO - Debug with wifi
+
+// test('Class name bindings', function(assert) {
+//   const className = component.get('className');
+//   const newlyValidDuration = 100;
+
+//   let shouldContinueTests = false;
+
+//   assert.expect(4);
+
+//   this.render();
+
+//   testClassNameBinding(assert, component);
+
+//   setPropertiesOnComponent(component, { newlyValidDuration });
+
+//   /* Set as invalid then look at class */
+
+//   sendAction(component, 'setGroupAsInvalid');
+//   assertClass(assert, component, `${className}-error`);
+
+//   /* Set as invalid then look at class */
+
+//   sendAction(component, 'setGroupAsValid');
+//   assertClass(assert, component, `${className}-newly-valid`);
+
+//   /* Look at class after validity period is over */
+
+//   run.later(component, function() {
+
+//     sendAction(component, 'setGroupAsValid');
+//     assertClass(assert, component, `${className}-valid`);
+
+//     shouldContinueTests = true;
+//   }, newlyValidDuration);
+
+//   // Ember.Test.registerWaiter(this, function() {
+//   //   console.log('checking', shouldContinueTests);
+//   //   return false;
+//   // });
+
+// });
+
+test('Input attribute properties', function(assert) {
+
+  assert.expect(0);
+
+  // TODO
+
+});
+
+test('Type property and partial', function(assert) {
+  const inputId = component .get('inputId');
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  // assert.expect(0);
+
+  /* Render early so we can check the <input> type attribute */
 
   this.render();
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
+  /* Check the type attributes we expect to detect based on the
+  property (e.g. password, email, etc) for HTML5 inputs */
+
+  const expectedTypeDetects = {
+    password: 'password',
+    email: 'email',
+    url: 'url',
+    color: 'color',
+    tel: 'tel',
+    phone: 'tel',
+    search: 'search'
+  };
+
+  for (const type in expectedTypeDetects) {
+    setOnComponent(component, 'property', type);
+
+    assert.equal(component.get('type'), expectedTypeDetects[type],
+      'Type should be autodetected by string matches when no type is set');
+
+    assert.equal(component.get('inputPartial'), 'form-inputs/default',
+      'The form input partial should still be the default');
+
+    assert.equal(this.$(`#${inputId}`).attr('type'), type,
+      'The type attribute should be bound to the input element');
+  }
+
+  /* Now check for selects */
+
+  setOnComponent(component, 'content', [1, 2, 3]);
+
+  assert.equal(component.get('type'), 'select',
+    'Type should be set to select when the content property is present (regardless of the property name)');
+
+  assert.equal(this.$(`#${inputId}`).attr('type'), type,
+    "The type attribute, 'select', should be bound to the input element");
+
+  /* Now, for fallbacks, check the type of the value */
+
+  const expectedValueDetects = {
+    number: 123,
+    date: new Date(),
+    checkbox: true,
+  };
+
+  for (const type in expectedValueDetects) {
+    const partialName = type === 'checkbox' ? type : 'default';
+
+    setOnComponent(component, 'value', expectedTypeDetects[type]);
+
+    assert.equal(component.get('type'), type,
+      'Type should be autodetected by matching the type of value when no type is set');
+
+    assert.equal(component.get('inputPartial'), `form-inputs/${partialName}`,
+      'The form input partial should reflect the value detect');
+
+    assert.equal(this.$(`#${inputId}`).attr('type'), type,
+      'The type attribute should be bound to the input element');
+  }
+
+  /* Finally, check setting the type manually using textarea */
+
+  // setOnComponent(component, 'type', 'textarea');
+
+});
+
+test('Value and property binding', function(assert) {
+  const property = 'fruit';
+  const value = 'apples';
+
+  assert.expect(6);
+
+  assert.notOk(component.get('bindingForValue'),
+    'The component should not have created a binding for the value');
+
+  this.render();
+
+  setOnController(component, property, value);
+
+  setOnComponent(component, 'property', property);
+
+  assert.equal(component.get('label'), property,
+    'The label should update once the property is bound');
+
+  initAttrs(component);
+
+  assert.ok(!!component.get('bindingForValue'),
+    'The component should have created a binding for the value');
+
+  assert.equal(component.get('value'), value,
+    'The property value on the controller should be bound to the input group');
+
+  assert.equal(component.$().data('test'), `input-wrapper-for-${property}`,
+    'The component should have the correct testig attribute bound');
+
+  destroy(component);
+
+  assert.notOk(!!component.get('bindingForValue'),
+    'The component should remove the binding for the value');
+
+});
+
+test('Action routing', function(assert) {
+
+  assert.expect(0);
+
+  // TODO
+
 });

From 884fd76d64c50dac4c86a68c819f229db823ec4c Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 14:37:09 -0400
Subject: [PATCH 47/73] Error field refactored text property

---
 addon/components/error-field.js            | 9 +++++++--
 addon/components/input-group.js            | 2 +-
 addon/templates/components/error-field.hbs | 2 +-
 tests/unit/components/error-field-test.js  | 9 +++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 8cbc30c..6802e3c 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import layout from '../templates/components/error-field';
-import toWords from '../utils/to-words';
 
 const { computed, observer, on } = Ember;
 
@@ -22,7 +21,13 @@ export default Ember.Component.extend({
   tagName: 'span',
   validAction: 'setGroupAsValid',
   showError: false,
-  text: computed.oneWay('errors.firstObject'),
+
+  text: computed('errors.firstObject', 'label', function() {
+    const error = this.get('errors.firstObject');
+    const label = this.get('label');
+
+    return `${label} ${error}`;
+  }),
 
   formController: computed(function() {
     const hasFormController = this.nearestWithProperty('formController');
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index ff2bf43..a4d43a8 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -99,7 +99,7 @@ export default Ember.Component.extend({
 
     if (this.get('content')) {
       type = 'select';
-    else if (property.match(/password/)) {
+    } else if (property.match(/password/)) {
       type = 'password';
     } else if (property.match(/email/)) {
       type = 'email';
diff --git a/addon/templates/components/error-field.hbs b/addon/templates/components/error-field.hbs
index 30af83a..f14cee9 100644
--- a/addon/templates/components/error-field.hbs
+++ b/addon/templates/components/error-field.hbs
@@ -1,5 +1,5 @@
 {{#if errors.length}}
   {{#if showError}}
-    {{capitalize-string label}} {{text}}
+    {{capitalize-string text}}
   {{/if}}
 {{/if}}
diff --git a/tests/unit/components/error-field-test.js b/tests/unit/components/error-field-test.js
index 4ad4833..6427780 100644
--- a/tests/unit/components/error-field-test.js
+++ b/tests/unit/components/error-field-test.js
@@ -58,7 +58,9 @@ test('Properties', function(assert) {
   assert.ok(component.get('text').indexOf(property) > -1,
     'The error text should contain the new property name');
 
-  const element = this.$(); // Calls render
+  this.render();
+
+  const element = this.$();
 
   assert.ok(element.hasClass(component.get('className')),
     'The class name should be bound to the element');
@@ -110,7 +112,10 @@ test('The DOM', function(assert) {
     ]),
   });
 
-  setPropertiesOnComponent(component, { property });
+  setPropertiesOnComponent(component, {
+    property,
+    showError: true,
+  });
 
   initAttrs(component);
 

From f2be2d6e53ebfc70336db3c9fa42f571f7952991 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 16:48:44 -0400
Subject: [PATCH 48/73] Type property and partial test passing plus jshint
 fixes

---
 addon/components/input-group.js               | 19 ++++--
 .../components/form-submission-button-test.js |  2 +-
 tests/unit/components/form-submission-test.js |  1 +
 tests/unit/components/input-group-test.js     | 65 ++++++++++++-------
 4 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index a4d43a8..a835b37 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -11,6 +11,7 @@ export default Ember.Component.extend({
 
   className: 'input-wrapper',
   hint: null,
+  pathToInputPartials: 'form-inputs',
   property: null,
   newlyValidDuration: 3000,
 
@@ -71,14 +72,18 @@ export default Ember.Component.extend({
   }),
 
   inputPartial: computed('type', function() {
-    const container = this.get('container');
-    const dir = 'form-inputs/';
-    const type = this.get('type');
+    const { container, pathToInputPartials, type } = this.getProperties(
+      [ 'container', 'pathToInputPartials', 'type' ]
+    );
 
-    if (!!container.lookup(`template:${dir}${type}`)) {
-      return `${dir}${type}`;
+    /* Remove leading and trailing slashes for consistency */
+
+    const dir = pathToInputPartials.replace(/^\/|\/$/g, '');
+
+    if (!!container.lookup(`template:${dir}/${type}`)) {
+      return `${dir}/${type}`;
     } else {
-      return `${dir}default`;
+      return `${dir}/default`;
     }
   }),
 
@@ -92,7 +97,7 @@ export default Ember.Component.extend({
     return toWords(property);
   }),
 
-  type: computed('content', 'propertyWithoutModel', function() {
+  type: computed('content', 'propertyWithoutModel', 'value', function() {
     const property = this.get('propertyWithoutModel');
 
     let type;
diff --git a/tests/unit/components/form-submission-button-test.js b/tests/unit/components/form-submission-button-test.js
index fb63135..b81bcaa 100644
--- a/tests/unit/components/form-submission-button-test.js
+++ b/tests/unit/components/form-submission-button-test.js
@@ -82,7 +82,7 @@ test('The DOM', function(assert) {
 
 test('Actions', function(assert) {
 
-  expect(1);
+  assert.expect(1);
 
   setPropertiesOnComponent(component, {
     action: 'orderBigMacs',
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 83f945d..a2007d7 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import { moduleForComponent, test } from 'ember-qunit';
 import {
   renderingTests,
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index d7bde6b..47f01f6 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -23,7 +23,10 @@ moduleForComponent('input-group', 'Unit | Component | input group', {
     'component:error-field',
     'component:label-field',
     'helper:capitalize-string',
+    'template:form-inputs/checkbox',
     'template:form-inputs/default',
+    'template:form-inputs/select',
+    'template:form-inputs/textarea',
   ],
   unit: true,
 
@@ -130,9 +133,9 @@ test('Input attribute properties', function(assert) {
 });
 
 test('Type property and partial', function(assert) {
-  const inputId = component .get('inputId');
+  const inputId = component.get('inputId');
 
-  // assert.expect(0);
+  assert.expect(24);
 
   /* Render early so we can check the <input> type attribute */
 
@@ -151,41 +154,63 @@ test('Type property and partial', function(assert) {
     search: 'search'
   };
 
-  for (const type in expectedTypeDetects) {
+  for (let type in expectedTypeDetects) {
+    const expectedType = expectedTypeDetects[type];
+
     setOnComponent(component, 'property', type);
 
-    assert.equal(component.get('type'), expectedTypeDetects[type],
+    assert.equal(component.get('type'), expectedType,
       'Type should be autodetected by string matches when no type is set');
 
     assert.equal(component.get('inputPartial'), 'form-inputs/default',
       'The form input partial should still be the default');
 
-    assert.equal(this.$(`#${inputId}`).attr('type'), type,
+    assert.equal(this.$(`#${inputId}`).attr('type'), expectedType,
       'The type attribute should be bound to the input element');
   }
 
   /* Now check for selects */
 
-  setOnComponent(component, 'content', [1, 2, 3]);
+  setOnComponent(component, 'content', Em.A([1, 2, 3]));
 
   assert.equal(component.get('type'), 'select',
     'Type should be set to select when the content property is present (regardless of the property name)');
 
-  assert.equal(this.$(`#${inputId}`).attr('type'), type,
+  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'select',
     "The type attribute, 'select', should be bound to the input element");
 
-  /* Now, for fallbacks, check the type of the value */
+  /* Reset the component for the next set of tests */
 
-  const expectedValueDetects = {
-    number: 123,
-    date: new Date(),
-    checkbox: true,
-  };
+  /* Finally, check setting the type manually using textarea */
+
+  setOnComponent(component, 'type', 'textarea');
+
+  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'textarea',
+    "The type attribute, 'select', should be bound to the input element");
+
+});
+
+/* Now, for fallbacks, check the type of the value */
 
-  for (const type in expectedValueDetects) {
+const expectedValueDetects = {
+  number: 123,
+  date: new Date(),
+  checkbox: true,
+};
+
+for (let type in expectedValueDetects) {
+  test(`typeof value detection fallback for ${type} property`, function(assert) {
+    const inputId = component.get('inputId');
     const partialName = type === 'checkbox' ? type : 'default';
+    const value = expectedValueDetects[type];
+
+    assert.expect(3);
+
+    setPropertiesOnComponent(component, {
+      value,
+    });
 
-    setOnComponent(component, 'value', expectedTypeDetects[type]);
+    this.render();
 
     assert.equal(component.get('type'), type,
       'Type should be autodetected by matching the type of value when no type is set');
@@ -193,15 +218,11 @@ test('Type property and partial', function(assert) {
     assert.equal(component.get('inputPartial'), `form-inputs/${partialName}`,
       'The form input partial should reflect the value detect');
 
-    assert.equal(this.$(`#${inputId}`).attr('type'), type,
+    assert.equal(component.$(`#${inputId}`).attr('type'), type,
       'The type attribute should be bound to the input element');
-  }
 
-  /* Finally, check setting the type manually using textarea */
-
-  // setOnComponent(component, 'type', 'textarea');
-
-});
+  });
+}
 
 test('Value and property binding', function(assert) {
   const property = 'fruit';

From 51c58ed36ea9ff9fc187743e0df57fd02ccafac4 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 17:49:02 -0400
Subject: [PATCH 49/73] Validity tests for class name working

---
 addon/components/input-group.js           |   4 +-
 tests/unit/components/input-group-test.js | 124 +++++++++++++---------
 2 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index a835b37..5e899d3 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -179,7 +179,9 @@ export default Ember.Component.extend({
     }
 
     run.later(this, function() {
-      this.set('isNewlyValid', false);
+      if (!this.get('isDestroying')) {
+        this.set('isNewlyValid', false);
+      }
     }, this.get('newlyValidDuration'));
   }),
 
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index 47f01f6..328ab85 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -81,48 +81,40 @@ test('Basic properties', function(assert) {
 
 });
 
-// TODO - Debug with wifi
+test('Class name bindings', function(assert) {
+  const className = component.get('className');
+  const done = assert.async(); // Enable asyns test
+  const newlyValidDuration = 10;
 
-// test('Class name bindings', function(assert) {
-//   const className = component.get('className');
-//   const newlyValidDuration = 100;
+  assert.expect(4);
 
-//   let shouldContinueTests = false;
-
-//   assert.expect(4);
-
-//   this.render();
-
-//   testClassNameBinding(assert, component);
+  this.render();
 
-//   setPropertiesOnComponent(component, { newlyValidDuration });
+  testClassNameBinding(assert, component);
 
-//   /* Set as invalid then look at class */
+  setPropertiesOnComponent(component, { newlyValidDuration });
 
-//   sendAction(component, 'setGroupAsInvalid');
-//   assertClass(assert, component, `${className}-error`);
+  /* Set as invalid then look at class */
 
-//   /* Set as invalid then look at class */
+  sendAction(component, 'setGroupAsInvalid');
+  assertClass(assert, component, `${className}-error`);
 
-//   sendAction(component, 'setGroupAsValid');
-//   assertClass(assert, component, `${className}-newly-valid`);
+  /* Set as invalid then look at class */
 
-//   /* Look at class after validity period is over */
+  sendAction(component, 'setGroupAsValid');
+  assertClass(assert, component, `${className}-newly-valid`);
 
-//   run.later(component, function() {
+  /* Look at class after validity period is over */
 
-//     sendAction(component, 'setGroupAsValid');
-//     assertClass(assert, component, `${className}-valid`);
+  run.later(component, function() {
 
-//     shouldContinueTests = true;
-//   }, newlyValidDuration);
+    sendAction(component, 'setGroupAsValid');
+    assertClass(assert, component, `${className}-valid`);
 
-//   // Ember.Test.registerWaiter(this, function() {
-//   //   console.log('checking', shouldContinueTests);
-//   //   return false;
-//   // });
+    done();
+  }, newlyValidDuration);
 
-// });
+});
 
 test('Input attribute properties', function(assert) {
 
@@ -135,7 +127,7 @@ test('Input attribute properties', function(assert) {
 test('Type property and partial', function(assert) {
   const inputId = component.get('inputId');
 
-  assert.expect(24);
+  assert.expect(33);
 
   /* Render early so we can check the <input> type attribute */
 
@@ -181,30 +173,26 @@ test('Type property and partial', function(assert) {
 
   /* Reset the component for the next set of tests */
 
-  /* Finally, check setting the type manually using textarea */
-
-  setOnComponent(component, 'type', 'textarea');
-
-  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'textarea',
-    "The type attribute, 'select', should be bound to the input element");
-
-});
+  setPropertiesOnComponent(component, {
+    content: null,
+    property: 'bananas',
+  });
 
-/* Now, for fallbacks, check the type of the value */
+  /* Now, for fallbacks, check the type of the value */
 
-const expectedValueDetects = {
-  number: 123,
-  date: new Date(),
-  checkbox: true,
-};
+  const expectedValueDetects = {
+    number: 123,
+    date: new Date(),
+    checkbox: true,
+  };
 
-for (let type in expectedValueDetects) {
-  test(`typeof value detection fallback for ${type} property`, function(assert) {
-    const inputId = component.get('inputId');
+  for (let type in expectedValueDetects) {
+    // test(`typeof value detection fallback for ${type} property`, function(assert) {
+      // const inputId = component.get('inputId');
     const partialName = type === 'checkbox' ? type : 'default';
     const value = expectedValueDetects[type];
 
-    assert.expect(3);
+    // assert.expect(3);
 
     setPropertiesOnComponent(component, {
       value,
@@ -221,8 +209,17 @@ for (let type in expectedValueDetects) {
     assert.equal(component.$(`#${inputId}`).attr('type'), type,
       'The type attribute should be bound to the input element');
 
-  });
-}
+    // });
+  }
+
+  /* Finally, check setting the type manually using textarea */
+
+  setOnComponent(component, 'type', 'textarea');
+
+  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'textarea',
+    "The type attribute, 'select', should be bound to the input element and setabble manually");
+
+});
 
 test('Value and property binding', function(assert) {
   const property = 'fruit';
@@ -260,10 +257,31 @@ test('Value and property binding', function(assert) {
 
 });
 
-test('Action routing', function(assert) {
+test('Validity action routing', function(assert) {
 
-  assert.expect(0);
+  assert.expect(3);
 
-  // TODO
+  /* Ensure properties begin as we want */
+
+  setPropertiesOnComponent(component, {
+    isValid: false,
+    newlyValidDuration: 0,
+    showError: false,
+  });
+
+  sendAction(component, 'showError');
+
+  assert.ok(component.get('showError'),
+    'Calling the showError() action should set showError to true');
+
+  sendAction(component, 'setGroupAsValid');
+
+  assert.ok(component.get('isValid'),
+    'Calling the setGroupAsValid() action should set isValid to true');
+
+  sendAction(component, 'setGroupAsInvalid');
+
+  assert.notOk(component.get('isValid'),
+    'Calling the setGroupAsInvalid() action should set isValid to false');
 
 });

From ce684b0dd51dda7cc45cdb7ec49d5155a2cfa7a3 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 17:57:15 -0400
Subject: [PATCH 50/73] test for input attribute bindings

---
 tests/unit/components/input-group-test.js | 25 ++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index 328ab85..6591eb1 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -118,9 +118,28 @@ test('Class name bindings', function(assert) {
 
 test('Input attribute properties', function(assert) {
 
-  assert.expect(0);
+  const properties = [
+    'collection',
+    'content',
+    'optionValuePath',
+    'optionLabelPath',
+    'selection',
+    'multiple',
+    'name',
+    'placeholder',
+    'prompt',
+    'disabled',
+  ];
+
+  assert.expect(properties.length);
+
+  properties.forEach(function(property) {
+    const value = component.get(property);
+
+    assert.ok(value !== undefined,
+      `The ipnut group should have a binding for the input attribute ${property}`);
 
-  // TODO
+  });
 
 });
 
@@ -163,7 +182,7 @@ test('Type property and partial', function(assert) {
 
   /* Now check for selects */
 
-  setOnComponent(component, 'content', Em.A([1, 2, 3]));
+  setOnComponent(component, 'content', Ember.A([1, 2, 3]));
 
   assert.equal(component.get('type'), 'select',
     'Type should be set to select when the content property is present (regardless of the property name)');

From a2e017215e93c9a0371ce8e7bab65731caac24a9 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 18:05:01 -0400
Subject: [PATCH 51/73] Label field unit test

---
 addon/components/label-field.js            |  2 +-
 addon/templates/components/input-group.hbs |  2 +-
 addon/templates/components/label-field.hbs |  2 +-
 tests/unit/components/label-field-test.js  | 46 +++++++++++++++++++---
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/addon/components/label-field.js b/addon/components/label-field.js
index 521defd..05dcbc4 100644
--- a/addon/components/label-field.js
+++ b/addon/components/label-field.js
@@ -6,7 +6,7 @@ export default Ember.Component.extend({
   className: 'label',
   classNameBindings: ['className'],
   for: null,
-  label: null,
+  text: null,
   layout: layout,
   tagName: 'label',
 });
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index c13fd56..2ea2b28 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -1,7 +1,7 @@
 {{#if label}}
   {{label-field
     for=inputId
-    label=label
+    text=label
   }}
   {{!-- TODO - change label to text? --}}
 {{/if}}
diff --git a/addon/templates/components/label-field.hbs b/addon/templates/components/label-field.hbs
index fc36da3..bea1f81 100644
--- a/addon/templates/components/label-field.hbs
+++ b/addon/templates/components/label-field.hbs
@@ -1 +1 @@
-{{capitalize-string label}}
+{{capitalize-string text}}
diff --git a/tests/unit/components/label-field-test.js b/tests/unit/components/label-field-test.js
index 9137144..014e8c8 100644
--- a/tests/unit/components/label-field-test.js
+++ b/tests/unit/components/label-field-test.js
@@ -1,4 +1,16 @@
 import { moduleForComponent, test } from 'ember-qunit';
+import {
+  assertClass,
+  destroy,
+  initAttrs,
+  renderingTests,
+  sendAction,
+  setOnController,
+  setOnComponent,
+  setPropertiesOnComponent,
+  setupComponent,
+  testClassNameBinding
+} from '../../helpers/unit/component';
 
 let component;
 
@@ -11,15 +23,37 @@ moduleForComponent('label-field', 'Unit | Component | label field', {
   },
 });
 
-test('it renders', function(assert) {
+test('Rendering', function(assert) {
 
-  assert.equal(component._state, 'preRender',
-    'The component instance should be created');
+  assert.expect(2);
+
+  renderingTests(assert, this, component);
+});
+
+test('Properties', function(assert) {
+  const forId = '#ember-fake-123';
+  const text = 'Group of bananas?';
+
+  assert.expect(4);
 
   this.render();
 
-  assert.equal(component._state, 'inDOM');
+  testClassNameBinding(assert, component);
+
+  setPropertiesOnComponent(component, {
+    for: forId,
+    text
+  });
+
+  const $component = component.$();
+
+  assert.equal($component.html().trim(), text,
+    'The label text property should appear in the template');
+
+  assert.equal($component.attr('for'), forId,
+    'The for attribute should be bound to the element');
+
+  assert.equal($component.prop('tagName').toLowerCase(), 'label',
+    'The element should be a <label>');
 
-  assert.equal(component._state, 'inDOM',
-    'The component should be inserted into the DOM after render');
 });

From 99fb4c9bf530ff256472724706e7e8b43c01b59f Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 18:17:30 -0400
Subject: [PATCH 52/73] Test for input aria attribtues in initializers

---
 app/templates/form-inputs/default.hbs         |  2 +-
 app/templates/form-inputs/select.hbs          |  2 +-
 app/templates/form-inputs/textarea.hbs        |  2 +-
 .../initializers/easy-form-extensions-test.js | 21 +++++++++++++++----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/templates/form-inputs/default.hbs b/app/templates/form-inputs/default.hbs
index 98469d6..ca88747 100644
--- a/app/templates/form-inputs/default.hbs
+++ b/app/templates/form-inputs/default.hbs
@@ -1,5 +1,6 @@
 {{input
   id=inputId
+  invalid=isInvalid
   focus-out='showError'
 
   placeholder=placeholder
@@ -32,5 +33,4 @@
   form=form
   selectionDirection=selectionDirection
   spellcheck=spellcheck
-  invalid=isInvalid
 }}
diff --git a/app/templates/form-inputs/select.hbs b/app/templates/form-inputs/select.hbs
index 0e78144..7e01414 100644
--- a/app/templates/form-inputs/select.hbs
+++ b/app/templates/form-inputs/select.hbs
@@ -1,5 +1,6 @@
 {{view 'select'
   id=inputId
+  invalid=isInvalid
 
   content=content
   name=name
@@ -8,5 +9,4 @@
   prompt=prompt
   disabled=disabled
   required=required
-  invalid=isInvalid
 }}
diff --git a/app/templates/form-inputs/textarea.hbs b/app/templates/form-inputs/textarea.hbs
index 88df991..47a5e96 100644
--- a/app/templates/form-inputs/textarea.hbs
+++ b/app/templates/form-inputs/textarea.hbs
@@ -1,5 +1,6 @@
 {{textarea
   id=inputId
+  invalid=isInvalid
   focus-out='showError'
 
   placeholder=placeholder
@@ -20,5 +21,4 @@
   form=form
   spellcheck=spellcheck
   required=required
-  invalid=isInvalid
 }}
diff --git a/tests/unit/initializers/easy-form-extensions-test.js b/tests/unit/initializers/easy-form-extensions-test.js
index 6a2d564..3ef3d21 100644
--- a/tests/unit/initializers/easy-form-extensions-test.js
+++ b/tests/unit/initializers/easy-form-extensions-test.js
@@ -14,10 +14,23 @@ module('Unit | Initializer | easy form extensions', {
   }
 });
 
-// Replace this with your real tests.
-test('it works', function(assert) {
+test('Input element basic accessibility', function(assert) {
   initialize(container, application);
 
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
+  assert.expect(7);
+
+  assert.ok(Ember.Checkbox.create().get('attributeBindings').toString().indexOf('aria-checked') > -1,
+    'Ember.Checkbox should have an aria-checked binding');
+
+  ['TextArea', 'TextField', 'Select'].forEach(function(className) {
+    const instance = Ember[className].create();
+    const attributeBindings = instance.get('attributeBindings').toString();
+
+    assert.ok(attributeBindings.indexOf('aria-invalid') > -1,
+      `Ember.${className} should have an aria-invalid binding`);
+
+    assert.ok(attributeBindings.indexOf('aria-required') > -1,
+      `Ember.${className} should have an aria-required binding`);
+
+  });
 });

From f3a95e2429c972991185a5814af2a0b0515fb28d Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 19:22:02 -0400
Subject: [PATCH 53/73] Submission class name mixin unit test

---
 .../components/form-submission-class-name.js  |  1 +
 .../unit/initializers/routing-events-test.js  |  3 ++
 .../form-submission-class-name-test.js        | 42 ++++++++++++++++---
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/addon/mixins/components/form-submission-class-name.js b/addon/mixins/components/form-submission-class-name.js
index 0909ff5..7fce389 100644
--- a/addon/mixins/components/form-submission-class-name.js
+++ b/addon/mixins/components/form-submission-class-name.js
@@ -3,6 +3,7 @@ import Ember from 'ember';
 const { computed } = Ember;
 
 export default Ember.Mixin.create({
+  className: null,
   classNameBindings: ['submissionClassName'],
 
   submissionClassName: computed('className', 'formIsSubmitted',
diff --git a/tests/unit/initializers/routing-events-test.js b/tests/unit/initializers/routing-events-test.js
index 7ef5319..73e94e6 100644
--- a/tests/unit/initializers/routing-events-test.js
+++ b/tests/unit/initializers/routing-events-test.js
@@ -4,6 +4,8 @@ import { module, test } from 'qunit';
 
 var container, application;
 
+/* ROUTE INITIALIZER TO BE DEPRECATED */
+
 module('Unit | Initializer | routing events', {
   beforeEach: function() {
     Ember.run(function() {
@@ -20,4 +22,5 @@ test('it works', function(assert) {
 
   // you would normally confirm the results of the initializer here
   assert.ok(true);
+
 });
diff --git a/tests/unit/mixins/components/form-submission-class-name-test.js b/tests/unit/mixins/components/form-submission-class-name-test.js
index 6d5e235..059faec 100644
--- a/tests/unit/mixins/components/form-submission-class-name-test.js
+++ b/tests/unit/mixins/components/form-submission-class-name-test.js
@@ -2,11 +2,41 @@ import Ember from 'ember';
 import FormSubmissionClassNameMixin from 'ember-easy-form-extensions/mixins/components/form-submission-class-name';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | form submission class name');
+const { run } = Ember;
+
+let component;
+
+function setProperties(properties) {
+  run(function() {
+    component.setProperties(properties);
+  });
+}
+
+module('Unit | Mixin | form submission class name', {
+  unit: true,
+
+  beforeEach: function() {
+    const FormSubmissionClassNameObject = Ember.Component.extend(FormSubmissionClassNameMixin);
+
+    component = FormSubmissionClassNameObject.create();
+  },
+});
+
+test('Class name bindings', function(assert) {
+  const className = 'bananas';
+  const property = 'submissionClassName';
+
+  assert.expect(2);
+
+  setProperties({
+    className: className,
+    formIsSubmitted: true,
+  });
+
+  assert.equal(component.get(property), `${className}-submitted`,
+    'submissionClassName should reflect that the form is submitted');
+
+  assert.ok(component.get('classNameBindings').indexOf(property) > -1,
+    `The ${property} class should be bound to the component`);
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var FormSubmissionClassNameObject = Ember.Object.extend(FormSubmissionClassNameMixin);
-  var subject = FormSubmissionClassNameObject.create();
-  assert.ok(subject);
 });

From c7b30654caca32f8519f921a75317c1c487d1735 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 19:49:13 -0400
Subject: [PATCH 54/73] Revalidations mixin unit test

---
 .../controllers/conditional-validations.js    |  6 +-
 .../conditional-validations-test.js           | 63 +++++++++++++++++--
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/addon/mixins/controllers/conditional-validations.js b/addon/mixins/controllers/conditional-validations.js
index 4d9bca4..421788b 100644
--- a/addon/mixins/controllers/conditional-validations.js
+++ b/addon/mixins/controllers/conditional-validations.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-const { on } = Ember;
+const { on, typeOf } = Ember;
 
 export default Ember.Mixin.create({
   revalidateFor: [],
@@ -21,7 +21,9 @@ export default Ember.Mixin.create({
 
   _revalidate: on('routeDidTransition',
     function() {
-      Ember.assert('No validate() method detected. You must use the conditional validations mixin with the form mixin.', this.validate);
+      const validateExists = typeOf(this.validate) === 'function';
+
+      Ember.assert('No validate() method detected. You must use the conditional validations mixin with the form mixin.', validateExists);
 
       this.forEachRevalidator(function(property) {
         this.addObserver(property, this.validate);
diff --git a/tests/unit/mixins/controllers/conditional-validations-test.js b/tests/unit/mixins/controllers/conditional-validations-test.js
index 8fda84f..4885faa 100644
--- a/tests/unit/mixins/controllers/conditional-validations-test.js
+++ b/tests/unit/mixins/controllers/conditional-validations-test.js
@@ -2,11 +2,62 @@ import Ember from 'ember';
 import ControllersConditionalValidationsMixin from 'ember-easy-form-extensions/mixins/controllers/conditional-validations';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | controllers/conditional validations');
+const { run } = Ember;
+
+let controller;
+
+function set(key, value) {
+  run(function() {
+    controller.set(key, value);
+  });
+}
+
+function trigger(event) {
+  run(function() {
+    controller.trigger(event);
+  });
+}
+
+module('Unit | Mixin | controllers/conditional validations', {
+  unit: true,
+
+  beforeEach: function() {
+    const ControllersConditionalValidationsObject = Ember.Controller.extend(
+      ControllersConditionalValidationsMixin,
+      Ember.Evented, {
+
+      validate: function() {
+        Ember.warn("It looks like you forgot to set validate() with an assertion in your test. For example controller.set('validate', function() { assert.ok(...) });");
+      }
+    });
+
+    controller = ControllersConditionalValidationsObject.create();
+  },
+});
+
+test('Revalidation calls to validate', function(assert) {
+  const property = 'bananas';
+
+  assert.expect(1);
+
+  set('revalidateFor', ['bananas']);
+
+  set('validate', function() {
+
+    assert.ok(true,
+      `validate() should be called when the ${property} property changes`);
+
+  });
+
+  trigger('routeDidTransition');
+
+  set('bananas', 'some value');
+
+  /* Remove observer with willTransition and check the validate
+  method is not called again */
+
+  trigger('routeWillTransition');
+
+  set('bananas', 'some value');
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var ControllersConditionalValidationsObject = Ember.Object.extend(ControllersConditionalValidationsMixin);
-  var subject = ControllersConditionalValidationsObject.create();
-  assert.ok(subject);
 });

From 7ceb5e04dee28bd1a6a35c5219bdb0ef332929c5 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 11 Jul 2015 23:50:24 -0400
Subject: [PATCH 55/73] Test for _eventHandler in form mixin

---
 addon/components/form-wrapper.js              |   4 +-
 addon/mixins/controllers/form.js              |  28 +--
 .../form-submission-class-name-test.js        |   1 -
 .../conditional-validations-test.js           |   1 -
 tests/unit/mixins/controllers/form-test.js    | 200 +++++++++++++++++-
 5 files changed, 210 insertions(+), 24 deletions(-)

diff --git a/addon/components/form-wrapper.js b/addon/components/form-wrapper.js
index cafc064..95352d0 100644
--- a/addon/components/form-wrapper.js
+++ b/addon/components/form-wrapper.js
@@ -28,9 +28,9 @@ export default Ember.Component.extend(
   formController: Ember.computed(function() {
     const routeController = this.get('targetObject');
 
-    if (this.get('isFormController')) {
+    if (this.get('hasFormMixin')) {
       return this;
-    } else if (routeController.get('isFormController')) {
+    } else if (routeController.get('hasFormMixin')) {
       return routeController;
     } else {
       return null;
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 7729bb0..70a6e6a 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -8,14 +8,13 @@ export default Ember.Mixin.create(
 
   /* Properties */
 
-  cancelClicked: false,
   formIsSubmitted: false,
 
   editing: computed(function() {
     return this.toString().indexOf('/edit:') > -1;
   }),
 
-  isFormController: computed(function() {
+  hasFormMixin: computed(function() {
     return true;
   }).readOnly(),
 
@@ -41,20 +40,15 @@ export default Ember.Mixin.create(
       });
     },
 
-    /* Form submisison actions */
+    /* Form submission actions */
 
     cancel() {
-      this.setProperties({
-        cancelClicked: true,
-        formIsSubmitted: true
-      });
-
+      this.set('formIsSubmitted', true);
       this._eventHandler('cancel');
     },
 
     delete() {
       this.set('formIsSubmitted', true);
-
       this._eventHandler('delete');
     },
 
@@ -63,7 +57,6 @@ export default Ember.Mixin.create(
     submit() {
       this.set('formIsSubmitted', true);
       this.trigger('submission');
-
       this._eventHandler('submit');
     },
 
@@ -72,13 +65,20 @@ export default Ember.Mixin.create(
   /* Methods */
 
   resetForm: on('routeDidTransition', function() {
-    this.set('formIsSubmitted', false);
+    this.resetSubmission();
+
+    /* Add logic for resetting anything to do with
+    input here */
   }),
 
-  showServerError(/* xhr */) {
+  resetSubmission() {
     this.set('formIsSubmitted', false);
   },
 
+  showServerError(/* xhr */) {
+    this.resetSubmission();
+  },
+
   validateThenSave() {
     const _this = this;
 
@@ -100,7 +100,7 @@ export default Ember.Mixin.create(
     if (this.runCustomValidations) {
       const customValidationsPromise = this.runCustomValidations();
 
-      if (!customValidationsPromise.then) {
+      if (!customValidationsPromise || !customValidationsPromise.then) {
         Ember.assert(
           'runCustomValidations() must return a promise (e.g. return new Ember.RSVP.Promise(...)).'
         );
@@ -111,7 +111,7 @@ export default Ember.Mixin.create(
 
       /* Else save with normal ember-validations checks */
 
-      if (!_this.get('isValid')) {
+      if (!this.get('isValid')) {
         reject();
       } else {
         resolve();
diff --git a/tests/unit/mixins/components/form-submission-class-name-test.js b/tests/unit/mixins/components/form-submission-class-name-test.js
index 059faec..8e8d1d7 100644
--- a/tests/unit/mixins/components/form-submission-class-name-test.js
+++ b/tests/unit/mixins/components/form-submission-class-name-test.js
@@ -13,7 +13,6 @@ function setProperties(properties) {
 }
 
 module('Unit | Mixin | form submission class name', {
-  unit: true,
 
   beforeEach: function() {
     const FormSubmissionClassNameObject = Ember.Component.extend(FormSubmissionClassNameMixin);
diff --git a/tests/unit/mixins/controllers/conditional-validations-test.js b/tests/unit/mixins/controllers/conditional-validations-test.js
index 4885faa..e066ede 100644
--- a/tests/unit/mixins/controllers/conditional-validations-test.js
+++ b/tests/unit/mixins/controllers/conditional-validations-test.js
@@ -19,7 +19,6 @@ function trigger(event) {
 }
 
 module('Unit | Mixin | controllers/conditional validations', {
-  unit: true,
 
   beforeEach: function() {
     const ControllersConditionalValidationsObject = Ember.Controller.extend(
diff --git a/tests/unit/mixins/controllers/form-test.js b/tests/unit/mixins/controllers/form-test.js
index eaf0b82..ffe357a 100644
--- a/tests/unit/mixins/controllers/form-test.js
+++ b/tests/unit/mixins/controllers/form-test.js
@@ -2,11 +2,199 @@ import Ember from 'ember';
 import ControllersFormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | controllers/form');
+const { run, typeOf } = Ember;
+
+let component;
+
+function set(key, value) {
+  run(function() {
+    component.set(key, value);
+  });
+}
+
+function setProperties(properties) {
+  run(function() {
+    component.setProperties(properties);
+  });
+}
+
+function trigger(event) {
+  run(function() {
+    component.trigger(event);
+  });
+}
+
+module('Unit | Mixin | controllers/form', {
+
+  beforeEach: function() {
+
+    const ControllersFormMixinObject = Ember.Component.extend(
+      ControllersFormMixin,
+      Ember.Evented, {
+
+      cancel: function() {
+        Ember.warn("It looks like you forgot to set cancel() with an assertion in your test. For example controller.set('cancel', function() { assert.ok(...) });");
+      },
+
+      delete: function() {
+        Ember.warn("It looks like you forgot to set delete() with an assertion in your test. For example controller.set('delete', function() { assert.ok(...) });");
+      },
+
+      save: function() {
+        Ember.warn("It looks like you forgot to set save() with an assertion in your test. For example controller.set('save', function() { assert.ok(...) });");
+      },
+
+    });
+
+    component = ControllersFormMixinObject.create();
+  },
+});
+
+test('Properties and actions', function(assert) {
+
+  assert.strictEqual(component.get('formIsSubmitted'), false,
+    'Form is submitted should default to false');
+
+  assert.ok(component.get('hasFormMixin'),
+    'The mixin should have a helper property for detection by components');
+
+  ['cancel', 'delete', 'submit'].forEach(function(action) {
+
+    assert.ok(component.get(`_actions.${action}`),
+      `The ${action} action should exist`);
+
+  });
+
+});
+
+test('Public methods', function(assert) {
+  const done = assert.async();
+
+  assert.expect(7);
+
+  /* Check public methods exist */
+
+  [
+    'resetForm',
+    'resetSubmission',
+    'showServerError',
+    'validateThenSave'
+  ].forEach(function(publicMethod) {
+
+    assert.ok(typeOf(component.get(publicMethod)) === 'function',
+      `${publicMethod} should be a public method`);
+
+  });
+
+  /* resetForm() */
+
+  set('formIsSubmitted', true);
+
+  component.resetForm();
+
+  assert.strictEqual(component.get('formIsSubmitted'), false,
+    'Form is submitted should be set to false after calling resetForm');
+
+  /* validateThenSave() */
+
+  set('runCustomValidations', function() {
+    return new Ember.RSVP.Promise(function(resolve) {
+
+      assert.ok(true,
+        'runCustomValidations should be called by validateThenSave');
+
+      resolve();
+
+    });
+  });
+
+  set('save', function() {
+
+    assert.ok(true,
+      'save() should be called by validateThenSave()');
+
+    done();
+
+  });
+
+  component.validateThenSave();
+
+});
+
+test('Private methods', function(assert) {
+
+  /* _eventHandler */
+
+  const events = ['cancel', 'delete', 'submit'];
+
+  /* Use an array and index to save and call assert.async()
+  methods so we can wait for the promises to resolve before
+  ending the test */
+
+  const waiters = [];
+
+  let doneCount = 0;
+
+  assert.expect(9);
+
+  /* Test without event handlers... */
+
+  events.forEach(function(event) {
+    const eventHandler = `${event}Handler`;
+
+    let method = event;
+
+    if (event === 'submit') {
+      method = 'validateThenSave';
+    }
+
+    set(method, function() {
+
+      assert.ok(true,
+        `${method}() should be called by _eventHandler()`);
+
+    });
+
+    component._eventHandler(event);
+
+  });
+
+  /* ... Then test event handlers */
+
+  events.forEach(function(event) {
+    const eventHandler = `${event}Handler`;
+
+    let method = event;
+
+    if (event === 'submit') {
+      method = 'validateThenSave';
+    }
+
+    waiters.push(assert.async());
+
+    set(eventHandler, function() {
+      return new Ember.RSVP.Promise(function(resolve) {
+
+        assert.ok(true,
+          '${eventHandler}() should be called by _eventHandler()');
+
+        resolve();
+
+      });
+    });
+
+    set(method, function() {
+
+      assert.ok(true,
+        `${method}() should be called by _eventHandler()`);
+
+      waiters[doneCount]();
+
+      doneCount++;
+    });
+
+    component._eventHandler(event);
+
+  });
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var ControllersFormObject = Ember.Object.extend(ControllersFormMixin);
-  var subject = ControllersFormObject.create();
-  assert.ok(subject);
 });

From f510965244ae5c05a7e86d5ce2688947e67e007d Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 12 Jul 2015 00:32:22 -0400
Subject: [PATCH 56/73] Routes mixin unit tests

---
 .../routes/dirty-record-handler-test.js       | 97 +++++++++++++++++--
 1 file changed, 91 insertions(+), 6 deletions(-)

diff --git a/tests/unit/mixins/routes/dirty-record-handler-test.js b/tests/unit/mixins/routes/dirty-record-handler-test.js
index f540b78..0aa2d7a 100644
--- a/tests/unit/mixins/routes/dirty-record-handler-test.js
+++ b/tests/unit/mixins/routes/dirty-record-handler-test.js
@@ -2,11 +2,96 @@ import Ember from 'ember';
 import RoutesDirtyRecordHandlerMixin from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | routes/dirty record handler');
+const { run } = Ember;
+
+let route;
+
+function setOnModel(properties) {
+  run(function() {
+    route.get('controller.model').setProperties(properties);
+  });
+}
+
+function trigger(event) {
+  run(function() {
+    route.trigger(event);
+  });
+}
+
+module('Unit | Mixin | routes/dirty record handler', {
+
+  beforeEach: function() {
+    const RoutesDirtyRecordHandlerObject = Ember.Route.extend(
+      Ember.Evented, // So we can call trigger
+      RoutesDirtyRecordHandlerMixin, {
+
+      controller: Ember.Controller.create({
+        model: Ember.Object.create({
+          isDirty: true,
+        }),
+      }),
+
+    });
+
+    route = RoutesDirtyRecordHandlerObject.create();
+  },
+
+});
+
+test('The model rolls back', function(assert) {
+
+  assert.expect(1);
+
+  /* Set ID as if the record was existing and being edited */
+
+  setOnModel({
+    id: 123,
+    rollback: function() {
+
+      assert.ok(true,
+        'rollback() should be called by rollbackIfDirty');
+
+    },
+  });
+
+  trigger('willTransition');
+
+});
+
+test('The model is deleted', function(assert) {
+
+  assert.expect(1);
+
+  /* Don't set an ID as if the record was new */
+
+  setOnModel({
+    deleteRecord: function() {
+
+      assert.ok(true,
+        'deleteRecord() should be called by rollbackIfDirty');
+
+    },
+  });
+
+  trigger('willTransition');
+
+});
+
+test('Using rollbackIfDirty as a public method', function(assert) {
+
+  assert.expect(1);
+
+  /* Don't set an ID as if the record was new */
+
+  setOnModel({
+    deleteRecord: function() {
+
+    assert.ok(true,
+      'deleteRecord() should be called by rollbackIfDirty');
+
+    },
+  });
+
+  route.rollbackIfDirty(route.get('controller.model'));
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var RoutesDirtyRecordHandlerObject = Ember.Object.extend(RoutesDirtyRecordHandlerMixin);
-  var subject = RoutesDirtyRecordHandlerObject.create();
-  assert.ok(subject);
 });

From c56167353a148d339755caf2aa61900507e3413e Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 12 Jul 2015 00:39:45 -0400
Subject: [PATCH 57/73] defaultFor unit test

---
 tests/unit/utils/default-for-test.js | 35 ++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/tests/unit/utils/default-for-test.js b/tests/unit/utils/default-for-test.js
index e924557..8bb28ce 100644
--- a/tests/unit/utils/default-for-test.js
+++ b/tests/unit/utils/default-for-test.js
@@ -3,8 +3,35 @@ import { module, test } from 'qunit';
 
 module('Unit | Utility | default for');
 
-// Replace this with your real tests.
-test('it works', function(assert) {
-  var result = defaultFor();
-  assert.ok(true);
+test('Correct values are returned', function(assert) {
+
+  assert.expect(11);
+
+  /* Test that fallbacks are used for the desired references */
+
+  assert.strictEqual(defaultFor(null, true), true,
+    'null should result in fallback');
+
+  assert.strictEqual(defaultFor(undefined, true), true,
+    'undefined should result in fallback');
+
+  /* Test what we expect to not need a fallback value */
+
+  [
+    'abc',
+    123,
+    {},
+    [],
+    function() {},
+    new Date,
+    false,
+    true,
+    0
+  ].forEach(function(expectedPositive) {
+
+    assert.strictEqual(defaultFor(expectedPositive, true), expectedPositive,
+      'The test should result in no fallback');
+
+  });
+
 });

From 78a659d29611740f9be90f619ebb01aaaf7ce3b1 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 12 Jul 2015 00:50:18 -0400
Subject: [PATCH 58/73] toWords unit test and bug fixes

---
 addon/utils/to-words.js              |  4 +++-
 tests/unit/utils/default-for-test.js |  2 +-
 tests/unit/utils/to-words-test.js    | 23 +++++++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addon/utils/to-words.js b/addon/utils/to-words.js
index ab8935e..0fa6954 100644
--- a/addon/utils/to-words.js
+++ b/addon/utils/to-words.js
@@ -4,5 +4,7 @@ export default function(string) {
   const underscored = Ember.String.underscore(string);
   const spaced = underscored.split('_').join(' ');
 
-  return spaced.replace('.', ' ');
+  /* Replace dots then remove double spaces */
+
+  return spaced.replace(/\./g, ' ').replace(/ +(?= )/g,'');
 }
diff --git a/tests/unit/utils/default-for-test.js b/tests/unit/utils/default-for-test.js
index 8bb28ce..d205b3e 100644
--- a/tests/unit/utils/default-for-test.js
+++ b/tests/unit/utils/default-for-test.js
@@ -23,7 +23,7 @@ test('Correct values are returned', function(assert) {
     {},
     [],
     function() {},
-    new Date,
+    new Date(),
     false,
     true,
     0
diff --git a/tests/unit/utils/to-words-test.js b/tests/unit/utils/to-words-test.js
index b7f603a..790e67e 100644
--- a/tests/unit/utils/to-words-test.js
+++ b/tests/unit/utils/to-words-test.js
@@ -5,6 +5,25 @@ module('Unit | Utility | to words');
 
 // Replace this with your real tests.
 test('it works', function(assert) {
-  var result = toWords('fake');
-  assert.ok(result);
+  const expectedResult = 'i am an orange banana';
+  const versions = [
+    'I am an orange banana',
+    'I-am-an-orange-banana',
+    'i_am_an_orange_banana',
+    'iAmAnOrangeBanana',
+    'i.am.an.orange.banana',
+    'I AM AN ORANGE BANANA',
+    'I-am_an-orange.banana',
+    'iAm-an_orange-banana',
+  ];
+
+  assert.expect(versions.length);
+
+  versions.forEach(function(version) {
+
+    assert.equal(toWords(version), expectedResult,
+      `"${version}" should be turned into "${expectedResult}"`);
+
+  });
+
 });

From bba1a67496a01589a196d8a3c7e9c7b787c3b1cc Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 12 Jul 2015 12:59:53 -0400
Subject: [PATCH 59/73] Unit tests tidied up and aceptance test added

---
 app/test-helpers/sync/fill-in-input.js        |  1 +
 tests/.jshintrc                               |  3 ++-
 tests/acceptance/posts/new-test.js            | 25 +++++++++++++++++++
 .../app/resources/posts/index/template.hbs    |  2 +-
 tests/helpers/start-app.js                    |  2 ++
 tests/helpers/sync/fill-in-input.js           |  6 +++++
 tests/unit/components/input-group-test.js     |  4 +--
 7 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 app/test-helpers/sync/fill-in-input.js
 create mode 100644 tests/acceptance/posts/new-test.js
 create mode 100644 tests/helpers/sync/fill-in-input.js

diff --git a/app/test-helpers/sync/fill-in-input.js b/app/test-helpers/sync/fill-in-input.js
new file mode 100644
index 0000000..95d118d
--- /dev/null
+++ b/app/test-helpers/sync/fill-in-input.js
@@ -0,0 +1 @@
+export { default } from 'ember-easy-form-extensions/test-helpers/sync/fill-in-input';
\ No newline at end of file
diff --git a/tests/.jshintrc b/tests/.jshintrc
index a197e1a..711ceb8 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -22,7 +22,8 @@
     "currentURL",
     "currentPath",
     "currentRouteName",
-    "moment"
+    "moment",
+    "fillInInput"
   ],
   "node": false,
   "browser": false,
diff --git a/tests/acceptance/posts/new-test.js b/tests/acceptance/posts/new-test.js
new file mode 100644
index 0000000..acb438b
--- /dev/null
+++ b/tests/acceptance/posts/new-test.js
@@ -0,0 +1,25 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../../helpers/start-app';
+
+let application;
+
+module('Acceptance | posts/new', {
+  beforeEach: function() {
+    application = startApp();
+  },
+
+  afterEach: function() {
+    Ember.run(application, 'destroy');
+  }
+});
+
+test('visiting /posts/new', function(assert) {
+  visit('/posts/new');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/posts/new');
+
+    fillInInput('title', 'checking');
+  });
+});
diff --git a/tests/dummy/app/resources/posts/index/template.hbs b/tests/dummy/app/resources/posts/index/template.hbs
index 147c72c..f46b3e4 100644
--- a/tests/dummy/app/resources/posts/index/template.hbs
+++ b/tests/dummy/app/resources/posts/index/template.hbs
@@ -1,4 +1,4 @@
-{{#each post in model}}
+{{#each model as |post|}}
   {{#link-to 'post.edit' post}}
     {{post.title}}
   {{/link-to}}
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 16cc7c3..18ad910 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -3,6 +3,8 @@ import Application from '../../app';
 import Router from '../../router';
 import config from '../../config/environment';
 
+import fillInInput from './sync/fill-in-input';
+
 export default function startApp(attrs) {
   var application;
 
diff --git a/tests/helpers/sync/fill-in-input.js b/tests/helpers/sync/fill-in-input.js
new file mode 100644
index 0000000..a8c299c
--- /dev/null
+++ b/tests/helpers/sync/fill-in-input.js
@@ -0,0 +1,6 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerHelper('fillInInput', function(app, property, value) {
+  fillIn(selectorFor(`input-wrapper-for-${property}`) + ' input', value);
+});
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index 6591eb1..a729d24 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -84,7 +84,7 @@ test('Basic properties', function(assert) {
 test('Class name bindings', function(assert) {
   const className = component.get('className');
   const done = assert.async(); // Enable asyns test
-  const newlyValidDuration = 10;
+  const newlyValidDuration = 100;
 
   assert.expect(4);
 
@@ -112,7 +112,7 @@ test('Class name bindings', function(assert) {
     assertClass(assert, component, `${className}-valid`);
 
     done();
-  }, newlyValidDuration);
+  }, newlyValidDuration + 100);
 
 });
 

From 5294a0228145ca84819e11ae91e31665bf022940 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sun, 12 Jul 2015 20:45:25 -0400
Subject: [PATCH 60/73] Basic acceptance test setup with fruit

---
 tests/.jshintrc                               |  4 +-
 tests/acceptance/fruit-form-test.js           | 79 +++++++++++++++++++
 tests/acceptance/posts/new-test.js            | 25 ------
 .../app/resources/application/template.hbs    |  5 +-
 .../{posts/new => fruit/form}/controller.js   | 10 +--
 .../{posts/new => fruit/form}/route.js        |  2 +-
 .../app/resources/fruit/form/template.hbs     | 11 +++
 tests/dummy/app/resources/fruit/model.js      | 28 +++++++
 .../app/resources/post/edit/controller.js     | 25 ------
 tests/dummy/app/resources/post/edit/route.js  | 11 ---
 tests/dummy/app/resources/post/edit/view.js   |  5 --
 .../app/resources/post/index/controller.js    |  5 --
 tests/dummy/app/resources/post/index/route.js |  9 ---
 .../app/resources/post/index/template.hbs     |  6 --
 tests/dummy/app/resources/post/model.js       | 45 -----------
 .../app/resources/posts/index/controller.js   |  5 --
 .../dummy/app/resources/posts/index/route.js  |  9 ---
 .../app/resources/posts/index/template.hbs    |  5 --
 .../app/resources/posts/new/template.hbs      | 57 -------------
 tests/dummy/app/router.js                     | 12 +--
 tests/dummy/app/templates/input-groups.hbs    | 40 ++++++++++
 tests/dummy/app/templates/input-values.hbs    | 14 ++++
 tests/fixtures/fruit.js                       | 10 +++
 tests/helpers/async/async-click.js            | 11 +++
 tests/helpers/async/fill-in-input-for.js      | 11 +++
 tests/helpers/start-app.js                    |  6 +-
 tests/helpers/sync/fill-in-input.js           |  6 --
 tests/helpers/sync/inspect-input-for.js       | 11 +++
 tests/helpers/sync/inspect-model-value-for.js | 11 +++
 tests/helpers/sync/inspect.js                 | 18 +++++
 30 files changed, 261 insertions(+), 235 deletions(-)
 create mode 100644 tests/acceptance/fruit-form-test.js
 delete mode 100644 tests/acceptance/posts/new-test.js
 rename tests/dummy/app/resources/{posts/new => fruit/form}/controller.js (75%)
 rename tests/dummy/app/resources/{posts/new => fruit/form}/route.js (82%)
 create mode 100644 tests/dummy/app/resources/fruit/form/template.hbs
 create mode 100644 tests/dummy/app/resources/fruit/model.js
 delete mode 100644 tests/dummy/app/resources/post/edit/controller.js
 delete mode 100644 tests/dummy/app/resources/post/edit/route.js
 delete mode 100644 tests/dummy/app/resources/post/edit/view.js
 delete mode 100644 tests/dummy/app/resources/post/index/controller.js
 delete mode 100644 tests/dummy/app/resources/post/index/route.js
 delete mode 100644 tests/dummy/app/resources/post/index/template.hbs
 delete mode 100644 tests/dummy/app/resources/post/model.js
 delete mode 100644 tests/dummy/app/resources/posts/index/controller.js
 delete mode 100644 tests/dummy/app/resources/posts/index/route.js
 delete mode 100644 tests/dummy/app/resources/posts/index/template.hbs
 delete mode 100644 tests/dummy/app/resources/posts/new/template.hbs
 create mode 100644 tests/dummy/app/templates/input-groups.hbs
 create mode 100644 tests/dummy/app/templates/input-values.hbs
 create mode 100644 tests/fixtures/fruit.js
 create mode 100644 tests/helpers/async/async-click.js
 create mode 100644 tests/helpers/async/fill-in-input-for.js
 delete mode 100644 tests/helpers/sync/fill-in-input.js
 create mode 100644 tests/helpers/sync/inspect-input-for.js
 create mode 100644 tests/helpers/sync/inspect-model-value-for.js
 create mode 100644 tests/helpers/sync/inspect.js

diff --git a/tests/.jshintrc b/tests/.jshintrc
index 711ceb8..d2e926f 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -23,7 +23,9 @@
     "currentPath",
     "currentRouteName",
     "moment",
-    "fillInInput"
+    "asyncClick",
+    "fillInInputFor",
+    "inspect"
   ],
   "node": false,
   "browser": false,
diff --git a/tests/acceptance/fruit-form-test.js b/tests/acceptance/fruit-form-test.js
new file mode 100644
index 0000000..ca8c69c
--- /dev/null
+++ b/tests/acceptance/fruit-form-test.js
@@ -0,0 +1,79 @@
+import Ember from 'ember';
+import Fruit from '../fixtures/fruit';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+
+let application;
+
+const {
+  color,
+  description,
+  name,
+  numberOfSeeds,
+} = Fruit;
+
+module('Acceptance | fruit/form', {
+  beforeEach: function() {
+    application = startApp();
+  },
+
+  afterEach: function() {
+    Ember.run(application, 'destroy');
+  }
+});
+
+test('Binding text values to inputs and the model', function(assert) {
+
+  assert.expect(6);
+
+  visit('/fruit/form');
+
+  fillInInputFor('name', name);
+
+  fillInInputFor('description', description, 'textarea');
+
+  fillInInputFor('numberOfSeeds', numberOfSeeds);
+
+  andThen(function() {
+
+    assert.equal(inspectInputFor('name').val(), name,
+      `The title value should be updated on the input element`);
+
+    assert.equal(inspectInputFor('description', 'textarea').val(), description,
+      `The description value should be updated on the textarea element`);
+
+    assert.equal(inspectInputFor('numberOfSeeds').val(), numberOfSeeds,
+      `The numberOfSeeds value should be updated on the input element`);
+
+    [
+      'description',
+      'name',
+      'numberOfSeeds'
+    ].forEach(function(property) {
+
+      assert.equal(inspectModelValueFor(property), Fruit.get(property),
+        `${property} should be bound to the model`);
+
+    });
+
+  });
+});
+
+test('Binding select values and options', function(assert) {
+
+  visit('/fruit/form');
+
+  fillInInputFor('color', color, 'select');
+
+  andThen(function() {
+
+    assert.equal(inspectInputFor('color', 'select').val(), color,
+      `The value of the selected option should be updated on the select`);
+
+    assert.equal(inspectModelValueFor('color'), color,
+      `color should be bound to the model`);
+
+
+  });
+
+});
diff --git a/tests/acceptance/posts/new-test.js b/tests/acceptance/posts/new-test.js
deleted file mode 100644
index acb438b..0000000
--- a/tests/acceptance/posts/new-test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Ember from 'ember';
-import { module, test } from 'qunit';
-import startApp from '../../helpers/start-app';
-
-let application;
-
-module('Acceptance | posts/new', {
-  beforeEach: function() {
-    application = startApp();
-  },
-
-  afterEach: function() {
-    Ember.run(application, 'destroy');
-  }
-});
-
-test('visiting /posts/new', function(assert) {
-  visit('/posts/new');
-
-  andThen(function() {
-    assert.equal(currentURL(), '/posts/new');
-
-    fillInInput('title', 'checking');
-  });
-});
diff --git a/tests/dummy/app/resources/application/template.hbs b/tests/dummy/app/resources/application/template.hbs
index ba62456..89c196c 100644
--- a/tests/dummy/app/resources/application/template.hbs
+++ b/tests/dummy/app/resources/application/template.hbs
@@ -5,10 +5,7 @@
 </dl>
 
 <ul>
-  <li>{{#link-to 'index'}}Home{{/link-to}}</li>
-  <li>{{#link-to 'posts'}}Posts{{/link-to}}</li>
-  <li>{{#link-to 'posts.new'}}New post{{/link-to}}</li>
-  <li>{{#link-to 'post.edit' 1}}Edit post{{/link-to}}</li>
+  <li>{{#link-to 'fruit.form'}}Fruit Form{{/link-to}}</li>
 </ul>
 
 {{outlet}}
diff --git a/tests/dummy/app/resources/posts/new/controller.js b/tests/dummy/app/resources/fruit/form/controller.js
similarity index 75%
rename from tests/dummy/app/resources/posts/new/controller.js
rename to tests/dummy/app/resources/fruit/form/controller.js
index fd091fc..fb82ec5 100644
--- a/tests/dummy/app/resources/posts/new/controller.js
+++ b/tests/dummy/app/resources/fruit/form/controller.js
@@ -4,22 +4,22 @@ import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 export default Ember.Controller.extend(
   FormMixin, {
 
-  categories: Ember.A(['ember', 'rails', 'css']),
+  colors: Ember.A(['orange', 'yellow', 'green']),
 
   validations: {
-    'model.title': {
+    'model.name': {
       presence: true
     },
     'model.description': {
       presence: true
     },
-    'model.category': {
+    'model.color': {
       presence: true
     }
   },
 
   save: function() {
-    console.log('Saving');
+    Ember.debug('Saving');
   },
 
   cancel: function() {
@@ -28,7 +28,7 @@ export default Ember.Controller.extend(
 
   submitHandler: function() {
     return new Ember.RSVP.Promise(function(resolve, reject) {
-      console.log('submit handler running');
+      Ember.debug('Submit handler running');
 
       resolve();
     });
diff --git a/tests/dummy/app/resources/posts/new/route.js b/tests/dummy/app/resources/fruit/form/route.js
similarity index 82%
rename from tests/dummy/app/resources/posts/new/route.js
rename to tests/dummy/app/resources/fruit/form/route.js
index 66762d7..6adbdcf 100644
--- a/tests/dummy/app/resources/posts/new/route.js
+++ b/tests/dummy/app/resources/fruit/form/route.js
@@ -5,7 +5,7 @@ export default Ember.Route.extend(
   DirtyRecordHandler, {
 
   model: function() {
-    return this.store.createRecord('post');
+    return this.store.createRecord('fruit');
   }
 
 });
diff --git a/tests/dummy/app/resources/fruit/form/template.hbs b/tests/dummy/app/resources/fruit/form/template.hbs
new file mode 100644
index 0000000..6e6b0b0
--- /dev/null
+++ b/tests/dummy/app/resources/fruit/form/template.hbs
@@ -0,0 +1,11 @@
+{{#form-wrapper}}
+
+  {{#form-controls legend='Write a new post'}}
+    {{partial 'input-groups'}}
+  {{/form-controls}}
+
+  {{form-submission}}
+
+{{/form-wrapper}}
+
+{{partial 'input-values'}}
diff --git a/tests/dummy/app/resources/fruit/model.js b/tests/dummy/app/resources/fruit/model.js
new file mode 100644
index 0000000..eab5f9c
--- /dev/null
+++ b/tests/dummy/app/resources/fruit/model.js
@@ -0,0 +1,28 @@
+import DS from 'ember-data';
+
+const { attr } = DS;
+
+export default DS.Model.extend({
+  color: attr('string', {
+    defaultValue() {
+      return 'orange';
+    }
+  }), // Select
+  numberOfSeeds: attr('number', {
+    defaultValue() {
+      return 0;
+    }
+  }),
+  description: attr('string'), // Textarea
+  isTropical: attr('boolean', {
+    defaultValue() {
+      return false;
+    }
+  }),
+  name: attr('string'),
+  pickedOn: attr('date', {
+    defaultValue() {
+      return moment('2008-06-24');
+    }
+  }),
+});
diff --git a/tests/dummy/app/resources/post/edit/controller.js b/tests/dummy/app/resources/post/edit/controller.js
deleted file mode 100644
index de47f65..0000000
--- a/tests/dummy/app/resources/post/edit/controller.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Ember from 'ember';
-import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
-
-export default Ember.Controller.extend(
-  FormMixin, {
-
-  validations: {
-    'model.title': {
-      presence: true
-    }
-  },
-
-  save: function() {
-    console.log('Saving');
-  },
-
-  cancel: function() {
-    this.transitionToRoute('index');
-  },
-
-  destroy: function() {
-    console.log('Destroying');
-  }
-
-});
diff --git a/tests/dummy/app/resources/post/edit/route.js b/tests/dummy/app/resources/post/edit/route.js
deleted file mode 100644
index d282361..0000000
--- a/tests/dummy/app/resources/post/edit/route.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Ember from 'ember';
-import DirtyRecordHandler from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
-
-export default Ember.Route.extend(
-  DirtyRecordHandler, {
-
-  model: function() {
-    return this.modelFor('post');
-  }
-
-});
diff --git a/tests/dummy/app/resources/post/edit/view.js b/tests/dummy/app/resources/post/edit/view.js
deleted file mode 100644
index f325373..0000000
--- a/tests/dummy/app/resources/post/edit/view.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import PostsNewView from 'dummy/resources/posts/new/view';
-
-export default PostsNewView.extend({
-  templateName: 'posts/new'
-});
diff --git a/tests/dummy/app/resources/post/index/controller.js b/tests/dummy/app/resources/post/index/controller.js
deleted file mode 100644
index b461f2c..0000000
--- a/tests/dummy/app/resources/post/index/controller.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
-
-});
diff --git a/tests/dummy/app/resources/post/index/route.js b/tests/dummy/app/resources/post/index/route.js
deleted file mode 100644
index fde77e4..0000000
--- a/tests/dummy/app/resources/post/index/route.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-
-  model: function(params) {
-    return this.modelFor('post');
-  }
-
-});
diff --git a/tests/dummy/app/resources/post/index/template.hbs b/tests/dummy/app/resources/post/index/template.hbs
deleted file mode 100644
index 99d09d4..0000000
--- a/tests/dummy/app/resources/post/index/template.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<dl>
-  <dt>Title</dt>
-  <dd>{{title}}</dd>
-  <dt>Description</dt>
-  <dd>{{description}}</dd>
-</dl>
diff --git a/tests/dummy/app/resources/post/model.js b/tests/dummy/app/resources/post/model.js
deleted file mode 100644
index 09f70a1..0000000
--- a/tests/dummy/app/resources/post/model.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import DS from 'ember-data';
-import Ember from 'ember';
-
-const { attr } = DS;
-
-const PostModel = DS.Model.extend({
-  category: attr('string', {
-    defaultValue() {
-      return 'ember';
-    }
-  }),
-  description: attr('string'),
-  published: attr('boolean', {
-    defaultValue() {
-      return false;
-    }
-  }),
-  title: attr('string'),
-  views: attr('number'),
-  writtenOn: attr('date'),
-});
-
-PostModel.reopenClass({
-  FIXTURES: [
-    {
-      id: 1,
-      category: 'ember',
-      description: 'This is an introduction on how to Ember. Wow.',
-      published: true,
-      title: 'How to Ember',
-      views: 100,
-      writtenOn: window.moment().subtract(2, 'days')
-    }, {
-      id: 2,
-      category: 'rails',
-      description: 'This is an introduction on how to Rails. Wow.',
-      published: false,
-      title: 'How to Rails',
-      views: 0,
-      writtenOn: window.moment().subtract(7, 'days')
-    }
-  ]
-});
-
-export default PostModel;
diff --git a/tests/dummy/app/resources/posts/index/controller.js b/tests/dummy/app/resources/posts/index/controller.js
deleted file mode 100644
index b461f2c..0000000
--- a/tests/dummy/app/resources/posts/index/controller.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Controller.extend({
-
-});
diff --git a/tests/dummy/app/resources/posts/index/route.js b/tests/dummy/app/resources/posts/index/route.js
deleted file mode 100644
index 2afafb6..0000000
--- a/tests/dummy/app/resources/posts/index/route.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-
-  model: function() {
-    return this.store.find('post');
-  }
-
-});
diff --git a/tests/dummy/app/resources/posts/index/template.hbs b/tests/dummy/app/resources/posts/index/template.hbs
deleted file mode 100644
index f46b3e4..0000000
--- a/tests/dummy/app/resources/posts/index/template.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{#each model as |post|}}
-  {{#link-to 'post.edit' post}}
-    {{post.title}}
-  {{/link-to}}
-{{/each}}
diff --git a/tests/dummy/app/resources/posts/new/template.hbs b/tests/dummy/app/resources/posts/new/template.hbs
deleted file mode 100644
index 335daa6..0000000
--- a/tests/dummy/app/resources/posts/new/template.hbs
+++ /dev/null
@@ -1,57 +0,0 @@
-{{#form-wrapper}}
-
-  {{#form-controls legend='Write a new post'}}
-
-    {{input-group
-      property='model.title'
-    }}
-
-    {{input-group
-      property='model.description'
-      type='textarea'
-    }}
-
-    {{input-group
-      property='model.category'
-      content=categories
-    }}
-
-    {{input-group
-      property='model.views'
-      type='number'
-    }}
-
-    {{input-group
-      property='model.published'
-      type='checkbox'
-    }}
-
-    {{input-group
-      property='model.writtenOn'
-      type='date'
-    }}
-
-  {{/form-controls}}
-
-  {{form-submission formIsSubmitted=formIsSubmitted}}
-
-{{/form-wrapper}}
-
-<dl>
-  <dt>Title</dt>
-  <dd data-test="title">{{model.title}}</dd>
-  <dt>Description</dt>
-  <dd data-test="description">{{model.description}}</dd>
-  <dt>Category</dt>
-  <dd data-test="category">{{model.category}}</dd>
-  <dt>Views</dt>
-  <dd data-test="views">{{model.views}}</dd>
-  <dt>Published</dt>
-  <dd data-test="published">{{model.published}}</dd>
-  <dt>Written On</dt>
-  <dd data-test="written-on">{{model.writtenOn}}</dd>
-</dl>
-
-{{#if editing}}
-  {{destroy-submission formIsSubmitted=formIsSubmitted}}
-{{/if}}
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
index cac389c..f1fbaf7 100644
--- a/tests/dummy/app/router.js
+++ b/tests/dummy/app/router.js
@@ -7,16 +7,8 @@ var Router = Ember.Router.extend({
 
 Router.map(function() {
 
-  this.route('posts', function() {
-    this.route('new');
-
-    this.route('post', {
-      path: '/:post_id',
-      resetNamespace: true,
-    }, function() {
-      this.route('edit');
-    });
-
+  this.route('fruit', function() {
+    this.route('form');
   });
 
 });
diff --git a/tests/dummy/app/templates/input-groups.hbs b/tests/dummy/app/templates/input-groups.hbs
new file mode 100644
index 0000000..866d0d2
--- /dev/null
+++ b/tests/dummy/app/templates/input-groups.hbs
@@ -0,0 +1,40 @@
+{{!-- Default --}}
+
+{{input-group
+  property='model.name'
+}}
+
+{{!-- Textarea --}}
+
+{{input-group
+  property='model.description'
+  type='textarea'
+}}
+
+{{!-- Select --}}
+
+{{input-group
+  property='model.color'
+  content=colors
+}}
+
+{{!-- Number --}}
+
+{{input-group
+  property='model.numberOfSeeds'
+  type='number'
+}}
+
+{{!-- Checkbox --}}
+
+{{input-group
+  property='model.isTropical'
+  type='checkbox'
+}}
+
+{{!-- Date --}}
+
+{{input-group
+  property='model.pickedOn'
+  type='date'
+}}
diff --git a/tests/dummy/app/templates/input-values.hbs b/tests/dummy/app/templates/input-values.hbs
new file mode 100644
index 0000000..0d6ddde
--- /dev/null
+++ b/tests/dummy/app/templates/input-values.hbs
@@ -0,0 +1,14 @@
+<dl>
+  <dt>Name</dt>
+  <dd data-test="model-name">{{model.name}}</dd>
+  <dt>Description</dt>
+  <dd data-test="model-description">{{model.description}}</dd>
+  <dt>Category</dt>
+  <dd data-test="model-color">{{model.color}}</dd>
+  <dt>Number of Seeds</dt>
+  <dd data-test="model-number-of-seeds">{{model.numberOfSeeds}}</dd>
+  <dt>Is Tropical</dt>
+  <dd data-test="model-is-tropical">{{model.isTropical}}</dd>
+  <dt>Picked On</dt>
+  <dd data-test="model-picked-on">{{model.pickedOn}}</dd>
+</dl>
diff --git a/tests/fixtures/fruit.js b/tests/fixtures/fruit.js
new file mode 100644
index 0000000..7ce6264
--- /dev/null
+++ b/tests/fixtures/fruit.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Object.create({
+  color: 'yellow',
+  description: 'A big yellow fruit with leaves',
+  isTropical: true,
+  name: 'Pinapple',
+  numberOfSeeds: 70,
+  writtenOn: moment('1995-12-25'),
+});
diff --git a/tests/helpers/async/async-click.js b/tests/helpers/async/async-click.js
new file mode 100644
index 0000000..12853c5
--- /dev/null
+++ b/tests/helpers/async/async-click.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+
+/* like click() but runs asyncrously allowing you to
+use it outside of an andThen function with the same
+stuff in the DOM */
+
+export default Ember.Test.registerAsyncHelper('asyncClick',
+  function(app, name) {
+    click(inspect(name));
+  }
+);
diff --git a/tests/helpers/async/fill-in-input-for.js b/tests/helpers/async/fill-in-input-for.js
new file mode 100644
index 0000000..06740f2
--- /dev/null
+++ b/tests/helpers/async/fill-in-input-for.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerAsyncHelper('fillInInputFor',
+  function(app, property, value, tagName = 'input') {
+    const dasherizedProperty = Ember.String.dasherize(property);
+    const selector = selectorFor(`input-wrapper-for-${dasherizedProperty}`);
+
+    fillIn(`${selector} ${tagName}`, value);
+  }
+);
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 18ad910..54534cd 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -3,7 +3,11 @@ import Application from '../../app';
 import Router from '../../router';
 import config from '../../config/environment';
 
-import fillInInput from './sync/fill-in-input';
+import asyncClick from './async/async-click';
+import fillInInputFor from './async/fill-in-input-for';
+import inspectInputFor from './sync/inspect-input-for';
+import inspectModelValueFor from './sync/inspect-model-value-for';
+import inspect from './sync/inspect';
 
 export default function startApp(attrs) {
   var application;
diff --git a/tests/helpers/sync/fill-in-input.js b/tests/helpers/sync/fill-in-input.js
deleted file mode 100644
index a8c299c..0000000
--- a/tests/helpers/sync/fill-in-input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Ember from 'ember';
-import selectorFor from '../selector-for';
-
-export default Ember.Test.registerHelper('fillInInput', function(app, property, value) {
-  fillIn(selectorFor(`input-wrapper-for-${property}`) + ' input', value);
-});
diff --git a/tests/helpers/sync/inspect-input-for.js b/tests/helpers/sync/inspect-input-for.js
new file mode 100644
index 0000000..87931f7
--- /dev/null
+++ b/tests/helpers/sync/inspect-input-for.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerHelper('inspectInputFor',
+  function(app, property, tagName = 'input') {
+    const dasherizedProperty = Ember.String.dasherize(property);
+
+    return inspect(`input-wrapper-for-${dasherizedProperty}`).find(tagName);
+  }
+);
+
diff --git a/tests/helpers/sync/inspect-model-value-for.js b/tests/helpers/sync/inspect-model-value-for.js
new file mode 100644
index 0000000..58b76c1
--- /dev/null
+++ b/tests/helpers/sync/inspect-model-value-for.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerHelper('inspectModelValueFor',
+  function(app, property) {
+    const dasherizedProperty = Ember.String.dasherize(property);
+
+    return inspect(`model-${dasherizedProperty}`).html();
+  }
+);
+
diff --git a/tests/helpers/sync/inspect.js b/tests/helpers/sync/inspect.js
new file mode 100644
index 0000000..3194688
--- /dev/null
+++ b/tests/helpers/sync/inspect.js
@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerHelper('inspect',
+  function(app, name, context) {
+    const selector = selectorFor(name);
+
+    let element;
+
+    if (context) {
+      element = find(selector, context);
+    } else {
+      element = find(selector);
+    }
+
+    return element;
+  }
+);

From 45b21ac3aedfb5c9d29fdea5dcdd4c676ec48aca Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Mon, 13 Jul 2015 23:22:21 -0400
Subject: [PATCH 61/73] property is now relative to modelPath

---
 addon/components/input-group.js               | 51 +++++++++++--------
 addon/templates/components/input-group.hbs    |  2 +-
 tests/.jshintrc                               |  5 +-
 tests/acceptance/fruit-form-test.js           | 51 ++++++++++++++++++-
 tests/acceptance/model-path-test.js           | 41 +++++++++++++++
 .../resources/fruit/model-path/controller.js  | 13 +++++
 .../resources/fruit/model-path/template.hbs   | 16 ++++++
 tests/dummy/app/resources/fruit/model.js      |  4 +-
 tests/dummy/app/router.js                     |  1 +
 tests/dummy/app/templates/input-groups.hbs    | 12 ++---
 tests/helpers/async/click-input-for.js        | 11 ++++
 tests/helpers/start-app.js                    |  1 +
 12 files changed, 177 insertions(+), 31 deletions(-)
 create mode 100644 tests/acceptance/model-path-test.js
 create mode 100644 tests/dummy/app/resources/fruit/model-path/controller.js
 create mode 100644 tests/dummy/app/resources/fruit/model-path/template.hbs
 create mode 100644 tests/helpers/async/click-input-for.js

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 5e899d3..60c8067 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -44,19 +44,9 @@ export default Ember.Component.extend({
   unregisterAction: 'unregisterInputGroup',
   value: null,
 
-  propertyWithoutModel: computed('property', 'modelPath', function() {
-    const modelPath = this.get('modelPath');
-
-    if (modelPath) {
-      return this.get('property').replace(`${modelPath}.`, '');
-    } else {
-      return this.get('property');
-    }
-  }),
-
-  dataTest: computed('propertyWithoutModel', function() {
-    const propertyWithoutModel = this.get('propertyWithoutModel');
-    const dasherizedProperty = Ember.String.dasherize(propertyWithoutModel);
+  dataTest: computed('property', function() {
+    const property = this.get('property');
+    const dasherizedProperty = Ember.String.dasherize(property);
 
     return `input-wrapper-for-${dasherizedProperty}`;
   }),
@@ -92,13 +82,35 @@ export default Ember.Component.extend({
   }).readOnly(),
 
   label: computed('property', function() {
-    const property = defaultFor(this.get('propertyWithoutModel'), '');
+    const property = defaultFor(this.get('property'), '');
 
     return toWords(property);
   }),
 
-  type: computed('content', 'propertyWithoutModel', 'value', function() {
-    const property = this.get('propertyWithoutModel');
+  propertyWithModel: computed('property', 'modelPath', function() {
+    const { modelPath, property } = this.getProperties(
+      [ 'modelPath', 'property' ]
+    );
+
+    if (modelPath) {
+      return `${modelPath}.${property}`;
+    } else {
+      return property;
+    }
+  }),
+
+  // propertyWithoutModel: computed('property', 'modelPath', function() {
+  //   const modelPath = this.get('modelPath');
+
+  //   if (modelPath) {
+  //     return this.get('property').replace(`${modelPath}.`, '');
+  //   } else {
+  //     return this.get('property');
+  //   }
+  // }),
+
+  type: computed('content', 'property', 'value', function() {
+    const property = this.get('property');
 
     let type;
 
@@ -195,11 +207,10 @@ export default Ember.Component.extend({
   }),
 
   setBindingForValue: on('didInitAttrs', function() {
-    const property = this.get('property');
-
-    Ember.assert('You must set a property attribute on the {{input-group}} component', property);
+    Ember.assert('You must set a property attribute on the {{input-group}} component', this.get('property'));
 
-    const binding = Ember.bind(this, 'value', `formController.${property}`);
+    const propertyWithModel = this.get('propertyWithModel');
+    const binding = Ember.bind(this, 'value', `formController.${propertyWithModel}`);
 
     this.set('bindingForValue', binding);
   }),
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index 2ea2b28..7bcc57b 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -16,7 +16,7 @@
 
 {{error-field
   label=label
-  property=property
+  property=propertyWithModel
   showError=showError
 }}
 
diff --git a/tests/.jshintrc b/tests/.jshintrc
index d2e926f..f06bd1b 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -24,8 +24,11 @@
     "currentRouteName",
     "moment",
     "asyncClick",
+    "clickInputFor",
     "fillInInputFor",
-    "inspect"
+    "inspect",
+    "inspectInputFor",
+    "inspectModelValueFor"
   ],
   "node": false,
   "browser": false,
diff --git a/tests/acceptance/fruit-form-test.js b/tests/acceptance/fruit-form-test.js
index ca8c69c..e764695 100644
--- a/tests/acceptance/fruit-form-test.js
+++ b/tests/acceptance/fruit-form-test.js
@@ -8,8 +8,10 @@ let application;
 const {
   color,
   description,
+  isTropical,
   name,
   numberOfSeeds,
+  pickedOn,
 } = Fruit;
 
 module('Acceptance | fruit/form', {
@@ -60,20 +62,67 @@ test('Binding text values to inputs and the model', function(assert) {
 });
 
 test('Binding select values and options', function(assert) {
+  const defaultValue = 'orange';
 
   visit('/fruit/form');
 
+  /* Check the default value */
+
+  andThen(function() {
+
+    assert.equal(inspectInputFor('color', 'select').val(), defaultValue,
+      `The default value of the selected option should be set by default on the model`);
+
+    assert.equal(inspectModelValueFor('color'), defaultValue,
+      `Default select values should be bound to the model`);
+
+  });
+
   fillInInputFor('color', color, 'select');
 
+  /* Then check changing the select works */
+
   andThen(function() {
 
     assert.equal(inspectInputFor('color', 'select').val(), color,
       `The value of the selected option should be updated on the select`);
 
     assert.equal(inspectModelValueFor('color'), color,
-      `color should be bound to the model`);
+      `Select values should be bound to the model`);
+
+  });
 
+});
+
+test('Binding checkbox values', function(assert) {
+
+  visit('/fruit/form');
+
+  clickInputFor('isTropical');
+
+  andThen(function() {
+
+    assert.equal(inspectInputFor('isTropical').prop('checked'), isTropical,
+      `The value of isTropical should be updated on the checkbox`);
+
+    assert.equal(inspectModelValueFor('isTropical'), isTropical.toString(),
+      `Checkbox values should be bound to the model`);
 
   });
 
 });
+
+// TODO - Dates - coming soon
+
+// test('Binding dates', function(assert) {
+
+//   visit('/fruit/form');
+
+//   fillInInputFor('pickedOn', pickedOn);
+
+//   andThen(function() {
+
+
+//   });
+
+// });
diff --git a/tests/acceptance/model-path-test.js b/tests/acceptance/model-path-test.js
new file mode 100644
index 0000000..adb176b
--- /dev/null
+++ b/tests/acceptance/model-path-test.js
@@ -0,0 +1,41 @@
+import Ember from 'ember';
+import Fruit from '../fixtures/fruit';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+
+let application;
+
+const {
+  color,
+  description,
+  isTropical,
+  name,
+  numberOfSeeds,
+  pickedOn,
+} = Fruit;
+
+module('Acceptance | model path', {
+  beforeEach: function() {
+    application = startApp();
+  },
+
+  afterEach: function() {
+    Ember.run(application, 'destroy');
+  }
+});
+
+test('Binding text values to inputs and the model', function(assert) {
+
+  assert.expect(6);
+
+  visit('/fruit/model-path');
+
+  // fillInInputFor('numberOfSeeds', numberOfSeeds);
+
+  andThen(function() {
+
+    // assert.equal(inspectInputFor('name').val(), name,
+    //   `The title value should be updated on the input element`);
+
+  });
+});
diff --git a/tests/dummy/app/resources/fruit/model-path/controller.js b/tests/dummy/app/resources/fruit/model-path/controller.js
new file mode 100644
index 0000000..d9e70ca
--- /dev/null
+++ b/tests/dummy/app/resources/fruit/model-path/controller.js
@@ -0,0 +1,13 @@
+import Ember from 'ember';
+import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
+
+export default Ember.Controller.extend(
+  FormMixin, {
+
+  model: {
+    fruit: {
+      name: null
+    }
+  },
+
+});
diff --git a/tests/dummy/app/resources/fruit/model-path/template.hbs b/tests/dummy/app/resources/fruit/model-path/template.hbs
new file mode 100644
index 0000000..83a32d7
--- /dev/null
+++ b/tests/dummy/app/resources/fruit/model-path/template.hbs
@@ -0,0 +1,16 @@
+{{#form-wrapper}}
+
+  {{#form-controls legend='Write a new post' modelPath='model.fruit'}}
+
+    {{input-group property='name'}}
+
+  {{/form-controls}}
+
+  {{form-submission}}
+
+{{/form-wrapper}}
+
+<dl>
+  <dt>Fruit Name</dt>
+  <dd data-test="model-fruit-name">{{model.fruit.name}}</dd>
+</dl>
diff --git a/tests/dummy/app/resources/fruit/model.js b/tests/dummy/app/resources/fruit/model.js
index eab5f9c..a8cae1a 100644
--- a/tests/dummy/app/resources/fruit/model.js
+++ b/tests/dummy/app/resources/fruit/model.js
@@ -10,7 +10,7 @@ export default DS.Model.extend({
   }), // Select
   numberOfSeeds: attr('number', {
     defaultValue() {
-      return 0;
+      return 10;
     }
   }),
   description: attr('string'), // Textarea
@@ -22,7 +22,7 @@ export default DS.Model.extend({
   name: attr('string'),
   pickedOn: attr('date', {
     defaultValue() {
-      return moment('2008-06-24');
+      return moment('2008-06-24').toDate();
     }
   }),
 });
diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js
index f1fbaf7..ff2e89c 100644
--- a/tests/dummy/app/router.js
+++ b/tests/dummy/app/router.js
@@ -9,6 +9,7 @@ Router.map(function() {
 
   this.route('fruit', function() {
     this.route('form');
+    this.route('model-path');
   });
 
 });
diff --git a/tests/dummy/app/templates/input-groups.hbs b/tests/dummy/app/templates/input-groups.hbs
index 866d0d2..4a078d5 100644
--- a/tests/dummy/app/templates/input-groups.hbs
+++ b/tests/dummy/app/templates/input-groups.hbs
@@ -1,40 +1,40 @@
 {{!-- Default --}}
 
 {{input-group
-  property='model.name'
+  property='name'
 }}
 
 {{!-- Textarea --}}
 
 {{input-group
-  property='model.description'
+  property='description'
   type='textarea'
 }}
 
 {{!-- Select --}}
 
 {{input-group
-  property='model.color'
+  property='color'
   content=colors
 }}
 
 {{!-- Number --}}
 
 {{input-group
-  property='model.numberOfSeeds'
+  property='numberOfSeeds'
   type='number'
 }}
 
 {{!-- Checkbox --}}
 
 {{input-group
-  property='model.isTropical'
+  property='isTropical'
   type='checkbox'
 }}
 
 {{!-- Date --}}
 
 {{input-group
-  property='model.pickedOn'
+  property='pickedOn'
   type='date'
 }}
diff --git a/tests/helpers/async/click-input-for.js b/tests/helpers/async/click-input-for.js
new file mode 100644
index 0000000..85b36c7
--- /dev/null
+++ b/tests/helpers/async/click-input-for.js
@@ -0,0 +1,11 @@
+import Ember from 'ember';
+import selectorFor from '../selector-for';
+
+export default Ember.Test.registerAsyncHelper('clickInputFor',
+  function(app, property, value, tagName = 'input') {
+    const dasherizedProperty = Ember.String.dasherize(property);
+    const dataTest = `input-wrapper-for-${dasherizedProperty}`;
+
+    click(inspect(dataTest).find(tagName));
+  }
+);
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 54534cd..4355198 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -4,6 +4,7 @@ import Router from '../../router';
 import config from '../../config/environment';
 
 import asyncClick from './async/async-click';
+import clickInputFir from './async/click-input-for';
 import fillInInputFor from './async/fill-in-input-for';
 import inspectInputFor from './sync/inspect-input-for';
 import inspectModelValueFor from './sync/inspect-model-value-for';

From 33e106c0d5aba89a4d8424aeb3d3409745991c48 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 14:22:53 -0400
Subject: [PATCH 62/73] Acceptance test for model path

---
 tests/acceptance/model-path-test.js                | 12 ++++++++----
 tests/dummy/app/resources/application/template.hbs |  1 +
 tests/unit/components/input-group-test.js          |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/model-path-test.js b/tests/acceptance/model-path-test.js
index adb176b..6c94e9d 100644
--- a/tests/acceptance/model-path-test.js
+++ b/tests/acceptance/model-path-test.js
@@ -25,17 +25,21 @@ module('Acceptance | model path', {
 });
 
 test('Binding text values to inputs and the model', function(assert) {
+  const name = 'Banana';
 
-  assert.expect(6);
+  assert.expect(2);
 
   visit('/fruit/model-path');
 
-  // fillInInputFor('numberOfSeeds', numberOfSeeds);
+  fillInInputFor('name', name);
 
   andThen(function() {
 
-    // assert.equal(inspectInputFor('name').val(), name,
-    //   `The title value should be updated on the input element`);
+    assert.equal(inspectInputFor('name').val(), name,
+      `The name value should be updated on the input element`);
+
+    assert.equal(inspectModelValueFor('fruit-name'), name,
+      `The name value should be updated on model`);
 
   });
 });
diff --git a/tests/dummy/app/resources/application/template.hbs b/tests/dummy/app/resources/application/template.hbs
index 89c196c..612fbf4 100644
--- a/tests/dummy/app/resources/application/template.hbs
+++ b/tests/dummy/app/resources/application/template.hbs
@@ -6,6 +6,7 @@
 
 <ul>
   <li>{{#link-to 'fruit.form'}}Fruit Form{{/link-to}}</li>
+  <li>{{#link-to 'fruit.model-path'}}Fruit Model Path{{/link-to}}</li>
 </ul>
 
 {{outlet}}
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index a729d24..3396026 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -67,7 +67,7 @@ test('Basic properties', function(assert) {
     property,
   });
 
-  assert.equal(component.get('propertyWithoutModel'), propertyName,
+  assert.equal(component.get('property'), property,
     "The 'cleaned' property should be a relative reference from the model path");
 
   this.render();

From 050dbf5d4ab17bf709c365e9d79168a5b8197b42 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 14:28:56 -0400
Subject: [PATCH 63/73] Phantom updated to 2.0

---
 .travis.yml |  5 ++++-
 README.md   | 16 ++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8197d31..c54f2e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,10 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
diff --git a/README.md b/README.md
index e8b316b..5518c46 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,8 @@
 # Ember Easy Form Extensions
 
-This addon extends Ember EasyForm into the view and controller layers of your Ember CLI app to provide easy event and action handling using mixins and components. The newly accessible developer-friendly layer includes form submission handlers, components, and integration with ember-validations.
+This addon enhances Ember EasyForm by providing easy event and action handling for your forms.
 
-**This is also the easiest known way to use Easy Form with Ember 1.10 and HTMLBars.**
-
-## Ember 1.11+ Users
-
-Whilst this addon's master branch currently supports Ember 1.10, there are even more known issues with Ember Easy Forms and Ember 1.11. As such, work has begun on a completely Ember CLIified branch [here](https://github.com/sir-dunxalot/ember-easy-form-extensions/tree/ember-1.11)
-
-The `ember-1.11` branch is an evolved easy form API. It is very early stage and undocumented but no longer requires vendor files either. A release will come soon but feel free to dig into the addon tree's source in the meantime.
-
-```json
-devDepencencies: {
-  "ember-easy-form-extensions": "sir-dunxalot/ember-easy-form-extensions#ember-1.11",
-}
-```
+**To support Ember 1.10+ Easy Form has been temporarily rewritten for Ember CLI. When EasyForm is updated by Dockyard this addon will support that instead of our own form components.**
 
 ## Installation
 

From 1e5fe05771294c2c855f5857ac1446cc7b9ab43a Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 17:19:49 -0400
Subject: [PATCH 64/73] Allowinf failure due to rjwblue/ember-qunit#178

---
 .travis.yml                                   |   2 +
 README.md                                     | 504 +-----------------
 tests/unit/components/form-submission-test.js |  18 +-
 tests/unit/components/input-group-test.js     |  19 +-
 4 files changed, 39 insertions(+), 504 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c54f2e8..b2f7d35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-release # https://github.com/rwjblue/ember-qunit/issues/178
+    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
diff --git a/README.md b/README.md
index 5518c46..e7afb08 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@ This addon enhances Ember EasyForm by providing easy event and action handling f
 
 ## Installation
 
-Uninstall any references to `ember-easy-form` and `ember-validations`. Then:
+Uninstall any references to `ember-easy-form` and `ember-validations`and then:
 
-```
+```sh
 ember install ember-easy-form-extensions
 ```
 
@@ -16,151 +16,51 @@ ember install ember-easy-form-extensions
 
 `ember-easy-form-extensions` comes prepackaged with `ember-easy-form` and `ember-validations` so you can now build awesome forms and handle the subsequent submission events just as easily as Easy Form makes writing your templates.
 
-The below code works out of the box but is also very customizable and extendible.
+Here's an example:
 
 ```hbs
 {{!--app-name/templates/posts/new.hbs--}}
 
 {{#form-wrapper}}
   {{#form-controls legend='Write a new post'}}
-    {{input value=model.title}}
-    {{input value=model.description type='textarea'}}
-  {{/form-controls}}
 
-  {{form-submission}}
-{{/form-wrapper}}
-```
+    {{!--model.title--}}
+    {{input-group property='title'}}
 
-```js
-// app-name/views/posts/new.js
-
-import Ember from 'ember';
-import Submitting from 'ember-easy-form-extensions/mixins/views/submitting';
+    {{!--model.description--}}
+    {{input-group property='description' type='textarea'}}
 
-export default Ember.View.extend(
-  Submitting, {
+  {{/form-controls}}
 
-});
+  {{!--Submit and cancel buttons--}}
+  {{form-submission}}
+{{/form-wrapper}}
 ```
 
 ```js
 // app-name/controllers/posts/new.js
 
 import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
+import FormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 
-export default Ember.ObjectController.extend(
-  Saving, {
+export default Ember.Controller.extend(
+  FormMixin, {
 
-  // Validations run out of the box
   validations: {
     'model.title': {
       presence: true
     }
   }
 
-  cancel: function() {
-    this.transitionTo('posts');
-  },
-
-  save: function() {
-    // Validations have already been run by the Saving mixin
-    this.get('content').save().then(function(post) {
-      this.transitionTo('post', post);
-    });
-  },
-
-});
-```
-
-# Documentation
-
-- [Mixins](#mixins)
-- [Components](#components)
-- [Templating](#templating)
-
-## Mixins
-
-The core functionality added by `ember-easy-form-extensions` lies in it's mixins. The mixins handle form submission events and work with the included components to make validating, saving, deleting, and cancelling, a breeze.
-
-In most situations you will add the `Saving` mixin to your controller, the `Submitting` mixin to your view, and either `Rollback` or `DeleteRecord` to your route.
-
-### Form Submitting (for views)
-
-The form submitting mixin is intended to be mixed into **views** to handle  `cancel`, `save`, and `destroy` (aka delete) events. This mixin works in parallel with the included [components](#components).
-
-If you don't specify custom event handlers, the events will be routed directly to the controller.
-
-This mixin also takes care of hiding buttons after submission to enhance the usability of your forms.
-
-```js
-// app-name/views/posts/new.js
-
-import Ember from 'ember';
-import Submitting from 'ember-easy-form-extensions/mixins/views/submitting';
-
-export default Ember.View.extend(
-  Submitting, {
-
-});
-```
-
-If you want to add custom handling for the events, you can add `submitHandler()`, `cancelHandler()`, and `destroyHandler()` to your view to handle the respective events. **Each handler should return a promise.**
-
-```js
-// app-name/views/posts/new.js
-
-import Ember from 'ember';
-import Submitting from 'ember-easy-form-extensions/mixins/views/submitting';
-
-export default Ember.View.extend(
-  Submitting, {
-
-  submitHandler: function() {
-    return new Ember.RSVP.Promise(function(resolve, reject) {
-      // Do something unusual here, then resolve.
-
-      this.showCoolAnimation();
-
-      if (!this.get('someViewProperty')) {
-        reject(); // Resets the form submission state
-      } else {
-        resolve(); // Will call the controller method
-      }
-    });
-  }
-
-});
-```
-
-### Form Saving (for controllers)
-
-The form saving mixin is intended to be mixed into **controllers**. Once added, the events handled in your view will automatically validate your model against the controller's validations object (powered by [ember-validations](https://github.com/dockyard/ember-validations)).
-
-In most use cases, you should add a `save()` and `cancel()` method to the controller:
-
-```js
-// app-name/controllers/posts/new.js
-
-import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
-
-export default Ember.ObjectController.extend(
-  Saving, {
-
-  // Validations run out of the box
-  validations: {
-    title: {
-      presence: true
-    }
-  },
+  /* Runs if cancel button in {{form-submission}} is clicked */
 
   cancel: function() {
     this.transitionTo('posts');
   },
 
+  /* Runs after validations pass and submit button in {{form-submission}} is clicked */
+
   save: function() {
-    // Validations have already been run by the Saving mixin
     this.get('content').save().then(function(post) {
       this.transitionTo('post', post);
     });
@@ -169,372 +69,6 @@ export default Ember.ObjectController.extend(
 });
 ```
 
-The saving mixin will handle all internals including the state of the form (submitted or not submitted) and running the validations - you just have to specify what you want to happen when validations have been run.
-
-You can also add a destroy method:
-
-```js
-// app-name/controllers/post/edit.js
-
-import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
-
-export default Ember.ObjectController.extend(
-  Saving, {
-
-  destroy: function() {
-    var _this = this;
-
-    // Runs when the user clicks on the destroy submission component after the view has handled the destroy action and checked to see if you've specified a destroyHandler in the view
-    _this.get('content').destroyRecord().then(function() {
-      _this.transitionToRoute('posts');
-    });
-  }
-
-});
-```
-
-Please note, this is best used when you're deleting a persisted model, not a new one - in the latter situation consider using [the delete record mixin](#delete-record).
-
-The `Saving` mixin also provides support for automatically revalidating your model when you're using a computed property with `ember-validations`. Just add the computed property names to the `revalidateFor` array:
-
-```js
-// app-name/controllers/posts/new.js
-
-import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
-
-export default Ember.ObjectController.extend(
-  Saving, {
-
-  revalidateFor: ['required'],
-
-  // Validations run out of the box
-  validations: {
-    title: {
-      presence: {
-        if: 'required'
-      }
-    }
-  },
-
-  required: function() {
-    return this.get('somethingElse') && !this.get('anotherThing');
-  }.property('somethingElse', 'anotherThing'),
-
-  cancel: function() {},
-  save: function() {},
-
-});
-```
-
-If your routes follow a RESTful naming convention, you can take advantage of two new **boolean** properties on the controller:
-- `newModel` - True if the route is for a new model (e.g. `this.route('new')`)
-- `editingModel` - True if the route is for editing a model (e.g. `this.route('edit')`)
-
-You can use these to set the button text, for example:
-
-```js
-// app-name/controllers/posts/new.js
-
-import Ember from 'ember';
-import Saving from 'ember-easy-form-extensions/mixins/controllers/saving';
-
-export default Ember.ObjectController.extend(
-  Saving, {
-
-  saveButtonText: function() {
-    return this.get('editingModel') ? 'Save' : 'Add post';
-  }.property('editing'),
-});
-```
-
-The `saveButtonText` could then be used in your [`{{form-submission}}` component](#form-submission).
-
-### Dirty Record Handler (for routes)
-
-The diry record handler mixin is intended for use in routes. This mixin will check to see if the model is dirty and will do one of two things:
-
-- If there is a clean version of the model in the store it will rollback to it (i.e. if the user if editing a resource)
-- If there is no clean version in the store it will delete the record (i.e. if the user is creating a new resource)
-
-The most common reason for this to happen is the user navigates to the edit or new route of a resource and then clicks cancel.
-
-```js
-// app-name/routes/post/edit.js
-
-import Ember from 'ember';
-import DirtyRecordHandler from 'ember-easy-form-extensions/mixins/routes/dirty-record-handler';
-
-export default Ember.Route.extend(
-  DirtyRecordHandler, {
-
-  model: function(params) {
-    return this.modelFor('post');
-  }
-
-});
-```
-
-## Components
-
-To extend the class of any components to overwrite or add functionality, just import them from this addon and then export them in your app. For example:
-
-```js
-// app-name/components/form-submissison.js
-
-import FormSubmissionComponent from 'ember-easy-form-extensions/components/form-submission';
-
-export default FormSubmissionComponent.extend({
-  // Your functionality here
-});
-```
-
-To overwrite the default class names of any components, overwrite the options in the easy-form service:
-
-```js
-// app/sevices/easy-form.js
-
-import EasyFormService from 'ember-easy-form-extensions/services/easy-form';
-
-export default EasyFormService.extend({
-  errorClass: 'error',
-  hintClass: 'hint',
-  inputClass: 'input',
-  inputGroupClass: 'input-wrapper',
-  formWrapperClass: 'form',
-  formControlsClass: 'controls',
-});
-```
-
-### Form Wrapper
-
-The `{{#form-wrapper}}` component wraps your code in a `<form class="form">` tag to enable HTML5 form events. It also disables HTMl5 validations. It's pretty simple:
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{#form-wrapper}}
-  {{!--Your inputs here--}}
-
-  {{form-submission}}
-{{/form-wrapper}}
-```
-
-You can use HTML5 validations by setting the `novalidate` attribute to false:
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{#form-wrapper novalidate=false}}
-  {{!--Your inputs here--}}
-
-  {{form-submission}}
-{{/form-wrappexr}}
-```
-
-### Form Controls
-
-The `{{#form-controls}}` component adds more sementicism to your templates. Use it **inside** your `{{#form-wrapper}}`:
-
-This will render a `<fieldset>` element, which groups related inputs together.
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{#form-wrapper}}
-  {{#form-controls legend='Write a new post'}}
-    {{!--Your inputs here--}}
-  {{/form-controls}}
-
-  {{form-submission}}
-{{/form-wrapper}}
-```
-
-`{{#form-controls}}` expects a `legend` attribute for accessibility.
-
-You can also pass a `model` attribute to the controls. By default, this `{{form-controls}}` component will assume the model is at the path `model`. However, if this fieldset is for a nested model you might prefer passing that. It will resolve your input labels correctly:
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{#form-wrapper}}
-  {{#form-controls legend='Write a new post' model=model.post}}
-    {{!--Your inputs here--}}
-  {{/form-controls}}
-
-  {{form-submission}}
-{{/form-wrapper}}
-```
-
-### Input Group
-
-The heart of your form functionality is provided by the `{{input-group}}` component. This replaces Easy Form's overriding of Ember's `{{input}}` helper.
-
-Simply pass a value and optional type to render a label, input, and error (when present):
-
-```hbs
-{{input-group value=model.title}}
-{{!--Renders as...--}}
-<span class="label" for="ember234-input">Title</span>
-<input id="ember234-input">
-```
-
-#### Textareas
-
-```hbs
-{{input-group
-  value=model.description
-  type='textarea'
-}}
-```
-
-#### Selects
-
-When you pass a `content` attribute the input will automatically use a `<select>`.
-
-You can bind the `value` or `selection` for string and objects, respectively.
-
-```hbs
-{{input-group
-  content=categoryOptions
-  value=model.category {{!--Or selection--}}
-}}
-```
-
-#### Checkboxes
-
-```hbs
-{{input-group
-  value=model.published {{!--Boolean value--}}
-  type='checkbox'
-}}
-```
-
-#### Custom inputs
-
-It's very easy to add custom input types.
-
-1. Add a partial matching the format of [the default input](https://github.com/sir-dunxalot/ember-easy-form-extensions/blob/ember-1.11/app/templates/form-inputs/default.hbs) and overwrite the type-to-partial option object of the Easy Form service:
-
-```js
-// app/sevices/easy-form.js
-
-import EasyFormService from 'ember-easy-form-extensions/services/easy-form';
-
-export default EasyFormService.extend({
-  inputTypePartials: {
-    checkbox: 'form-inputs/checkbox',
-    select: 'form-inputs/select',
-    textarea: 'form-inputs/textarea',
-    date: 'form-inputs/pikaday' // Added template name
-  }
-});
-```
-
-You can extend the `{{input-wrapper}}` component to add any options you need. The input partial will have the context of the input wrapper component.
-
-You can also use inputs in block form instead:
-
-```hbs
-{{#input-group value=model.dateCreated}}
-  {{input value=model.dateCreated type='date'}}
-{{/input-group}}
-```
-
-This will render labels, errors, and hints correctly.
-
-#### Input styling
-
-The `{{input-wrapper}}` component has several dynamic classes, depending on the state of the input (e.g. invalid):
-
-- When `isValid` is true, the class will be affixed with `-valid`.
-- When `isInvalid` is true, the class will be affixed with `-error`.
-- When `isInvalid` *was* true and `isValid` turned true within 3000ms, the class will be affixed with `-newly-valid`. This allows you to show after-valid styling before returning to the inputs normal state.
-
-### Form Submission
-
-The `{{form-submission}}` component adds buttons for submit/save and cancel to your form.
-
-You can customize the text of the buttons and which buttons show by passing in options. The default values are shown below:
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{form-submission
-  cancel=true {{!--Whether to show cancel button--}}
-  cancelText='Cancel' {{!--Cancel button text--}}
-  submit=true {{!--Whether to show submit button--}}
-  submitText='Save' {{!--Submit button text--}]
-}}
-```
-
-The argument can be bound easily:
-
-```hbs
-{{!--app-name/templates/posts/new.hbs--}}
-
-{{!--saveButtonText is a property on the controller--}}
-{{form-submission submitText=saveButtonText}}
-```
-
-The buttons will automatically be replaced by a [loading spinner](#loading-spinner) when the form is submitted. The form will return to it's original state if there are validation errors, etc, so the user can resubmit the form.
-
-### Destroy Submission
-
-The `{{destroy-submission}}` component can be used in the same template as the `{{form-submission}}` component. It is built to handle events that delete a record.
-
-An example would be the user is on the route to edit an item but is also given to option to delete the item entirely. Whether the user clicks delete, save, or cancel, all submission buttons are disabled until the event is resolved or rejected.
-
-You can customize the text of the button by passing in the `destroytext` option. The default value is shown below:
-
-```hbs
-{{!--app-name/templates/post/edit.hbs--}}
-
-{{!--Slightly detached from your form UI...--}}
-{{destroy-submission destroyText='Delete'}}
-
-{{!--And somewhere later in the template...--}}
-{{form-submission}}
-```
-
-#### Template customization
-
-To customize the template, just override the path at `app-name/templates/components/destroy-submission.hbs` - easy!
-
-### Loading Spinner
-
-The loading spinner component replaces the buttons in your submission components when the form has been submitted.
-
-If you already have a spinner component simply export it at the correct path to immediately use your component:
-
-```js
-// app-name/components/loading-spinner.js
-
-import CustomSpinner from 'app-name/components/custom-spinner';
-
-export default CustomSpinner;
-```
-
-Alternatively, just add your spinner to the template:
-
-```hbs
-{{!--app-name/templates/components/loading-spinner.hbs--}}
-
-<img src="some-non-css-spinner.gif">
-```
-
-If you really don't want to use the `{{loading-spinner}}` component anywhere in your app, edit the submission component templates as described in [template customization](#template-customization).
-
-
-## Templating
-
-To customize the template of any components just override the path in your app. For example, `app-name/templates/components/form-submission.hbs` - easy!
-
-To override the template of any Easy Form view, just override the easyform path:
+## Documentation
 
-- Error: `app-name/templates/easy-form/error.hbs`
-- Hint: `app-name/templates/easy-form/hint.hbs`
-- Control: `app-name/templates/easy-form/input-controls.hbs`
-- Input: `app-name/templates/easy-form/input.hbs`
-- Label: `app-name/templates/easy-form/label.hbs`
+A walkthrough and documentation can be found in the [wiki](https://github.com/sir-dunxalot/ember-easy-form-extensions/wiki).
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index a2007d7..ab96b6d 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -7,7 +7,7 @@ import {
 } from '../../helpers/unit/component';
 import selectorFor from '../../helpers/selector-for';
 
-const { typeOf } = Ember;
+const { run, typeOf } = Ember;
 
 let component;
 
@@ -63,7 +63,7 @@ test('Properties', function(assert) {
 
   this.render();
 
-  assert.ok(this.$().hasClass(component.get('className')),
+  assert.ok(component.$().hasClass(component.get('className')),
     'The class name should be bound to the element');
 
 });
@@ -77,14 +77,16 @@ test('The DOM', function(assert) {
 
   /* Check the template before any submitting */
 
-  assert.ok(this.$().html().indexOf(submittingText) === -1,
+  assert.ok(component.$().html().indexOf(submittingText) === -1,
     'The template should reflect that the form has not been submitted');
 
   /* Check in button in turn */
 
-  ['cancel', 'delete', 'submit'].forEach(function(action) {
+  ['cancel', 'delete', 'submit'].forEach(function(action, i) {
     const selector = selectorFor(`button-for-${action}`);
 
+    doneArray.push(assert.async());
+
     setOnComponent(component, action, true);
 
     setOnComponent(component, `_actions.${action}`, function() {
@@ -94,7 +96,7 @@ test('The DOM', function(assert) {
 
     });
 
-    const $button = this.$(selector);
+    const $button = component.$(selector);
 
     assert.ok(!!$button,
       'The ${action} button should exist in the template');
@@ -103,16 +105,16 @@ test('The DOM', function(assert) {
 
     setOnComponent(component, action, false);
 
-    assert.notOk(this.$(selector).length,
+    assert.notOk(component.$(selector).length,
       'The ${action} button should no longer exist in the template');
 
   }, this);
 
-  /* Fake submisiosn and check the template */
+  /* Fake submission and check the template */
 
   setOnComponent(component, 'formIsSubmitted', true);
 
-  assert.ok(this.$().html().indexOf(submittingText) > -1,
+  assert.ok(component.$().html().indexOf(submittingText) > -1,
     'The template should reflect that the form is submitting');
 
 });
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index 3396026..46fa8eb 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -145,6 +145,7 @@ test('Input attribute properties', function(assert) {
 
 test('Type property and partial', function(assert) {
   const inputId = component.get('inputId');
+  const done = assert.async();
 
   assert.expect(33);
 
@@ -176,7 +177,7 @@ test('Type property and partial', function(assert) {
     assert.equal(component.get('inputPartial'), 'form-inputs/default',
       'The form input partial should still be the default');
 
-    assert.equal(this.$(`#${inputId}`).attr('type'), expectedType,
+    assert.equal(component.$(`#${inputId}`).attr('type'), expectedType,
       'The type attribute should be bound to the input element');
   }
 
@@ -187,7 +188,7 @@ test('Type property and partial', function(assert) {
   assert.equal(component.get('type'), 'select',
     'Type should be set to select when the content property is present (regardless of the property name)');
 
-  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'select',
+  assert.equal(component.$(`#${inputId}`).prop('tagName').toLowerCase(), 'select',
     "The type attribute, 'select', should be bound to the input element");
 
   /* Reset the component for the next set of tests */
@@ -205,20 +206,16 @@ test('Type property and partial', function(assert) {
     checkbox: true,
   };
 
+  this.render();
+
   for (let type in expectedValueDetects) {
-    // test(`typeof value detection fallback for ${type} property`, function(assert) {
-      // const inputId = component.get('inputId');
     const partialName = type === 'checkbox' ? type : 'default';
     const value = expectedValueDetects[type];
 
-    // assert.expect(3);
-
     setPropertiesOnComponent(component, {
       value,
     });
 
-    this.render();
-
     assert.equal(component.get('type'), type,
       'Type should be autodetected by matching the type of value when no type is set');
 
@@ -227,17 +224,17 @@ test('Type property and partial', function(assert) {
 
     assert.equal(component.$(`#${inputId}`).attr('type'), type,
       'The type attribute should be bound to the input element');
-
-    // });
   }
 
   /* Finally, check setting the type manually using textarea */
 
   setOnComponent(component, 'type', 'textarea');
 
-  assert.equal(this.$(`#${inputId}`).prop('tagName').toLowerCase(), 'textarea',
+  assert.equal(component.$(`#${inputId}`).prop('tagName').toLowerCase(), 'textarea',
     "The type attribute, 'select', should be bound to the input element and setabble manually");
 
+  done();
+
 });
 
 test('Value and property binding', function(assert) {

From c170232fda970c6885d236833901898e0d41d3e4 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 17:22:05 -0400
Subject: [PATCH 65/73] Removed failing reference to doneArray

---
 tests/unit/components/form-submission-test.js | 2 --
 tests/unit/components/input-group-test.js     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index ab96b6d..11e8fbb 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -85,8 +85,6 @@ test('The DOM', function(assert) {
   ['cancel', 'delete', 'submit'].forEach(function(action, i) {
     const selector = selectorFor(`button-for-${action}`);
 
-    doneArray.push(assert.async());
-
     setOnComponent(component, action, true);
 
     setOnComponent(component, `_actions.${action}`, function() {
diff --git a/tests/unit/components/input-group-test.js b/tests/unit/components/input-group-test.js
index 46fa8eb..e1394fd 100644
--- a/tests/unit/components/input-group-test.js
+++ b/tests/unit/components/input-group-test.js
@@ -83,7 +83,7 @@ test('Basic properties', function(assert) {
 
 test('Class name bindings', function(assert) {
   const className = component.get('className');
-  const done = assert.async(); // Enable asyns test
+  const done = assert.async(); // Enable async test
   const newlyValidDuration = 100;
 
   assert.expect(4);

From 0dd7589e8037fb44740a3da5d14afb1a2c229315 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 17:23:54 -0400
Subject: [PATCH 66/73] Travis badge added

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e7afb08..98ec283 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# Ember Easy Form Extensions
+Ember Easy Form Extensions [![Build Status](https://travis-ci.org/sir-dunxalot/ember-easy-form-extensions.svg?branch=master)](https://travis-ci.org/sir-dunxalot/ember-easy-form-extensions)
+======
 
 This addon enhances Ember EasyForm by providing easy event and action handling for your forms.
 

From a568e0399f86599ddf0860b2a4b27ead42cfa787 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 17:59:23 -0400
Subject: [PATCH 67/73] PR fixes. toWords --> humanize, comments removed

---
 addon/components/error-field.js                    |  2 +-
 addon/components/input-group.js                    | 14 ++------------
 addon/templates/components/form-submission.hbs     |  5 +----
 addon/templates/components/input-group.hbs         |  1 -
 addon/utils/{to-words.js => humanize.js}           |  0
 app/templates/form-is-submitted.hbs                |  1 +
 tests/unit/components/form-submission-test.js      |  5 ++++-
 .../utils/{to-words-test.js => humanize-test.js}   |  4 ++--
 8 files changed, 11 insertions(+), 21 deletions(-)
 rename addon/utils/{to-words.js => humanize.js} (100%)
 create mode 100644 app/templates/form-is-submitted.hbs
 rename tests/unit/utils/{to-words-test.js => humanize-test.js} (83%)

diff --git a/addon/components/error-field.js b/addon/components/error-field.js
index 6802e3c..2ab18d5 100644
--- a/addon/components/error-field.js
+++ b/addon/components/error-field.js
@@ -62,7 +62,7 @@ export default Ember.Component.extend({
     }
   }),
 
-  removeBindingForErrors: Ember.on('willDestroyElement', function() {
+  removeBindingForErrors: on('willDestroyElement', function() {
     const property = 'bindingForErrors';
 
     if (this.get(property)) {
diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index 60c8067..b283f5a 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -1,7 +1,7 @@
 import defaultFor from '../utils/default-for';
 import Ember from 'ember';
+import humanize from '../utils/humanize';
 import layout from '../templates/components/input-group';
-import toWords from '../utils/to-words';
 
 const { computed, observer, on, run, typeOf } = Ember;
 
@@ -84,7 +84,7 @@ export default Ember.Component.extend({
   label: computed('property', function() {
     const property = defaultFor(this.get('property'), '');
 
-    return toWords(property);
+    return humanize(property);
   }),
 
   propertyWithModel: computed('property', 'modelPath', function() {
@@ -99,16 +99,6 @@ export default Ember.Component.extend({
     }
   }),
 
-  // propertyWithoutModel: computed('property', 'modelPath', function() {
-  //   const modelPath = this.get('modelPath');
-
-  //   if (modelPath) {
-  //     return this.get('property').replace(`${modelPath}.`, '');
-  //   } else {
-  //     return this.get('property');
-  //   }
-  // }),
-
   type: computed('content', 'property', 'value', function() {
     const property = this.get('property');
 
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index c6289a3..0a4df13 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -1,7 +1,6 @@
 {{#if cancel}}
   {{form-submission-button
     action='cancel'
-    class='button-secondary'
     disabled=formIsSubmitted
     text=cancelText
     type='reset'
@@ -11,7 +10,6 @@
 {{#if delete}}
   {{form-submission-button
     action='delete'
-    class='button-secondary'
     disabled=formIsSubmitted
     text=deleteText
   }}
@@ -20,7 +18,6 @@
 {{#if submit}}
   {{form-submission-button
     action='submit'
-    class='button-primary'
     disabled=formIsSubmitted
     text=submitText
     type='submit'
@@ -28,5 +25,5 @@
 {{/if}}
 
 {{#if formIsSubmitted}}
-  Submitting...
+  {{partial 'form-is-submitted'}}
 {{/if}}
diff --git a/addon/templates/components/input-group.hbs b/addon/templates/components/input-group.hbs
index 7bcc57b..d8b0228 100644
--- a/addon/templates/components/input-group.hbs
+++ b/addon/templates/components/input-group.hbs
@@ -3,7 +3,6 @@
     for=inputId
     text=label
   }}
-  {{!-- TODO - change label to text? --}}
 {{/if}}
 
 {{#if hasBlock}}
diff --git a/addon/utils/to-words.js b/addon/utils/humanize.js
similarity index 100%
rename from addon/utils/to-words.js
rename to addon/utils/humanize.js
diff --git a/app/templates/form-is-submitted.hbs b/app/templates/form-is-submitted.hbs
new file mode 100644
index 0000000..1a0b3dc
--- /dev/null
+++ b/app/templates/form-is-submitted.hbs
@@ -0,0 +1 @@
+Submitting...
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 11e8fbb..3a1fcdb 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -12,7 +12,10 @@ const { run, typeOf } = Ember;
 let component;
 
 moduleForComponent('form-submission', 'Unit | Component | form submission', {
-  needs: ['component:form-submission-button'],
+  needs: [
+    'component:form-submission-button',
+    'template:form-is-submitted',
+  ],
   unit: true,
 
   beforeEach: function() {
diff --git a/tests/unit/utils/to-words-test.js b/tests/unit/utils/humanize-test.js
similarity index 83%
rename from tests/unit/utils/to-words-test.js
rename to tests/unit/utils/humanize-test.js
index 790e67e..5c63024 100644
--- a/tests/unit/utils/to-words-test.js
+++ b/tests/unit/utils/humanize-test.js
@@ -1,4 +1,4 @@
-import toWords from 'ember-easy-form-extensions/utils/to-words';
+import humanize from 'ember-easy-form-extensions/utils/humanize';
 import { module, test } from 'qunit';
 
 module('Unit | Utility | to words');
@@ -21,7 +21,7 @@ test('it works', function(assert) {
 
   versions.forEach(function(version) {
 
-    assert.equal(toWords(version), expectedResult,
+    assert.equal(humanize(version), expectedResult,
       `"${version}" should be turned into "${expectedResult}"`);
 
   });

From d914ba5cee2ad8e7b1a43dfdf7b5f956c4441e97 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 18:06:36 -0400
Subject: [PATCH 68/73] submit renamed save

---
 addon/components/form-submission.js            | 10 +++++-----
 addon/initializers/routing-events.js           |  2 ++
 addon/mixins/controllers/form.js               |  8 ++++----
 addon/templates/components/form-submission.hbs | 10 +++++-----
 tests/unit/components/form-submission-test.js  |  5 +++--
 tests/unit/mixins/controllers/form-test.js     |  9 +++++----
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/addon/components/form-submission.js b/addon/components/form-submission.js
index bc56c45..6f70542 100644
--- a/addon/components/form-submission.js
+++ b/addon/components/form-submission.js
@@ -19,9 +19,9 @@ export default Ember.Component.extend(
   deleteAction: 'delete',
   deleteText: 'Delete',
 
-  submit: true,
-  submitAction: 'submit',
-  submitText: 'Submit',
+  save: true,
+  saveAction: 'save',
+  saveText: 'Save',
 
   /* Properties */
 
@@ -47,8 +47,8 @@ export default Ember.Component.extend(
       this.sendAction('delete');
     },
 
-    submit() {
-      this.sendAction('submitAction');
+    save() {
+      this.sendAction('saveAction');
     },
 
   },
diff --git a/addon/initializers/routing-events.js b/addon/initializers/routing-events.js
index cca5608..0ddf15c 100644
--- a/addon/initializers/routing-events.js
+++ b/addon/initializers/routing-events.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 
 export function initialize(/* container, app */) {
 
+  /* TODO - Deprecate with routable components */
+
   /**
   @class Ember.Controller
   @submodule controllers
diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 70a6e6a..9ee2ac0 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -54,10 +54,10 @@ export default Ember.Mixin.create(
 
     /* Show validation errors on submit click */
 
-    submit() {
+    save() {
       this.set('formIsSubmitted', true);
       this.trigger('submission');
-      this._eventHandler('submit');
+      this._eventHandler('save');
     },
 
   },
@@ -130,9 +130,9 @@ export default Ember.Mixin.create(
       return Ember.typeOf(key) === 'function';
     }
 
-    /* If event is submit, method is renamed */
+    /* If event is save, method is renamed */
 
-    if (type === 'submit') {
+    if (type === 'save') {
       type = 'validateThenSave';
     }
 
diff --git a/addon/templates/components/form-submission.hbs b/addon/templates/components/form-submission.hbs
index 0a4df13..21a5ef7 100644
--- a/addon/templates/components/form-submission.hbs
+++ b/addon/templates/components/form-submission.hbs
@@ -1,6 +1,6 @@
 {{#if cancel}}
   {{form-submission-button
-    action='cancel'
+    action=cancelAction
     disabled=formIsSubmitted
     text=cancelText
     type='reset'
@@ -9,17 +9,17 @@
 
 {{#if delete}}
   {{form-submission-button
-    action='delete'
+    action=deleteAction
     disabled=formIsSubmitted
     text=deleteText
   }}
 {{/if}}
 
-{{#if submit}}
+{{#if save}}
   {{form-submission-button
-    action='submit'
+    action=saveAction
     disabled=formIsSubmitted
-    text=submitText
+    text=saveText
     type='submit'
   }}
 {{/if}}
diff --git a/tests/unit/components/form-submission-test.js b/tests/unit/components/form-submission-test.js
index 3a1fcdb..e6e4d98 100644
--- a/tests/unit/components/form-submission-test.js
+++ b/tests/unit/components/form-submission-test.js
@@ -7,6 +7,7 @@ import {
 } from '../../helpers/unit/component';
 import selectorFor from '../../helpers/selector-for';
 
+const supportedButtons = ['cancel', 'delete', 'save'];
 const { run, typeOf } = Ember;
 
 let component;
@@ -44,7 +45,7 @@ test('Properties', function(assert) {
 
   /* Check cancel, cancelAction, and cancelText, etc */
 
-  ['cancel', 'delete', 'submit'].forEach(function(buttonType) {
+  supportedButtons.forEach(function(buttonType) {
     const actionProperty = `${buttonType}Action`;
     const existsByDefault = buttonType !== 'delete';
     const expectedButtonText = Ember.String.capitalize(buttonType);
@@ -85,7 +86,7 @@ test('The DOM', function(assert) {
 
   /* Check in button in turn */
 
-  ['cancel', 'delete', 'submit'].forEach(function(action, i) {
+  supportedButtons.forEach(function(action, i) {
     const selector = selectorFor(`button-for-${action}`);
 
     setOnComponent(component, action, true);
diff --git a/tests/unit/mixins/controllers/form-test.js b/tests/unit/mixins/controllers/form-test.js
index ffe357a..811eea7 100644
--- a/tests/unit/mixins/controllers/form-test.js
+++ b/tests/unit/mixins/controllers/form-test.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import ControllersFormMixin from 'ember-easy-form-extensions/mixins/controllers/form';
 import { module, test } from 'qunit';
 
+const supportedButtons = ['cancel', 'delete', 'save'];
 const { run, typeOf } = Ember;
 
 let component;
@@ -58,7 +59,7 @@ test('Properties and actions', function(assert) {
   assert.ok(component.get('hasFormMixin'),
     'The mixin should have a helper property for detection by components');
 
-  ['cancel', 'delete', 'submit'].forEach(function(action) {
+  ['cancel', 'delete', 'save'].forEach(function(action) {
 
     assert.ok(component.get(`_actions.${action}`),
       `The ${action} action should exist`);
@@ -125,7 +126,7 @@ test('Private methods', function(assert) {
 
   /* _eventHandler */
 
-  const events = ['cancel', 'delete', 'submit'];
+  const events = supportedButtons;
 
   /* Use an array and index to save and call assert.async()
   methods so we can wait for the promises to resolve before
@@ -144,7 +145,7 @@ test('Private methods', function(assert) {
 
     let method = event;
 
-    if (event === 'submit') {
+    if (event === 'save') {
       method = 'validateThenSave';
     }
 
@@ -166,7 +167,7 @@ test('Private methods', function(assert) {
 
     let method = event;
 
-    if (event === 'submit') {
+    if (event === 'save') {
       method = 'validateThenSave';
     }
 

From ab795103b7d9fc7ac7a2c68898111b885a0bd543 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 18:24:38 -0400
Subject: [PATCH 69/73] xHandler --> beforeX

---
 addon/mixins/controllers/form.js           | 3 ++-
 tests/unit/mixins/controllers/form-test.js | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/mixins/controllers/form.js b/addon/mixins/controllers/form.js
index 9ee2ac0..6bab03a 100644
--- a/addon/mixins/controllers/form.js
+++ b/addon/mixins/controllers/form.js
@@ -123,7 +123,8 @@ export default Ember.Mixin.create(
   /* Private methods */
 
   _eventHandler(type) {
-    const handlerMethodName = `${type}Handler`;
+    const capitalizedType = Ember.String.capitalize(type);
+    const handlerMethodName = `before${capitalizedType}`;
     const handler = this[handlerMethodName];
 
     function isFunction(key) {
diff --git a/tests/unit/mixins/controllers/form-test.js b/tests/unit/mixins/controllers/form-test.js
index 811eea7..26fb3cb 100644
--- a/tests/unit/mixins/controllers/form-test.js
+++ b/tests/unit/mixins/controllers/form-test.js
@@ -59,7 +59,7 @@ test('Properties and actions', function(assert) {
   assert.ok(component.get('hasFormMixin'),
     'The mixin should have a helper property for detection by components');
 
-  ['cancel', 'delete', 'save'].forEach(function(action) {
+  supportedButtons.forEach(function(action) {
 
     assert.ok(component.get(`_actions.${action}`),
       `The ${action} action should exist`);
@@ -163,7 +163,8 @@ test('Private methods', function(assert) {
   /* ... Then test event handlers */
 
   events.forEach(function(event) {
-    const eventHandler = `${event}Handler`;
+    const capitalizedEvent = Ember.String.capitalize(event);
+    const eventHandler = `before${capitalizedEvent}`;
 
     let method = event;
 

From b308421deee2e27821628f95c09d4c58bb23a8ca Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 18:34:38 -0400
Subject: [PATCH 70/73] Warnign added to readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98ec283..9dc218b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@ Ember Easy Form Extensions [![Build Status](https://travis-ci.org/sir-dunxalot/e
 
 This addon enhances Ember EasyForm by providing easy event and action handling for your forms.
 
-**To support Ember 1.10+ Easy Form has been temporarily rewritten for Ember CLI. When EasyForm is updated by Dockyard this addon will support that instead of our own form components.**
+**To support Ember 1.13 Easy Form has been temporarily rewritten for Ember CLI. When EasyForm is updated by Dockyard this addon will support that instead of our own form components.**
+
+Ember apps running 1.12 or below may behave unexpectedly.
 
 ## Installation
 

From 34e63efc5c37791942ce08e916ddd573540d7d70 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 18:37:24 -0400
Subject: [PATCH 71/73] Version bump

---
 README.md    | 2 +-
 package.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9dc218b..609d7c8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Ember Easy Form Extensions [![Build Status](https://travis-ci.org/sir-dunxalot/ember-easy-form-extensions.svg?branch=master)](https://travis-ci.org/sir-dunxalot/ember-easy-form-extensions)
 ======
 
-This addon enhances Ember EasyForm by providing easy event and action handling for your forms.
+This Ember addon enhances Ember EasyForm by providing easy action handling, validations, and Ember 1.13 support for your forms
 
 **To support Ember 1.13 Easy Form has been temporarily rewritten for Ember CLI. When EasyForm is updated by Dockyard this addon will support that instead of our own form components.**
 
diff --git a/package.json b/package.json
index 271e0e1..3b09fdd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-easy-form-extensions",
-  "version": "0.4.0",
-  "description": "Extends Ember EasyForm into the view and controller layers of your Ember CLI app to provide easy event and action handling using mixins and components.",
+  "version": "1.0.0",
+  "description": "Enhances Ember EasyForm by providing easy action handling, validations, and Ember 1.13 support for your forms",
   "directories": {
     "doc": "doc",
     "test": "tests"
@@ -11,7 +11,7 @@
     "build": "ember build",
     "test": "ember try:testall"
   },
-  "repository": "https://://github.com/sir-dunxalot/ember-easy-form-extensions",
+  "repository": "https://github.com/sir-dunxalot/ember-easy-form-extensions",
   "engines": {
     "node": ">= 0.10.0"
   },

From 2d68b75c202126b33031efc146634958ba5b9ae3 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 19:02:21 -0400
Subject: [PATCH 72/73] Additional select options bound

---
 app/templates/form-inputs/select.hbs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/templates/form-inputs/select.hbs b/app/templates/form-inputs/select.hbs
index 7e01414..c9aaac7 100644
--- a/app/templates/form-inputs/select.hbs
+++ b/app/templates/form-inputs/select.hbs
@@ -9,4 +9,6 @@
   prompt=prompt
   disabled=disabled
   required=required
+  optionValuePath=optionValuePath
+  optionLabelPath=optionLabelPath
 }}

From 5fcb42ee1843c0b089488d79fd6c8a1f20619ce9 Mon Sep 17 00:00:00 2001
From: Duncan Graham Walker <walkerdu@bc.edu>
Date: Sat, 18 Jul 2015 19:08:32 -0400
Subject: [PATCH 73/73] select working with option and label paths

---
 addon/components/input-group.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/components/input-group.js b/addon/components/input-group.js
index b283f5a..25d853a 100644
--- a/addon/components/input-group.js
+++ b/addon/components/input-group.js
@@ -19,8 +19,8 @@ export default Ember.Component.extend({
 
   collection: null,
   content: null,
-  optionValuePath: null,
-  optionLabelPath: null,
+  optionValuePath: 'content',
+  optionLabelPath: 'content',
   selection: null,
   multiple: null,
   name: computed.oneWay('property'),