Skip to content

Commit 32342ff

Browse files
committed
Stable Version 1.2.0.
Closes #3 Closes #4 Fixes #5 Fixes #6
1 parent 6133f1f commit 32342ff

15 files changed

+555
-405
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
##### 1.2.0 - 26 March 2015
2+
3+
###### Backwards compatible API changes
4+
- #3 - Add support for loading relations
5+
- #4 - Add support for auto-creating secondary indexes based on the relation definitions
6+
7+
###### Backwards compatible bug fixes
8+
- #5 - Should not be saving relations (duplicating data)
9+
- #6 - Need to use removeCircular
10+
111
##### 1.1.2 - 07 March 2015
212

313
###### Other

CONTRIBUTING.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Contributing Guide
22

3-
First, feel free to contact me with questions. [Mailing List](https://groups.io/org/groupsio/jsdata). [Issues](https://github.com/js-data/js-data-rethinkdb/issues).
3+
First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
4+
5+
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
6+
7+
- good - Your versions of js-data, js-data-rethinkdb, etc., relevant console logs/error, code examples that revealed the issue
8+
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
9+
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
10+
11+
[Github Issues](https://github.com/js-data/js-data-rethinkdb/issues).
12+
13+
#### Pull Requests
414

515
1. Contribute to the issue that is the reason you'll be developing in the first place
616
1. Fork js-data-rethinkdb

Gruntfile.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* js-data-rethinkdb
3-
* http://github.com/js-data/js-data-rethinkdb
3+
* https://github.com/js-data/js-data-rethinkdb
44
*
5-
* Copyright (c) 2014-2015 Jason Dobry <http://www.js-data.io/js-data-rethinkdb>
5+
* Copyright (c) 2014-2015 Jason Dobry <http://www.js-data.io/docs/dsrethinkdbadapter>
66
* Licensed under the MIT license. <https://github.com/js-data/js-data-rethinkdb/blob/master/LICENSE>
77
*/
88
module.exports = function (grunt) {
@@ -18,10 +18,6 @@ module.exports = function (grunt) {
1818
// Project configuration.
1919
grunt.initConfig({
2020
pkg: pkg,
21-
jshint: {
22-
all: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
23-
jshintrc: '.jshintrc'
24-
},
2521
watch: {
2622
dist: {
2723
files: ['src/**/*.js'],
@@ -52,15 +48,9 @@ module.exports = function (grunt) {
5248
library: 'js-data-rethinkdb'
5349
},
5450
externals: [
55-
'mout/array/contains',
56-
'mout/object/forOwn',
5751
'mout/object/keys',
58-
'mout/object/deepMixIn',
59-
'mout/array/forEach',
60-
'mout/lang/isObject',
61-
'mout/lang/isArray',
52+
'mout/object/omit',
6253
'mout/lang/isEmpty',
63-
'mout/lang/isString',
6454
'mout/string/upperCase',
6555
'mout/string/underscore',
6656
'bluebird',

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,17 @@ store.registerAdapter('rethinkdb', adapter, { default: true });
5050

5151
### Contributing
5252

53-
First, feel free to contact me with questions. [Mailing List](https://groups.io/org/groupsio/jsdata). [Issues](https://github.com/js-data/js-data-rethinkdb/issues).
53+
First, support is handled via the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
54+
55+
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
56+
57+
- good - Your versions of js-data, js-data-rethinkdb, etc., relevant console logs/error, code examples that revealed the issue
58+
- better - A [plnkr](http://plnkr.co/), [fiddle](http://jsfiddle.net/), or [bin](http://jsbin.com/?html,output) that demonstrates the issue
59+
- best - A Pull Request that fixes the issue, including test coverage for the issue and the fix
60+
61+
[Github Issues](https://github.com/js-data/js-data-rethinkdb/issues).
62+
63+
#### Pull Requests
5464

5565
1. Contribute to the issue that is the reason you'll be developing in the first place
5666
1. Fork js-data-rethinkdb

dist/js-data-rethinkdb.js

Lines changed: 244 additions & 180 deletions
Large diffs are not rendered by default.

mocha.start.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ beforeEach(function () {
6060
hasMany: {
6161
post: {
6262
localField: 'posts',
63-
foreignKey: 'post'
63+
foreignKey: 'userId'
64+
},
65+
comment: {
66+
localField: 'comments',
67+
foreignKey: 'userId'
6468
}
6569
}
6670
}

package.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-rethinkdb",
33
"description": "RethinkDB adapter for js-data.",
4-
"version": "1.1.2",
4+
"version": "1.2.0",
55
"homepage": "http://www.js-data.io/docs/dsrethinkdbadapter",
66
"repository": {
77
"type": "git",
@@ -28,28 +28,30 @@
2828
"reql"
2929
],
3030
"devDependencies": {
31-
"babel-core": "^4.7.3",
32-
"babel-loader": "^4.1.0",
31+
"babel-core": "4.7.16",
32+
"babel-loader": "4.2.0",
3333
"chai": "2.1.1",
3434
"grunt": "0.4.5",
3535
"grunt-contrib-watch": "0.6.1",
3636
"grunt-karma-coveralls": "2.5.3",
3737
"grunt-mocha-test": "0.12.7",
38-
"grunt-webpack": "^1.0.8",
38+
"grunt-webpack": "1.0.8",
3939
"jit-grunt": "0.9.1",
40-
"jshint": "^2.6.3",
41-
"jshint-loader": "^0.8.3",
40+
"jshint": "2.6.3",
41+
"jshint-loader": "0.8.3",
4242
"sinon": "1.13.0",
4343
"time-grunt": "1.1.0",
44-
"webpack": "^1.7.2",
45-
"webpack-dev-server": "^1.7.0"
44+
"webpack": "1.7.3",
45+
"webpack-dev-server": "1.7.0"
4646
},
4747
"scripts": {
4848
"test": "grunt test"
4949
},
5050
"dependencies": {
51-
"js-data": ">=1.2.0",
52-
"mout": "0.11.0",
51+
"mout": "0.11.0"
52+
},
53+
"peerDependencies": {
54+
"js-data": ">=1.5.7",
5355
"rethinkdbdash": ">=1.15.0"
5456
}
5557
}

0 commit comments

Comments
 (0)