Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 17d8df0

Browse files
jmdobryjmdobry
committedNov 7, 2014
Closes #227. Closes #228. Fixes #207.
Stable Version 1.3.0.
1 parent 3e11ffa commit 17d8df0

File tree

14 files changed

+199
-175
lines changed

14 files changed

+199
-175
lines changed
 

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
##### 1.3.0 - 07 November 2014
2+
3+
###### Backwards compatible API changes
4+
- #227 - Added DSDestroy and DSRefresh to instance methods
5+
- #228 - Added DS.getAll(resourceName[, ids])
6+
7+
###### Backwards compatible bug fixes
8+
- #207 - digest iterations error
9+
110
##### 1.2.1 - 04 November 2014
211

312
###### Backwards compatible bug fixes

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Unlike Backbone and Ember Models, angular-data does not require the use of gette
88

99
Supporting relations, computed properties, model lifecycle control and a slew of other features, angular-data is the tool for giving your data the respect it deserves.
1010

11-
__Latest Release:__ [1.2.1](https://github.com/jmdobry/angular-data/releases/tag/1.2.1)
11+
__Latest Release:__ [1.3.0](https://github.com/jmdobry/angular-data/releases/tag/1.3.0)
1212

13-
Angular-data is finally 1.0.!
13+
Angular-data is finally 1.0.!
1414

1515
Angular-data 1.x will continue to see bug fixes, but all new development will be on [js-data](https://github.com/js-data/js-data) and [js-data-angular](https://github.com/jmdobry/angular-data/pull/198) (Angular-data 2.0).
1616

@@ -55,14 +55,14 @@ app.controller('postCtrl', function ($scope, $routeParams, Post, Comment) {
5555
var query = {
5656
postId: $routeParams.id
5757
};
58-
58+
5959
Post.find($routeParams.id);
6060
Comment.findAll(query);
61-
61+
6262
// My goodness this was easy
6363
Post.bindOne($scope, 'post', $routeParams.id);
6464
Comment.bindAll($scope, 'comments', query);
65-
65+
6666
// Long form, functionally the same as above
6767
$scope.$watch(function () {
6868
return Post.lastModified($routeParams.id);

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"author": "Jason Dobry",
33
"name": "angular-data",
44
"description": "Data store for Angular.js.",
5-
"version": "1.2.1",
5+
"version": "1.3.0",
66
"homepage": "http://angular-data.pseudobry.com/",
77
"repository": {
88
"type": "git",
9-
"url": "git://github.com/jmdobry/angular-data.git"
9+
"url": "https://github.com/jmdobry/angular-data.git"
1010
},
1111
"main": "./dist/angular-data.min.js",
1212
"ignore": [
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"angular": "1.2.25",
3333
"angular-mocks": "1.2.25",
34-
"angular-cache": "3.1.1",
34+
"angular-cache": "3.2.0",
3535
"observe-js": "0.3.4",
3636
"angular-data-mocks": "1.0.0",
3737
"bootstrap": "3.2.0"

‎dist/angular-data.js

Lines changed: 54 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @author Jason Dobry <jason.dobry@gmail.com>
33
* @file angular-data.js
4-
* @version 1.2.1 - Homepage <http://angular-data.pseudobry.com/>
4+
* @version 1.3.0 - Homepage <http://angular-data.pseudobry.com/>
55
* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>
66
* @license MIT <https://github.com/jmdobry/angular-data/blob/master/LICENSE>
77
*
@@ -4079,6 +4079,10 @@ function updateAll(resourceName, attrs, params, options) {
40794079
module.exports = updateAll;
40804080

40814081
},{}],67:[function(require,module,exports){
4082+
var observe = require('../../lib/observe-js/observe-js');
4083+
4084+
var total = 0;
4085+
40824086
function lifecycleNoop(resourceName, attrs, cb) {
40834087
cb(null, attrs);
40844088
}
@@ -4210,7 +4214,14 @@ Defaults.prototype.defaultFilter = function (collection, resourceName, params, o
42104214
if (_this.utils.isString(def)) {
42114215
def = [def, 'ASC'];
42124216
} else if (!_this.utils.isArray(def)) {
4213-
throw new _this.errors.IllegalArgumentError('DS.filter(resourceName[, params][, options]): ' + angular.toJson(def) + ': Must be a string or an array!', { params: { 'orderBy[i]': { actual: typeof def, expected: 'string|array' } } });
4217+
throw new _this.errors.IllegalArgumentError('DS.filter(resourceName[, params][, options]): ' + angular.toJson(def) + ': Must be a string or an array!', {
4218+
params: {
4219+
'orderBy[i]': {
4220+
actual: typeof def,
4221+
expected: 'string|array'
4222+
}
4223+
}
4224+
});
42144225
}
42154226
filtered = _this.utils.sort(filtered, function (a, b) {
42164227
var cA = a[def[0]], cB = b[def[0]];
@@ -4734,9 +4745,9 @@ function DSProvider() {
47344745
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors',
47354746
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors) {
47364747

4737-
var syncMethods = require('./sync_methods'),
4738-
asyncMethods = require('./async_methods'),
4739-
cache;
4748+
var syncMethods = require('./sync_methods');
4749+
var asyncMethods = require('./async_methods');
4750+
var cache;
47404751

47414752
try {
47424753
cache = angular.injector(['angular-data.DSCacheFactory']).get('DSCacheFactory');
@@ -4846,10 +4857,7 @@ function DSProvider() {
48464857
if (typeof Object.observe !== 'function' ||
48474858
typeof Array.observe !== 'function') {
48484859
$rootScope.$watch(function () {
4849-
// Throttle angular-data's digest loop to tenths of a second
4850-
return new Date().getTime() / 100 | 0;
4851-
}, function () {
4852-
DS.digest();
4860+
observe.Platform.performMicrotaskCheckpoint();
48534861
});
48544862
}
48554863

@@ -4860,7 +4868,7 @@ function DSProvider() {
48604868

48614869
module.exports = DSProvider;
48624870

4863-
},{"./async_methods":61,"./sync_methods":82}],68:[function(require,module,exports){
4871+
},{"../../lib/observe-js/observe-js":1,"./async_methods":61,"./sync_methods":82}],68:[function(require,module,exports){
48644872
function errorPrefix(resourceName) {
48654873
return 'DS.bindAll(scope, expr, ' + resourceName + ', params[, cb]): ';
48664874
}
@@ -5382,6 +5390,13 @@ function Resource(utils, options) {
53825390
}
53835391
}
53845392

5393+
var instanceMethods = [
5394+
'save',
5395+
'update',
5396+
'destroy',
5397+
'refresh'
5398+
];
5399+
53855400
var methodsToProxy = [
53865401
'bindAll',
53875402
'bindOne',
@@ -5398,6 +5413,7 @@ var methodsToProxy = [
53985413
'find',
53995414
'findAll',
54005415
'get',
5416+
'getAll',
54015417
'hasChanges',
54025418
'inject',
54035419
'lastModified',
@@ -5488,24 +5504,27 @@ function defineResource(definition) {
54885504
name: definition
54895505
};
54905506
}
5507+
5508+
var defName = definition ? definition.name : undefined;
5509+
54915510
if (!DSUtils.isObject(definition)) {
54925511
throw new IA(errorPrefix + 'definition: Must be an object!');
5493-
} else if (!DSUtils.isString(definition.name)) {
5512+
} else if (!DSUtils.isString(defName)) {
54945513
throw new IA(errorPrefix + 'definition.name: Must be a string!');
54955514
} else if (definition.idAttribute && !DSUtils.isString(definition.idAttribute)) {
54965515
throw new IA(errorPrefix + 'definition.idAttribute: Must be a string!');
54975516
} else if (definition.endpoint && !DSUtils.isString(definition.endpoint)) {
54985517
throw new IA(errorPrefix + 'definition.endpoint: Must be a string!');
5499-
} else if (DS.store[definition.name]) {
5500-
throw new DS.errors.R(errorPrefix + definition.name + ' is already registered!');
5518+
} else if (DS.store[defName]) {
5519+
throw new DS.errors.R(errorPrefix + defName + ' is already registered!');
55015520
}
55025521

55035522
try {
55045523
// Inherit from global defaults
55055524
Resource.prototype = DS.defaults;
5506-
definitions[definition.name] = new Resource(DSUtils, definition);
5525+
definitions[defName] = new Resource(DSUtils, definition);
55075526

5508-
var def = definitions[definition.name];
5527+
var def = definitions[defName];
55095528

55105529
// Setup nested parent configuration
55115530
if (def.relations) {
@@ -5597,7 +5616,7 @@ function defineResource(definition) {
55975616
});
55985617

55995618
// Create the wrapper class for the new resource
5600-
def.class = DSUtils.pascalCase(definition.name);
5619+
def.class = DSUtils.pascalCase(defName);
56015620
eval('function ' + def.class + '() {}');
56025621
def[def.class] = eval(def.class);
56035622

@@ -5640,19 +5659,14 @@ function defineResource(definition) {
56405659
};
56415660
}
56425661

5643-
def[def.class].prototype.DSUpdate = function () {
5644-
var args = Array.prototype.slice.call(arguments);
5645-
args.unshift(this[def.idAttribute]);
5646-
args.unshift(def.name);
5647-
return DS.update.apply(DS, args);
5648-
};
5649-
5650-
def[def.class].prototype.DSSave = function () {
5651-
var args = Array.prototype.slice.call(arguments);
5652-
args.unshift(this[def.idAttribute]);
5653-
args.unshift(def.name);
5654-
return DS.save.apply(DS, args);
5655-
};
5662+
DSUtils.forEach(instanceMethods, function (name) {
5663+
def[def.class].prototype['DS' + DSUtils.pascalCase(name)] = function () {
5664+
var args = Array.prototype.slice.call(arguments);
5665+
args.unshift(this[def.idAttribute]);
5666+
args.unshift(def.name);
5667+
return DS[name].apply(DS, args);
5668+
};
5669+
});
56565670

56575671
// Initialize store data for the new resource
56585672
DS.store[def.name] = {
@@ -5702,8 +5716,8 @@ function defineResource(definition) {
57025716
return def;
57035717
} catch (err) {
57045718
DS.$log.error(err);
5705-
delete definitions[definition.name];
5706-
delete DS.store[definition.name];
5719+
delete definitions[defName];
5720+
delete DS.store[defName];
57075721
throw err;
57085722
}
57095723
}
@@ -6136,7 +6150,7 @@ function errorPrefix(resourceName) {
61366150
* @id DS.sync methods:getAll
61376151
* @name getAll
61386152
* @description
6139-
* Synchronously return all of the resource.
6153+
* Synchronously return all items of the given resource, or optionally, a subset based on the given primary keys.
61406154
*
61416155
* ## Signature:
61426156
* ```js
@@ -6155,27 +6169,27 @@ function errorPrefix(resourceName) {
61556169
* - `{NonexistentResourceError}`
61566170
*
61576171
* @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
6158-
* @param {array} ids Optional list of primary keys to filter the array of results by.
6172+
* @param {array} ids Optional list of primary keys by which to filter the results.
61596173
*
61606174
* @returns {array} The items of the type specified by `resourceName`.
61616175
*/
61626176
function getAll(resourceName, ids) {
6163-
var DS = this;
6177+
var DS = this;
61646178
var IA = DS.errors.IA;
6165-
var resource;
6179+
var resource = DS.store[resourceName];
61666180
var collection = [];
61676181

61686182
if (!DS.definitions[resourceName]) {
61696183
throw new DS.errors.NER(errorPrefix(resourceName) + resourceName);
6170-
} else if (arguments.length === 2 && !DS.utils.isArray(ids)) {
6184+
} else if (ids && !DS.utils.isArray(ids)) {
61716185
throw new IA(errorPrefix(resourceName, ids) + 'ids: Must be an array!');
61726186
}
61736187

6174-
resource = DS.store[resourceName];
6175-
61766188
if (DS.utils.isArray(ids)) {
61776189
for (var i = 0; i < ids.length; i++) {
6178-
collection.push(resource.index.get(ids[i]));
6190+
if (resource.index.get(ids[i])) {
6191+
collection.push(resource.index.get(ids[i]));
6192+
}
61796193
}
61806194
} else {
61816195
collection = resource.collection.slice();
@@ -6185,6 +6199,7 @@ function getAll(resourceName, ids) {
61856199
}
61866200

61876201
module.exports = getAll;
6202+
61886203
},{}],81:[function(require,module,exports){
61896204
function errorPrefix(resourceName, id) {
61906205
return 'DS.hasChanges(' + resourceName + ', ' + id + '): ';

‎dist/angular-data.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎guide/nav.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<i class="icon-wrench icon-white"></i> API <b class="caret"></b>
8383
</a>
8484
<ul class="dropdown-menu">
85-
<li class="nav-header">Angular-data - 1.2.0</li>
85+
<li class="nav-header">Angular-data - 1.3.0</li>
8686
<li>
8787
<a href="/documentation/api/angular-data/angular-data">Overview</a>
8888
</li>
@@ -107,7 +107,7 @@
107107
<a href="/documentation/api/angular-data-mocks/DSHttpAdapter">DSHttpAdapter</a>
108108
</li>
109109
<li class="divider"></li>
110-
<li class="nav-header">Angular-cache - 3.1.1</li>
110+
<li class="nav-header">Angular-cache - 3.2.0</li>
111111
<li>
112112
<a href="/documentation/api/angular-cache/angular-cache">Overview</a>
113113
</li>

‎karma.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module.exports = function (config) {
1616
'karma-spec-reporter'
1717
],
1818
autoWatch: false,
19+
browserNoActivityTimeout: 30000,
1920
browsers: ['Chrome'],
2021

2122
// list of files / patterns to load in the browser

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-data",
33
"description": "Data store for Angular.js.",
4-
"version": "1.2.1",
4+
"version": "1.3.0",
55
"homepage": "http://angular-data.pseudobry.com",
66
"repository": {
77
"type": "git",
@@ -20,10 +20,10 @@
2020
],
2121
"devDependencies": {
2222
"grunt": "0.4.5",
23-
"grunt-browserify": "3.0.1",
23+
"grunt-browserify": "3.2.0",
2424
"grunt-contrib-clean": "0.6.0",
2525
"grunt-contrib-concat": "0.5.0",
26-
"grunt-contrib-copy": "0.6.0",
26+
"grunt-contrib-copy": "0.7.0",
2727
"grunt-contrib-jshint": "0.10.0",
2828
"grunt-contrib-uglify": "0.6.0",
2929
"grunt-contrib-watch": "0.6.1",
@@ -40,7 +40,7 @@
4040
"karma-sinon": "1.0.3",
4141
"karma-spec-reporter": "0.0.13",
4242
"time-grunt": "1.0.0",
43-
"jit-grunt": "0.8.0",
43+
"jit-grunt": "0.9.0",
4444
"grunt-docular": "0.1.4"
4545
},
4646
"scripts": {

‎src/datastore/index.js

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
var observe = require('../../lib/observe-js/observe-js');
2+
3+
var total = 0;
4+
15
function lifecycleNoop(resourceName, attrs, cb) {
26
cb(null, attrs);
37
}
@@ -129,7 +133,14 @@ Defaults.prototype.defaultFilter = function (collection, resourceName, params, o
129133
if (_this.utils.isString(def)) {
130134
def = [def, 'ASC'];
131135
} else if (!_this.utils.isArray(def)) {
132-
throw new _this.errors.IllegalArgumentError('DS.filter(resourceName[, params][, options]): ' + angular.toJson(def) + ': Must be a string or an array!', { params: { 'orderBy[i]': { actual: typeof def, expected: 'string|array' } } });
136+
throw new _this.errors.IllegalArgumentError('DS.filter(resourceName[, params][, options]): ' + angular.toJson(def) + ': Must be a string or an array!', {
137+
params: {
138+
'orderBy[i]': {
139+
actual: typeof def,
140+
expected: 'string|array'
141+
}
142+
}
143+
});
133144
}
134145
filtered = _this.utils.sort(filtered, function (a, b) {
135146
var cA = a[def[0]], cB = b[def[0]];
@@ -653,9 +664,9 @@ function DSProvider() {
653664
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors',
654665
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors) {
655666

656-
var syncMethods = require('./sync_methods'),
657-
asyncMethods = require('./async_methods'),
658-
cache;
667+
var syncMethods = require('./sync_methods');
668+
var asyncMethods = require('./async_methods');
669+
var cache;
659670

660671
try {
661672
cache = angular.injector(['angular-data.DSCacheFactory']).get('DSCacheFactory');
@@ -765,10 +776,7 @@ function DSProvider() {
765776
if (typeof Object.observe !== 'function' ||
766777
typeof Array.observe !== 'function') {
767778
$rootScope.$watch(function () {
768-
// Throttle angular-data's digest loop to tenths of a second
769-
return new Date().getTime() / 100 | 0;
770-
}, function () {
771-
DS.digest();
779+
observe.Platform.performMicrotaskCheckpoint();
772780
});
773781
}
774782

‎src/datastore/sync_methods/defineResource.js

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ function Resource(utils, options) {
1212
}
1313
}
1414

15+
var instanceMethods = [
16+
'save',
17+
'update',
18+
'destroy',
19+
'refresh'
20+
];
21+
1522
var methodsToProxy = [
1623
'bindAll',
1724
'bindOne',
@@ -28,6 +35,7 @@ var methodsToProxy = [
2835
'find',
2936
'findAll',
3037
'get',
38+
'getAll',
3139
'hasChanges',
3240
'inject',
3341
'lastModified',
@@ -118,24 +126,27 @@ function defineResource(definition) {
118126
name: definition
119127
};
120128
}
129+
130+
var defName = definition ? definition.name : undefined;
131+
121132
if (!DSUtils.isObject(definition)) {
122133
throw new IA(errorPrefix + 'definition: Must be an object!');
123-
} else if (!DSUtils.isString(definition.name)) {
134+
} else if (!DSUtils.isString(defName)) {
124135
throw new IA(errorPrefix + 'definition.name: Must be a string!');
125136
} else if (definition.idAttribute && !DSUtils.isString(definition.idAttribute)) {
126137
throw new IA(errorPrefix + 'definition.idAttribute: Must be a string!');
127138
} else if (definition.endpoint && !DSUtils.isString(definition.endpoint)) {
128139
throw new IA(errorPrefix + 'definition.endpoint: Must be a string!');
129-
} else if (DS.store[definition.name]) {
130-
throw new DS.errors.R(errorPrefix + definition.name + ' is already registered!');
140+
} else if (DS.store[defName]) {
141+
throw new DS.errors.R(errorPrefix + defName + ' is already registered!');
131142
}
132143

133144
try {
134145
// Inherit from global defaults
135146
Resource.prototype = DS.defaults;
136-
definitions[definition.name] = new Resource(DSUtils, definition);
147+
definitions[defName] = new Resource(DSUtils, definition);
137148

138-
var def = definitions[definition.name];
149+
var def = definitions[defName];
139150

140151
// Setup nested parent configuration
141152
if (def.relations) {
@@ -227,7 +238,7 @@ function defineResource(definition) {
227238
});
228239

229240
// Create the wrapper class for the new resource
230-
def.class = DSUtils.pascalCase(definition.name);
241+
def.class = DSUtils.pascalCase(defName);
231242
eval('function ' + def.class + '() {}');
232243
def[def.class] = eval(def.class);
233244

@@ -270,19 +281,14 @@ function defineResource(definition) {
270281
};
271282
}
272283

273-
def[def.class].prototype.DSUpdate = function () {
274-
var args = Array.prototype.slice.call(arguments);
275-
args.unshift(this[def.idAttribute]);
276-
args.unshift(def.name);
277-
return DS.update.apply(DS, args);
278-
};
279-
280-
def[def.class].prototype.DSSave = function () {
281-
var args = Array.prototype.slice.call(arguments);
282-
args.unshift(this[def.idAttribute]);
283-
args.unshift(def.name);
284-
return DS.save.apply(DS, args);
285-
};
284+
DSUtils.forEach(instanceMethods, function (name) {
285+
def[def.class].prototype['DS' + DSUtils.pascalCase(name)] = function () {
286+
var args = Array.prototype.slice.call(arguments);
287+
args.unshift(this[def.idAttribute]);
288+
args.unshift(def.name);
289+
return DS[name].apply(DS, args);
290+
};
291+
});
286292

287293
// Initialize store data for the new resource
288294
DS.store[def.name] = {
@@ -332,8 +338,8 @@ function defineResource(definition) {
332338
return def;
333339
} catch (err) {
334340
DS.$log.error(err);
335-
delete definitions[definition.name];
336-
delete DS.store[definition.name];
341+
delete definitions[defName];
342+
delete DS.store[defName];
337343
throw err;
338344
}
339345
}

‎src/datastore/sync_methods/getAll.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function errorPrefix(resourceName) {
77
* @id DS.sync methods:getAll
88
* @name getAll
99
* @description
10-
* Synchronously return all of the resource.
10+
* Synchronously return all items of the given resource, or optionally, a subset based on the given primary keys.
1111
*
1212
* ## Signature:
1313
* ```js
@@ -26,27 +26,27 @@ function errorPrefix(resourceName) {
2626
* - `{NonexistentResourceError}`
2727
*
2828
* @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
29-
* @param {array} ids Optional list of primary keys to filter the array of results by.
29+
* @param {array} ids Optional list of primary keys by which to filter the results.
3030
*
3131
* @returns {array} The items of the type specified by `resourceName`.
3232
*/
3333
function getAll(resourceName, ids) {
34-
var DS = this;
34+
var DS = this;
3535
var IA = DS.errors.IA;
36-
var resource;
36+
var resource = DS.store[resourceName];
3737
var collection = [];
3838

3939
if (!DS.definitions[resourceName]) {
4040
throw new DS.errors.NER(errorPrefix(resourceName) + resourceName);
41-
} else if (arguments.length === 2 && !DS.utils.isArray(ids)) {
41+
} else if (ids && !DS.utils.isArray(ids)) {
4242
throw new IA(errorPrefix(resourceName, ids) + 'ids: Must be an array!');
4343
}
4444

45-
resource = DS.store[resourceName];
46-
4745
if (DS.utils.isArray(ids)) {
4846
for (var i = 0; i < ids.length; i++) {
49-
collection.push(resource.index.get(ids[i]));
47+
if (resource.index.get(ids[i])) {
48+
collection.push(resource.index.get(ids[i]));
49+
}
5050
}
5151
} else {
5252
collection = resource.collection.slice();
@@ -55,4 +55,4 @@ function getAll(resourceName, ids) {
5555
return collection;
5656
}
5757

58-
module.exports = getAll;
58+
module.exports = getAll;

‎test/integration/datastore/async_methods/findAll.test.js

Lines changed: 48 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ describe('DS.findAll(resourceName, params[, options]): ', function () {
320320
$httpBackend.flush();
321321
});
322322
it('stress test repeated injection', function () {
323+
this.timeout(15000);
323324
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(100));
324325

325326
var start = new Date().getTime();
@@ -362,79 +363,51 @@ describe('DS.findAll(resourceName, params[, options]): ', function () {
362363

363364
$httpBackend.flush();
364365
});
365-
it('stress test 1000', function () {
366-
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(1000));
367-
368-
var start = new Date().getTime();
369-
370-
DS.findAll('comment', {}, {
371-
bypassCache: true
372-
}).then(function () {
373-
console.log('1000 - time taken: ' + (new Date().getTime() - start) + 'ms');
374-
}, function () {
375-
fail('Should not have failed!');
376-
});
377-
378-
$httpBackend.flush();
379-
});
380-
it('stress test 2000', function () {
381-
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(2000));
382-
383-
var start = new Date().getTime();
384-
385-
DS.findAll('comment', {}, {
386-
bypassCache: true
387-
}).then(function () {
388-
console.log('2000 - time taken: ' + (new Date().getTime() - start) + 'ms');
389-
}, function () {
390-
fail('Should not have failed!');
391-
});
392-
393-
$httpBackend.flush();
394-
});
395-
it('stress test 3000', function () {
396-
this.timeout(10000);
397-
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(3000));
398-
var start = new Date().getTime();
399-
400-
DS.findAll('comment', {}, {
401-
bypassCache: true
402-
}).then(function () {
403-
console.log('3000 - time taken: ' + (new Date().getTime() - start) + 'ms');
404-
}, function () {
405-
fail('Should not have failed!');
406-
});
407-
408-
$httpBackend.flush();
409-
});
410-
it('stress test 4000', function () {
411-
this.timeout(10000);
412-
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(4000));
413-
var start = new Date().getTime();
414-
415-
DS.findAll('comment', {}, {
416-
bypassCache: true
417-
}).then(function () {
418-
console.log('4000 - time taken: ' + (new Date().getTime() - start) + 'ms');
419-
}, function () {
420-
fail('Should not have failed!');
421-
});
422-
423-
$httpBackend.flush();
424-
});
425-
it('stress test 5000', function () {
426-
this.timeout(15000);
427-
$httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(5000));
428-
var start = new Date().getTime();
429-
430-
DS.findAll('comment', {}, {
431-
bypassCache: true
432-
}).then(function () {
433-
console.log('5000 - time taken: ' + (new Date().getTime() - start) + 'ms');
434-
}, function () {
435-
fail('Should not have failed!');
436-
});
437-
438-
$httpBackend.flush();
439-
});
366+
//it('stress test 1000', function () {
367+
// this.timeout(15000);
368+
// $httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(1000));
369+
//
370+
// var start = new Date().getTime();
371+
//
372+
// DS.findAll('comment', {}, {
373+
// bypassCache: true
374+
// }).then(function () {
375+
// console.log('1000 - time taken: ' + (new Date().getTime() - start) + 'ms');
376+
// }, function () {
377+
// fail('Should not have failed!');
378+
// });
379+
//
380+
// $httpBackend.flush();
381+
//});
382+
//it('stress test 2000', function () {
383+
// this.timeout(30000);
384+
// $httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(2000));
385+
//
386+
// var start = new Date().getTime();
387+
//
388+
// DS.findAll('comment', {}, {
389+
// bypassCache: true
390+
// }).then(function () {
391+
// console.log('2000 - time taken: ' + (new Date().getTime() - start) + 'ms');
392+
// }, function () {
393+
// fail('Should not have failed!');
394+
// });
395+
//
396+
// $httpBackend.flush();
397+
//});
398+
//it('stress test 3000', function () {
399+
// this.timeout(30000);
400+
// $httpBackend.expectGET('http://test.angular-cache.com/comment').respond(200, createComments(3000));
401+
// var start = new Date().getTime();
402+
//
403+
// DS.findAll('comment', {}, {
404+
// bypassCache: true
405+
// }).then(function () {
406+
// console.log('3000 - time taken: ' + (new Date().getTime() - start) + 'ms');
407+
// }, function () {
408+
// fail('Should not have failed!');
409+
// });
410+
//
411+
// $httpBackend.flush();
412+
//});
440413
});

‎test/integration/datastore/async_methods/save.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,14 @@ describe('DS.save(resourceName, id[, options])', function () {
143143

144144
DS.inject('post', p1);
145145

146-
var initialModified = DS.lastModified('post', 5);
147146
var initialSaved = DS.lastSaved('post', 5);
148147

149148
DS.get('post', 5).author = 'Jake';
150149

150+
$rootScope.$apply();
151+
152+
var initialModified = DS.lastModified('post', 5);
153+
151154
DS.save('post', 5, { cacheResponse: false }).then(function (post) {
152155
assert.deepEqual(post, {
153156
random: 'stuff'

‎test/integration/datastore/sync_methods/getAll.test.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,28 @@ describe('DS.getAll(resourceName)', function () {
99
assert.throws(function () {
1010
DS.getAll('does not exist');
1111
}, DS.errors.NonexistentResourceError, errorPrefix('does not exist', {}) + 'does not exist is not a registered resource!');
12-
12+
1313
angular.forEach(TYPES_EXCEPT_ARRAY, function (key) {
14-
assert.throws(function () {
15-
DS.getAll('post', key);
16-
}, DS.errors.IllegalArgumentError, errorPrefix('post', key) + 'ids: Must be an array!');
14+
if (key) {
15+
assert.throws(function () {
16+
DS.getAll('post', key);
17+
}, DS.errors.IllegalArgumentError, errorPrefix('post', key) + 'ids: Must be an array!');
18+
}
1719
});
1820
});
1921
it('should return an array of all items in the store', function() {
20-
assert.isArray(DS.getAll('post'), 'should be an empty array');
22+
assert.isArray(DS.getAll('post'), 'should be an array');
23+
assert.equal(DS.getAll('post').length, 0, 'should be an empty array');
24+
DS.inject('post', p1);
25+
DS.inject('post', p2);
26+
DS.inject('post', p3);
27+
assert.isArray(DS.getAll('post'), 'should be an array');
28+
assert.equal(DS.getAll('post').length, 3, 'should be an array of length 3');
29+
assert.deepEqual(DS.getAll('post'), DS.filter('post', {}));
2130
});
2231
it('should return results that match a set of ids', function() {
2332
DS.inject('post', [ p1, p2, p3 ]);
2433
var posts = DS.getAll('post', [ 5, 7 ]);
2534
assert.deepEqual(angular.toJson(posts), angular.toJson([ p1, p3 ]));
2635
});
27-
});
36+
});

0 commit comments

Comments
 (0)
Please sign in to comment.