Skip to content

Commit 53108d2

Browse files
committed
Stable Version 2.1.0.
Closes #10. Closes #11.
1 parent 1ac928e commit 53108d2

File tree

9 files changed

+1041
-126
lines changed

9 files changed

+1041
-126
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
##### 2.1.0 - 10 July 2015
2+
3+
Upgraded dependencies
4+
5+
###### Backwards compatible API changes
6+
- #10 - Add support for loading relations in find()
7+
- #11 - Add support for loading relations in findAll()
8+
19
##### 2.0.1 - 02 July 2015
210

311
Removed unnecessary dependency

dist/js-data-localstorage.js

Lines changed: 604 additions & 71 deletions
Large diffs are not rendered by default.

dist/js-data-localstorage.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.

dist/js-data-localstorage.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.start.js

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
// Setup global test variables
2-
var dsLocalStorageAdapter, User, datastore;
2+
var dsLocalStorageAdapter, Profile, User, Post, Comment, datastore;
3+
4+
assert.equalObjects = function (a, b, m) {
5+
assert.deepEqual(JSON.parse(JSON.stringify(a)), JSON.parse(JSON.stringify(b)), m || 'Objects should be equal!');
6+
};
37

48
// Helper globals
59
var fail = function (msg) {
@@ -43,6 +47,57 @@ beforeEach(function () {
4347

4448
datastore = new JSData.DS();
4549

46-
User = datastore.defineResource('user');
50+
Profile = datastore.defineResource({
51+
name: 'profile'
52+
});
53+
User = datastore.defineResource({
54+
name: 'user',
55+
relations: {
56+
hasMany: {
57+
post: {
58+
localField: 'posts',
59+
foreignKey: 'post'
60+
}
61+
},
62+
hasOne: {
63+
profile: {
64+
localField: 'profile',
65+
localKey: 'profileId'
66+
}
67+
}
68+
}
69+
});
70+
Post = datastore.defineResource({
71+
name: 'post',
72+
relations: {
73+
belongsTo: {
74+
user: {
75+
localField: 'user',
76+
localKey: 'userId'
77+
}
78+
},
79+
hasMany: {
80+
comment: {
81+
localField: 'comments',
82+
foreignKey: 'postId'
83+
}
84+
}
85+
}
86+
});
87+
Comment = datastore.defineResource({
88+
name: 'comment',
89+
relations: {
90+
belongsTo: {
91+
post: {
92+
localField: 'post',
93+
localKey: 'postId'
94+
},
95+
user: {
96+
localField: 'user',
97+
localKey: 'userId'
98+
}
99+
}
100+
}
101+
});
47102
dsLocalStorageAdapter = new DSLocalStorageAdapter();
48103
});

package.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-localstorage",
33
"description": "localStorage adapter for js-data.",
4-
"version": "2.0.1",
4+
"version": "2.1.0",
55
"homepage": "http://www.js-data.io/docs/dslocalstorageadapter",
66
"repository": {
77
"type": "git",
@@ -11,12 +11,7 @@
1111
"name": "Jason Dobry",
1212
"email": "[email protected]"
1313
},
14-
"licenses": [
15-
{
16-
"type": "MIT",
17-
"url": "https://github.com/js-data/js-data-localstorage/blob/master/LICENSE"
18-
}
19-
],
14+
"license": "MIT",
2015
"keywords": [
2116
"data",
2217
"datastore",
@@ -27,8 +22,8 @@
2722
],
2823
"main": "./dist/js-data-localstorage.js",
2924
"devDependencies": {
30-
"babel-core": "5.6.15",
31-
"babel-loader": "5.2.2",
25+
"babel-core": "5.6.17",
26+
"babel-loader": "5.3.1",
3227
"es6-promise": "2.3.0",
3328
"grunt": "0.4.5",
3429
"grunt-contrib-clean": "0.6.0",

0 commit comments

Comments
 (0)