From a8a8ec3790b521e0dc03ccb47246ee0e3e1d0043 Mon Sep 17 00:00:00 2001
From: Iyanu Adelekan <iyanuadelekan@gmail.com>
Date: Thu, 8 Jun 2017 20:55:34 +0100
Subject: [PATCH] Added support for HTTP OPTIONS method

---
 .idea/workspace.xml                           | 276 ++++++++++--------
 pom.xml                                       |   2 +-
 .../iyanuadelekan/kanary/core/KanaryRouter.kt |  14 +
 .../kanary/handlers/AppHandler.kt             |  34 +--
 .../kanary/interfaces/RouterInterface.kt      |   3 +
 target/maven-archiver/pom.properties          |   4 +-
 6 files changed, 197 insertions(+), 136 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b1f0ed..2a171ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="56aa6acc-fe78-4c9d-bdc4-fc686e2a2261" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt" afterPath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt" afterPath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt" afterPath="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -42,40 +46,41 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="FIRST">
-              <first_editor relative-caret-position="90">
-                <caret line="27" column="183" lean-forward="false" selection-start-line="27" selection-start-column="183" selection-end-line="27" selection-end-column="183" />
-                <folding>
-                  <marker date="1496346290000" expanded="true" signature="466:857" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="1159:1322" ph="..." />
-                  <marker date="1496346290000" expanded="true" signature="1181:1300" ph="..." />
-                  <marker date="1496346290000" expanded="true" signature="1383:1569" ph="..." />
-                  <marker date="1496346290000" expanded="true" signature="1404:1547" ph="..." />
-                  <marker date="1496346290000" expanded="true" signature="1719:1782" ph="..." />
-                  <marker date="1496346290000" expanded="true" signature="2488:2597" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="3373:3524" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="3477:3517" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="3982:4445" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="4076:4134" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="4230:4295" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="4398:4438" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="8575:8786" ph="{...}" />
-                  <marker date="1496346290000" expanded="true" signature="8679:8779" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="KanaryRouter.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="109" column="63" lean-forward="false" selection-start-line="109" selection-start-column="63" selection-end-line="109" selection-end-column="63" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="46" column="25" lean-forward="true" selection-start-line="40" selection-start-column="4" selection-end-line="46" selection-end-column="25" />
+            <state relative-caret-position="270">
+              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AppHandler.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="158">
+              <caret line="42" column="0" lean-forward="false" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RouterInterface.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
               <folding />
             </state>
           </provider>
@@ -149,10 +154,8 @@
         <option value="$PROJECT_DIR$/src/main/UserController.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/exceptions/InvalidRoutePathException.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/exceptions/InvalidRouteException.kt" />
-        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryMiddleware.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/utils/RequestUtils.kt" />
-        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/Route.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/libs/RouteList.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/app/KanaryApp.kt" />
@@ -167,12 +170,15 @@
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/UserController.kt" />
         <option value="$PROJECT_DIR$/src/main/EchoApp.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/helpers/http/response/HttpServletResponseHelpers.kt" />
-        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt" />
         <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/middleware/RequestLoggers.kt" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/settings.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt" />
+        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt" />
+        <option value="$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt" />
+        <option value="$PROJECT_DIR$/src/main/App.kt" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>
@@ -266,7 +272,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -279,9 +284,42 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Kanary" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Kanary" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Kanary" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Kanary" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -300,6 +338,11 @@
     <property name="FullScreen" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$" />
+      <recent name="$PROJECT_DIR$/src/main" />
+      <recent name="$PROJECT_DIR$/src/com/iyanuadelekan" />
+    </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
       <recent name="com.iyanuadelekan.kanary.server" />
       <recent name="com.iyanuadelekan.kanary.helpers.http.request" />
@@ -308,13 +351,8 @@
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/images" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/main" />
-      <recent name="$PROJECT_DIR$/src/com/iyanuadelekan" />
-      <recent name="$PROJECT_DIR$" />
-    </key>
   </component>
-  <component name="RunManager" selected="Kotlin.EchoAppKt">
+  <component name="RunManager" selected="Kotlin.AppKt">
     <configuration default="false" name="build (1)" type="GroovyScriptRunConfiguration" factoryName="Groovy" temporary="true">
       <module name="Kanary" />
       <setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
@@ -339,6 +377,19 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="false" name="AppKt" type="JetRunConfigurationType" factoryName="Kotlin" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" value="AppKt" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="Kanary" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -782,15 +833,17 @@
         <option name="Make" enabled="false" />
       </method>
     </configuration>
-    <list size="3">
+    <list size="4">
       <item index="0" class="java.lang.String" itemvalue="Groovy.build" />
       <item index="1" class="java.lang.String" itemvalue="Groovy.build (1)" />
       <item index="2" class="java.lang.String" itemvalue="Kotlin.EchoAppKt" />
