#228 Add OPTIONS HTTP Method

Author: Igor Polevoy

activeweb-testing/src/main/java/org/javalite/activeweb/RequestBuilder.java

@@ -320,6 +320,16 @@ public void delete(String actionName) {
         submitRequest(actionName, HttpMethod.DELETE);
     }
 
+    /**
+     * Simulate HTTP OPTIONS call to an action of controller.
+     *
+     * @param actionName name of action as on a URL - not CamelCase.
+     */
+    public void options(String actionName) {
+        realAction = actionName;
+        submitRequest(actionName, HttpMethod.OPTIONS);
+    }
+
 
     private void submitRequest(String actionName, HttpMethod method) {
 
@@ -361,7 +371,7 @@ private void submitRequest(String actionName, HttpMethod method) {
         addCookiesInternal(request);
 
         //this is to fake the PUT and DELETE methods, just like a browser
-        if(!(method.equals(HttpMethod.GET) || method.equals(HttpMethod.POST))){
+        if(method.equals(HttpMethod.PUT)){
             request.setParameter("_method", method.toString());
             request.setMethod("POST");
         }else{

activeweb-testing/src/test/java/app/controllers/OptionsController.java

@@ -0,0 +1,15 @@
+package app.controllers;
+
+import org.javalite.activeweb.AppController;
+import org.javalite.activeweb.annotations.OPTIONS;
+
+/**
+ * @author Igor Polevoy on 6/19/15.
+ */
+public class OptionsController extends AppController {
+
+    @OPTIONS
+    public void index(){
+        respond("ok");
+    }
+}

activeweb-testing/src/test/java/org/javalite/activeweb/OptionsMethodSpec.java

@@ -0,0 +1,33 @@
+/*
+Copyright 2009-2014 Igor Polevoy
+
+Licensed under the Apache License, Version 2.0 (the "License"); 
+you may not use this file except in compliance with the License. 
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+package org.javalite.activeweb;
+
+
+import org.junit.Test;
+
+
+/**
+ * @author Igor Polevoy
+ */
+public class OptionsMethodSpec extends IntegrationSpec{
+
+
+    @Test
+    public void shouldRouteToAppropriateDeleteMethod(){
+        controller("options").integrateViews().options("index");
+        a(responseContent()).shouldBeEqual("ok");
+    }
+}

activeweb/src/main/java/org/javalite/activeweb/HttpMethod.java

@@ -24,7 +24,7 @@
  * @author Igor Polevoy
  */
 public enum HttpMethod {
-    GET, POST, PUT, DELETE, HEAD;
+    GET, POST, PUT, DELETE, HEAD, OPTIONS;
 
     /**
      * Detects a method from annotation
@@ -43,8 +43,10 @@ public static HttpMethod method(Annotation annotation){
             return DELETE;
         }else if (annotation instanceof HEAD) {
             return HEAD;
+        }else if (annotation instanceof OPTIONS) {
+            return OPTIONS;
         }else{
-            throw new IllegalArgumentException("allowable annotations: @GET, @POST, @PUT, @DELETE, @HEAD, all from 'activeweb.annotations' package.");
+            throw new IllegalArgumentException("Allowed annotations can be found in 'org.javalite.activeweb.annotations' package.");
         }
     }
 

activeweb/src/main/java/org/javalite/activeweb/annotations/OPTIONS.java

@@ -0,0 +1,31 @@
+/*
+Copyright 2009-2014 Igor Polevoy
+
+Licensed under the Apache License, Version 2.0 (the "License"); 
+you may not use this file except in compliance with the License. 
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+package org.javalite.activeweb.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark an action of a controller with this annotation to receive an HTTP OPTIONS request.
+ *
+ * @author Igor Polevoy
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface OPTIONS {}