Merge branch 'master' into release

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,8 @@
+##### 3.0.0-beta.8 - 08 July 2016
+
+###### Backwards compatible changes
+- RethinkDBAdapter now inherits from Adapter via the `extend` method
+
 ##### 3.0.0-beta.7 - 29 June 2016
 
 ###### Backwards compatible changes

circle.yml

@@ -8,7 +8,7 @@ machine:
 dependencies:
   pre:
     - npm i -g npm codecov nyc
-    - npm i js-data@^3.0.0-beta.5 rethinkdbdash
+    - npm i js-data@^3.0.0-beta.10 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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-rethinkdb",
   "description": "RethinkDB adapter for js-data.",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "homepage": "https://github.com/js-data/js-data-rethinkdb",
   "repository": {
     "type": "git",
@@ -59,14 +59,14 @@
     "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "dependencies": {
-    "js-data-adapter": "~0.7.3",
+    "js-data-adapter": "~0.7.4",
     "mout": "1.0.0"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.8",
+    "js-data": "^3.0.0-beta.10",
     "rethinkdbdash": ">=2.0.0"
   },
   "devDependencies": {
-    "js-data-repo-tools": "0.5.4"
+    "js-data-repo-tools": "0.5.5"
   }
 }

src/index.js

@@ -274,46 +274,9 @@ export function RethinkDBAdapter (opts) {
   this.r || (this.r = rethinkdbdash(this.rOpts))
 }
 
-// Setup prototype inheritance from Adapter
-RethinkDBAdapter.prototype = Object.create(Adapter.prototype, {
-  constructor: {
-    value: RethinkDBAdapter,
-    enumerable: false,
-    writable: true,
-    configurable: true
-  }
-})
-
-Object.defineProperty(RethinkDBAdapter, '__super__', {
-  configurable: true,
-  value: Adapter
-})
-
-/**
- * Alternative to ES6 class syntax for extending `RethinkDBAdapter`.
- *
- * @example <caption>Using the ES2015 class syntax.</caption>
- * class MyRethinkDBAdapter extends RethinkDBAdapter {...}
- * const adapter = new MyRethinkDBAdapter()
- *
- * @example <caption>Using {@link RethinkDBAdapter.extend}.</caption>
- * var instanceProps = {...}
- * var classProps = {...}
- *
- * var MyRethinkDBAdapter = RethinkDBAdapter.extend(instanceProps, classProps)
- * var adapter = new MyRethinkDBAdapter()
- *
- * @method RethinkDBAdapter.extend
- * @static
- * @param {Object} [instanceProps] Properties that will be added to the
- * prototype of the subclass.
- * @param {Object} [classProps] Properties that will be added as static
- * properties to the subclass itself.
- * @return {Constructor} Subclass of `RethinkDBAdapter`.
- */
-RethinkDBAdapter.extend = utils.extend
+Adapter.extend({
+  constructor: RethinkDBAdapter,
 
-utils.addHiddenPropsToTarget(RethinkDBAdapter.prototype, {
   _handleErrors (cursor) {
     if (cursor && cursor.errors > 0) {
       if (cursor.first_error) {
@@ -1113,3 +1076,56 @@ export const version = '<%= version %>'
  *
  * @module js-data-rethinkdb
  */
+
+/**
+ * Create a subclass of this RethinkDBAdapter:
+ * @example <caption>RethinkDBAdapter.extend</caption>
+ * // Normally you would do: import {RethinkDBAdapter} from 'js-data-rethinkdb'
+ * const JSDataRethinkDB = require('[email protected]')
+ * const {RethinkDBAdapter} = JSDataRethinkDB
+ * console.log('Using JSDataRethinkDB v' + JSDataRethinkDB.version.full)
+ *
+ * // Extend the class using ES2015 class syntax.
+ * class CustomRethinkDBAdapterClass extends RethinkDBAdapter {
+ *   foo () { return 'bar' }
+ *   static beep () { return 'boop' }
+ * }
+ * const customRethinkDBAdapter = new CustomRethinkDBAdapterClass()
+ * console.log(customRethinkDBAdapter.foo())
+ * console.log(CustomRethinkDBAdapterClass.beep())
+ *
+ * // Extend the class using alternate method.
+ * const OtherRethinkDBAdapterClass = RethinkDBAdapter.extend({
+ *   foo () { return 'bar' }
+ * }, {
+ *   beep () { return 'boop' }
+ * })
+ * const otherRethinkDBAdapter = new OtherRethinkDBAdapterClass()
+ * console.log(otherRethinkDBAdapter.foo())
+ * console.log(OtherRethinkDBAdapterClass.beep())
+ *
+ * // Extend the class, providing a custom constructor.
+ * function AnotherRethinkDBAdapterClass () {
+ *   RethinkDBAdapter.call(this)
+ *   this.created_at = new Date().getTime()
+ * }
+ * RethinkDBAdapter.extend({
+ *   constructor: AnotherRethinkDBAdapterClass,
+ *   foo () { return 'bar' }
+ * }, {
+ *   beep () { return 'boop' }
+ * })
+ * const anotherRethinkDBAdapter = new AnotherRethinkDBAdapterClass()
+ * console.log(anotherRethinkDBAdapter.created_at)
+ * console.log(anotherRethinkDBAdapter.foo())
+ * console.log(AnotherRethinkDBAdapterClass.beep())
+ *
+ * @method RethinkDBAdapter.extend
+ * @param {Object} [props={}] Properties to add to the prototype of the
+ * subclass.
+ * @param {Object} [props.constructor] Provide a custom constructor function
+ * to be used as the subclass itself.
+ * @param {Object} [classProps={}] Static properties to add to the subclass.
+ * @returns {Constructor} Subclass of this RethinkDBAdapter class.
+ * @since 3.0.0
+ */