Preparing for 2.0.0-rc.1.

Added getEndpoint(), which was removed from JSData.

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 2.0.0-rc.1 - xx June 2015
+
+Added `getEndpoint()`, which was removed from JSData
+
 ##### 2.0.0-beta.1 - 17 April 2015
 
 Prepare for 2.0

bower.json

@@ -29,6 +29,6 @@
     "karma.start.js"
   ],
   "dependencies": {
-    "js-data": "2.0.0-beta.1"
+    "js-data": "2.0.0-rc.1"
   }
 }

dist/js-data-http.js

@@ -1,6 +1,6 @@
 /*!
  * js-data-http
- * @version 2.0.0-beta.3 - Homepage <http://www.js-data.io/docs/dshttpadapter>
+ * @version 2.0.0-rc.1 - Homepage <http://www.js-data.io/docs/dshttpadapter>
  * @author Jason Dobry <[email protected]>
  * @copyright (c) 2014-2015 Jason Dobry 
  * @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>
@@ -63,27 +63,18 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
-
 	var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } };
 
 	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
-	Object.defineProperty(exports, '__esModule', {
-	  value: true
-	});
-
-	var _JSData = __webpack_require__(1);
-
-	var _JSData2 = _interopRequireWildcard(_JSData);
-
+	var JSData = __webpack_require__(1);
 	var axios = null;
 
 	try {
 	  axios = __webpack_require__(2);
 	} catch (e) {}
 
-	var DSUtils = _JSData2['default'].DSUtils;
+	var DSUtils = JSData.DSUtils;
 	var deepMixIn = DSUtils.deepMixIn;
 	var removeCircular = DSUtils.removeCircular;
 	var copy = DSUtils.copy;
@@ -150,11 +141,64 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  _createClass(DSHttpAdapter, [{
+	    key: 'getEndpoint',
+	    value: function getEndpoint(resourceConfig, id, options) {
+	      var _this = this;
+
+	      options = options || {};
+	      options.params = options.params || {};
+
+	      var item = undefined;
+	      var parentKey = resourceConfig.parentKey;
+	      var endpoint = options.hasOwnProperty('endpoint') ? options.endpoint : resourceConfig.endpoint;
+	      var parentField = resourceConfig.parentField;
+	      var parentDef = resourceConfig.getResource(resourceConfig.parent);
+	      var parentId = options.params[parentKey];
+
+	      if (parentId === false || !parentKey || !parentDef) {
+	        if (parentId === false) {
+	          delete options.params[parentKey];
+	        }
+	        return endpoint;
+	      } else {
+	        delete options.params[parentKey];
+
+	        if (DSUtils._sn(id)) {
+	          item = resourceConfig.get(id);
+	        } else if (DSUtils._o(id)) {
+	          item = id;
+	        }
+
+	        if (item) {
+	          parentId = parentId || item[parentKey] || (item[parentField] ? item[parentField][parentDef.idAttribute] : null);
+	        }
+
+	        if (parentId) {
+	          var _ret = (function () {
+	            delete options.endpoint;
+	            var _options = {};
+	            DSUtils.forOwn(options, function (value, key) {
+	              _options[key] = value;
+	            });
+	            return {
+	              v: DSUtils.makePath(_this.getEndpoint(parentDef, parentId, DSUtils._(parentDef, _options)), parentId, endpoint)
+	            };
+	          })();
+
+	          if (typeof _ret === 'object') {
+	            return _ret.v;
+	          }
+	        } else {
+	          return endpoint;
+	        }
+	      }
+	    }
+	  }, {
 	    key: 'getPath',
 	    value: function getPath(method, resourceConfig, id, options) {
 	      var _this = this;
 	      options = options || {};
-	      var args = [options.basePath || _this.defaults.basePath || resourceConfig.basePath, resourceConfig.getEndpoint(isString(id) || isNumber(id) || method === 'create' ? id : null, options)];
+	      var args = [options.basePath || _this.defaults.basePath || resourceConfig.basePath, this.getEndpoint(resourceConfig, isString(id) || isNumber(id) || method === 'create' ? id : null, options)];
 	      if (method === 'find' || method === 'update' || method === 'destroy') {
 	        args.push(id);
 	      }
@@ -345,8 +389,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return DSHttpAdapter;
 	})();
 
-	exports['default'] = DSHttpAdapter;
-	module.exports = exports['default'];
+	module.exports = DSHttpAdapter;
 
 /***/ },
 /* 1 */

dist/js-data-http.min.js

