embient 0.0.9 → 0.1.0

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    embient (0.0.9)
+    embient (0.1.0)
       emberjs-rails
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
-      mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -41,7 +41,7 @@ GEM
       hamlbars
       rails (~> 3.1)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.3.1)
       multi_json (~> 1.0)
     haml (3.1.4)
     hamlbars (2012.3.21)
@@ -52,13 +52,13 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.6)
+    json (1.7.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    multi_json (1.2.0)
+    multi_json (1.3.4)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -67,17 +67,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -85,7 +85,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)

data/lib/embient/version.rb

@@ -1,3 +1,3 @@
 module Embient
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

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

@@ -275,7 +275,7 @@ DS.ManyArray = DS.RecordArray.extend({
     var stateManager = get(this, 'stateManager');
 
     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));
+
 
       if (pendingParent) {
         record.send('waitingOn', parentRecord);
@@ -320,6 +320,21 @@ DS.ManyArray = DS.RecordArray.extend({
     if (actual) {
       set(record, actual.name, remove ? null : parentRecord);
     }
+  },
+
+  // Create a child record within the parentRecord
+  createRecord: function(hash, transaction) {
+    var parentRecord = get(this, 'parentRecord'),
+        store = get(parentRecord, 'store'),
+        type = get(this, 'type'),
+        record;
+
+    transaction = transaction || get(parentRecord, 'transaction');
+
+    record = store.createRecord.call(store, type, hash, transaction);
+    this.pushObject(record);
+
+    return record;
   }
 });
 
