lib/nitcorn: HttpRequest added methods to get an argument of a certain type

[nit.git] / lib / nitcorn / http_request.nit

diff --git a/lib/nitcorn/http_request.nit b/lib/nitcorn/http_request.nit
index 85aef12..c52a4a5 100644 (file)
--- a/lib/nitcorn/http_request.nit
+++ b/lib/nitcorn/http_request.nit
@@ -54,6 +54,44 @@ class HttpRequest
 
        # The arguments passed with the POST method
        var post_args = new HashMap[String, String]
+
+       # The arguments passed with the POST or GET method (with a priority on POST)
+       var all_args = new HashMap[String, String]
+
+       # Returns argument `arg_name` in the request as a String
+       # or null if it was not found.
+       # Also cleans the String by trimming it.
+       # If the Strings happens to be empty after trimming,
+       # the method will return `null`
+       #
+       # NOTE: Prioritizes POST before GET
+       fun string_arg(arg_name: String): nullable String do
+               if not all_args.has_key(arg_name) then return null
+               var s = all_args[arg_name].trim
+               if s.is_empty then return null
+               return s
+       end
+
+       # Returns argument `arg_name` as an Int or `null` if not found or not a number.
+       #
+       # NOTE: Prioritizes POST before GET
+       fun int_arg(arg_name: String): nullable Int do
+               if not all_args.has_key(arg_name) then return null
+               var i = all_args[arg_name]
+               if not i.is_numeric then return null
+               return i.to_i
+       end
+
+       # Returns argument `arg_name` as a Bool or `null` if not found or not a boolean.
+       #
+       # NOTE: Prioritizes POST before GET
+       fun bool_arg(arg_name: String): nullable Bool do
+               if not all_args.has_key(arg_name) then return null
+               var i = all_args[arg_name]
+               if i == "true" then return true
+               if i == "false" then return false
+               return null
+       end
 end
 
 # Utility class to parse a request string and build a `HttpRequest`
@@ -61,7 +99,7 @@ end
 # The main method is `parse_http_request`.
 class HttpRequestParser
        # The current `HttpRequest` under construction
-       private var http_request: HttpRequest
+       private var http_request: HttpRequest is noinit
 
        # Untreated body
        private var body = ""
@@ -96,7 +134,10 @@ class HttpRequestParser
                if http_request.url.has('?') then
                        http_request.uri = first_line[1].substring(0, first_line[1].index_of('?'))
                        http_request.query_string = first_line[1].substring_from(first_line[1].index_of('?')+1)
+
+                       var parse_url = parse_url
                        http_request.get_args = parse_url
+                       http_request.all_args.recover_with parse_url
                else
                        http_request.uri = first_line[1]
                end
@@ -113,6 +154,7 @@ class HttpRequestParser
                                                continue
                                        end
                                        http_request.post_args[parts[0]] = decoded
+                                       http_request.all_args[parts[0]] = decoded
                                else
                                        print "POST Error: {line} format error on {line}"
                                end