Skip to content

Commit 94c57b0

Browse files
jmdobryjmdobry
committed
Fixes #66.
1 parent e83f887 commit 94c57b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+309
-212
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- #59, #62 - Make queryTransform() consistent with the rest of the API
66

77
###### Backwards compatible API changes
8-
- #30, #48 - DSCacheFactory integration
8+
- #30, #48, #66 - DSCacheFactory integration
99
- #49 - DS.bindOne($scope, prop, resourceName, id)
1010
- #50 - DS.bindAll($scope, prop, resourceName, query)
1111
- #51 - Allow baseUrl to be overridable at the method level

‎Gruntfile.js‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,24 +97,44 @@ module.exports = function (grunt) {
9797
dev: {
9898
browsers: ['Chrome'],
9999
autoWatch: true,
100-
singleRun: false
100+
singleRun: false,
101+
exclude: [
102+
'test/integration/datastore/cacheFactory.test.js'
103+
]
101104
},
102105
min: {
103-
browsers: ['Chrome'],
104-
autoWatch: false,
105-
singleRun: true,
106+
browsers: ['Firefox', 'PhantomJS'],
106107
options: {
107108
files: [
108109
'bower_components/angular/angular.js',
109110
'bower_components/angular-mocks/angular-mocks.js',
111+
'bower_components/angular-cache/dist/angular-cache.js',
110112
'dist/angular-data.min.js',
111-
'test/integration/**/*.js',
112-
'karma.start.js'
113+
'karma.start.js',
114+
'test/integration/**/*.js'
115+
]
116+
},
117+
exclude: [
118+
'test/integration/datastore/cacheFactory.test.js'
119+
]
120+
},
121+
cacheFactory: {
122+
browsers: ['Firefox', 'PhantomJS'],
123+
options: {
124+
files: [
125+
'bower_components/angular/angular.js',
126+
'bower_components/angular-mocks/angular-mocks.js',
127+
'dist/angular-data.js',
128+
'karma.start.js',
129+
'test/integration/datastore/cacheFactory.test.js'
113130
]
114131
}
115132
},
116133
ci: {
117-
browsers: ['Firefox', 'PhantomJS']
134+
browsers: ['Firefox', 'PhantomJS'],
135+
exclude: [
136+
'test/integration/datastore/cacheFactory.test.js'
137+
]
118138
}
119139
},
120140
coveralls: {
@@ -375,5 +395,5 @@ module.exports = function (grunt) {
375395
grunt.registerTask('default', ['build']);
376396

377397
// Used by TravisCI
378-
grunt.registerTask('ci', ['build', 'karma:ci', 'coveralls', 'doc']);
398+
grunt.registerTask('ci', ['build', 'karma:ci', 'karma:cacheFactory', 'karma:min', 'coveralls', 'doc']);
379399
};

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22

33
__Data store for Angular.js.__
44

5-
__Current version:__ 0.9.0
5+
__Latest Release:__ [0.8.1](http://angular-data.codetrain.io/)
6+
__master:__ [0.9.0](http://angular-data-next.codetrain.io/)
67

78
Angular-data is in a pre-1.0.0 development stage; the API is fluctuating, not a lot of tests yet, etc.
89

9-
Not for production use (yet). If you still want to develop with Angular-data, be prepared to keep a close eye on the changelog, as the API is very liable to change (a lot).
10+
Not for production use (yet). If you still want to develop with Angular-data, be prepared to keep a close eye on the changelog, as the API is still liable to change before 1.0.0.
1011

11-
Pending:
12-
- A Solid Roadmap
12+
Roadmap:
1313
- Relations/Associations
1414
- Various Adapters
1515
- Schema Definition/Validation
1616
- Nested Resources
17-
- Website / documentation
18-
- 100% tested (whatever _that_ means)
1917
- See [issues](https://github.com/jmdobry/angular-data/issues?milestone=7&page=1&state=open) for what's in development
2018
- See [Design Doc](https://docs.google.com/document/d/1o069KLuBH4jpwm1FCLZFwKMgM73Xi8_1JyjhSxVpidM/edit?usp=sharing) for other juicy reading material
2119

‎dist/angular-data.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3346,8 +3346,8 @@ function DSProvider() {
33463346
var defaults = this.defaults = new BaseConfig();
33473347

33483348
this.$get = [
3349-
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors', 'DSCacheFactory',
3350-
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors, DSCacheFactory) {
3349+
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors',
3350+
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors) {
33513351

33523352
var syncMethods = require('./sync_methods'),
33533353
asyncMethods = require('./async_methods'),

‎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.

‎karma.conf.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ module.exports = function (config) {
1212
'karma-chrome-launcher',
1313
'karma-phantomjs-launcher',
1414
'karma-firefox-launcher',
15-
'karma-coverage'
15+
'karma-coverage',
16+
'karma-spec-reporter'
1617
],
1718
autoWatch: false,
1819
browsers: ['Chrome'],
@@ -23,11 +24,11 @@ module.exports = function (config) {
2324
'bower_components/angular-mocks/angular-mocks.js',
2425
'bower_components/angular-cache/dist/angular-cache.js',
2526
'dist/angular-data.js',
26-
'test/integration/**/*.js',
27-
'karma.start.js'
27+
'karma.start.js',
28+
'test/integration/**/*.js'
2829
],
2930

30-
reporters: ['progress', 'coverage'],
31+
reporters: ['spec', 'coverage'],
3132

3233
preprocessors: {
3334
'dist/angular-data.js': ['coverage']

‎karma.start.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ var fail = function (msg) {
2727
}],
2828
TYPES_EXCEPT_FUNCTION = ['string', 123, 123.123, null, undefined, {}, [], true, false];
2929

30-
angular.module('app', ['ng', 'angular-data.DS', 'angular-data.DSCacheFactory']);
30+
angular.module('app', ['ng', 'angular-data.DS']);
3131

3232
// Setup before each test
33-
beforeEach(function (done) {
33+
beforeEach(function () {
3434
lifecycle.beforeValidate = function (resourceName, attrs, cb) {
3535
lifecycle.beforeValidate.callCount += 1;
3636
cb(null, attrs);
@@ -103,10 +103,13 @@ beforeEach(function (done) {
103103
DSProvider.defaults.deserialize = lifecycle.deserialize;
104104
DSHttpAdapterProvider = _DSHttpAdapterProvider_;
105105
DSHttpAdapterProvider.defaults.queryTransform = lifecycle.queryTransform;
106-
107106
});
107+
});
108+
109+
function startInjector() {
108110
inject(function (_$rootScope_, _$q_, _$httpBackend_, _DS_, _$log_, _DSUtils_, _DSHttpAdapter_, _DSLocalStorageAdapter_) {
109111
// Setup global mocks
112+
110113
localStorage.clear();
111114
$q = _$q_;
112115
$rootScope = _$rootScope_;
@@ -141,10 +144,8 @@ beforeEach(function (done) {
141144
p3 = { author: 'Mike', age: 32, id: 7 };
142145
p4 = { author: 'Adam', age: 33, id: 8 };
143146
p5 = { author: 'Adam', age: 33, id: 9 };
144-
145-
done();
146147
});
147-
});
148+
}
148149

149150
// Clean up after each test
150151
afterEach(function () {

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
],
2121
"devDependencies": {
22-
"grunt": "0.4.4",
22+
"grunt": "0.4.5",
2323
"grunt-cli": "0.1.13",
2424
"grunt-contrib-clean": "0.5.0",
2525
"load-grunt-tasks": "0.4.0",
@@ -35,15 +35,16 @@
3535
"karma": "~0.12.16",
3636
"grunt-karma": "~0.8.3",
3737
"karma-chai": "0.1.0",
38-
"mocha": "~1.18.2",
38+
"mocha": "~1.19.0",
3939
"karma-coverage": "~0.2.1",
4040
"grunt-contrib-watch": "~0.6.1",
4141
"grunt-karma-coveralls": "~2.5.0",
4242
"karma-mocha": "~0.1.3",
4343
"karma-sinon": "~1.0.3",
4444
"time-grunt": "~0.3.1",
4545
"browserify": "4.1.3",
46-
"grunt-browserify": "2.1.0"
46+
"grunt-browserify": "2.1.0",
47+
"karma-spec-reporter": "0.0.13"
4748
},
4849
"scripts": {
4950
"test": "node node_modules/grunt-cli/bin/grunt test"

‎src/datastore/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,8 @@ function DSProvider() {
461461
var defaults = this.defaults = new BaseConfig();
462462

463463
this.$get = [
464-
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors', 'DSCacheFactory',
465-
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors, DSCacheFactory) {
464+
'$rootScope', '$log', '$q', 'DSHttpAdapter', 'DSLocalStorageAdapter', 'DSUtils', 'DSErrors',
465+
function ($rootScope, $log, $q, DSHttpAdapter, DSLocalStorageAdapter, DSUtils, DSErrors) {
466466

467467
var syncMethods = require('./sync_methods'),
468468
asyncMethods = require('./async_methods'),

‎test/integration/adapters/http/create.test.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
describe('DSHttpAdapter.create(resourceConfig, attrs, options)', function () {
2+
3+
beforeEach(startInjector);
4+
25
it('should make a POST request', function () {
36
$httpBackend.expectPOST('api/posts', {
47
author: 'John',

0 commit comments

Comments
 (0)