ember-data-source 2.0.1 → 2.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cbb3e7aeb8402514a2c16df64ff6fa3dddbdbe
-  data.tar.gz: 0074152bef6776110c690b11c710f2989be1dc1a
+  metadata.gz: 42a7133babf76842ad69f869acf49924e5778386
+  data.tar.gz: b68ec9a80f7078159afb73ef4939ef884759ab3d
 SHA512:
-  metadata.gz: 7572751098acad398e2e478038b22093031aa42c227e1445547902a3cb08476a3a642c15ef77076545003950c27f3a9a3cf0eede684e7d0bc41ac384047e3066
-  data.tar.gz: e98bbfa7a24ce04ad082a26df0e616f93777b0db980ad7814cceb64e655722172b7ed639e77c2a7398a5dc149ba7537aff8bd281d05d6348e58d079cfe0148f7
+  metadata.gz: de202a28d55bad5e3d376bd2f34c504d34e9a4714081dfb4aa8d11a0979e7d49e63b5d59d5aeb26ea7a7eab4a0ea1fd57eaa243d6658702e98f6155bcb0f8337
+  data.tar.gz: 9bf21e5c777c62986a361444cf653701e9a9f38fe429633a40b0b4ac765f86174d89c872ce57bf00defffaafd914a9142dd92019aa022e57d7c625dc07c73a0c

data/dist/ember-data-tests.js