+      <item index="3" class="java.lang.String" itemvalue="Kotlin.AppKt" />
     </list>
     <recent_temporary>
-      <list size="2">
-        <item index="0" class="java.lang.String" itemvalue="Kotlin.EchoAppKt" />
-        <item index="1" class="java.lang.String" itemvalue="Groovy.build (1)" />
+      <list size="3">
+        <item index="0" class="java.lang.String" itemvalue="Kotlin.AppKt" />
+        <item index="1" class="java.lang.String" itemvalue="Kotlin.EchoAppKt" />
+        <item index="2" class="java.lang.String" itemvalue="Groovy.build (1)" />
       </list>
     </recent_temporary>
   </component>
@@ -814,11 +867,12 @@
       <workItem from="1496086838157" duration="861000" />
       <workItem from="1496087940941" duration="1801000" />
       <workItem from="1496171650400" duration="9721000" />
+      <workItem from="1496950639481" duration="1038000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="91970000" />
+    <option name="totallyTimeSpent" value="93008000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -848,13 +902,14 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34246576" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49676898" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30547947" sideWeight="0.49030694" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30273974" sideWeight="0.4878837" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28594506" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2907916" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -862,7 +917,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.49676898" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -875,7 +929,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="2" />
+      <option name="time" value="3" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -884,7 +938,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/agents/ResponseAgent.kt" />
     <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/agents/RequestAgent.kt" />
     <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/server/Server.kt">
       <provider selected="true" editor-type-id="text-editor">
@@ -967,13 +1020,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/libs/RouteList.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -988,17 +1034,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="46" column="17" lean-forward="false" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-            <element signature="e#89#446#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_65.jdk/Contents/Home/src.zip!/java/io/PrintWriter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="159">
@@ -1050,30 +1085,12 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/EchoApp.kt" />
-    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="132" column="47" lean-forward="false" selection-start-line="132" selection-start-column="47" selection-end-line="132" selection-end-column="47" />
-          <folding>
-            <element signature="e#43#549#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/UserController.kt" />
-    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/constants/HttpConstants.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gradlew" />
     <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/javax/servlet/http/HttpServletResponse.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1099,9 +1116,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="345">
           <caret line="23" column="1" lean-forward="false" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
-          <folding>
-            <element signature="e#45#142#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1125,7 +1139,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="29" column="26" lean-forward="true" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1145,41 +1158,74 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="46" column="25" lean-forward="true" selection-start-line="40" selection-start-column="4" selection-end-line="46" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="FIRST">
-          <first_editor relative-caret-position="90">
-            <caret line="27" column="183" lean-forward="false" selection-start-line="27" selection-start-column="183" selection-end-line="27" selection-end-column="183" />
+          <first_editor relative-caret-position="150">
+            <caret line="31" column="14" lean-forward="true" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
             <folding>
-              <marker date="1496346290000" expanded="true" signature="466:857" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="1159:1322" ph="..." />
-              <marker date="1496346290000" expanded="true" signature="1181:1300" ph="..." />
-              <marker date="1496346290000" expanded="true" signature="1383:1569" ph="..." />
-              <marker date="1496346290000" expanded="true" signature="1404:1547" ph="..." />
-              <marker date="1496346290000" expanded="true" signature="1719:1782" ph="..." />
-              <marker date="1496346290000" expanded="true" signature="2488:2597" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="3373:3524" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="3477:3517" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="3982:4445" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="4076:4134" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="4230:4295" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="4398:4438" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="8575:8786" ph="{...}" />
-              <marker date="1496346290000" expanded="true" signature="8679:8779" ph="{...}" />
+              <marker date="1496950658000" expanded="true" signature="466:857" ph="{...}" />
+              <marker date="1496950658000" expanded="true" signature="1153:1295" ph="..." />
+              <marker date="1496950658000" expanded="true" signature="1169:1279" ph="..." />
+              <marker date="1496950658000" expanded="true" signature="1356:1521" ph="..." />
+              <marker date="1496950658000" expanded="true" signature="1377:1499" ph="..." />
+              <marker date="1496950658000" expanded="true" signature="1671:1734" ph="..." />
+              <marker date="1496950658000" expanded="true" signature="3325:3476" ph="{...}" />
+              <marker date="1496950658000" expanded="true" signature="3429:3469" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/constants/HttpConstants.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="35" lean-forward="false" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="109" column="63" lean-forward="false" selection-start-line="109" selection-start-column="63" selection-end-line="109" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/App.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="9" column="38" lean-forward="false" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="42" column="0" lean-forward="false" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/pom.xml b/pom.xml
index 3a1cc82..6aa101c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.iyanuadelekan</groupId>
     <artifactId>kanary</artifactId>
     <packaging>jar</packaging>
-    <version>0.9.0</version>
+    <version>0.9.1</version>
 
     <properties>
         <kotlin.version>1.1.2-4</kotlin.version>
