Skip to content

Commit 0a3b8a9

Browse files
committed
3.0.0-alpha.4
1 parent 8bf87a0 commit 0a3b8a9

File tree

6 files changed

+51
-46
lines changed

6 files changed

+51
-46
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 3.0.0-alpha.4 - 26 February 2016
2+
3+
###### Other
4+
- Finished JSDoc comments
5+
16
##### 3.0.0-alpha.3 - 26 February 2016
27

38
###### Backwards compatible API changes

CONTRIBUTORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# Names should be added to this file as:
66
# [commit count] Name <email address>
77
1 InternalFX <bryan@internalfx.com>
8-
45 Jason Dobry <jason.dobry@gmail.com>
8+
48 Jason Dobry <jason.dobry@gmail.com>
99
2 Ollie Relph <ollie@relph.me>

dist/js-data-rethinkdb.js

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

package.json

Lines changed: 2 additions & 2 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": "3.0.0-alpha.3",
4+
"version": "3.0.0-alpha.4",
55
"homepage": "https://github.com/js-data/js-data-rethinkdb",
66
"repository": {
77
"type": "git",
@@ -60,7 +60,7 @@
6060
"coveralls": "2.11.8",
6161
"ink-docstrap": "1.1.2",
6262
"istanbul": "0.4.2",
63-
"js-data-adapter-tests": "^2.0.0-alpha.8",
63+
"js-data-adapter-tests": "^2.0.0-alpha.9",
6464
"jsdoc": "3.4.0",
6565
"mocha": "2.4.5",
6666
"rollup": "0.25.4",

src/index.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
359359
return this.r.db(isUndefined(opts.db) ? this.db : opts.db)
360360
},
361361

362-
selectTable (Resource, opts) {
363-
return this.selectDb(opts).table(Resource.table || underscore(Resource.name))
362+
selectTable (mapper, opts) {
363+
return this.selectDb(opts).table(mapper.table || underscore(mapper.name))
364364
},
365365

366366
filterSequence (sequence, params) {
@@ -673,7 +673,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
673673
},
674674

675675
/**
676-
* TODO
676+
* Return the foreignKey from the given record for the provided relationship.
677677
*
678678
* There may be reasons why you may want to override this method, like when
679679
* the id of the parent doesn't exactly match up to the key on the child.
@@ -682,18 +682,18 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
682682
* @method
683683
* @return {*}
684684
*/
685-
makeHasManyForeignKey (Resource, def, record) {
685+
makeHasManyForeignKey (mapper, def, record) {
686686
return def.getForeignKey(record)
687687
},
688688

689689
/**
690-
* TODO
690+
* Load a hasMany relationship.
691691
*
692692
* @name RethinkDBAdapter#loadHasMany
693693
* @method
694694
* @return {Promise}
695695
*/
696-
loadHasMany (Resource, def, records, __opts) {
696+
loadHasMany (mapper, def, records, __opts) {
697697
const self = this
698698
let singular = false
699699

@@ -702,7 +702,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
702702
records = [records]
703703
}
704704
const IDs = records.map(function (record) {
705-
return self.makeHasManyForeignKey(Resource, def, record)
705+
return self.makeHasManyForeignKey(mapper, def, record)
706706
})
707707
const query = {}
708708
const criteria = query[def.foreignKey] = {}
@@ -722,7 +722,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
722722
attached = relatedItems
723723
} else {
724724
relatedItems.forEach(function (relatedItem) {
725-
if (get(relatedItem, def.foreignKey) === record[Resource.idAttribute]) {
725+
if (get(relatedItem, def.foreignKey) === record[mapper.idAttribute]) {
726726
attached.push(relatedItem)
727727
}
728728
})
@@ -733,17 +733,17 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
733733
},
734734

735735
/**
736-
* TODO
736+
* Load a hasOne relationship.
737737
*
738738
* @name RethinkDBAdapter#loadHasOne
739739
* @method
740740
* @return {Promise}
741741
*/
742-
loadHasOne (Resource, def, records, __opts) {
742+
loadHasOne (mapper, def, records, __opts) {
743743
if (isObject(records) && !isArray(records)) {
744744
records = [records]
745745
}
746-
return this.loadHasMany(Resource, def, records, __opts).then(function () {
746+
return this.loadHasMany(mapper, def, records, __opts).then(function () {
747747
records.forEach(function (record) {
748748
const relatedData = def.getLocalField(record)
749749
if (isArray(relatedData) && relatedData.length) {
@@ -754,18 +754,18 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
754754
},
755755

756756
/**
757-
* TODO
757+
* Return the foreignKey from the given record for the provided relationship.
758758
*
759759
* @name RethinkDBAdapter#makeBelongsToForeignKey
760760
* @method
761761
* @return {*}
762762
*/
763-
makeBelongsToForeignKey (Resource, def, record) {
763+
makeBelongsToForeignKey (mapper, def, record) {
764764
return def.getForeignKey(record)
765765
},
766766

767767
/**
768-
* TODO
768+
* Load a belongsTo relationship.
769769
*
770770
* @name RethinkDBAdapter#loadBelongsTo
771771
* @method
@@ -815,7 +815,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
815815
* @param {boolean} [opts.raw=false] Whether to return a more detailed
816816
* response object.
817817
* @param {Object} [opts.runOpts] Options to pass to r#run.
818-
* @param {string[]} [opts.with=[]] TODO
818+
* @param {string[]} [opts.with=[]] Relations to eager load.
819819
* @return {Promise}
820820
*/
821821
find (mapper, id, opts) {
@@ -846,9 +846,9 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
846846
op = opts.op = 'beforeFind'
847847
return resolve(self[op](mapper, id, opts))
848848
}).then(function () {
849-
op = opts.op = 'find'
850-
self.dbg(op, id, opts)
851-
return self.selectTable(mapper, opts).get(id).run(self.getOpt('runOpts', opts))
849+
op = opts.op = 'find'
850+
self.dbg(op, id, opts)
851+
return self.selectTable(mapper, opts).get(id).run(self.getOpt('runOpts', opts))
852852
}).then(function (_record) {
853853
if (!_record) {
854854
return
@@ -924,7 +924,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
924924
* @param {boolean} [opts.raw=false] Whether to return a more detailed
925925
* response object.
926926
* @param {Object} [opts.runOpts] Options to pass to r#run.
927-
* @param {string[]} [opts.with=[]] TODO
927+
* @param {string[]} [opts.with=[]] Relations to eager load.
928928
* @return {Promise}
929929
*/
930930
findAll (mapper, query, opts) {
@@ -1060,7 +1060,7 @@ addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
10601060
},
10611061

10621062
/**
1063-
* TODO
1063+
* Logging utility method.
10641064
*
10651065
* @name RethinkDBAdapter#log
10661066
* @method

0 commit comments

Comments
 (0)