A few updates.

Author: jmdobry

circle.yml

@@ -1,9 +1,9 @@
 machine:
   node:
     version: 4.1.0
-
 dependencies:
   pre:
+    - npm i js-data@^3.0.0-beta.3 rethinkdbdash
     - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
     - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
     - sudo apt-get update -qq

mocha.start.js

@@ -7,17 +7,14 @@ require('babel-polyfill')
 var JSData = require('js-data')
 var JSDataAdapterTests = require('js-data-adapter-tests')
 var JSDataRethinkDB = require('./')
-var version = JSDataRethinkDB.version
-var OPERATORS = JSDataRethinkDB.OPERATORS
-var RethinkDBAdapter = JSDataRethinkDB.RethinkDBAdapter
 
 var assert = global.assert = JSDataAdapterTests.assert
 global.sinon = JSDataAdapterTests.sinon
 
 JSDataAdapterTests.init({
   debug: false,
   JSData: JSData,
-  Adapter: RethinkDBAdapter,
+  Adapter: JSDataRethinkDB.RethinkDBAdapter,
   adapterConfig: {
     min: 1,
     max: 5,
@@ -33,8 +30,13 @@ JSDataAdapterTests.init({
 require('./test/handleErrors.test')
 
 describe('exports', function () {
-  assert(OPERATORS)
-  assert(OPERATORS['=='])
-  assert(version)
-  assert(version.full)
+  it('should have correct exports', function () {
+    assert(JSDataRethinkDB.default)
+    assert(JSDataRethinkDB.RethinkDBAdapter)
+    assert(JSDataRethinkDB.RethinkDBAdapter === JSDataRethinkDB.default)
+    assert(JSDataRethinkDB.OPERATORS)
+    assert(JSDataRethinkDB.OPERATORS['=='])
+    assert(JSDataRethinkDB.version)
+    assert(JSDataRethinkDB.version.full)
+  })
 })

package.json

@@ -64,12 +64,12 @@
     "rethinkdbdash": ">=1.15.0"
   },
   "devDependencies": {
-    "babel-polyfill": "6.7.4",
+    "babel-polyfill": "6.8.0",
     "babel-preset-es2015-rollup": "1.1.1",
     "istanbul": "0.4.3",
-    "js-data-adapter-tests": "^2.0.0-alpha.16",
+    "js-data-adapter-tests": "^2.0.0-alpha.20",
     "js-data-repo-tools": "0.5.0",
-    "rollup": "0.26.1",
+    "rollup": "0.26.2",
     "rollup-plugin-babel": "2.4.0",
     "source-map-support": "0.4.0",
     "watch": "0.18.0"

rollup.config.js

@@ -1,6 +1,12 @@
 var babel = require('rollup-plugin-babel')
 
 module.exports = {
+  external: [
+    'rethinkdbdash',
+    'js-data',
+    'js-data-adapter',
+    'mout/string/underscore'
+  ],
   plugins: [
     babel({
       exclude: 'node_modules/**'

src/index.js

@@ -285,12 +285,12 @@ Object.defineProperty(RethinkDBAdapter, '__super__', {
  * var MyRethinkDBAdapter = RethinkDBAdapter.extend(instanceProps, classProps)
  * var adapter = new MyRethinkDBAdapter()
  *
- * @name RethinkDBAdapter.extend
- * @method
+ * @method RethinkDBAdapter.extend
+ * @static
  * @param {Object} [instanceProps] Properties that will be added to the
- * prototype of the Subclass.
+ * prototype of the subclass.
  * @param {Object} [classProps] Properties that will be added as static
- * properties to the Subclass itself.
+ * properties to the subclass itself.
  * @return {Constructor} Subclass of `RethinkDBAdapter`.
  */
 RethinkDBAdapter.extend = utils.extend
@@ -1009,6 +1009,10 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
 /**
  * Details of the current version of the `js-data-rethinkdb` module.
  *
+ * @example
+ * import {version} from 'js-data-rethinkdb'
+ * console.log(version.full)
+ *
  * @name module:js-data-rethinkdb.version
  * @type {Object}
  * @property {string} version.full The full semver value.
@@ -1022,4 +1026,33 @@ utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
  */
 export const version = '<%= version %>'
 
+/**
+ * {@link RethinkDBAdapter} class.
+ *
+ * @example
+ * import {RethinkDBAdapter} from 'js-data-rethinkdb'
+ * const adapter = new RethinkDBAdapter()
+ *
+ * @name module:js-data-rethinkdb.RethinkDBAdapter
+ * @see RethinkDBAdapter
+ * @type {Constructor}
+ */
+
+/**
+ * Registered as `js-data-rethinkdb` in NPM.
+ *
+ * @example <caption>Install from NPM</caption>
+ * npm i --save js-data-rethinkdb@beta js-data@beta rethinkdbdash
+ *
+ * @example <caption>Load via CommonJS</caption>
+ * var RethinkDBAdapter = require('js-data-rethinkdb').RethinkDBAdapter
+ * var adapter = new RethinkDBAdapter()
+ *
+ * @example <caption>Load via ES2015 Modules</caption>
+ * import {RethinkDBAdapter} from 'js-data-rethinkdb'
+ * const adapter = new RethinkDBAdapter()
+ *
+ * @module js-data-rethinkdb
+ */
+
 export default RethinkDBAdapter