Skip to content

Commit 7ae1170

Browse files
committed
Stable Version 1.0.0.
1 parent 17deb9a commit 7ae1170

File tree

10 files changed

+79
-73
lines changed

10 files changed

+79
-73
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
##### 1.0.0 - 04 October 2014
2+
3+
Stable Version 1.0.0
4+
15
##### 1.0.0-rc.2-1 - 25 September 2014
26

37
###### Backwards compatible bug fixes

README.md

+28-27
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ 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.0.0-rc.2-1](http://angular-data.pseudobry.com/)
12-
__master:__ [1.0.0-rc.2-1](http://angular-data-next.pseudobry.com/)
11+
__Latest Release:__ [1.0.0](https://github.com/jmdobry/angular-data/releases/tag/1.0.0)
1312

14-
Angular-data is in a 1.0.0 Beta. The API is rather stable and angular-data is well tested.
13+
Angular-data is finally 1.0.0!
1514

16-
Although angular-data is being used in production, it's not fully 1.0.0. If you want to use Angular-data, keep an eye on the changelog. 1.0.0 will introduce strict semver (until then, minor number is bumped for breaking changes).
15+
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).
1716

18-
## Documentation
17+
#### A note about Angular-data 2.0 (forthcoming)
18+
See [angular-data/pull/198](https://github.com/jmdobry/angular-data/pull/198).
19+
20+
## 1.x Documentation
1921
[http://angular-data.pseudobry.com](http://angular-data.pseudobry.com)
2022

2123
## Project Status
@@ -37,42 +39,41 @@ var app = angular.module('myApp', ['angular-data.DS']);
3739
```
3840

3941
```js
40-
app.factory('User', function (DS) {
42+
app.factory('Post', function (DS) {
4143
// Simplest resource definition
42-
return DS.defineResource('user');
44+
return DS.defineResource('post');
45+
});
46+
app.factory('Comment', function (DS) {
47+
return DS.defineResource('comment');
4348
});
4449
```
4550

4651
```js
47-
app.controller('friendsCtrl', function ($scope, $routeParams, User) {
52+
app.controller('postCtrl', function ($scope, $routeParams, Post, Comment) {
4853
// it's up to your server to know how to interpret this query
4954
// or you can teach angular-data how to understand your servers' query language
5055
var query = {
51-
where: {
52-
friendIds: {
53-
in: $routeParams.id
54-
}
55-
}
56+
postId: $routeParams.id
5657
};
5758

58-
User.find($routeParams.id);
59-
User.findAll(query);
59+
Post.find($routeParams.id);
60+
Comment.findAll(query);
6061

6162
// My goodness this was easy
62-
User.bindOne($scope, 'me', $routeParams.id);
63-
User.bindAll($scope, 'friends', query);
63+
Post.bindOne($scope, 'post', $routeParams.id);
64+
Comment.bindAll($scope, 'comments', query);
6465

65-
// Long form
66+
// Long form, functionally the same as above
6667
$scope.$watch(function () {
67-
return User.lastModified($routeParams.id);
68+
return Post.lastModified($routeParams.id);
6869
}, function () {
69-
$scope.me = User.get($routeParams.id);
70+
$scope.post = Post.get($routeParams.id);
7071
});
7172
$scope.$watch(function () {
72-
// Changes when anything in the User collection is modified
73-
return User.lastModified();
73+
// Changes when anything in the Comment collection is modified
74+
return Comment.lastModified();
7475
}, function () {
75-
$scope.friends = User.filter(query);
76+
$scope.comments = Comment.filter(query);
7677
});
7778
});
7879
```
@@ -101,9 +102,7 @@ app.controller('friendsCtrl', function ($scope, $routeParams, User) {
101102
## Community
102103
- [Mailing List](https://groups.google.com/forum/?fromgroups#!forum/angular-data) - Ask your questions!
103104
- [Issues](https://github.com/jmdobry/angular-data/issues) - Found a bug? Feature request? Submit an issue!
104-
- [GitHub](https://github.com/jmdobry/angular-data) - View the source code for angular-data.
105-
- [Design Doc](https://docs.google.com/document/d/1o069KLuBH4jpwm1FCLZFwKMgM73Xi8_1JyjhSxVpidM/edit?usp=sharing) - Design document for Angular-data.
106-
- [Contributing Guide](#Contributing)
105+
- [Contributing Guide](https://github.com/jmdobry/angular-data/blob/master/CONTRIBUTING.md)
107106

108107
## Contributing
109108

@@ -120,7 +119,9 @@ First, feel free to contact me with questions. [Mailing List](https://groups.goo
120119

121120
## License
122121

123-
Copyright (C) 2014 Jason Dobry
122+
The MIT License (MIT)
123+
124+
Copyright (c) 2014 Jason Dobry
124125

125126
Permission is hereby granted, free of charge, to any person obtaining a copy of
126127
this software and associated documentation files (the "Software"), to deal in

bower.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Jason Dobry",
33
"name": "angular-data",
44
"description": "Data store for Angular.js.",
5-
"version": "1.0.0-rc.2-1",
5+
"version": "1.0.0",
66
"homepage": "http://angular-data.pseudobry.com/",
77
"repository": {
88
"type": "git",
@@ -26,11 +26,11 @@
2626
"karma.start.js"
2727
],
2828
"devDependencies": {
29-
"angular": "~1.2.22",
30-
"angular-mocks": "~1.2.22",
31-
"angular-cache": "~3.1.1",
29+
"angular": "1.2.25",
30+
"angular-mocks": "1.2.25",
31+
"angular-cache": "3.1.1",
3232
"observe-js": "0.3.4",
33-
"angular-data-mocks": "1.0.0-rc.1",
34-
"bootstrap": "~3.2.0"
33+
"angular-data-mocks": "1.0.0",
34+
"bootstrap": "3.2.0"
3535
}
3636
}

dist/angular-data.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* @author Jason Dobry <[email protected]>
33
* @file angular-data.js
4-
* @version 1.0.0-rc.2-1 - Homepage <http://angular-data.pseudobry.com/>
4+
* @version 1.0.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
*
@@ -4720,8 +4720,7 @@ function DSProvider() {
47204720
try {
47214721
cache = angular.injector(['angular-data.DSCacheFactory']).get('DSCacheFactory');
47224722
} catch (err) {
4723-
$log.warn(err);
4724-
$log.warn('DSCacheFactory is unavailable. Resorting to the lesser capabilities of $cacheFactory.');
4723+
$log.debug('DSCacheFactory is unavailable. Resorting to the lesser capabilities of $cacheFactory.');
47254724
cache = angular.injector(['ng']).get('$cacheFactory');
47264725
}
47274726

@@ -6384,7 +6383,10 @@ function _injectRelations(definition, injected, options) {
63846383
DS.utils.forEach(definition.relationList, function (def) {
63856384
var relationName = def.relation;
63866385
var relationDef = DS.definitions[relationName];
6387-
if (relationDef && injected[def.localField]) {
6386+
if (injected[def.localField]) {
6387+
if (!relationDef) {
6388+
throw new DS.errors.R(definition.name + 'relation is defined but the resource is not!');
6389+
}
63886390
try {
63896391
injected[def.localField] = DS.inject(relationName, injected[def.localField], options);
63906392
} catch (err) {
@@ -7410,7 +7412,7 @@ module.exports = [function () {
74107412
* @id angular-data
74117413
* @name angular-data
74127414
* @description
7413-
* __Version:__ 1.0.0-rc.1
7415+
* __Version:__ 1.0.0
74147416
*
74157417
* ## Install
74167418
*

dist/angular-data.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

guide/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ <h1>Respect your data</h1>
8181
<li>Read the <a href="/documentation/guide/angular-data/overview">Guide</a></li>
8282
<li>Explore the <a href="/documentation/guide/angular-data/overview">API</a></li>
8383
<li>Ask a question on the <a href="https://groups.google.com/forum/?fromgroups#!forum/angular-data">Mailing List</a></li>
84-
<li>Submit an <a href="https://github.com/jmdobry/angular-data/issues">Bug or Feature Request</a></li>
84+
<li>Submit a <a href="https://github.com/jmdobry/angular-data/issues">Bug or Feature Request</a></li>
8585
<li><a href="https://github.com/jmdobry/angular-data/blob/master/CONTRIBUTING.md">Contribute</a></li>
8686
</ul>
8787
</p>

guide/nav.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<a class="navbar-brand" data-ng-href="/"
1212
style="padding-top: 6px; padding-bottom: 6px; color: #0088cc;">
1313
<img class="logo-small" src="/resources/img/data_grey.png" style="height: 27px">&nbsp;
14-
angular-data
14+
angular-data 1.x docs
1515
<small>Data store and caching for Angular.js</small>
1616
</a>
1717
</div>
@@ -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.0.0-rc.1</li>
85+
<li class="nav-header">Angular-data - 1.0.0</li>
8686
<li>
8787
<a href="/documentation/api/angular-data/angular-data">Overview</a>
8888
</li>
@@ -96,7 +96,7 @@
9696
<a href="/documentation/api/angular-data/DSLocalStorageAdapter">DSLocalStorageAdapter</a>
9797
</li>
9898
<li class="divider"></li>
99-
<li class="nav-header">Angular-data-mocks - 1.0.0-rc.1</li>
99+
<li class="nav-header">Angular-data-mocks - 1.0.0</li>
100100
<li>
101101
<a href="/documentation/api/angular-data-mocks/angular-data-mocks">Overview</a>
102102
</li>

package.json

+25-25
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.0.0-rc.2-1",
4+
"version": "1.0.0",
55
"homepage": "http://angular-data.pseudobry.com",
66
"repository": {
77
"type": "git",
@@ -19,34 +19,34 @@
1919
}
2020
],
2121
"devDependencies": {
22-
"grunt": "^0.4.5",
23-
"grunt-browserify": "^3.0.0",
24-
"grunt-contrib-clean": "^0.6.0",
25-
"grunt-contrib-concat": "^0.5.0",
26-
"grunt-contrib-copy": "^0.5.0",
27-
"grunt-contrib-jshint": "^0.10.0",
28-
"grunt-contrib-uglify": "^0.5.1",
29-
"grunt-contrib-watch": "^0.6.1",
30-
"grunt-karma": "^0.8.3",
31-
"grunt-karma-coveralls": "^2.5.1",
32-
"karma": "^0.12.23",
33-
"karma-chai": "^0.1.0",
34-
"karma-chrome-launcher": "^0.1.4",
35-
"karma-coverage": "^0.2.6",
36-
"karma-script-launcher": "^0.1.0",
37-
"karma-firefox-launcher": "^0.1.3",
38-
"karma-phantomjs-launcher": "^0.1.4",
39-
"karma-mocha": "^0.1.9",
40-
"karma-sinon": "^1.0.3",
41-
"karma-spec-reporter": "^0.0.13",
42-
"time-grunt": "^1.0.0",
43-
"jit-grunt": "^0.8.0",
44-
"grunt-docular": "^0.1.4"
22+
"grunt": "0.4.5",
23+
"grunt-browserify": "3.0.1",
24+
"grunt-contrib-clean": "0.6.0",
25+
"grunt-contrib-concat": "0.5.0",
26+
"grunt-contrib-copy": "0.6.0",
27+
"grunt-contrib-jshint": "0.10.0",
28+
"grunt-contrib-uglify": "0.6.0",
29+
"grunt-contrib-watch": "0.6.1",
30+
"grunt-karma": "0.9.0",
31+
"grunt-karma-coveralls": "2.5.2",
32+
"karma": "0.12.24",
33+
"karma-chai": "0.1.0",
34+
"karma-chrome-launcher": "0.1.5",
35+
"karma-coverage": "0.2.6",
36+
"karma-script-launcher": "0.1.0",
37+
"karma-firefox-launcher": "0.1.3",
38+
"karma-phantomjs-launcher": "0.1.4",
39+
"karma-mocha": "0.1.9",
40+
"karma-sinon": "1.0.3",
41+
"karma-spec-reporter": "0.0.13",
42+
"time-grunt": "1.0.0",
43+
"jit-grunt": "0.8.0",
44+
"grunt-docular": "0.1.4"
4545
},
4646
"scripts": {
4747
"test": "grunt test"
4848
},
4949
"dependencies": {
50-
"mout": "^0.10.0"
50+
"mout": "0.10.0"
5151
}
5252
}

src/datastore/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,7 @@ function DSProvider() {
644644
try {
645645
cache = angular.injector(['angular-data.DSCacheFactory']).get('DSCacheFactory');
646646
} catch (err) {
647-
$log.warn(err);
648-
$log.warn('DSCacheFactory is unavailable. Resorting to the lesser capabilities of $cacheFactory.');
647+
$log.debug('DSCacheFactory is unavailable. Resorting to the lesser capabilities of $cacheFactory.');
649648
cache = angular.injector(['ng']).get('$cacheFactory');
650649
}
651650

src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @id angular-data
77
* @name angular-data
88
* @description
9-
* __Version:__ 1.0.0-rc.1
9+
* __Version:__ 1.0.0
1010
*
1111
* ## Install
1212
*

0 commit comments

Comments
 (0)