support HTTP PATCH method

Fixes issues resthub#8
bclozel · Dec 12, 2013 · 8fdea50 · 8fdea50
1 parent afffa72
commit 8fdea50
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/resthub/web/springmvc/router/Router.java b/src/main/java/org/resthub/web/springmvc/router/Router.java
@@ -28,11 +28,11 @@
  */
 public class Router {
 
-    static Pattern routePattern = new Pattern("^({method}GET|POST|PUT|DELETE|OPTIONS|HEAD|\\*)[(]?({headers}[^)]*)(\\))?\\s+({path}.*/[^\\s]*)\\s+({action}[^\\s(]+)({params}.+)?(\\s*)$");
+    static Pattern routePattern = new Pattern("^({method}GET|POST|PUT|DELETE|PATCH|OPTIONS|HEAD|\\*)[(]?({headers}[^)]*)(\\))?\\s+({path}.*/[^\\s]*)\\s+({action}[^\\s(]+)({params}.+)?(\\s*)$");
     /**
      * Pattern used to locate a method override instruction
      */
-    static Pattern methodOverride = new Pattern("^.*x-http-method-override=({method}GET|PUT|POST|DELETE).*$");
+    static Pattern methodOverride = new Pattern("^.*x-http-method-override=({method}GET|PUT|POST|DELETE|PATCH).*$");
 
     /**
      * Timestamp the routes file was last loaded at.

diff --git a/src/test/resources/mappingroutes.conf b/src/test/resources/mappingroutes.conf
@@ -6,6 +6,7 @@ GET     /http                                         myTestController.httpActio
 PUT     /http                                         myTestController.httpAction(type:'PUT')
 POST    /http                                         myTestController.httpAction(type:'POST')
 DELETE  /http                                         myTestController.httpAction(type:'DELETE')
+PATCH   /http                                         myTestController.httpAction(type:'PATCH')
 PUT     /overridemethod                               myTestController.overrideMethod
 GET     /regex/{<[0-9]+>number}                       myTestController.regexNumberAction
 GET     /regex/{<[a-z]+>string}                       myTestController.regexStringAction

diff --git a/src/test/resources/org/resthub/web/springmvc/router/test/handler_mapping.feature b/src/test/resources/org/resthub/web/springmvc/router/test/handler_mapping.feature
@@ -44,6 +44,11 @@ Feature: Handler mapping support
     When I send the HTTP request "DELETE" "/http"
     Then the request should be handled by "myTestController.httpAction"
 
+  Scenario: Mapping a PATCH request
+    Given I have a web application with the config locations "/simpleTestContext.xml"
+    When I send the HTTP request "PATCH" "/http"
+    Then the request should be handled by "myTestController.httpAction"
+
   Scenario: Mapping a HEAD request
     Given I have a web application with the config locations "/simpleTestContext.xml"
     When I send the HTTP request "HEAD" "/http"

diff --git a/src/test/resources/org/resthub/web/springmvc/router/test/reverse_routing.feature b/src/test/resources/org/resthub/web/springmvc/router/test/reverse_routing.feature
@@ -11,6 +11,11 @@ Feature: Reverse routing support
     When I try to reverse route "myTestController.simpleAction"
     Then I should get an action with path "/simpleaction"
 
+  Scenario: Reverse routing a simple URL with PATCH method
+    Given I have a route with method "PATCH" path "/simpleaction" action "myTestController.simpleAction"
+    When I try to reverse route "myTestController.simpleAction"
+    Then I should get an action with path "/simpleaction"
+
   Scenario: Reverse routing an URL with params
     Given I have routes:
       | method | path             | action                       | params            |