embient 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    embient (0.0.5)
+    embient (0.0.6)
       emberjs-rails
       rails (>= 3.1.0)
 
@@ -50,7 +50,7 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.6.5)
-    mail (2.4.1)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -58,7 +58,7 @@ GEM
     multi_json (1.1.0)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
@@ -91,7 +91,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby

data/lib/embient/version.rb

@@ -1,3 +1,3 @@
 module Embient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/vendor/assets/javascripts/embient/ember-data.js

@@ -1,6 +1,8 @@
 
 (function(exports) {
-window.DS = Ember.Namespace.create();
+window.DS = Ember.Namespace.create({
+  CURRENT_API_REVISION: 3
+});
 
 })({});
 
@@ -89,11 +91,12 @@ DS.RESTAdapter = DS.Adapter.extend({
     var root = this.rootForType(type);
 
     var data = {};
-    data[root] = get(model, 'data');
+    data[root] = model.toJSON();
 
-    this.ajax("/" + this.pluralize(root), "POST", {
+    this.ajax(this.buildURL(root), "POST", {
       data: data,
       success: function(json) {
+        this.sideload(store, type, json, root);
         store.didCreateRecord(model, json[root]);
       }
     });
@@ -109,12 +112,14 @@ DS.RESTAdapter = DS.Adapter.extend({
 
     var data = {};
     data[plural] = models.map(function(model) {
-      return get(model, 'data');
+      return model.toJSON();
     });
 
-    this.ajax("/" + this.pluralize(root), "POST", {
+    this.ajax(this.buildURL(root), "POST", {
       data: data,
+
       success: function(json) {
+        this.sideload(store, type, json, plural);
         store.didCreateRecords(type, models, json[plural]);
       }
     });
@@ -125,14 +130,13 @@ DS.RESTAdapter = DS.Adapter.extend({
     var root = this.rootForType(type);
 
     var data = {};
-    data[root] = get(model, 'data');
+    data[root] = model.toJSON();
 
-    var url = ["", this.pluralize(root), id].join("/");
-
-    this.ajax(url, "PUT", {
+    this.ajax(this.buildURL(root, id), "PUT", {
       data: data,
       success: function(json) {
-        store.didUpdateRecord(model, json[root]);
+        this.sideload(store, type, json, root);
+        store.didUpdateRecord(model, json && json[root]);
       }
     });
   },
@@ -147,12 +151,13 @@ DS.RESTAdapter = DS.Adapter.extend({
 
     var data = {};
     data[plural] = models.map(function(model) {
-      return get(model, 'data');
+      return model.toJSON();
     });
 
-    this.ajax("/" + this.pluralize(root), "POST", {
+    this.ajax(this.buildURL(root, "bulk"), "PUT", {
       data: data,
       success: function(json) {
+        this.sideload(store, type, json, plural);
         store.didUpdateRecords(models, json[plural]);
       }
     });
@@ -162,10 +167,9 @@ DS.RESTAdapter = DS.Adapter.extend({
     var id = get(model, 'id');
     var root = this.rootForType(type);
 
-    var url = ["", this.pluralize(root), id].join("/");
-
-    this.ajax(url, "DELETE", {
+    this.ajax(this.buildURL(root, id), "DELETE", {
       success: function(json) {
+        if (json) { this.sideload(store, type, json); }
         store.didDeleteRecord(model);
       }
     });
@@ -184,9 +188,10 @@ DS.RESTAdapter = DS.Adapter.extend({
       return get(model, 'id');
     });
 
-    this.ajax("/" + this.pluralize(root) + "/delete", "POST", {
+    this.ajax(this.buildURL(root, 'bulk'), "DELETE", {
       data: data,
       success: function(json) {
+        if (json) { this.sideload(store, type, json); }
         store.didDeleteRecords(models);
       }
     });
@@ -195,11 +200,10 @@ DS.RESTAdapter = DS.Adapter.extend({
   find: function(store, type, id) {
     var root = this.rootForType(type);
 
-    var url = ["", this.pluralize(root), id].join("/");
-
-    this.ajax(url, "GET", {
+    this.ajax(this.buildURL(root, id), "GET", {
       success: function(json) {
         store.load(type, json[root]);
+        this.sideload(store, type, json, root);
       }
     });
   },
@@ -207,10 +211,11 @@ DS.RESTAdapter = DS.Adapter.extend({
   findMany: function(store, type, ids) {
     var root = this.rootForType(type), plural = this.pluralize(root);
 
-    this.ajax("/" + plural, "GET", {
+    this.ajax(this.buildURL(root), "GET", {
       data: { ids: ids },
       success: function(json) {
         store.loadMany(type, ids, json[plural]);
+        this.sideload(store, type, json, plural);
       }
     });
   },
@@ -218,9 +223,10 @@ DS.RESTAdapter = DS.Adapter.extend({
   findAll: function(store, type) {
     var root = this.rootForType(type), plural = this.pluralize(root);
 
-    this.ajax("/" + plural, "GET", {
+    this.ajax(this.buildURL(root), "GET", {
       success: function(json) {
         store.loadMany(type, json[plural]);
+        this.sideload(store, type, json, plural);
       }
     });
   },
@@ -228,10 +234,11 @@ DS.RESTAdapter = DS.Adapter.extend({
   findQuery: function(store, type, query, modelArray) {
     var root = this.rootForType(type), plural = this.pluralize(root);
 
-    this.ajax("/" + plural, "GET", {
+    this.ajax(this.buildURL(root), "GET", {
       data: query,
       success: function(json) {
         modelArray.load(json[plural]);
+        this.sideload(store, type, json, plural);
       }
     });
   },
@@ -258,9 +265,61 @@ DS.RESTAdapter = DS.Adapter.extend({
   ajax: function(url, type, hash) {
     hash.url = url;
     hash.type = type;
-    hash.dataType = "json";
+    hash.dataType = 'json';
+    hash.contentType = 'application/json';
+    hash.context = this;
+
+    if (hash.data && type !== 'GET') {
+      hash.data = JSON.stringify(hash.data);
+    }
 
     jQuery.ajax(hash);
+  },
+
+  sideload: function(store, type, json, root) {
+    var sideloadedType, mappings;
+
+    for (var prop in json) {
+      if (!json.hasOwnProperty(prop)) { continue; }
+      if (prop === root) { continue; }
+
+      sideloadedType = type.typeForAssociation(prop);
+
+      if (!sideloadedType) {
+        mappings = get(this, 'mappings');
+
+        ember_assert("Your server returned a hash with the key " + prop + " but you have no mappings", !!mappings);
+
+        sideloadedType = get(get(this, 'mappings'), prop);
+
+        ember_assert("Your server returned a hash with the key " + prop + " but you have no mapping for it", !!sideloadedType);
+      }
+
+      this.loadValue(store, sideloadedType, json[prop]);
+    }
+  },
+
+  loadValue: function(store, type, value) {
+    if (value instanceof Array) {
+      store.loadMany(type, value);
+    } else {
+      store.load(type, value);
+    }
+  },
+
+  buildURL: function(model, suffix) {
+    var url = [""];
+
+    if (this.namespace !== undefined) {
+      url.push(this.namespace);
+    }
+
+    url.push(this.pluralize(model));
+    if (suffix !== undefined) {
+      url.push(suffix);
+    }
+
+    return url.join("/");
   }
 });
 
@@ -297,29 +356,11 @@ DS.ModelArray = Ember.ArrayProxy.extend({
   // The store that created this model array.
   store: null,
 
-  // for associations, the model that this association belongs to.
-  parentModel: null,
-
   init: function() {
     set(this, 'modelCache', Ember.A([]));
     this._super();
   },
 
-  // Overrides Ember.Array's replace method to implement
-  replace: function(index, removed, added) {
-    var parentRecord = get(this, 'parentRecord');
-    var pendingParent = parentRecord && !get(parentRecord, 'id');
-
-    added = added.map(function(item) {
-      ember_assert("You can only add items of " + (get(this, 'type') && get(this, 'type').toString()) + " to this association.", !get(this, 'type') || (get(this, 'type') === item.constructor));
-
-      if (pendingParent) { item.send('waitingOn', parentRecord); }
-      return item.get('clientId');
-    });
-
-    this._super(index, removed, added);
-  },
-
   arrayDidChange: function(array, index, removed, added) {
     var modelCache = get(this, 'modelCache');
     modelCache.replace(index, 0, new Array(added));
@@ -363,6 +404,11 @@ var get = Ember.get;
 DS.FilteredModelArray = DS.ModelArray.extend({
   filterFunction: null,
 
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a client-side filter (on " + type + ") is immutable.");
+  },
+
   updateFilter: Ember.observer(function() {
     var store = get(this, 'store');
     store.updateModelArrayFilter(this, get(this, 'type'), get(this, 'filterFunction'));
@@ -379,6 +425,11 @@ DS.AdapterPopulatedModelArray = DS.ModelArray.extend({
   query: null,
   isLoaded: false,
 
+  replace: function() {
+    var type = get(this, 'type').toString();
+    throw new Error("The result of a server query (on " + type + ") is immutable.");
+  },
+
   load: function(array) {
     var store = get(this, 'store'), type = get(this, 'type');
 
@@ -396,168 +447,161 @@ DS.AdapterPopulatedModelArray = DS.ModelArray.extend({
 
 
 (function(exports) {
-})({});
+var get = Ember.get, set = Ember.set;
 
+DS.ManyArray = DS.ModelArray.extend({
+  parentRecord: null,
 
-(function(exports) {
-var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
+  // Overrides Ember.Array's replace method to implement
+  replace: function(index, removed, added) {
+    var parentRecord = get(this, 'parentRecord');
+    var pendingParent = parentRecord && !get(parentRecord, 'id');
 
-var OrderedSet = Ember.Object.extend({
-  init: function() {
-    this.clear();
-  },
+    added = added.map(function(record) {
+      ember_assert("You can only add records of " + (get(this, 'type') && get(this, 'type').toString()) + " to this association.", !get(this, 'type') || (get(this, 'type') === record.constructor));
 
-  clear: function() {
-    this.set('presenceSet', {});
-    this.set('list', Ember.NativeArray.apply([]));
-  },
+      if (pendingParent) {
+        record.send('waitingOn', parentRecord);
+      }
 
-  add: function(obj) {
-    var guid = Ember.guidFor(obj),
-        presenceSet = get(this, 'presenceSet'),
-        list = get(this, 'list');
+      this.assignInverse(record, parentRecord);
 
-    if (guid in presenceSet) { return; }
+      return record.get('clientId');
+    }, this);
 
-    presenceSet[guid] = true;
-    list.pushObject(obj);
+    this._super(index, removed, added);
   },
 
-  remove: function(obj) {
-    var guid = Ember.guidFor(obj),
-        presenceSet = get(this, 'presenceSet'),
-        list = get(this, 'list');
+  assignInverse: function(record, parentRecord) {
+    var associationMap = get(record.constructor, 'associations'),
+        possibleAssociations = associationMap.get(record.constructor),
+        possible, actual;
 
-    delete presenceSet[guid];
-    list.removeObject(obj);
-  },
+    if (!possibleAssociations) { return; }
 
-  isEmpty: function() {
-    return getPath(this, 'list.length') === 0;
-  },
+    for (var i = 0, l = possibleAssociations.length; i < l; i++) {
+      possible = possibleAssociations[i];
 
-  forEach: function(fn, self) {
-    // allow mutation during iteration
-    get(this, 'list').slice().forEach(function(item) {
-      fn.call(self, item);
-    });
-  },
+      if (possible.kind === 'belongsTo') {
+        actual = possible;
+        break;
+      }
+    }
 
-  toArray: function() {
-    return get(this, 'list').slice();
+    if (actual) {
+      set(record, actual.name, parentRecord);
+    }
   }
 });
 
-/**
-  A Hash stores values indexed by keys. Unlike JavaScript's
-  default Objects, the keys of a Hash can be any JavaScript
-  object.
+})({});
 
-  Internally, a Hash has two data structures:
 
-    `keys`: an OrderedSet of all of the existing keys
-    `values`: a JavaScript Object indexed by the
-      Ember.guidFor(key)
+(function(exports) {
+})({});
 
-  When a key/value pair is added for the first time, we
-  add the key to the `keys` OrderedSet, and create or
-  replace an entry in `values`. When an entry is deleted,
-  we delete its entry in `keys` and `values`.
-*/
 
-var Hash = Ember.Object.extend({
+(function(exports) {
+var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
+
+DS.Transaction = Ember.Object.extend({
   init: function() {
-    set(this, 'keys', OrderedSet.create());
-    set(this, 'values', {});
+    set(this, 'buckets', {
+      clean:   Ember.Map.create(),
+      created: Ember.Map.create(),
+      updated: Ember.Map.create(),
+      deleted: Ember.Map.create()
+    });
   },
 
-  add: function(key, value) {
-    var keys = get(this, 'keys'), values = get(this, 'values');
-    var guid = Ember.guidFor(key);
-
-    keys.add(key);
-    values[guid] = value;
+  createRecord: function(type, hash) {
+    var store = get(this, 'store');
 
-    return value;
+    return store.createRecord(type, hash, this);
   },
 
-  remove: function(key) {
-    var keys = get(this, 'keys'), values = get(this, 'values');
-    var guid = Ember.guidFor(key), value;
+  add: function(record) {
+    // we could probably make this work if someone has a valid use case. Do you?
+    ember_assert("Once a record has changed, you cannot move it into a different transaction", !get(record, 'isDirty'));
 
-    keys.remove(key);
+    var modelTransaction = get(record, 'transaction'),
+        defaultTransaction = getPath(this, 'store.defaultTransaction');
 
-    value = values[guid];
-    delete values[guid];
+    ember_assert("Models cannot belong to more than one transaction at a time.", modelTransaction === defaultTransaction);
 
-    return value;
+    this.adoptRecord(record);
   },
 
-  fetch: function(key) {
-    var values = get(this, 'values');
-    var guid = Ember.guidFor(key);
+  remove: function(record) {
+    var defaultTransaction = getPath(this, 'store.defaultTransaction');
 
-    return values[guid];
+    defaultTransaction.adoptRecord(record);
   },
 
-  forEach: function(fn, binding) {
-    var keys = get(this, 'keys'),
-        values = get(this, 'values');
+  /**
+    @private
 
-    keys.forEach(function(key) {
-      var guid = Ember.guidFor(key);
-      fn.call(binding, key, values[guid]);
-    });
-  }
-});
+    This method moves a record into a different transaction without the normal
+    checks that ensure that the user is not doing something weird, like moving
+    a dirty record into a new transaction.
 
-DS.Transaction = Ember.Object.extend({
-  init: function() {
-    set(this, 'dirty', {
-      created: Hash.create(),
-      updated: Hash.create(),
-      deleted: Hash.create()
-    });
-  },
+    It is designed for internal use, such as when we are moving a clean record
+    into a new transaction when the transaction is committed.
 
-  createRecord: function(type, hash) {
-    var store = get(this, 'store');
+    This method must not be called unless the record is clean.
+  */
+  adoptRecord: function(record) {
+    var oldTransaction = get(record, 'transaction');
 
-    return store.createRecord(type, hash, this);
-  },
+    if (oldTransaction) {
+      oldTransaction.removeFromBucket('clean', record);
+    }
 
-  add: function(model) {
-    var modelTransaction = get(model, 'transaction');
-    ember_assert("Models cannot belong to more than one transaction at a time.", !modelTransaction);
+    this.addToBucket('clean', record);
+    set(record, 'transaction', this);
+  },
 
-    set(model, 'transaction', this);
+  modelBecameDirty: function(kind, record) {
+    this.removeFromBucket('clean', record);
+    this.addToBucket(kind, record);
   },
 
-  modelBecameDirty: function(kind, model) {
-    var dirty = get(get(this, 'dirty'), kind),
-        type = model.constructor;
+  /** @private */
+  addToBucket: function(kind, record) {
+    var bucket = get(get(this, 'buckets'), kind),
+        type = record.constructor;
+
+    var records = bucket.get(type);
 
-    var models = dirty.fetch(type);
+    if (!records) {
+      records = Ember.OrderedSet.create();
+      bucket.set(type, records);
+    }
 
-    models = models || dirty.add(type, OrderedSet.create());
-    models.add(model);
+    records.add(record);
   },
 
-  modelBecameClean: function(kind, model) {
-    var dirty = get(get(this, 'dirty'), kind),
-        type = model.constructor;
+  /** @private */
+  removeFromBucket: function(kind, record) {
+    var bucket = get(get(this, 'buckets'), kind),
+        type = record.constructor;
+
+    var records = bucket.get(type);
+    records.remove(record);
+  },
 
-    var models = dirty.fetch(type);
-    models.remove(model);
+  modelBecameClean: function(kind, record) {
+    this.removeFromBucket(kind, record);
 
-    set(model, 'transaction', null);
+    var defaultTransaction = getPath(this, 'store.defaultTransaction');
+    defaultTransaction.adoptRecord(record);
   },
 
   commit: function() {
-    var dirtyMap = get(this, 'dirty');
+    var buckets = get(this, 'buckets');
 
     var iterate = function(kind, fn, binding) {
-      var dirty = get(dirtyMap, kind);
+      var dirty = get(buckets, kind);
 
       dirty.forEach(function(type, models) {
         if (models.isEmpty()) { return; }
@@ -592,6 +636,16 @@ DS.Transaction = Ember.Object.extend({
 
     var store = get(this, 'store');
     var adapter = get(store, '_adapter');
+
+    var clean = get(buckets, 'clean');
+    var defaultTransaction = get(store, 'defaultTransaction');
+
+    clean.forEach(function(type, records) {
+      records.forEach(function(record) {
+        this.remove(record);
+      }, this);
+    }, this);
+
     if (adapter && adapter.commit) { adapter.commit(store, commitDetails); }
     else { throw fmt("Adapter is either null or do not implement `commit` method", this); }
   }
@@ -603,46 +657,12 @@ DS.Transaction = Ember.Object.extend({
 (function(exports) {
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
 
-var OrderedSet = Ember.Object.extend({
-  init: function() {
-    this.clear();
-  },
-
-  clear: function() {
-    this.set('presenceSet', {});
-    this.set('list', Ember.NativeArray.apply([]));
-  },
-
-  add: function(obj) {
-    var guid = Ember.guidFor(obj),
-        presenceSet = get(this, 'presenceSet'),
-        list = get(this, 'list');
-
-    if (guid in presenceSet) { return; }
-
-    presenceSet[guid] = true;
-    list.pushObject(obj);
-  },
-
-  remove: function(obj) {
-    var guid = Ember.guidFor(obj),
-        presenceSet = get(this, 'presenceSet'),
-        list = get(this, 'list');
-
-    delete presenceSet[guid];
-    list.removeObject(obj);
-  },
-
-  isEmpty: function() {
-    return getPath(this, 'list.length') === 0;
-  },
-
-  forEach: function(fn, self) {
-    get(this, 'list').forEach(function(item) {
-      fn.call(self, item);
-    });
+var DATA_PROXY = {
+  get: function(name) {
+    return this.savedData[name];
   }
-});
+};
+
 
 // Implementors Note:
 //
@@ -691,33 +711,49 @@ DS.Store = Ember.Object.extend({
     The init method registers this store as the default if none is specified.
   */
   init: function() {
+    // Enforce API revisioning. See BREAKING_CHANGES.md for more.
+    var revision = get(this, 'revision');
+
+    if (revision !== DS.CURRENT_API_REVISION && !Ember.ENV.TESTING) {
+      throw new Error("Error: The Ember Data library has had breaking API changes since the last time you updated the library. Please review the list of breaking changes at https://github.com/emberjs/data/blob/master/BREAKING_CHANGES.md, then update your store's `revision` property to " + DS.CURRENT_API_REVISION);
+    }
+
     if (!get(DS, 'defaultStore') || get(this, 'isDefaultStore')) {
       set(DS, 'defaultStore', this);
     }
 
-    set(this, 'data', []);
-    set(this, '_typeMap', {});
-    set(this, 'models', []);
-    set(this, 'modelArrays', []);
-    set(this, 'modelArraysByClientId', {});
-    set(this, 'defaultTransaction', DS.Transaction.create({ store: this }));
+    // internal bookkeeping; not observable
+    this.typeMaps = {};
+    this.recordCache = [];
+    this.clientIdToId = {};
+    this.modelArraysByClientId = {};
+
+    set(this, 'defaultTransaction', this.transaction());
 
     return this._super();
   },
 
+  /**
+    Returns a new transaction scoped to this store.
+
+    @see {DS.Transaction}
+    @returns DS.Transaction
+  */
   transaction: function() {
     return DS.Transaction.create({ store: this });
   },
 
-  modelArraysForClientId: function(clientId) {
-    var modelArrays = get(this, 'modelArraysByClientId');
-    var ret = modelArrays[clientId];
+  /**
+    @private
 
-    if (!ret) {
-      ret = modelArrays[clientId] = OrderedSet.create();
-    }
+    This is used only by the model's DataProxy. Do not use this directly.
+  */
+  dataForRecord: function(record) {
+    var type = record.constructor,
+        clientId = get(record, 'clientId'),
+        typeMap = this.typeMapFor(type);
 
-    return ret;
+    return typeMap.cidToHash[clientId];
   },
 
   /**
@@ -730,6 +766,13 @@ DS.Store = Ember.Object.extend({
   */
   adapter: null,
 
+  /**
+    @private
+
+    This property returns the adapter, after resolving a possible String.
+
+    @returns DS.Adapter
+  */
   _adapter: Ember.computed(function() {
     var adapter = get(this, 'adapter');
     if (typeof adapter === 'string') {
@@ -738,44 +781,80 @@ DS.Store = Ember.Object.extend({
     return adapter;
   }).property('adapter').cacheable(),
 
+  // A monotonically increasing number to be used to uniquely identify
+  // data hashes and records.
   clientIdCounter: -1,
 
   // ....................
   // . CREATE NEW MODEL .
   // ....................
 
+  /**
+    Create a new record in the current store. The properties passed
+    to this method are set on the newly created record.
+
+    @param {subclass of DS.Model} type
+    @param {Object} properties a hash of properties to set on the
+      newly created record.
+    @returns DS.Model
+  */
   createRecord: function(type, properties, transaction) {
     properties = properties || {};
 
-    var id = properties[getPath(type, 'proto.primaryKey')] || null;
-
-    var model = type._create({
-      store: this,
-      transaction: transaction
+    // Create a new instance of the model `type` and put it
+    // into the specified `transaction`. If no transaction is
+    // specified, the default transaction will be used.
+    //
+    // NOTE: A `transaction` is specified when the
+    // `transaction.createRecord` API is used.
+    var record = type._create({
+      store: this
     });
 
+    transaction = transaction || get(this, 'defaultTransaction');
+    transaction.adoptRecord(record);
+
+    // Extract the primary key from the `properties` hash,
+    // based on the `primaryKey` for the model type.
+    var id = properties[get(record, 'primaryKey')] || null;
+
     var hash = {}, clientId;
 
+    // Push the hash into the store. If present, associate the
+    // extracted `id` with the hash.
     clientId = this.pushHash(hash, id, type);
-    model.send('setData', hash);
 
-    var models = get(this, 'models');
+    record.send('didChangeData');
 
-    set(model, 'clientId', clientId);
-    models[clientId] = model;
+    var recordCache = get(this, 'recordCache');
 
-    model.setProperties(properties);
-    this.updateModelArrays(type, clientId, hash);
+    // Now that we have a clientId, attach it to the record we
+    // just created.
+    set(record, 'clientId', clientId);
 
-    return model;
+    // Store the record we just created in the record cache for
+    // this clientId.
+    recordCache[clientId] = record;
+
+    // Set the properties specified on the record.
+    record.setProperties(properties);
+
+    this.updateModelArrays(type, clientId, get(record, 'data'));
+
+    return record;
   },
 
   // ................
   // . DELETE MODEL .
   // ................
 
-  deleteRecord: function(model) {
-    model.send('deleteRecord');
+  /**
+    For symmetry, a record can be deleted via the store.
+
+    @param {DS.Model} record
+  */
+  deleteRecord: function(record) {
+    record.send('deleteRecord');
   },
 
   // ...............
@@ -783,22 +862,60 @@ DS.Store = Ember.Object.extend({
   // ...............
 
   /**
-    Finds a model by its id. If the data for that model has already been
-    loaded, an instance of DS.Model with that data will be returned
-    immediately. Otherwise, an empty DS.Model instance will be returned in
-    the loading state. As soon as the requested data is available, the model
-    will be moved into the loaded state and all of the information will be
-    available.
+    This is the main entry point into finding records. The first
+    parameter to this method is always a subclass of `DS.Model`.
 
-    Note that only one DS.Model instance is ever created per unique id for a
-    given type.
+    You can use the `find` method on a subclass of `DS.Model`
+    directly if your application only has one store. For
+    example, instead of `store.find(App.Person, 1)`, you could
+    say `App.Person.find(1)`.
 
-    Example:
+    ---
 
-        var record = MyApp.store.find(MyApp.Person, 1234);
+    To find a record by ID, pass the `id` as the second parameter:
 
-    @param {DS.Model} type
-    @param {String|Number} id
+        store.find(App.Person, 1);
+        App.Person.find(1);
+
+    If the record with that `id` had not previously been loaded,
+    the store will return an empty record immediately and ask
+    the adapter to find the data by calling its `find` method.
+
+    The `find` method will always return the same object for a
+    given type and `id`. To check whether the adapter has populated
+    a record, you can check its `isLoaded` property.
+
+    ---
+
+    To find all records for a type, call `find` with no additional
+    parameters:
+
+        store.find(App.Person);
+        App.Person.find();
+
+    This will return a `ModelArray` representing all known records
+    for the given type and kick off a request to the adapter's
+    `findAll` method to load any additional records for the type.
+
+    The `ModelArray` returned by `find()` is live. If any more
+    records for the type are added at a later time through any
+    mechanism, it will automatically update to reflect the change.
+
+    ---
+
+    To find a record by a query, call `find` with a hash as the
+    second parameter:
+
+        store.find(App.Person, { page: 1 });
+        App.Person.find({ page: 1 });
+
+    This will return a `ModelArray` immediately, but it will always
+    be an empty `ModelArray` at first. It will call the adapter's
+    `findQuery` method, which will populate the `ModelArray` once
+    the server has returned results.
+
+    You can check whether a query results `ModelArray` has loaded
+    by checking its `isLoaded` property.
   */
   find: function(type, id, query) {
     if (id === undefined) {
@@ -821,10 +938,9 @@ DS.Store = Ember.Object.extend({
   },
 
   findByClientId: function(type, clientId, id) {
-    var model;
-
-    var models = get(this, 'models');
-    var data = this.clientIdToHashMap(type);
+    var recordCache = get(this, 'recordCache'),
+        dataCache = this.typeMapFor(type).cidToHash,
+        model;
 
     // If there is already a clientId assigned for this
     // type/id combination, try to find an existing
@@ -832,15 +948,16 @@ DS.Store = Ember.Object.extend({
     // materialize a new model and set its data to the
     // value we already have.
     if (clientId !== undefined) {
-      model = models[clientId];
+      model = recordCache[clientId];
 
       if (!model) {
         // create a new instance of the model in the
         // 'isLoading' state
         model = this.materializeRecord(type, clientId);
 
-        // immediately set its data
-        model.send('setData', data[clientId] || null);
+        if (dataCache[clientId]) {
+          model.send('didChangeData');
+        }
       }
     } else {
       clientId = this.pushHash(null, id, type);
@@ -861,8 +978,10 @@ DS.Store = Ember.Object.extend({
   /** @private
   */
   findMany: function(type, ids, query) {
-    var idToClientIdMap = this.idToClientIdMap(type);
-    var data = this.clientIdToHashMap(type), needed;
+    var typeMap = this.typeMapFor(type),
+        idToClientIdMap = typeMap.idToCid,
+        data = typeMap.cidToHash,
+        needed;
 
     var clientIds = Ember.A([]);
 
@@ -888,7 +1007,7 @@ DS.Store = Ember.Object.extend({
       else { throw fmt("Adapter is either null or does not implement `findMany` method", this); }
     }
 
-    return this.createModelArray(type, clientIds);
+    return this.createManyArray(type, clientIds);
   },
 
   findQuery: function(type, query) {
@@ -916,7 +1035,14 @@ DS.Store = Ember.Object.extend({
     return array;
   },
 
-  filter: function(type, filter) {
+  filter: function(type, query, filter) {
+    // allow an optional server query
+    if (arguments.length === 3) {
+      this.findQuery(type, query);
+    } else if (arguments.length === 2) {
+      filter = query;
+    }
+
     var array = DS.FilteredModelArray.create({ type: type, content: Ember.A([]), store: this, filterFunction: filter });
 
     this.registerModelArray(array, type, filter);
@@ -928,11 +1054,8 @@ DS.Store = Ember.Object.extend({
   // . UPDATING .
   // ............
 
-  hashWasUpdated: function(type, clientId) {
-    var clientIdToHashMap = this.clientIdToHashMap(type);
-    var hash = clientIdToHashMap[clientId];
-
-    this.updateModelArrays(type, clientId, hash);
+  hashWasUpdated: function(type, clientId, record) {
+    this.updateModelArrays(type, clientId, get(record, 'data'));
   },
 
   // ..............
@@ -940,11 +1063,14 @@ DS.Store = Ember.Object.extend({
   // ..............
 
   commit: function() {
-    get(this, 'defaultTransaction').commit();
+    var defaultTransaction = get(this, 'defaultTransaction');
+    set(this, 'defaultTransaction', this.transaction());
+
+    defaultTransaction.commit();
   },
 
   didUpdateRecords: function(array, hashes) {
-    if (arguments.length === 2) {
+    if (hashes) {
       array.forEach(function(model, idx) {
         this.didUpdateRecord(model, hashes[idx]);
       }, this);
@@ -956,12 +1082,13 @@ DS.Store = Ember.Object.extend({
   },
 
   didUpdateRecord: function(model, hash) {
-    if (arguments.length === 2) {
-      var clientId = get(model, 'clientId');
-      var data = this.clientIdToHashMap(model.constructor);
+    if (hash) {
+      var clientId = get(model, 'clientId'),
+          dataCache = this.typeMapFor(model.constructor).cidToHash;
 
-      data[clientId] = hash;
-      model.send('setData', hash);
+      dataCache[clientId] = hash;
+      model.send('didChangeData');
+      model.hashWasUpdated();
     }
 
     model.send('didCommit');
@@ -977,41 +1104,54 @@ DS.Store = Ember.Object.extend({
     model.send('didCommit');
   },
 
-  didCreateRecords: function(type, array, hashes) {
-    var id, clientId, primaryKey = getPath(type, 'proto.primaryKey');
+  _didCreateRecord: function(record, hash, typeMap, clientId, primaryKey) {
+    var recordData = get(record, 'data'), id, changes;
 
-    var idToClientIdMap = this.idToClientIdMap(type);
-    var data = this.clientIdToHashMap(type);
-    var idList = this.idList(type);
+    if (hash) {
+      typeMap.cidToHash[clientId] = hash;
+
+      // If the server returns a hash, we assume that the server's version
+      // of the data supercedes the local changes.
+      record.beginPropertyChanges();
+      record.send('didChangeData');
+      recordData.adapterDidUpdate(hash);
+      record.hashWasUpdated();
+      record.endPropertyChanges();
 
-    for (var i=0, l=get(array, 'length'); i<l; i++) {
-      var model = array[i], hash = hashes[i];
       id = hash[primaryKey];
-      clientId = get(model, 'clientId');
 
-      data[clientId] = hash;
-      model.send('setData', hash);
+      typeMap.idToCid[id] = clientId;
+      this.clientIdToId[clientId] = id;
+    } else {
+      recordData.commit();
+    }
+
+    record.send('didCommit');
+  },
 
-      idToClientIdMap[id] = clientId;
-      idList.push(id);
 
-      model.send('didCommit');
+  didCreateRecords: function(type, array, hashes) {
+    var primaryKey = type.proto().primaryKey,
+        typeMap = this.typeMapFor(type),
+        id, clientId;
+
+    for (var i=0, l=get(array, 'length'); i<l; i++) {
+      var model = array[i], hash = hashes[i];
+      clientId = get(model, 'clientId');
+
+      this._didCreateRecord(model, hash, typeMap, clientId, primaryKey);
     }
   },
 
   didCreateRecord: function(model, hash) {
-    var type = model.constructor;
-
-    var id, clientId, primaryKey;
-
-    var idToClientIdMap = this.idToClientIdMap(type);
-    var data = this.clientIdToHashMap(type);
-    var idList = this.idList(type);
+    var type = model.constructor,
+        typeMap = this.typeMapFor(type),
+        id, clientId, primaryKey;
 
     // The hash is optional, but if it is not provided, the client must have
     // provided a primary key.
 
-    primaryKey = getPath(type, 'proto.primaryKey');
+    primaryKey = type.proto().primaryKey;
 
     // TODO: Make ember_assert more flexible and convert this into an ember_assert
     if (hash) {
@@ -1020,21 +1160,9 @@ DS.Store = Ember.Object.extend({
       ember_assert("The server did not return data, and you did not create a primary key (" + primaryKey + ") on the client", get(get(model, 'data'), primaryKey));
     }
 
-    // If a hash was provided, index it under the model's client ID
-    // and update the model.
-    if (arguments.length === 2) {
-      id = hash[primaryKey];
-
-      data[clientId] = hash;
-      set(model, 'data', hash);
-    }
-
     clientId = get(model, 'clientId');
 
-    idToClientIdMap[id] = clientId;
-    idList.push(id);
-
-    model.send('didCommit');
+    this._didCreateRecord(model, hash, typeMap, clientId, primaryKey);
   },
 
   recordWasInvalid: function(record, errors) {
@@ -1046,15 +1174,15 @@ DS.Store = Ember.Object.extend({
   // ................
 
   registerModelArray: function(array, type, filter) {
-    var modelArrays = get(this, 'modelArrays');
+    var modelArrays = this.typeMapFor(type).modelArrays;
 
     modelArrays.push(array);
 
     this.updateModelArrayFilter(array, type, filter);
   },
 
-  createModelArray: function(type, clientIds) {
-    var array = DS.ModelArray.create({ type: type, content: clientIds, store: this });
+  createManyArray: function(type, clientIds) {
+    var array = DS.ManyArray.create({ type: type, content: clientIds, store: this });
 
     clientIds.forEach(function(clientId) {
       var modelArrays = this.modelArraysForClientId(clientId);
@@ -1065,41 +1193,46 @@ DS.Store = Ember.Object.extend({
   },
 
   updateModelArrayFilter: function(array, type, filter) {
-    var data = this.clientIdToHashMap(type);
-    var allClientIds = this.clientIdList(type), clientId, hash;
+    var typeMap = this.typeMapFor(type),
+        dataCache = typeMap.cidToHash,
+        clientIds = typeMap.clientIds,
+        clientId, hash, proxy;
+
+    var recordCache = get(this, 'recordCache'), record;
 
-    for (var i=0, l=allClientIds.length; i<l; i++) {
-      clientId = allClientIds[i];
+    for (var i=0, l=clientIds.length; i<l; i++) {
+      clientId = clientIds[i];
 
-      hash = data[clientId];
+      if (hash = dataCache[clientId]) {
+        if (record = recordCache[clientId]) {
+          proxy = get(record, 'data');
+        } else {
+          DATA_PROXY.savedData = hash;
+          proxy = DATA_PROXY;
+        }
 
-      if (hash) {
-        this.updateModelArray(array, filter, type, clientId, hash);
+        this.updateModelArray(array, filter, type, clientId, proxy);
       }
     }
   },
 
-  updateModelArrays: function(type, clientId, hash) {
-    var modelArrays = get(this, 'modelArrays'),
+  updateModelArrays: function(type, clientId, dataProxy) {
+    var modelArrays = this.typeMapFor(type).modelArrays,
         modelArrayType, filter;
 
     modelArrays.forEach(function(array) {
-      modelArrayType = get(array, 'type');
       filter = get(array, 'filterFunction');
-
-      if (type !== modelArrayType) { return; }
-
-      this.updateModelArray(array, filter, type, clientId, hash);
+      this.updateModelArray(array, filter, type, clientId, dataProxy);
     }, this);
   },
 
-  updateModelArray: function(array, filter, type, clientId, hash) {
+  updateModelArray: function(array, filter, type, clientId, dataProxy) {
     var shouldBeInArray;
 
     if (!filter) {
       shouldBeInArray = true;
     } else {
-      shouldBeInArray = filter(hash);
+      shouldBeInArray = filter(dataProxy);
     }
 
     var content = get(array, 'content');
@@ -1127,44 +1260,39 @@ DS.Store = Ember.Object.extend({
   },
 
   // ............
-  // . TYPE MAP .
+  // . INDEXING .
   // ............
 
+  modelArraysForClientId: function(clientId) {
+    var modelArrays = get(this, 'modelArraysByClientId');
+    var ret = modelArrays[clientId];
+
+    if (!ret) {
+      ret = modelArrays[clientId] = Ember.OrderedSet.create();
+    }
+
+    return ret;
+  },
+
   typeMapFor: function(type) {
-    var ids = get(this, '_typeMap');
+    var typeMaps = get(this, 'typeMaps');
     var guidForType = Ember.guidFor(type);
 
-    var typeMap = ids[guidForType];
+    var typeMap = typeMaps[guidForType];
 
     if (typeMap) {
       return typeMap;
     } else {
-      return (ids[guidForType] =
+      return (typeMaps[guidForType] =
         {
           idToCid: {},
-          idList: [],
-          cidList: [],
-          cidToHash: {}
+          clientIds: [],
+          cidToHash: {},
+          modelArrays: []
       });
     }
   },
 
-  idToClientIdMap: function(type) {
-    return this.typeMapFor(type).idToCid;
-  },
-
-  idList: function(type) {
-    return this.typeMapFor(type).idList;
-  },
-
-  clientIdList: function(type) {
-    return this.typeMapFor(type).cidList;
-  },
-
-  clientIdToHashMap: function(type) {
-    return this.typeMapFor(type).cidToHash;
-  },
-
   /** @private
 
     For a given type and id combination, returns the client id used by the store.
@@ -1177,13 +1305,6 @@ DS.Store = Ember.Object.extend({
     return this.typeMapFor(type).idToCid[id];
   },
 
-  idForHash: function(type, hash) {
-    var primaryKey = getPath(type, 'proto.primaryKey');
-
-    ember_assert("A data hash was loaded for a model of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", !!hash[primaryKey]);
-    return hash[primaryKey];
-  },
-
   // ................
   // . LOADING DATA .
   // ................
@@ -1203,28 +1324,29 @@ DS.Store = Ember.Object.extend({
   load: function(type, id, hash) {
     if (hash === undefined) {
       hash = id;
-      var primaryKey = getPath(type, 'proto.primaryKey');
-      ember_assert("A data hash was loaded for a model of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", !!hash[primaryKey]);
+      var primaryKey = type.proto().primaryKey;
+      ember_assert("A data hash was loaded for a model of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", primaryKey in hash);
       id = hash[primaryKey];
     }
 
-    var data = this.clientIdToHashMap(type);
-    var models = get(this, 'models');
-
-    var clientId = this.clientIdForId(type, id);
+    var typeMap = this.typeMapFor(type),
+        dataCache = typeMap.cidToHash,
+        clientId = typeMap.idToCid[id],
+        recordCache = get(this, 'recordCache');
 
     if (clientId !== undefined) {
-      data[clientId] = hash;
+      dataCache[clientId] = hash;
 
-      var model = models[clientId];
+      var model = recordCache[clientId];
       if (model) {
-        model.send('setData', hash);
+        model.send('didChangeData');
       }
     } else {
       clientId = this.pushHash(hash, id, type);
     }
 
-    this.updateModelArrays(type, clientId, hash);
+    DATA_PROXY.savedData = hash;
+    this.updateModelArrays(type, clientId, DATA_PROXY);
 
     return { id: id, clientId: clientId };
   },
@@ -1235,10 +1357,9 @@ DS.Store = Ember.Object.extend({
     if (hashes === undefined) {
       hashes = ids;
       ids = [];
-      var primaryKey = getPath(type, 'proto.primaryKey');
+      var primaryKey = type.proto().primaryKey;
 
-      ids = hashes.map(function(hash) {
-        ember_assert("A data hash was loaded for a model of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", !!hash[primaryKey]);
+      ids = Ember.ArrayUtils.map(hashes, function(hash) {
         return hash[primaryKey];
       });
     }
@@ -1262,23 +1383,25 @@ DS.Store = Ember.Object.extend({
     @returns {Number}
   */
   pushHash: function(hash, id, type) {
-    var idToClientIdMap = this.idToClientIdMap(type);
-    var clientIdList = this.clientIdList(type);
-    var idList = this.idList(type);
-    var data = this.clientIdToHashMap(type);
+    var typeMap = this.typeMapFor(type);
+
+    var idToClientIdMap = typeMap.idToCid,
+        clientIdToIdMap = this.clientIdToId,
+        clientIds = typeMap.clientIds,
+        dataCache = typeMap.cidToHash;
 
-    var clientId = this.incrementProperty('clientIdCounter');
+    var clientId = ++this.clientIdCounter;
 
-    data[clientId] = hash;
+    dataCache[clientId] = hash;
 
     // if we're creating an item, this process will be done
     // later, once the object has been persisted.
     if (id) {
       idToClientIdMap[id] = clientId;
-      idList.push(id);
+      clientIdToIdMap[clientId] = id;
     }
 
-    clientIdList.push(clientId);
+    clientIds.push(clientId);
 
     return clientId;
   },
@@ -1290,8 +1413,13 @@ DS.Store = Ember.Object.extend({
   materializeRecord: function(type, clientId) {
     var model;
 
-    get(this, 'models')[clientId] = model = type._create({ store: this, clientId: clientId });
-    set(model, 'clientId', clientId);
+    get(this, 'recordCache')[clientId] = model = type._create({
+      store: this,
+      clientId: clientId
+    });
+
+    get(this, 'defaultTransaction').adoptRecord(model);
+
     model.send('loadingData');
     return model;
   },
@@ -1305,7 +1433,6 @@ DS.Store = Ember.Object.extend({
   }
 });
 
-
 })({});
 
 
@@ -1327,6 +1454,14 @@ var isEmptyObject = function(object) {
   return true;
 };
 
+var hasDefinedProperties = function(object) {
+  for (var name in object) {
+    if (object.hasOwnProperty(name) && object[name]) { return true; }
+  }
+
+  return false;
+};
+
 DS.State = Ember.State.extend({
   isLoaded: stateProperty,
   isDirty: stateProperty,
@@ -1344,27 +1479,21 @@ DS.State = Ember.State.extend({
   dirtyType: stateProperty
 });
 
-var isEmptyObject = function(obj) {
-  for (var prop in obj) {
-    if (!obj.hasOwnProperty(prop)) { continue; }
-    return false;
-  }
-
-  return true;
-};
-
 var setProperty = function(manager, context) {
   var key = context.key, value = context.value;
 
   var model = get(manager, 'model'),
       data = get(model, 'data');
 
-  data[key] = value;
+  set(data, key, value);
+};
+
+var didChangeData = function(manager) {
+  var model = get(manager, 'model'),
+      data = get(model, 'data');
 
-  // At the end of the run loop, notify model arrays that
-  // this record has changed so they can re-evaluate its contents
-  // to determine membership.
-  Ember.run.once(model, model.notifyHashWasUpdated);
+  data._savedData = null;
+  model.notifyPropertyChange('data');
 };
 
 // The waitingOn event shares common functionality
@@ -1425,6 +1554,48 @@ var waitingOn = function(manager, object) {
 //   `isPending` property on all children will become `false`
 //   and the transaction will try to commit the records.
 
+// This mixin is mixed into various uncommitted states. Make
+// sure to mix it in *after* the class definition, so its
+// super points to the class definition.
+var Uncommitted = Ember.Mixin.create({
+  setProperty: setProperty,
+
+  deleteRecord: function(manager) {
+    this._super(manager);
+
+    var model = get(manager, 'model'),
+        dirtyType = get(this, 'dirtyType');
+
+    model.withTransaction(function(t) {
+      t.modelBecameClean(dirtyType, model);
+    });
+  }
+});
+
+// These mixins are mixed into substates of the concrete
+// subclasses of DirtyState.
+
+var CreatedUncommitted = Ember.Mixin.create({
+  deleteRecord: function(manager) {
+    this._super(manager);
+
+    manager.goToState('deleted.saved');
+  }
+});
+
+var UpdatedUncommitted = Ember.Mixin.create({
+  deleteRecord: function(manager) {
+    this._super(manager);
+
+    var model = get(manager, 'model');
+
+    model.withTransaction(function(t) {
+      t.modelBecameClean('created', model);
+    });
+
+    manager.goToState('deleted');
+  }
+});
 
 // The dirty state is a abstract state whose functionality is
 // shared between the `created` and `updated` states.
@@ -1460,11 +1631,7 @@ var DirtyState = DS.State.extend({
     },
 
     // EVENTS
-    setProperty: setProperty,
-
-    deleteRecord: function(manager) {
-      manager.goToState('deleted');
-    },
+    deleteRecord: Ember.K,
 
     waitingOn: function(manager, object) {
       waitingOn(manager, object);
@@ -1474,7 +1641,7 @@ var DirtyState = DS.State.extend({
     willCommit: function(manager) {
       manager.goToState('inFlight');
     }
-  }),
+  }, Uncommitted),
 
   // Once a record has been handed off to the adapter to be
   // saved, it is in the 'in flight' state. Changes to the
@@ -1505,10 +1672,7 @@ var DirtyState = DS.State.extend({
       manager.goToState('invalid');
     },
 
-    setData: function(manager, hash) {
-      var model = get(manager, 'model');
-      set(model, 'data', hash);
-    }
+    didChangeData: didChangeData
   }),
 
   // If a record becomes associated with a newly created
@@ -1533,8 +1697,6 @@ var DirtyState = DS.State.extend({
     // started to commit is in this state.
     uncommitted: DS.State.extend({
       // EVENTS
-      setProperty: setProperty,
-
       deleteRecord: function(manager) {
         var model = get(manager, 'model'),
             pendingQueue = get(model, 'pendingQueue'),
@@ -1548,8 +1710,6 @@ var DirtyState = DS.State.extend({
           tuple = pendingQueue[prop];
           Ember.removeObserver(tuple[0], 'id', tuple[1]);
         }
-
-        manager.goToState('deleted');
       },
 
       willCommit: function(manager) {
@@ -1572,7 +1732,7 @@ var DirtyState = DS.State.extend({
         var dirtyType = get(this, 'dirtyType');
         manager.goToState(dirtyType + '.uncommitted');
       }
-    }),
+    }, Uncommitted),
 
     // A pending record whose transaction has started
     // to commit is in this state. Since it has not yet
@@ -1596,6 +1756,15 @@ var DirtyState = DS.State.extend({
       },
 
       doneWaiting: function(manager) {
+        var model = get(manager, 'model'),
+            transaction = get(model, 'transaction');
+
+        // Now that the model is no longer pending, schedule
+        // the transaction to commit.
+        Ember.run.once(transaction, transaction.commit);
+      },
+
+      willCommit: function(manager) {
         var dirtyType = get(this, 'dirtyType');
         manager.goToState(dirtyType + '.inFlight');
       }
@@ -1623,7 +1792,7 @@ var DirtyState = DS.State.extend({
 
       delete errors[key];
 
-      if (isEmptyObject(errors)) {
+      if (!hasDefinedProperties(errors)) {
         manager.send('becameValid');
       }
     },
@@ -1634,6 +1803,41 @@ var DirtyState = DS.State.extend({
   })
 });
 
+// The created and updated states are created outside the state
+// chart so we can reopen their substates and add mixins as
+// necessary.
+
+var createdState = DirtyState.create({
+  dirtyType: 'created',
+
+  // FLAGS
+  isNew: true,
+
+  // EVENTS
+  invokeLifecycleCallbacks: function(manager, model) {
+    model.didCreate();
+  }
+});
+
+var updatedState = DirtyState.create({
+  dirtyType: 'updated',
+
+  // EVENTS
+  invokeLifecycleCallbacks: function(manager, model) {
+    model.didUpdate();
+  }
+});
+
+// The created.uncommitted state and created.pending.uncommitted share
+// some logic defined in CreatedUncommitted.
+createdState.states.uncommitted.reopen(CreatedUncommitted);
+createdState.states.pending.states.uncommitted.reopen(CreatedUncommitted);
+
+// The updated.uncommitted state and updated.pending.uncommitted share
+// some logic defined in UpdatedUncommitted.
+updatedState.states.uncommitted.reopen(UpdatedUncommitted);
+updatedState.states.pending.states.uncommitted.reopen(UpdatedUncommitted);
+
 var states = {
   rootState: Ember.State.create({
     // FLAGS
@@ -1659,9 +1863,9 @@ var states = {
         manager.goToState('loading');
       },
 
-      setData: function(manager, hash) {
-        var model = get(manager, 'model');
-        set(model, 'data', hash);
+      didChangeData: function(manager) {
+        didChangeData(manager);
+
         manager.goToState('loaded.created');
       }
     }),
@@ -1680,17 +1884,9 @@ var states = {
       },
 
       // EVENTS
-      setData: function(manager, data) {
-        var model = get(manager, 'model');
-
-        model.beginPropertyChanges();
-        set(model, 'data', data);
-
-        if (data !== null) {
-          manager.send('loadedData');
-        }
-
-        model.endPropertyChanges();
+      didChangeData: function(manager, data) {
+        didChangeData(manager);
+        manager.send('loadedData');
       },
 
       loadedData: function(manager) {
@@ -1718,6 +1914,8 @@ var states = {
           manager.goToState('updated');
         },
 
+        didChangeData: didChangeData,
+
         deleteRecord: function(manager) {
           manager.goToState('deleted');
         },
@@ -1731,29 +1929,12 @@ var states = {
       // A record is in this state after it has been locally
       // created but before the adapter has indicated that
       // it has been saved.
-      created: DirtyState.create({
-        dirtyType: 'created',
-
-        // FLAGS
-        isNew: true,
-
-        // EVENTS
-        invokeLifecycleCallbacks: function(manager, model) {
-          model.didCreate();
-        }
-      }),
+      created: createdState,
 
       // A record is in this state if it has already been
       // saved to the server, but there are new local changes
       // that have not yet been saved.
-      updated: DirtyState.create({
-        dirtyType: 'updated',
-
-        // EVENTS
-        invokeLifecycleCallbacks: function(manager, model) {
-          model.didUpdate();
-        }
-      })
+      updated: updatedState
     }),
 
     // A record is in this state if it was deleted from the store.
@@ -1763,26 +1944,27 @@ var states = {
       isLoaded: true,
       isDirty: true,
 
-      // TRANSITIONS
-      enter: function(manager) {
-        var model = get(manager, 'model');
-        var store = get(model, 'store');
-
-        if (store) {
-          store.removeFromModelArrays(model);
-        }
-
-        model.withTransaction(function(t) {
-          t.modelBecameDirty('deleted', model);
-        });
-      },
-
       // SUBSTATES
 
       // When a record is deleted, it enters the `start`
       // state. It will exit this state when the record's
       // transaction starts to commit.
       start: DS.State.create({
+        // TRANSITIONS
+        enter: function(manager) {
+          var model = get(manager, 'model');
+          var store = get(model, 'store');
+
+          if (store) {
+            store.removeFromModelArrays(model);
+          }
+
+          model.withTransaction(function(t) {
+            t.modelBecameDirty('deleted', model);
+          });
+        },
+
+        // EVENTS
         willCommit: function(manager) {
           manager.goToState('inFlight');
         }
@@ -1815,6 +1997,7 @@ var states = {
       // been saved, the record enters the `saved` substate
       // of `deleted`.
       saved: DS.State.create({
+        // FLAGS
         isDirty: false
       })
     }),
@@ -1838,12 +2021,103 @@ DS.StateManager = Ember.StateManager.extend({
 
 
 (function(exports) {
-var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
+var get = Ember.get, set = Ember.set, getPath = Ember.getPath, none = Ember.none;
 
 var retrieveFromCurrentState = Ember.computed(function(key) {
   return get(getPath(this, 'stateManager.currentState'), key);
 }).property('stateManager.currentState').cacheable();
 
+// This object is a regular JS object for performance. It is only
+// used internally for bookkeeping purposes.
+var DataProxy = function(record) {
+  this.record = record;
+  this.unsavedData = {};
+  this.associations = {};
+};
+
+DataProxy.prototype = {
+  get: function(key) { return Ember.get(this, key); },
+  set: function(key, value) { return Ember.set(this, key, value); },
+
+  setAssociation: function(key, value) {
+    this.associations[key] = value;
+  },
+
+  savedData: function() {
+    var savedData = this._savedData;
+    if (savedData) { return savedData; }
+
+    var record = this.record,
+        clientId = get(record, 'clientId'),
+        store = get(record, 'store');
+
+    if (store) {
+      savedData = store.dataForRecord(record);
+      this._savedData = savedData;
+      return savedData;
+    }
+  },
+
+  unknownProperty: function(key) {
+    var unsavedData = this.unsavedData,
+        associations = this.associations,
+        savedData = this.savedData(),
+        store;
+
+    var value = unsavedData[key], association;
+
+    // if this is a belongsTo association, this will
+    // be a clientId.
+    association = associations[key];
+
+    if (association !== undefined) {
+      store = get(this.record, 'store');
+      return store.clientIdToId[association];
+    }
+
+    if (savedData && value === undefined) {
+      value = savedData[key];
+    }
+
+    return value;
+  },
+
+  setUnknownProperty: function(key, value) {
+    var record = this.record,
+        unsavedData = this.unsavedData;
+
+    unsavedData[key] = value;
+
+    record.hashWasUpdated();
+
+    return value;
+  },
+
+  commit: function() {
+    var record = this.record;
+
+    var unsavedData = this.unsavedData;
+    var savedData = this.savedData();
+
+    for (var prop in unsavedData) {
+      if (unsavedData.hasOwnProperty(prop)) {
+        savedData[prop] = unsavedData[prop];
+        delete unsavedData[prop];
+      }
+    }
+
+    record.notifyPropertyChange('data');
+  },
+
+  rollback: function() {
+    this.unsavedData = {};
+  },
+
+  adapterDidUpdate: function(data) {
+    this.unsavedData = {};
+  }
+};
+
 DS.Model = Ember.Object.extend({
   isLoaded: retrieveFromCurrentState,
   isDirty: retrieveFromCurrentState,
@@ -1855,6 +2129,10 @@ DS.Model = Ember.Object.extend({
   isValid: retrieveFromCurrentState,
 
   clientId: null,
+  transaction: null,
+  stateManager: null,
+  pendingQueue: null,
+  errors: null,
 
   // because unknownProperty is used, any internal property
   // must be initialized here.
@@ -1871,10 +2149,159 @@ DS.Model = Ember.Object.extend({
     return data && get(data, primaryKey);
   }).property('primaryKey', 'data'),
 
-  data: null,
-  pendingQueue: null,
-  transaction: null,
-  errors: null,
+  // The following methods are callbacks invoked by `toJSON`. You
+  // can override one of the callbacks to override specific behavior,
+  // or toJSON itself.
+  //
+  // If you override toJSON, you can invoke these callbacks manually
+  // to get the default behavior.
+
+  /**
+    Add the record's primary key to the JSON hash.
+
+    The default implementation uses the record's specified `primaryKey`
+    and the `id` computed property, which are passed in as parameters.
+
+    @param {Object} json the JSON hash being built
+    @param {Number|String} id the record's id
+    @param {String} key the primaryKey for the record
+  */
+  addIdToJSON: function(json, id, key) {
+    if (id) { json[key] = id; }
+  },
+
+  /**
+    Add the attributes' current values to the JSON hash.
+
+    The default implementation gets the current value of each
+    attribute from the `data`, and uses a `defaultValue` if
+    specified in the `DS.attr` definition.
+
+    @param {Object} json the JSON hash being build
+    @param {Ember.Map} attributes a Map of attributes
+    @param {DataProxy} data the record's data, accessed with `get` and `set`.
+  */
+  addAttributesToJSON: function(json, attributes, data) {
+    attributes.forEach(function(name, meta) {
+      var key = meta.key(this.constructor),
+          value = get(data, key);
+
+      if (value === undefined) {
+        value = meta.options.defaultValue;
+      }
+
+      json[key] = value;
+    }, this);
+  },
+
+  /**
+    Add the value of a `hasMany` association to the JSON hash.
+
+    The default implementation honors the `embedded` option
+    passed to `DS.hasMany`. If embedded, `toJSON` is recursively
+    called on the child records. If not, the `id` of each
+    record is added.
+
+    Note that if a record is not embedded and does not
+    yet have an `id` (usually provided by the server), it
+    will not be included in the output.
+
+    @param {Object} json the JSON hash being built
+    @param {DataProxy} data the record's data, accessed with `get` and `set`.
+    @param {Object} meta information about the association
+    @param {Object} options options passed to `toJSON`
+  */
+  addHasManyToJSON: function(json, data, meta, options) {
+    var key = meta.key,
+        manyArray = get(this, key),
+        records = [],
+        clientId, id;
+
+    if (meta.options.embedded) {
+      // TODO: Avoid materializing embedded hashes if possible
+      manyArray.forEach(function(record) {
+        records.push(record.toJSON(options));
+      });
+    } else {
+      var clientIds = get(manyArray, 'content');
+
+      for (var i=0, l=clientIds.length; i<l; i++) {
+        clientId = clientIds[i];
+        id = get(this, 'store').clientIdToId[clientId];
+
+        if (id !== undefined) {
+          records.push(id);
+        }
+      }
+    }
+
+    json[key] = records;
+  },
+
+  /**
+    Add the value of a `belongsTo` association to the JSON hash.
+
+    The default implementation always includes the `id`.
+
+    @param {Object} json the JSON hash being built
+    @param {DataProxy} data the record's data, accessed with `get` and `set`.
+    @param {Object} meta information about the association
+    @param {Object} options options passed to `toJSON`
+  */
+  addBelongsToToJSON: function(json, data, meta, options) {
+    var key = meta.key, value, id;
+
+    if (options.embedded) {
+      key = options.key || get(this, 'namingConvention').keyToJSONKey(key);
+      value = get(data.record, key);
+      json[key] = value ? value.toJSON(options) : null;
+    } else {
+      key = options.key || get(this, 'namingConvention').foreignKey(key);
+      id = data.get(key);
+      json[key] = none(id) ? null : id;
+    }
+  },
+  /**
+    Create a JSON representation of the record, including its `id`,
+    attributes and associations. Honor any settings defined on the
+    attributes or associations (such as `embedded` or `key`).
+  */
+  toJSON: function(options) {
+    var data = get(this, 'data'),
+        result = {},
+        type = this.constructor,
+        attributes = get(type, 'attributes'),
+        primaryKey = get(this, 'primaryKey'),
+        id = get(this, 'id'),
+        store = get(this, 'store'),
+        associations;
+
+    options = options || {};
+
+    // delegate to `addIdToJSON` callback
+    this.addIdToJSON(result, id, primaryKey);
+
+    // delegate to `addAttributesToJSON` callback
+    this.addAttributesToJSON(result, attributes, data);
+
+    associations = get(type, 'associationsByName');
+
+    // add associations, delegating to `addHasManyToJSON` and
+    // `addBelongsToToJSON`.
+    associations.forEach(function(key, meta) {
+      if (options.associations && meta.kind === 'hasMany') {
+        this.addHasManyToJSON(result, data, meta, options);
+      } else if (meta.kind === 'belongsTo') {
+        this.addBelongsToToJSON(result, data, meta, options);
+      }
+    }, this);
+
+    return result;
+  },
+
+  data: Ember.computed(function() {
+    return new DataProxy(this);
+  }).cacheable(),
 
   didLoad: Ember.K,
   didUpdate: Ember.K,
@@ -1886,6 +2313,7 @@ DS.Model = Ember.Object.extend({
     });
 
     set(this, 'pendingQueue', {});
+
     set(this, 'stateManager', stateManager);
     stateManager.goToState('empty');
   },
@@ -1902,7 +2330,7 @@ DS.Model = Ember.Object.extend({
   },
 
   withTransaction: function(fn) {
-    var transaction = get(this, 'transaction') || getPath(this, 'store.defaultTransaction');
+    var transaction = get(this, 'transaction');
     if (transaction) { fn(transaction); }
   },
 
@@ -1921,7 +2349,7 @@ DS.Model = Ember.Object.extend({
   notifyHashWasUpdated: function() {
     var store = get(this, 'store');
     if (store) {
-      store.hashWasUpdated(this.constructor, get(this, 'clientId'));
+      store.hashWasUpdated(this.constructor, get(this, 'clientId'), this);
     }
   },
 
@@ -1941,6 +2369,25 @@ DS.Model = Ember.Object.extend({
     } else {
       return this._super(key, value);
     }
+  },
+
+  namingConvention: {
+    keyToJSONKey: function(key) {
+      // TODO: Strip off `is` from the front. Example: `isHipster` becomes `hipster`
+      return Ember.String.decamelize(key);
+    },
+
+    foreignKey: function(key) {
+      return Ember.String.decamelize(key) + '_id';
+    }
+  },
+
+  /** @private */
+  hashWasUpdated: function() {
+    // At the end of the run loop, notify model arrays that
+    // this record has changed so they can re-evaluate its contents
+    // to determine membership.
+    Ember.run.once(this, this.notifyHashWasUpdated);
   }
 });
 
@@ -1976,6 +2423,30 @@ DS.Model.reopenClass({
 
 (function(exports) {
 var get = Ember.get, getPath = Ember.getPath;
+DS.Model.reopenClass({
+  attributes: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAttribute) { map.set(name, meta); }
+    });
+
+    return map;
+  }).cacheable(),
+
+  processAttributeKeys: function() {
+    if (this.processedAttributeKeys) { return; }
+
+    var namingConvention = this.proto().namingConvention;
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAttribute && !meta.options.key) {
+        meta.options.key = namingConvention.keyToJSONKey(name, this);
+      }
+    }, this);
+  }
+});
+
 DS.attr = function(type, options) {
   var transform = DS.attr.transforms[type];
   ember_assert("Could not find model attribute of type " + type, !!transform);
@@ -1983,24 +2454,45 @@ DS.attr = function(type, options) {
   var transformFrom = transform.from;
   var transformTo = transform.to;
 
-  return Ember.computed(function(key, value) {
-    var data = get(this, 'data');
+  options = options || {};
 
-    key = (options && options.key) ? options.key : key;
+  var meta = {
+    type: type,
+    isAttribute: true,
+    options: options,
+
+    // this will ensure that the key always takes naming
+    // conventions into consideration.
+    key: function(recordType) {
+      recordType.processAttributeKeys();
+      return options.key;
+    }
+  };
 
-    if (value === undefined) {
-      if (!data) { return; }
+  return Ember.computed(function(key, value) {
+    var data;
 
-      return transformFrom(data[key]);
-    } else {
-      ember_assert("You cannot set a model attribute before its data is loaded.", !!data);
+    key = meta.key(this.constructor);
 
+    if (arguments.length === 2) {
       value = transformTo(value);
       this.setProperty(key, value);
-      return value;
+    } else {
+      data = get(this, 'data');
+      value = get(data, key);
+
+      if (value === undefined) {
+        value = options.defaultValue;
+      }
     }
-  }).property('data');
+
+    return transformFrom(value);
+  // `data` is never set directly. However, it may be
+  // invalidated from the state manager's setData
+  // event.
+  }).property('data').cacheable().meta(meta);
 };
+
 DS.attr.transforms = {
   string: {
     from: function(serialized) {
@@ -2012,7 +2504,7 @@ DS.attr.transforms = {
     }
   },
 
-  integer: {
+  number: {
     from: function(serialized) {
       return Ember.none(serialized) ? null : Number(serialized);
     },
@@ -2022,7 +2514,7 @@ DS.attr.transforms = {
     }
   },
 
-  boolean: {
+  'boolean': {
     from: function(serialized) {
       return Boolean(serialized);
     },
@@ -2087,13 +2579,55 @@ DS.attr.transforms = {
 (function(exports) {
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
 DS.Model.reopenClass({
-  typeForAssociation: function(association) {
-    var type = this.metaForProperty(association).type;
-    if (typeof type === 'string') {
-      type = getPath(this, type, false) || getPath(window, type);
-    }
-    return type;
-  }
+  typeForAssociation: function(name) {
+    var association = get(this, 'associationsByName').get(name);
+    return association && association.type;
+  },
+
+  associations: Ember.computed(function() {
+    var map = Ember.Map.create();
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAssociation) {
+        var type = meta.type,
+            typeList = map.get(type);
+
+        if (typeof type === 'string') {
+          type = getPath(this, type, false) || getPath(window, type);
+          meta.type = type;
+        }
+
+        if (!typeList) {
+          typeList = [];
+          map.set(type, typeList);
+        }
+
+        typeList.push({ name: name, kind: meta.kind });
+      }
+    });
+
+    return map;
+  }).cacheable(),
+
+  associationsByName: Ember.computed(function() {
+    var map = Ember.Map.create(), type;
+
+    this.eachComputedProperty(function(name, meta) {
+      if (meta.isAssociation) {
+        meta.key = name;
+        type = meta.type;
+
+        if (typeof type === 'string') {
+          type = getPath(this, type, false) || getPath(window, type);
+          meta.type = type;
+        }
+
+        map.set(name, meta);
+      }
+    });
+
+    return map;
+  }).cacheable()
 });
 
 
@@ -2111,29 +2645,55 @@ var referencedFindRecord = function(store, type, data, key, one) {
 };
 
 var hasAssociation = function(type, options, one) {
-  var embedded = options && options.embedded,
-    findRecord = embedded ? embeddedFindRecord : referencedFindRecord;
+  options = options || {};
+
+  var embedded = options.embedded,
+      findRecord = embedded ? embeddedFindRecord : referencedFindRecord;
 
-  return Ember.computed(function(key) {
+  var meta = { type: type, isAssociation: true, options: options };
+  if (one) {
+    meta.kind = 'belongsTo';
+  } else {
+    meta.kind = 'hasMany';
+  }
+
+  return Ember.computed(function(key, value) {
     var data = get(this, 'data'), ids, id, association,
-      store = get(this, 'store');
+        store = get(this, 'store');
 
     if (typeof type === 'string') {
       type = getPath(this, type, false) || getPath(window, type);
     }
 
-    key = (options && options.key) ? options.key : key;
     if (one) {
-      id = findRecord(store, type, data, key, true);
-      association = id ? store.find(type, id) : null;
+      if (arguments.length === 2) {
+        key = options.key || get(this, 'namingConvention').foreignKey(key);
+        data.setAssociation(key, get(value, 'clientId'));
+        // put the client id in `key` in the data hash
+        return value;
+      } else {
+        // Embedded belongsTo associations should not look for
+        // a foreign key.
+        if (embedded) {
+          key = options.key || key;
+
+        // Non-embedded associations should look for a foreign key.
+        // For example, instead of person, we might look for person_id
+        } else {
+          key = options.key || get(this, 'namingConvention').foreignKey(key);
+        }
+        id = findRecord(store, type, data, key, true);
+        association = id ? store.find(type, id) : null;
+      }
     } else {
+      key = options.key || key;
       ids = findRecord(store, type, data, key);
       association = store.findMany(type, ids);
       set(association, 'parentRecord', this);
     }
 
     return association;
-  }).property('data').cacheable().meta({ type: type });
+  }).property('data').cacheable().meta(meta);
 };
 
 DS.hasMany = function(type, options) {
@@ -2142,10 +2702,12 @@ DS.hasMany = function(type, options) {
 };
 
 DS.hasOne = function(type, options) {
-  ember_assert("The type passed to DS.hasOne must be defined", !!type);
+  ember_assert("The type passed to DS.belongsTo must be defined", !!type);
   return hasAssociation(type, options, true);
 };
 
+DS.belongsTo = DS.hasOne;
+
 })({});