@@ -4287,7 +4287,7 @@ define(
     var run = Ember.run;
     var Person, Dog, env, store, adapter;
 
-    module("integration/adapter/store-adapter - DS.Store and DS.Adapter integration test", {
+    module("integration/adapter/store_adapter - DS.Store and DS.Adapter integration test", {
       setup: function () {
         Person = DS.Model.extend({
           updatedAt: DS.attr('string'),
@@ -4731,13 +4731,7 @@ define(
         equal(type, Person, "the type is correct");
 
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: 'Invalid Attribute',
-            detail: 'common... name requires a "bro"',
-            source: {
-              pointer: '/data/attributes/name'
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ name: ['common... name requires a "bro"'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -4776,13 +4770,7 @@ define(
     test("allows errors on arbitrary properties on create", function () {
       adapter.createRecord = function (store, type, snapshot) {
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: "Invalid Attribute",
-            detail: "is a generally unsavoury character",
-            source: {
-              pointer: "/data/attributes/base"
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ base: ['is a generally unsavoury character'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -4828,13 +4816,7 @@ define(
         saveCount++;
 
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: 'Invalid Attribute',
-            detail: 'common... name requires a "bro"',
-            source: {
-              pointer: '/data/attributes/name'
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ name: ['common... name requires a "bro"'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -4898,13 +4880,7 @@ define(
         equal(type, Person, "the type is correct");
 
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: 'Invalid Attribute',
-            detail: 'common... name requires a "bro"',
-            source: {
-              pointer: '/data/attributes/name'
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ name: ['common... name requires a "bro"'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -4959,13 +4935,7 @@ define(
       };
       adapter.updateRecord = function (store, type, snapshot) {
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: "Invalid Attribute",
-            detail: "is a generally unsavoury character",
-            source: {
-              pointer: "/data/attributes/base"
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ base: ['is a generally unsavoury character'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -5027,13 +4997,7 @@ define(
         equal(type, Person, "the type is correct");
         saveCount++;
         if (snapshot.attr('name').indexOf('Bro') === -1) {
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: 'Invalid Attribute',
-            detail: 'common... name requires a "bro"',
-            source: {
-              pointer: '/data/attributes/name'
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ name: ['common... name requires a "bro"'] }));
         } else {
           return Ember.RSVP.resolve();
         }
@@ -10029,128 +9993,6 @@ define(
         ok(user._internalModel._relationships.has('favouriteMessage'), "Newly created record with relationships in params passed in its constructor should have relationships");
       });
     });
-
-    test("Related link should be fetched when no local data is present", function () {
-      expect(3);
-
-      Book.reopen({
-        author: DS.belongsTo('author', { async: true })
-      });
-
-      env.adapter.findBelongsTo = function (store, snapshot, url, relationship) {
-        equal(url, 'author', 'url is correct');
-        ok(true, "The adapter's findBelongsTo method should be called");
-        return Ember.RSVP.resolve({ id: 1, name: 'This is author' });
-      };
-
-      run(function () {
-        var book = env.store.push({
-          data: {
-            type: 'book',
-            id: '1',
-            relationships: {
-              author: {
-                links: {
-                  related: 'author'
-                }
-              }
-            }
-          }
-        });
-        book.get('author').then(function (author) {
-          equal(author.get('name'), 'This is author', 'author name is correct');
-        });
-      });
-    });
-
-    test("Local data should take precedence over related link", function () {
-      expect(1);
-
-      Book.reopen({
-        author: DS.belongsTo('author', { async: true })
-      });
-
-      env.adapter.findBelongsTo = function (store, snapshot, url, relationship) {
-        ok(false, "The adapter's findBelongsTo method should not be called");
-      };
-
-      env.adapter.findRecord = function (store, type, id, snapshot) {
-        return Ember.RSVP.resolve({ id: 1, name: 'This is author' });
-      };
-
-      run(function () {
-        var book = env.store.push({
-          data: {
-            type: 'book',
-            id: '1',
-            relationships: {
-              author: {
-                links: {
-                  related: 'author'
-                },
-                data: { type: 'author', id: '1' }
-              }
-            }
-          }
-        });
-        book.get('author').then(function (author) {
-          equal(author.get('name'), 'This is author', 'author name is correct');
-        });
-      });
-    });
-
-    test("Updated related link should take precedence over local data", function () {
-      expect(3);
-
-      Book.reopen({
-        author: DS.belongsTo('author', { async: true })
-      });
-
-      env.adapter.findBelongsTo = function (store, snapshot, url, relationship) {
-        equal(url, 'author-updated-link', 'url is correct');
-        ok(true, "The adapter's findBelongsTo method should be called");
-        return Ember.RSVP.resolve({ id: 1, name: 'This is author' });
-      };
-
-      env.adapter.findRecord = function (store, type, id, snapshot) {
-        ok(false, "The adapter's findRecord method should not be called");
-      };
-
-      run(function () {
-        var book = env.store.push({
-          data: {
-            type: 'book',
-            id: '1',
-            relationships: {
-              author: {
-                links: {
-                  related: 'author'
-                },
-                data: { type: 'author', id: '1' }
-              }
-            }
-          }
-        });
-
-        env.store.push({
-          data: {
-            type: 'book',
-            id: '1',
-            relationships: {
-              author: {
-                links: {
-                  related: 'author-updated-link'
-                }
-              }
-            }
-          }
-        });
-
-        book.get('author').then(function (author) {
-          equal(author.get('name'), 'This is author', 'author name is correct');
-        });
-      });
-    });
   }
 );
 
@@ -12382,128 +12224,6 @@ define(
         });
       });
     });
-
-    test("Related link should be fetched when no local data is present", function () {
-      expect(3);
-
-      Post.reopen({
-        comments: DS.hasMany('comment', { async: true })
-      });
-
-      env.adapter.findHasMany = function (store, snapshot, url, relationship) {
-        equal(url, 'comments', 'url is correct');
-        ok(true, "The adapter's findHasMany method should be called");
-        return Ember.RSVP.resolve([{ id: 1, body: 'This is comment' }]);
-      };
-
-      run(function () {
-        var post = env.store.push({
-          data: {
-            type: 'post',
-            id: '1',
-            relationships: {
-              comments: {
-                links: {
-                  related: 'comments'
-                }
-              }
-            }
-          }
-        });
-        post.get('comments').then(function (comments) {
-          equal(comments.get('firstObject.body'), 'This is comment', 'comment body is correct');
-        });
-      });
-    });
-
-    test("Local data should take precedence over related link", function () {
-      expect(1);
-
-      Post.reopen({
-        comments: DS.hasMany('comment', { async: true })
-      });
-
-      env.adapter.findHasMany = function (store, snapshot, url, relationship) {
-        ok(false, "The adapter's findHasMany method should not be called");
-      };
-
-      env.adapter.findRecord = function (store, type, id, snapshot) {
-        return Ember.RSVP.resolve({ id: 1, body: 'This is comment' });
-      };
-
-      run(function () {
-        var post = env.store.push({
-          data: {
-            type: 'post',
-            id: '1',
-            relationships: {
-              comments: {
-                links: {
-                  related: 'comments'
-                },
-                data: [{ type: 'comment', id: '1' }]
-              }
-            }
-          }
-        });
-        post.get('comments').then(function (comments) {
-          equal(comments.get('firstObject.body'), 'This is comment', 'comment body is correct');
-        });
-      });
-    });
-
-    test("Updated related link should take precedence over local data", function () {
-      expect(3);
-
-      Post.reopen({
-        comments: DS.hasMany('comment', { async: true })
-      });
-
-      env.adapter.findHasMany = function (store, snapshot, url, relationship) {
-        equal(url, 'comments-updated-link', 'url is correct');
-        ok(true, "The adapter's findHasMany method should be called");
-        return Ember.RSVP.resolve([{ id: 1, body: 'This is comment' }]);
-      };
-
-      env.adapter.findRecord = function (store, type, id, snapshot) {
-        ok(false, "The adapter's findRecord method should not be called");
-      };
-
-      run(function () {
-        var post = env.store.push({
-          data: {
-            type: 'post',
-            id: '1',
-            relationships: {
-              comments: {
-                links: {
-                  related: 'comments'
-                },
-                data: [{ type: 'comment', id: '1' }]
-              }
-            }
-          }
-        });
-
-        env.store.push({
-          data: {
-            type: 'post',
-            id: '1',
-            relationships: {
-              comments: {
-                links: {
-                  related: 'comments-updated-link'
-                }
-              }
-            }
-          }
-        });
-
-        post.get('comments').then(function (comments) {
-          equal(comments.get('firstObject.body'), 'This is comment', 'comment body is correct');
-        });
-      });
-    });
   }
 );
 
@@ -21731,7 +21451,7 @@ define(
       __exports__[name] = value;
     }
 
-    module("unit/adapter-errors - DS.AdapterError");
+    module("unit/adapter/errors - DS.AdapterError");
 
     test("DS.AdapterError", function () {
       var error = new DS.AdapterError();
@@ -21794,12 +21514,18 @@ define(
       deepEqual(result, { name: ['error message'] });
     });
 
-    test("DS.InvalidError will normalize errors hash will assert", function () {
+    test("DS.InvalidError will normalize errors hash with deprecation", function () {
       var error;
 
-      expectAssertion(function () {
+      expectDeprecation(function () {
         error = new DS.InvalidError({ name: ['is invalid'] });
       }, /expects json-api formatted errors/);
+
+      deepEqual(error.errors, [{
+        title: 'Invalid Attribute',
+        detail: 'is invalid',
+        source: { pointer: '/data/attributes/name' }
+      }]);
     });
   }
 );
@@ -22915,12 +22641,23 @@ define("ember-data/tests/unit/model-test", ["exports"], function(__exports__) {
     equal(Object.keys(mascot.changedAttributes()).length, 0, 'after rollback attributes there are no changes');
   });
 
+  function toObj(obj) {
+    // https://github.com/jquery/qunit/issues/851
+    var result = Object.create(null);
+    for (var key in obj) {
+      result[key] = obj[key];
+    }
+    return result;
+  }
+
   test("changedAttributes() works while the record is being saved", function () {
     expect(1);
     var cat;
     var adapter = DS.Adapter.extend({
       createRecord: function (store, model, snapshot) {
-        deepEqual(cat.changedAttributes(), { name: [undefined, 'Argon'], likes: [undefined, 'Cheese'] });
+        deepEqual(toObj(cat.changedAttributes()), {
+          name: [undefined, 'Argon'],
+          likes: [undefined, 'Cheese'] });
         return {};
       }
     });
@@ -22947,7 +22684,7 @@ define("ember-data/tests/unit/model-test", ["exports"], function(__exports__) {
     var cat;
     var adapter = DS.Adapter.extend({
       updateRecord: function (store, model, snapshot) {
-        deepEqual(cat.changedAttributes(), { name: ['Argon', 'Helia'], likes: ['Cheese', 'Mussels'] });
+        deepEqual(toObj(cat.changedAttributes()), { name: ['Argon', 'Helia'], likes: ['Cheese', 'Mussels'] });
         return { id: '1', type: 'mascot' };
       }
     });
@@ -24155,13 +23892,7 @@ define(
         updateRecord: function (store, type, snapshot) {
           equal(callCount, 0, "becameInvalid callback was not called until recordWasInvalid is called");
 
-          return Ember.RSVP.reject(new DS.InvalidError([{
-            title: "Invalid Attribute",
-            detail: "error",
-            source: {
-              pointer: "/data/attributes/bar"
-            }
-          }]));
+          return Ember.RSVP.reject(new DS.InvalidError({ bar: 'error' }));
         }
       });
 
@@ -27173,21 +26904,18 @@ define(
     var get = Ember.get;
     var set = Ember.set;
     var resolve = Ember.RSVP.resolve;
-    var TestAdapter, store, person, oldFilterEnabled;
+    var TestAdapter, store, person;
     var run = Ember.run;
 
     module("unit/store/adapter-interop - DS.Store working with a DS.Adapter", {
       setup: function () {
         TestAdapter = DS.Adapter.extend();
-        oldFilterEnabled = Ember.ENV.ENABLE_DS_FILTER;
-        Ember.ENV.ENABLE_DS_FILTER = false;
       },
       teardown: function () {
         run(function () {
           if (store) {
             store.destroy();
           }
-          Ember.ENV.ENABLE_DS_FILTER = oldFilterEnabled;
         });
       }
     });
@@ -28396,38 +28124,6 @@ define(
       equal(store.peekRecord('person', 1).get('name'), 'Tom');
     });
 
-    test("store should assert of the user tries to call store.filter", function () {
-      expect(1);
-
-      var Person = DS.Model.extend({
-        name: DS.attr('string')
-      });
-
-      store = createStore({
-        person: Person
-      });
-
-      expectAssertion(function () {
-        run(function () {
-          store.filter('person', {});
-        });
-      }, /The filter API has been moved to a plugin/);
-    });
-
-    test("Calling adapterFor with a model class should assert", function () {
-      var Person = DS.Model.extend({
-        name: DS.attr('string')
-      });
-
-      store = createStore({
-        person: Person
-      });
-
-      expectAssertion(function () {
-        store.adapterFor(Person);
-      }, /Passing classes to store.adapterFor has been removed/);
-    });
-
     module("unit/store/adapter_interop - find preload deprecations", {
       setup: function () {
         var Person = DS.Model.extend({
@@ -29694,13 +29390,12 @@ define(
       __exports__[name] = value;
     }
 
-    var container, store, registry, Person;
+    var container, store, registry;
     var run = Ember.run;
 
     module("unit/store/serializer_for - DS.Store#serializerFor", {
       setup: function () {
-        Person = DS.Model.extend({});
-        var env = setupStore({ person: Person });
+        var env = setupStore({ person: DS.Model.extend() });
         store = env.store;
         container = store.container;
         registry = env.registry;
@@ -29733,12 +29428,6 @@ define(
     test("Calling serializerFor with a type that has not been registered and in an application that does not have an ApplicationSerializer looks up the default Ember Data serializer", function () {
       ok(store.serializerFor('person') instanceof DS.JSONSerializer, "serializer returned from serializerFor is an instance of DS.JSONSerializer");
     });
-
-    test("Calling serializerFor with a model class should assert", function () {
-      expectAssertion(function () {
-        store.serializerFor(Person);
-      }, /Passing classes to store.serializerFor has been removed/);
-    });
   }
 );
 
@@ -30439,6 +30128,13 @@ QUnit.test('ember-data/lib/system/debug/debug-info.js should pass jshint', funct
   assert.ok(true, 'ember-data/lib/system/debug/debug-info.js should pass jshint.'); 
 });
 
+}
+if (!QUnit.urlParams.nojshint) {
+QUnit.module('JSHint - ember-data/lib/system');
+QUnit.test('ember-data/lib/system/empty-object.js should pass jshint', function(assert) { 
+  assert.ok(true, 'ember-data/lib/system/empty-object.js should pass jshint.'); 
+});
+
 }
 if (!QUnit.urlParams.nojshint) {
 QUnit.module('JSHint - ember-data/lib/system');