diff --git a/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt b/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt
index f542bcd..db9cdd3 100644
--- a/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt
+++ b/src/main/com/iyanuadelekan/kanary/core/KanaryRouter.kt
@@ -24,6 +24,7 @@ class KanaryRouter(var basePath: String?= null, var routeController: KanaryContr
     val putRouteList: RouteList = RouteList()
     val patchRouteList: RouteList = RouteList()
     val deleteRouteList: RouteList = RouteList()
+    val optionsRouteList: RouteList = RouteList()
 
     /**
      * Router function handling GET requests
@@ -85,6 +86,18 @@ class KanaryRouter(var basePath: String?= null, var routeController: KanaryContr
         return this
     }
 
+    /**
+     * Router function handling PATCH requests
+     * @param path Specified route path
+     * @param action Action to handle requests targeting specified route path
+     * @param controller Controller handling the route
+     * @return current instance of [KanaryRouter]
+     */
+    override fun options(path: String, action: (Request, HttpServletRequest, HttpServletResponse) -> Unit, controller: KanaryController?): KanaryRouter {
+        assembleAndQueueRoute(HttpConstants.OPTIONS.name, path, action, controller)
+        return this
+    }
+
     /**
      * Function used for route queuing
      * adds a [route] based on its [method] to its appropriate route list
@@ -98,6 +111,7 @@ class KanaryRouter(var basePath: String?= null, var routeController: KanaryContr
             HttpConstants.PUT.name -> putRouteList.add(route)
             HttpConstants.DELETE.name -> deleteRouteList.add(route)
             HttpConstants.PATCH.name -> patchRouteList.add(route)
+            HttpConstants.OPTIONS.name -> optionsRouteList.add(route)
             else -> {
                 println("Unrecognized HTTP method: '$method'")
             }
diff --git a/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt b/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt
index 16e5b21..147b520 100644
--- a/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt
+++ b/src/main/com/iyanuadelekan/kanary/handlers/AppHandler.kt
@@ -35,27 +35,19 @@ class AppHandler(val app: KanaryApp): AbstractHandler() {
 
         if (request != null) {
             if(isMethodSupported(request.method)) {
-                if(request.method == HttpConstants.OPTIONS.name) {
-                    response?.addHeader("Allow", "${HttpConstants.OPTIONS.name}, ${HttpConstants.GET.name}, " +
-                            "${HttpConstants.POST.name}, ${HttpConstants.PUT.name}, ${HttpConstants.DELETE.name}, " +
-                            HttpConstants.PATCH.name)
+                val route: Route? = resolveTargetRoute(request.method, "$target")
 
-                    response?. withStatus(200)?. send("")
-                } else {
-                    val route: Route? = resolveTargetRoute(request.method, "$target")
-
-                    if (route != null) {
-                        val action = route.action
-                        executeBeforeAction(route, request, response)
-
-                        if(baseRequest != null && response != null) {
-                            action.invoke(baseRequest, request, response)
-                        }
+                if (route != null) {
+                    val action = route.action
+                    executeBeforeAction(route, request, response)
 
-                        executeAfterAction(route, request, response)
-                    } else {
-                        response?. withStatus(404)?. send("Method not found.")
+                    if(baseRequest != null && response != null) {
+                        action.invoke(baseRequest, request, response)
                     }
+
+                    executeAfterAction(route, request, response)
+                } else {
+                    response?. withStatus(404)?. send("Method not found.")
                 }
             } else {
                 response?.addHeader("Allow", "${HttpConstants.OPTIONS.name}, ${HttpConstants.GET.name}, " +
@@ -119,6 +111,12 @@ class AppHandler(val app: KanaryApp): AbstractHandler() {
                         route = matchedRoutes[0]
                     }
                 }
+                HttpConstants.OPTIONS.name -> {
+                    matchedRoutes = router.optionsRouteList.filter { it.path == formattedTarget }
+                    if(matchedRoutes.isNotEmpty()) {
+                        route = matchedRoutes[0]
+                    }
+                }
             }
         } }
         return route
diff --git a/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt b/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt
index bda0f05..3b06c36 100644
--- a/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt
+++ b/src/main/com/iyanuadelekan/kanary/interfaces/RouterInterface.kt
@@ -27,4 +27,7 @@ interface RouterInterface {
     fun patch(path: String, action: (Request, HttpServletRequest, HttpServletResponse) -> Unit,
               controller: KanaryController?=null): KanaryRouter
 
+    fun options(path: String, action: (Request, HttpServletRequest, HttpServletResponse) -> Unit,
+              controller: KanaryController?=null): KanaryRouter
+
 }
\ No newline at end of file
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 13d4241..085c529 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Jun 01 20:20:29 WAT 2017
-version=0.9.0
+#Thu Jun 08 20:52:58 WAT 2017
+version=0.9.1
 groupId=com.iyanuadelekan
 artifactId=kanary