fixed rest route start with / problem

ldarren · Aug 16, 2016 · 564a1d7 · 564a1d7
1 parent 63d0697
commit 564a1d7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pico-common",
-    "version": "0.5.12",
+    "version": "0.5.13",
     "description": "pico common tools",
     "main": "pico.js",
     "scripts": {

diff --git a/pico.js b/pico.js
@@ -511,7 +511,8 @@ define('pico/str', function(){
 	},
 	matchRestCode=function(units,codes,params){
 		if (units.length < codes.length) return false
-		for(var i=0,u,c; c=codes[i]; i++){
+		for(var i=0,u,c,l=codes.length; i<l; i++){
+			c=codes[i]
 			u=units.shift()
 			if (Array.isArray(c)){
 				if (0!==u.indexOf(c[0])) return false

diff --git a/pico.min.js b/pico.min.js
diff --git a/pico.min.js.map b/pico.min.js.map
diff --git a/plugins/str.js b/plugins/str.js
@@ -44,7 +44,8 @@ define('pico/str', function(){
 	},
 	matchRestCode=function(units,codes,params){
 		if (units.length < codes.length) return false
-		for(var i=0,u,c; c=codes[i]; i++){
+		for(var i=0,u,c,l=codes.length; i<l; i++){
+			c=codes[i]
 			u=units.shift()
 			if (Array.isArray(c)){
 				if (0!==u.indexOf(c[0])) return false

diff --git a/tests.js b/tests.js
@@ -225,15 +225,15 @@ ensure('ensure restful params parser: url/v%version/pushPackage/:pushId',functio
 	api=str.execRest('url/v1/pushPackage/web.com.domain.app',build,params)
 	cb(null, api===route && 1===params.version && 'web.com.domain.app'===params.pushId)
 })
-ensure('ensure restful wildcard parser, route:url/v%version/path/#path',function(cb){
+ensure('ensure restful wildcard parser: url/v%version/path/#path',function(cb){
 	var
 	route='url/v%version/path/#path',
 	build=str.compileRest(route),
 	params={},
 	api=str.execRest('url/v1/path/web/com/domain/app',build,params)
 	cb(null, api===route && 1===params.version && 'web/com/domain/app'===params.path)
 })
-ensure('ensure restful optional parser, route:url/v%version|device/:deviceToken|path/#path',function(cb){
+ensure('ensure restful optional parser: url/v%version|device/:deviceToken|path/#path',function(cb){
 	var
 	route='url/v%version|device/:deviceToken|path/#path',
 	build=str.compileRest(route),
@@ -248,3 +248,11 @@ ensure('ensure restful optional parser, route:url/v%version|device/:deviceToken|
 	if(api!==route || 1!==params.version) return cb(null, false)
 	cb(null, true)
 })
+ensure('ensure restful optional parser2: /:appName|#appPath',function(cb){
+	var
+	route='/:appName|#appPath',
+	build=str.compileRest(route),
+	params={},
+	api=str.execRest('/msair',build,params)
+	cb(null, api===route && 'msair'===params.appName)
+})