Release 0.4.1

kiva · Feb 1, 2016 · 5f6949f · 5f6949f
1 parent 82f510d
commit 5f6949f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.siren",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "dependencies": {
     "backbone": "~1.1.0",
     "jquery": "~2.0.0",

diff --git a/dist/amd/backbone.siren.js b/dist/amd/backbone.siren.js
@@ -1,7 +1,7 @@
 /*
-* Backbone.Siren v0.4.0
+* Backbone.Siren v0.4.1
 *
-* Copyright (c) 2015 Kiva Microfunds
+* Copyright (c) 2016 Kiva Microfunds
 * Licensed under the MIT license.
 * https://github.com/kiva/backbone.siren/blob/master/license.txt
 */
@@ -654,6 +654,7 @@ define(['jquery', 'underscore', 'backbone'], function ($, _, Backbone) {
 
         /**
          * Given a url string, splits it and returns an array.
+    	 * @todo - Siren does not, yet, have a standard notation for referencing sub-entities / properties
          *
          * @param {String} str
          * @returns {Array}
@@ -1231,7 +1232,9 @@ define(['jquery', 'underscore', 'backbone'], function ($, _, Backbone) {
     	, getRootForPath: function (path) {
     		// remove parameters an anchor tags from path
     		var strippedPath = path.split(/[\?#]/)[0];
-    		return this.alternateRoots[strippedPath] ? this.alternateRoots[strippedPath] : this.apiRoot;
+    		// grab the parent path (0 is "", 1 is parent)
+    		var strippedPathParent = '/' + strippedPath.split('/')[1];
+    		return this.alternateRoots[strippedPath] ? this.alternateRoots[strippedPath] : this.alternateRoots[strippedPathParent] ? this.alternateRoots[strippedPathParent] : this.apiRoot;
     	}
 
 

diff --git a/dist/amd/backbone.siren.min.js b/dist/amd/backbone.siren.min.js
diff --git a/dist/iife/backbone.siren.js b/dist/iife/backbone.siren.js
@@ -1,7 +1,7 @@
 /*
-* Backbone.Siren v0.4.0
+* Backbone.Siren v0.4.1
 *
-* Copyright (c) 2015 Kiva Microfunds
+* Copyright (c) 2016 Kiva Microfunds
 * Licensed under the MIT license.
 * https://github.com/kiva/backbone.siren/blob/master/license.txt
 */
@@ -654,6 +654,7 @@
 
 	    /**
 	     * Given a url string, splits it and returns an array.
+		 * @todo - Siren does not, yet, have a standard notation for referencing sub-entities / properties
 	     *
 	     * @param {String} str
 	     * @returns {Array}
@@ -1231,7 +1232,9 @@
 		, getRootForPath: function (path) {
 			// remove parameters an anchor tags from path
 			var strippedPath = path.split(/[\?#]/)[0];
-			return this.alternateRoots[strippedPath] ? this.alternateRoots[strippedPath] : this.apiRoot;
+			// grab the parent path (0 is "", 1 is parent)
+			var strippedPathParent = '/' + strippedPath.split('/')[1];
+			return this.alternateRoots[strippedPath] ? this.alternateRoots[strippedPath] : this.alternateRoots[strippedPathParent] ? this.alternateRoots[strippedPathParent] : this.apiRoot;
 		}
 
 

diff --git a/dist/iife/backbone.siren.min.js b/dist/iife/backbone.siren.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.siren",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Converts Siren JSON representations into Backbone Models and Collections",
   "main": "index.js",
   "scripts": {