Skip to content

Commit

Permalink
Fixes #335.
Browse files Browse the repository at this point in the history
Stable Version 3.1.0
  • Loading branch information
jmdobry committed Sep 20, 2015
1 parent c3d47b0 commit 6f700f8
Show file tree
Hide file tree
Showing 10 changed files with 294 additions and 202 deletions.
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"browser": true,
"esnext": true,
"bitwise": true,
"asi": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
##### 3.1.1 - 20 September 2015

Stable Version 3.1.0

###### Backwards compatible API changes
- #335 - Calling $q.reject in http interceptor doesn't resolve to calling reject handler in DS.findAll.then

###### Other
- Built with js-data-http 2.1.1
- Upgraded dependencies

##### 3.0.0 - 02 July 2015

Stable Version 3.0.0
Expand Down
24 changes: 18 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
# Contributing Guide

First, feel free to contact me with questions. [Mailing List](https://groups.google.com/forum/?fromgroups#!forum/js-data-angular). [Issues](https://github.com/js-data/js-data-angular/issues).
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.

1. Contribute to the issue that is the reason you'll be developing in the first place
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.

- good - Your versions of Angular, js-data, js-data-angular, etc., relevant console logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix

[Github Issues](https://github.com/js-data/js-data-angular/issues).

#### Submitting Pull Requests

1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1. Fork js-data-angular
1. `git clone https://github.com/<you>/js-data-angular.git`
1. `git clone git@github.com:<you>/js-data-angular.git`
1. `cd js-data-angular; npm install; bower install;`
1. `grunt go` (builds and starts a watch)
1. (in another terminal) `grunt karma:dev` (runs the tests)
1. Write your code, including relevant documentation and tests
1. Submit a PR and we'll review
1. Run `grunt test` (build and test)
1. Your code will be linted and checked for formatting, the tests will be run
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
1. Submit your PR and we'll review!
1. Thanks!
31 changes: 31 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,19 @@ module.exports = function (grunt) {
'test/**/*.js'
]
}
},
c9: {
browsers: ['PhantomJS'],
options: {
files: [
'bower_components/angular-1.3.2/angular.js',
'bower_components/angular-mocks-1.3.2/angular-mocks.js',
'node_modules/js-data/dist/js-data.min.js',
'dist/js-data-angular.min.js',
'karma.start.js',
'test/**/*.js'
]
}
}
},
coveralls: {
Expand Down Expand Up @@ -123,6 +136,22 @@ module.exports = function (grunt) {
}
});

grunt.registerTask('standard', function () {
var child_process = require('child_process');
var done = this.async();
grunt.log.writeln('Linting for correcting formatting...');
child_process.exec('node node_modules/standard/bin/cmd.js --parser babel-eslint src/*.js src/**/*.js src/**/**/*.js', function (err, stdout) {
console.log(stdout);
if (err) {
grunt.log.writeln('Failed due to ' + (stdout.split('\n').length - 2) + ' lint errors!');
done(err);
} else {
grunt.log.writeln('Done linting.');
done();
}
});
});

grunt.registerTask('version', function (filePath) {
var file = grunt.file.read(filePath);

Expand All @@ -133,10 +162,12 @@ module.exports = function (grunt) {

grunt.registerTask('build', [
'clean',
'standard',
'webpack',
'uglify'
]);
grunt.registerTask('go', ['build', 'watch:dist']);
grunt.registerTask('default', ['build']);
grunt.registerTask('test', ['build', 'karma:min']);
grunt.registerTask('test_c9', ['build', 'karma:c9']);
};
24 changes: 18 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,28 @@ app.controller('postCtrl', function ($scope, $routeParams, Post, Comment) {

### Contributing

First, feel free to contact me with questions. [Mailing List](https://groups.io/org/groupsio/jsdata). [Issues](https://github.com/js-data/js-data-angular/issues).
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.

1. Contribute to the issue that is the reason you'll be developing in the first place
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.

- good - Your versions of Angular, js-data, js-data-angular, etc., relevant console logs/error, code examples that revealed the issue
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix

[Github Issues](https://github.com/js-data/js-data-angular/issues).

#### Submitting Pull Requests

1. Contribute to the issue/discussion that is the reason you'll be developing in the first place
1. Fork js-data-angular
1. `git clone https://github.com/<you>/js-data-angular.git`
1. `git clone git@github.com:<you>/js-data-angular.git`
1. `cd js-data-angular; npm install; bower install;`
1. `grunt go` (builds and starts a watch)
1. (in another terminal) `grunt karma:dev` (runs the tests)
1. Write your code, including relevant documentation and tests
1. Submit a PR and we'll review
1. Run `grunt test` (build and test)
1. Your code will be linted and checked for formatting, the tests will be run
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
1. Submit your PR and we'll review!
1. Thanks!

### License

Expand Down
Loading

0 comments on commit 6f700f8

Please sign in to comment.