@@ -423,10 +438,11 @@ DS.Transaction = Ember.Object.extend({
   */
   init: function() {
     set(this, 'buckets', {
-      clean:   Ember.Map.create(),
-      created: Ember.Map.create(),
-      updated: Ember.Map.create(),
-      deleted: Ember.Map.create()
+      clean:    Ember.Map.create(),
+      created:  Ember.Map.create(),
+      updated:  Ember.Map.create(),
+      deleted:  Ember.Map.create(),
+      inflight: Ember.Map.create()
     });
   },
 
@@ -455,12 +471,11 @@ DS.Transaction = Ember.Object.extend({
   */
   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'));
+
 
     var recordTransaction = get(record, 'transaction'),
         defaultTransaction = getPath(this, 'store.defaultTransaction');
 
-    ember_assert("Models cannot belong to more than one transaction at a time.", recordTransaction === defaultTransaction);
 
     this.adoptRecord(record);
   },
@@ -518,7 +533,7 @@ DS.Transaction = Ember.Object.extend({
     this.removeCleanRecords();
 
     if (adapter && adapter.commit) { adapter.commit(store, commitDetails); }
-    else { throw fmt("Adapter is either null or do not implement `commit` method", this); }
+    else { throw fmt("Adapter is either null or does not implement `commit` method", this); }
   },
 
   /**
@@ -542,7 +557,7 @@ DS.Transaction = Ember.Object.extend({
     // and initiate a rollback on them. As a side effect of telling
     // the record to roll back, it should also move itself out of
     // the dirty bucket and into the clean bucket.
-    ['created', 'updated', 'deleted'].forEach(function(bucketType) {
+    ['created', 'updated', 'deleted', 'inflight'].forEach(function(bucketType) {
       dirty = this.bucketForType(bucketType);
 
       dirty.forEach(function(type, records) {
@@ -685,7 +700,21 @@ DS.Transaction = Ember.Object.extend({
     @private
 
     Called by a record's state manager to indicate that the record has entered
-    a clean state. The record will be moved from its current dirty bucket and into
+    inflight state. The record will be moved from its current dirty bucket and into
+    the `inflight` bucket.
+
+    @param {String} bucketType one of `created`, `updated`, or `deleted`
+  */
+  recordBecameInFlight: function(kind, record) {
+    this.removeFromBucket(kind, record);
+    this.addToBucket('inflight', record);
+  },
+
+  /**
+    @private
+
+    Called by a record's state manager to indicate that the record has entered
+    a clean state. The record will be moved from its current dirty or inflight bucket and into
     the `clean` bucket.
 
     @param {String} bucketType one of `created`, `updated`, or `deleted`
@@ -693,8 +722,7 @@ DS.Transaction = Ember.Object.extend({
   recordBecameClean: function(kind, record) {
     this.removeFromBucket(kind, record);
 
-    var defaultTransaction = getPath(this, 'store.defaultTransaction');
-    defaultTransaction.adoptRecord(record);
+    this.remove(record);
   }
 });
 
@@ -870,7 +898,19 @@ DS.Store = Ember.Object.extend({
 
     // Extract the primary key from the `properties` hash,
     // based on the `primaryKey` for the model type.
-    var id = properties[get(record, 'primaryKey')] || null;
+    var primaryKey = get(record, 'primaryKey'),
+        id = properties[primaryKey] || null;
+
+    // If the passed properties do not include a primary key,
+    // give the adapter an opportunity to generate one.
+    var adapter;
+    if (Ember.none(id)) {
+      adapter = get(this, 'adapter');
+      if (adapter && adapter.generateIdForRecord) {
+        id = adapter.generateIdForRecord(this, record);
+        properties.id = id;
+      }
+    }
 
     var hash = {}, clientId;
 
@@ -1196,6 +1236,8 @@ DS.Store = Ember.Object.extend({
       dataCache[clientId] = hash;
       record.send('didChangeData');
       record.hashWasUpdated();
+    } else {
+      record.send('didSaveData');
     }
 
     record.send('didCommit');
@@ -1221,7 +1263,7 @@ DS.Store = Ember.Object.extend({
       // of the data supercedes the local changes.
       record.beginPropertyChanges();
       record.send('didChangeData');
-      recordData.adapterDidUpdate(hash);
+      recordData.adapterDidUpdate();
       record.hashWasUpdated();
       record.endPropertyChanges();
 
@@ -1260,11 +1302,11 @@ DS.Store = Ember.Object.extend({
 
     primaryKey = type.proto().primaryKey;
 
-    // TODO: Make ember_assert more flexible and convert this into an ember_assert
+    // TODO: Make Ember.assert more flexible
     if (hash) {
-      ember_assert("The server must provide a primary key: " + primaryKey, get(hash, primaryKey));
+
     } else {
-      ember_assert("The server did not return data, and you did not create a primary key (" + primaryKey + ") on the client", get(get(record, 'data'), primaryKey));
+
     }
 
     clientId = get(record, 'clientId');
@@ -1437,7 +1479,7 @@ DS.Store = Ember.Object.extend({
     if (hash === undefined) {
       hash = id;
       var primaryKey = type.proto().primaryKey;
-      ember_assert("A data hash was loaded for a record of type " + type.toString() + " but no primary key '" + primaryKey + "' was provided.", primaryKey in hash);
+
       id = hash[primaryKey];
     }
 
@@ -1579,7 +1621,7 @@ var get = Ember.get, set = Ember.set, getPath = Ember.getPath, guidFor = Ember.g
   string. You can determine a record's current state by getting its manager's
   current state path:
 
-        record.getPath('manager.currentState.path');
+        record.getPath('stateManager.currentState.path');
         //=> "created.uncommitted"
 
   The `DS.Model` states are themselves stateless. What we mean is that,
@@ -1892,11 +1934,6 @@ var DirtyState = DS.State.extend({
       });
     },
 
-    exit: function(manager) {
-      var record = get(manager, 'record');
-      manager.send('invokeLifecycleCallbacks', record);
-    },
-
     // EVENTS
     deleteRecord: Ember.K,
 
@@ -1909,6 +1946,17 @@ var DirtyState = DS.State.extend({
       manager.goToState('inFlight');
     },
 
+    becameInvalid: function(manager) {
+      var dirtyType = get(this, 'dirtyType'),
+          record = get(manager, 'record');
+
+      record.withTransaction(function (t) {
+        t.recordBecameInFlight(dirtyType, record);
+      });
+
+      manager.goToState('invalid');
+    },
+
     rollback: function(manager) {
       var record = get(manager, 'record'),
           dirtyType = get(this, 'dirtyType'),
@@ -1937,20 +1985,35 @@ var DirtyState = DS.State.extend({
           record = get(manager, 'record');
 
       record.withTransaction(function (t) {
-        t.recordBecameClean(dirtyType, record);
+        t.recordBecameInFlight(dirtyType, record);
       });
     },
 
     // EVENTS
     didCommit: function(manager) {
+      var dirtyType = get(this, 'dirtyType'),
+          record = get(manager, 'record');
+
+      record.withTransaction(function(t) {
+        t.recordBecameClean('inflight', record);
+      });
+
       manager.goToState('loaded');
+      manager.send('invokeLifecycleCallbacks', dirtyType);
     },
 
     becameInvalid: function(manager, errors) {
       var record = get(manager, 'record');
 
       set(record, 'errors', errors);
+
       manager.goToState('invalid');
+      manager.send('invokeLifecycleCallbacks');
+    },
+
+    becameError: function(manager) {
+      manager.goToState('error');
+      manager.send('invokeLifecycleCallbacks');
     },
 
     didChangeData: didChangeData
@@ -2046,8 +2109,13 @@ var DirtyState = DS.State.extend({
       },
 
       willCommit: function(manager) {
-        var dirtyType = get(this, 'dirtyType');
-        manager.goToState(dirtyType + '.inFlight');
+        var record = get(manager, 'record'),
+            pendingQueue = get(record, 'pendingQueue');
+
+        if (isEmptyObject(pendingQueue)) {
+          var dirtyType = get(this, 'dirtyType');
+          manager.goToState(dirtyType + '.inFlight');
+        }
       }
     })
   }),
@@ -2059,6 +2127,14 @@ var DirtyState = DS.State.extend({
     // FLAGS
     isValid: false,
 
+    exit: function(manager) {
+      var record = get(manager, 'record');
+
+      record.withTransaction(function (t) {
+        t.recordBecameClean('inflight', record);
+      });
+    },
+
     // EVENTS
     deleteRecord: function(manager) {
       manager.goToState('deleted');
@@ -2080,8 +2156,18 @@ var DirtyState = DS.State.extend({
       }
     },
 
+    rollback: function(manager) {
+      manager.send('becameValid');
+      manager.send('rollback');
+    },
+
     becameValid: function(manager) {
       manager.goToState('uncommitted');
+    },
+
+    invokeLifecycleCallbacks: function(manager) {
+      var record = get(manager, 'record');
+      record.fire('becameInvalid', record);
     }
   })
 });
@@ -2094,21 +2180,11 @@ var createdState = DirtyState.create({
   dirtyType: 'created',
 
   // FLAGS
-  isNew: true,
-
-  // EVENTS
-  invokeLifecycleCallbacks: function(manager, record) {
-    record.fire('didCreate');
-  }
+  isNew: true
 });
 
 var updatedState = DirtyState.create({
-  dirtyType: 'updated',
-
-  // EVENTS
-  invokeLifecycleCallbacks: function(manager, record) {
-    record.fire('didUpdate');
-  }
+  dirtyType: 'updated'
 });
 
 // The created.uncommitted state and created.pending.uncommitted share
@@ -2129,6 +2205,15 @@ createdState.states.uncommitted.reopen({
 // some logic defined in UpdatedUncommitted.
 updatedState.states.uncommitted.reopen(UpdatedUncommitted);
 updatedState.states.pending.states.uncommitted.reopen(UpdatedUncommitted);
+updatedState.states.inFlight.reopen({
+  didSaveData: function(manager) {
+    var record = get(manager, 'record'),
+        data = get(record, 'data');
+
+    data.saveData();
+    data.adapterDidUpdate();
+  }
+});
 
 var states = {
   rootState: Ember.State.create({
@@ -2200,6 +2285,7 @@ var states = {
       // If there are no local changes to a record, it remains
       // in the `saved` state.
       saved: DS.State.create({
+
         // EVENTS
         setProperty: function(manager, context) {
           setProperty(manager, context);
@@ -2220,6 +2306,15 @@ var states = {
         waitingOn: function(manager, object) {
           waitingOn(manager, object);
           manager.goToState('updated.pending');
+        },
+
+        invokeLifecycleCallbacks: function(manager, dirtyType) {
+          var record = get(manager, 'record');
+          if (dirtyType === 'created') {
+            record.fire('didCreate', record);
+          } else {
+            record.fire('didUpdate', record);
+          }
         }
       }),
 
@@ -2290,17 +2385,25 @@ var states = {
         isSaving: true,
 
         // TRANSITIONS
-        exit: function(stateManager) {
-          var record = get(stateManager, 'record');
+        enter: function(manager) {
+          var record = get(manager, 'record');
 
-          record.withTransaction(function(t) {
-            t.recordBecameClean('deleted', record);
+          record.withTransaction(function (t) {
+            t.recordBecameInFlight('deleted', record);
           });
         },
 
         // EVENTS
         didCommit: function(manager) {
+          var record = get(manager, 'record');
+
+          record.withTransaction(function(t) {
+            t.recordBecameClean('inflight', record);
+          });
+
           manager.goToState('saved');
+
+          manager.send('invokeLifecycleCallbacks');
         }
       }),
 
@@ -2309,7 +2412,12 @@ var states = {
       // of `deleted`.
       saved: DS.State.create({
         // FLAGS
-        isDirty: false
+        isDirty: false,
+
+        invokeLifecycleCallbacks: function(manager) {
+          var record = get(manager, 'record');
+          record.fire('didDelete', record);
+        }
       })
     }),
 
@@ -2317,7 +2425,14 @@ var states = {
     // error saving a record, the record enters the `error`
     // state.
     error: DS.State.create({
-      isError: true
+      isError: true,
+
+      // EVENTS
+
+      invokeLifecycleCallbacks: function(manager) {
+        var record = get(manager, 'record');
+        record.fire('becameError', record);
+      }
     })
   })
 };
@@ -2402,6 +2517,18 @@ DataProxy.prototype = {
   },
 
   commit: function() {
+    this.saveData();
+
+    this.record.notifyPropertyChange('data');
+  },
+
+  rollback: function() {
+    this.unsavedData = {};
+
+    this.record.notifyPropertyChange('data');
+  },
+
+  saveData: function() {
     var record = this.record;
 
     var unsavedData = this.unsavedData;
@@ -2413,17 +2540,9 @@ DataProxy.prototype = {
         delete unsavedData[prop];
       }
     }
-
-    record.notifyPropertyChange('data');
-  },
-
-  rollback: function() {
-    this.unsavedData = {};
-
-    this.record.notifyPropertyChange('data');
   },
 
-  adapterDidUpdate: function(data) {
+  adapterDidUpdate: function() {
     this.unsavedData = {};
   }
 };
@@ -2535,7 +2654,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
   addHasManyToJSON: function(json, data, meta, options) {
     var key = meta.key,
         manyArray = get(this, key),
-        records = [],
+        records = [], i, l,
         clientId, id;
 
     if (meta.options.embedded) {
@@ -2546,7 +2665,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
     } else {
       var clientIds = get(manyArray, 'content');
 
-      for (var i=0, l=clientIds.length; i<l; i++) {
+      for (i=0, l=clientIds.length; i<l; i++) {
         clientId = clientIds[i];
         id = get(this, 'store').clientIdToId[clientId];
 
@@ -2556,7 +2675,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
       }
     }
 
-    key = options.key || get(this, 'namingConvention').keyToJSONKey(key);
+    key = meta.options.key || get(this, 'namingConvention').keyToJSONKey(key);
     json[key] = records;
   },
 
@@ -2573,12 +2692,12 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
   addBelongsToToJSON: function(json, data, meta, options) {
     var key = meta.key, value, id;
 
-    if (options.embedded) {
-      key = options.key || get(this, 'namingConvention').keyToJSONKey(key);
+    if (meta.options.embedded) {
+      key = meta.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);
+      key = meta.options.key || get(this, 'namingConvention').foreignKey(key);
       id = data.get(key);
       json[key] = none(id) ? null : id;
     }
@@ -2628,6 +2747,9 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
   didLoad: Ember.K,
   didUpdate: Ember.K,
   didCreate: Ember.K,
+  didDelete: Ember.K,
+  becameInvalid: Ember.K,
+  becameError: Ember.K,
 
   init: function() {
     var stateManager = DS.StateManager.create({
@@ -2679,7 +2801,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
     var data = get(this, 'data');
 
     if (data && key in data) {
-      ember_assert("You attempted to access the " + key + " property on a record without defining an attribute.", false);
+
     }
   },
 
@@ -2687,7 +2809,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
     var data = get(this, 'data');
 
     if (data && key in data) {
-      ember_assert("You attempted to set the " + key + " property on a record without defining an attribute.", false);
+
     } else {
       return this._super(key, value);
     }
@@ -2723,7 +2845,8 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
         cachedValue = this.cacheFor(name);
 
         if (cachedValue) {
-          var ids = data.get(name) || [];
+          var key = association.options.key || name,
+              ids = data.get(key) || [];
           var clientIds = Ember.ArrayUtils.map(ids, function(id) {
             return store.clientIdForId(association.type, id);
           });
@@ -2806,7 +2929,7 @@ DS.Model.reopenClass({
 
 DS.attr = function(type, options) {
   var transform = DS.attr.transforms[type];
-  ember_assert("Could not find model attribute of type " + type, !!transform);
+
 
   var transformFrom = transform.from;
   var transformTo = transform.to;
@@ -2995,7 +3118,7 @@ var hasAssociation = function(type, options, one) {
 };
 
 DS.belongsTo = function(type, options) {
-  ember_assert("The type passed to DS.belongsTo must be defined", !!type);
+
   return hasAssociation(type, options);
 };
 
@@ -3031,7 +3154,7 @@ var hasAssociation = function(type, options) {
       type = getPath(this, type, false) || getPath(window, type);
     }
 
-    key = options.key || key;
+    key = options.key || get(this, 'namingConvention').keyToJSONKey(key);
     ids = findRecord(store, type, data, key);
     association = store.findMany(type, ids);
     set(association, 'parentRecord', this);
@@ -3041,7 +3164,7 @@ var hasAssociation = function(type, options) {
 };
 
 DS.hasMany = function(type, options) {
-  ember_assert("The type passed to DS.hasMany must be defined", !!type);
+
   return hasAssociation(type, options);
 };
 
@@ -3115,7 +3238,93 @@ DS.Model.reopenClass({
 
 
 (function() {
+/**
+  An adapter is an object that receives requests from a store and
+  translates them into the appropriate action to take against your
+  persistence layer. The persistence layer is usually an HTTP API, but may
+  be anything, such as the browser's local storage.
+
+  ### Creating an Adapter
+
+  First, create a new subclass of `DS.Adapter`:
+
+      App.MyAdapter = DS.Adapter.extend({
+        // ...your code here
+      });
+
+  To tell your store which adapter to use, set its `adapter` property:
+
+      App.store = DS.Store.create({
+        revision: 3,
+        adapter: App.MyAdapter.create()
+      });
+
+  `DS.Adapter` is an abstract base class that you should override in your
+  application to customize it for your backend. The minimum set of methods
+  that you should implement is:
+
+    * `find()`
+    * `createRecord()`
+    * `updateRecord()`
+    * `deleteRecord()`
+
+   To improve the network performance of your application, you can optimize
+   your adapter by overriding these lower-level methods:
+
+    * `findMany()`
+    * `createRecords()`
+    * `updateRecords()`
+    * `deleteRecords()`
+    * `commit()`
+
+   For more information about the adapter API, please see `README.md`.
+*/
+
 DS.Adapter = Ember.Object.extend({
+  /**
+    The `find()` method is invoked when the store is asked for a record that
+    has not previously been loaded. In response to `find()` being called, you
+    should query your persistence layer for a record with the given ID. Once
+    found, you can asynchronously call the store's `load()` method to load
+    the record.
+
+    Here is an example `find` implementation:
+
+      find: function(store, type, id) {
+        var url = type.url;
+        url = url.fmt(id);
+
+        jQuery.getJSON(url, function(data) {
+            // data is a Hash of key/value pairs. If your server returns a
+            // root, simply do something like:
+            // store.load(type, id, data.person)
+            store.load(type, id, data);
+        });
+      }
+  */
+  find: null,
+
+  /**
+    If the globally unique IDs for your records should be generated on the client,
+    implement the `generateIdForRecord()` method. This method will be invoked
+    each time you create a new record, and the value returned from it will be
+    assigned to the record's `primaryKey`.
+
+    Most traditional REST-like HTTP APIs will not use this method. Instead, the ID
+    of the record will be set by the server, and your adapter will update the store
+    with the new ID when it calls `didCreateRecord()`. Only implement this method if
+    you intend to generate record IDs on the client-side.
+
+    The `generateIdForRecord()` method will be invoked with the requesting store as
+    the first parameter and the newly created record as the second parameter:
+
+        generateIdForRecord: function(store, record) {
+          var uuid = App.generateUUIDWithStatisticallyLowOddsOfCollision();
+          return uuid;
+        }
+  */
+  generateIdForRecord: null,
+
   commit: function(store, commitDetails) {
     commitDetails.updated.eachType(function(type, array) {
       this.updateRecords(store, type, array.slice());
@@ -3164,7 +3373,6 @@ DS.fixtureAdapter = DS.Adapter.create({
   find: function(store, type, id) {
     var fixtures = type.FIXTURES;
 
-    ember_assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
     if (fixtures.hasLoaded) { return; }
 
     setTimeout(function() {
@@ -3180,7 +3388,6 @@ DS.fixtureAdapter = DS.Adapter.create({
   findAll: function(store, type) {
     var fixtures = type.FIXTURES;
 
-    ember_assert("Unable to find fixtures for model type "+type.toString(), !!fixtures);
 
     var ids = fixtures.map(function(item, index, self){ return item.id; });
     store.loadMany(type, ids, fixtures);
@@ -3198,6 +3405,8 @@ DS.fixtureAdapter = DS.Adapter.create({
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
 
 DS.RESTAdapter = DS.Adapter.extend({
+  bulkCommit: false,
+	
   createRecord: function(store, type, record) {
     var root = this.rootForType(type);
 
@@ -3325,7 +3534,7 @@ DS.RESTAdapter = DS.Adapter.extend({
     this.ajax(this.buildURL(root), "GET", {
       data: { ids: ids },
       success: function(json) {
-        store.loadMany(type, ids, json[plural]);
+        store.loadMany(type, json[plural]);
         this.sideload(store, type, json, plural);
       }
     });
@@ -3377,7 +3586,7 @@ DS.RESTAdapter = DS.Adapter.extend({
     hash.url = url;
     hash.type = type;
     hash.dataType = 'json';
-    hash.contentType = 'application/json';
+    hash.contentType = 'application/json; charset=utf-8';
     hash.context = this;
 
     if (hash.data && type !== 'GET') {
@@ -3399,11 +3608,9 @@ DS.RESTAdapter = DS.Adapter.extend({
       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);
+        sideloadedType = get(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]);
@@ -3421,6 +3628,9 @@ DS.RESTAdapter = DS.Adapter.extend({
   buildURL: function(record, suffix) {
     var url = [""];
 
+
+
+
     if (this.namespace !== undefined) {
       url.push(this.namespace);
     }