Fix range parsing

lib/jsgi/rest-store.js

@@ -63,20 +63,24 @@ exports.RestStore = function(options){
 			else if(!METHOD_HAS_BODY[method]){
 				if(method === "get" && request.pathInfo.substring(request.pathInfo.length - 1) === "/"){
 					// handle the range header
-					var range = request.headers.range || "items=0-";
-					var parts = range.replace('items=','').split('-');
-					// syntaxically invalid "Range:" just results in 0-Infinity
-					metadata.start = +parts[0] || undefined;
-					metadata.end = +parts[1] || undefined;
-					// shortcut evaluation of range that would result in empty set
-					if (metadata.end < metadata.start) {
-						responseValue = [];
-					} else {
-						// queries are not decoded, the info needs to be retained for parsing
-						// TODO: limit the range by a configurable number
-						responseValue = store.query(path, metadata);
+					if(metadata.range){
+						// invalid "Range:" just results in 0-Infinity
+						metadata.range.replace(/^items=(\d+)-(\d+)?/, function(s, b, e){
+							if(b >= 0){
+								metadata.start = b;
+							}
+							if(e >= b){
+								metadata.end = e;
+							}
+							else if (e !== undefined){
+								delete metadata.start;
+							}
+						});
 					}
-					if(request.headers.range){
+					// queries are not decoded, the info needs to be retained for parsing
+					// TODO: limit the range by a configurable number
+					responseValue = store.query(path, metadata);
+					if(metadata.range){
 						// we have to wait for promise for counts to be set (e.g., mongo)
 						when(responseValue, function(responseValue){
 							var count = responseValue.totalCount || responseValue.length || 0;