fix for GRAILS-676

git-svn-id: https://svn.codehaus.org/grails/trunk@2967 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/web/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerHelper.java

@@ -73,7 +73,7 @@ public class SimpleGrailsControllerHelper implements GrailsControllerHelper {
     private GrailsScaffolder scaffolder;
     private ServletContext servletContext;
     private GrailsApplicationAttributes grailsAttributes;
-    private Pattern uriPattern = Pattern.compile("/(\\w+)/?(\\w*)/?(\\w*)/?(.*)");
+    private Pattern uriPattern = Pattern.compile("/(\\w+)/?(\\w*)/?([^/]*)/?(.*)");
 
 
 	private GrailsWebRequest webRequest;
@@ -334,17 +334,24 @@ private String configureStateForUri(String uri) {
             uri = '/' + controllerName + '/' + actionName;
             id = m.group(3);
             String extraParamsString = m.group(4);
-            if(extraParamsString != null && extraParamsString.indexOf('/') > - 1) {
-                String[] tokens = extraParamsString.split("/");
+            if(!StringUtils.isBlank(extraParamsString)) {
                 extraParams = new HashMap();
-                for (int i = 0; i < tokens.length; i++) {
-                    String token = tokens[i];
-                    if(i == 0 || ((i % 2) == 0)) {
-                        if((i + 1) < tokens.length) {
-                            extraParams.put(token, tokens[i + 1]);
+                if(extraParamsString.indexOf('/') > -1) {
+                    String[] tokens = extraParamsString.split("/");
+
+                    for (int i = 0; i < tokens.length; i++) {
+                        String token = tokens[i];
+                        if(i == 0 || ((i % 2) == 0)) {
+                            if((i + 1) < tokens.length) {
+                                extraParams.put(token, tokens[i + 1]);
+                            }
                         }
                     }
                 }
+                else {
+                   extraParams.put(extraParamsString, null); 
+                }
+
 
             }
         }

test/groovy/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerHelperTests.groovy

@@ -44,6 +44,29 @@ class SimpleGrailsControllerHelperTests extends AbstractGrailsControllerTests {
 		assertEquals "four", extraParams["three"]			                                
 	}
 
+	void testConfigureStateForUri2() {
+		def helper = new SimpleGrailsControllerHelper(null, null, null)
+		helper.configureStateForUri("/location/show/united-kingdom")
+
+		assertEquals "location", helper.@controllerName
+		assertEquals "show", helper.@actionName
+		assertEquals "united-kingdom", helper.@id
+
+    }
+
+	void testConfigureStateForUri3() {
+		def helper = new SimpleGrailsControllerHelper(null, null, null)
+		helper.configureStateForUri("/location/show/united-kingdom/london")
+
+		assertEquals "location", helper.@controllerName
+		assertEquals "show", helper.@actionName
+		assertEquals "united-kingdom", helper.@id
+
+		assertTrue helper.@extraParams.containsKey("london")
+
+    }
+    
+
 	void testConfigureStateForUri() {
 		def helper = new SimpleGrailsControllerHelper(null, null, null)
 		helper.configureStateForUri("/controller/action/id")