Merge branch 'master' into release

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-rc.2 - 23 August 2016
+
+###### Backwards compatible changes
+- Add support for `fields` option to `find` and `findAll`.
+
 ##### 3.0.0-rc.1 - 15 August 2016
 
 ###### Backwards compatible changes

mocha.start.js

@@ -71,3 +71,65 @@ describe('exports', function () {
     assert(JSDataRethinkDB.version)
   })
 })
+
+describe('RethinkDBAdapter#find', function () {
+  it('should allow subset of fields to be returned', function () {
+    const User = this.$$User
+    let props = { name: 'John', age: 30, role: 'admin', password: 'foo', address: { state: 'TX', zip: 12345 } }
+    let user
+    assert.debug('create', User.name, props)
+    return this.$$adapter.create(User, props)
+      .then((_user) => {
+        user = _user
+
+        return this.$$adapter.find(User, user[User.idAttribute], { fields: User.idAttribute })
+      })
+      .then((_user) => {
+        assert.objectsEqual(_user, {
+          [User.idAttribute]: user[User.idAttribute]
+        }, 'only ID was selected')
+
+        return this.$$adapter.find(User, user[User.idAttribute], { fields: [User.idAttribute, 'age'] })
+      })
+      .then((_user) => {
+        assert.objectsEqual(_user, {
+          [User.idAttribute]: user[User.idAttribute],
+          age: user.age
+        }, 'only ID and age were selected')
+      })
+  })
+})
+
+describe('RethinkDBAdapter#findAll', function () {
+  it('should allow subset of fields to be returned', function () {
+    const User = this.$$User
+    let props = { name: 'John', age: 30, role: 'dev', password: 'foo', address: { state: 'TX', zip: 12345 } }
+    let props2 = { name: 'Sally', age: 28, role: 'admin', password: 'bar', address: { state: 'MA', zip: 54321 } }
+    let users
+    assert.debug('create', User.name, [props, props2])
+    return this.$$adapter.createMany(User, [props, props2])
+      .then((_users) => {
+        users = _users
+
+        return this.$$adapter.findAll(User, { orderBy: 'name' }, { fields: User.idAttribute })
+      })
+      .then((_users) => {
+        assert.objectsEqual(_users, [{
+          [User.idAttribute]: users[0][User.idAttribute]
+        }, {
+          [User.idAttribute]: users[1][User.idAttribute]
+        }], 'only ID was selected')
+
+        return this.$$adapter.findAll(User, { orderBy: 'name' }, { fields: [User.idAttribute, 'age'] })
+      })
+      .then((_users) => {
+        assert.objectsEqual(_users, [{
+          [User.idAttribute]: users[0][User.idAttribute],
+          age: users[0].age
+        }, {
+          [User.idAttribute]: users[1][User.idAttribute],
+          age: users[1].age
+        }], 'only ID and age were selected')
+      })
+  })
+})

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.2",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",