@@ -1,14 +1,15 @@
 {
   "name": "js-data-http",
   "description": "http adapter for js-data.",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-rc.1",
   "homepage": "http://www.js-data.io/docs/dshttpadapter",
   "repository": {
     "type": "git",
     "url": "https://github.com/js-data/js-data-http.git"
   },
   "author": {
     "name": "Jason Dobry",
+    "url": "http://www.pseudobry.com",
     "email": "[email protected]"
   },
   "licenses": [
@@ -26,30 +27,30 @@
     "http"
   ],
   "devDependencies": {
-    "babel-core": "5.1.10",
-    "babel-loader": "5.0.0",
-    "es6-promise": "2.1.0",
+    "babel-core": "5.6.15",
+    "babel-loader": "5.2.2",
+    "es6-promise": "2.3.0",
     "grunt": "0.4.5",
     "grunt-contrib-clean": "0.6.0",
     "grunt-contrib-uglify": "0.9.1",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-karma": "0.10.1",
+    "grunt-karma": "0.11.1",
     "grunt-karma-coveralls": "2.5.3",
     "grunt-webpack": "1.0.8",
     "jit-grunt": "0.9.1",
     "jshint-loader": "0.8.3",
-    "karma": "0.12.31",
+    "karma": "0.12.37",
     "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "0.1.8",
-    "karma-coverage": "0.3.1",
-    "karma-firefox-launcher": "0.1.4",
-    "karma-mocha": "0.1.10",
-    "karma-phantomjs-launcher": "0.1.4",
+    "karma-chrome-launcher": "0.2.0",
+    "karma-coverage": "0.4.2",
+    "karma-firefox-launcher": "0.1.6",
+    "karma-mocha": "0.2.0",
+    "karma-phantomjs-launcher": "0.2.0",
     "karma-script-launcher": "0.1.0",
     "karma-sinon": "1.0.4",
     "karma-spec-reporter": "0.0.19",
-    "time-grunt": "1.1.1",
-    "webpack-dev-server": "1.8.0"
+    "time-grunt": "1.2.1",
+    "webpack-dev-server": "1.9.0"
   },
   "scripts": {
     "test": "grunt test"
@@ -59,6 +60,6 @@
     "mout": "0.11.0"
   },
   "peerDependencies": {
-    "js-data": ">=2.0.0-beta.3"
+    "js-data": "2.0.0-rc.1"
   }
 }

dist/js-data-http.min.map

@@ -1,4 +1,4 @@
-import JSData from 'js-data';
+let JSData = require('js-data');
 let axios = null;
 
 try {
@@ -52,12 +52,54 @@ class DSHttpAdapter {
     this.http = options.http || axios;
   }
 
+  getEndpoint(resourceConfig, id, options) {
+    options = options || {};
+    options.params = options.params || {};
+
+    let item;
+    let parentKey = resourceConfig.parentKey;
+    let endpoint = options.hasOwnProperty('endpoint') ? options.endpoint : resourceConfig.endpoint;
+    let parentField = resourceConfig.parentField;
+    let parentDef = resourceConfig.getResource(resourceConfig.parent);
+    let parentId = options.params[parentKey];
+
+    if (parentId === false || !parentKey || !parentDef) {
+      if (parentId === false) {
+        delete options.params[parentKey];
+      }
+      return endpoint;
+    } else {
+      delete options.params[parentKey];
+
+      if (DSUtils._sn(id)) {
+        item = resourceConfig.get(id);
+      } else if (DSUtils._o(id)) {
+        item = id;
+      }
+
+      if (item) {
+        parentId = parentId || item[parentKey] || (item[parentField] ? item[parentField][parentDef.idAttribute] : null);
+      }
+
+      if (parentId) {
+        delete options.endpoint;
+        let _options = {};
+        DSUtils.forOwn(options, (value, key) => {
+          _options[key] = value;
+        });
+        return DSUtils.makePath(this.getEndpoint(parentDef, parentId, DSUtils._(parentDef, _options)), parentId, endpoint);
+      } else {
+        return endpoint;
+      }
+    }
+  }
+
   getPath(method, resourceConfig, id, options) {
     let _this = this;
     options = options || {};
     let args = [
       options.basePath || _this.defaults.basePath || resourceConfig.basePath,
-      resourceConfig.getEndpoint((isString(id) || isNumber(id) || method === 'create') ? id : null, options)
+      this.getEndpoint(resourceConfig, (isString(id) || isNumber(id) || method === 'create') ? id : null, options)
     ];
     if (method === 'find' || method === 'update' || method === 'destroy') {
       args.push(id);
@@ -246,5 +288,5 @@ class DSHttpAdapter {
   }
 }
 
-export default DSHttpAdapter;
+module.exports = DSHttpAdapter;