created myrequest

Author: neomatrixcode

README.md

@@ -69,25 +69,25 @@ end
 end
 
 @route POST|PUT|DELETE "/" begin
-  println("params: ",q.params)
-  println("query: ",q.query)
-  println("body: ",q.body)
+  println("params: ",req.params)
+  println("query: ",req.query)
+  println("body: ",req.body)
 
   res.headers["Content-Type"]= "text/plain"
 
   "I did something!"
 end
 
-Get("/data", (q,req,res)->(begin
+Get("/data", (req,res)->(begin
   res.headers["Content-Type"]= "text/plain"
   u*"data"
 end))
 
 
-Post("/data", (q,req,res)->(begin
-  println("params: ",q.params)
-  println("query: ",q.query)
-  println("body: ",q.body)
+Post("/data", (req,res)->(begin
+  println("params: ",req.params)
+  println("query: ",req.query)
+  println("body: ",req.body)
   res.headers["Content-Type"]= "text/plain"
   global u="bye"
   "I did something!"
@@ -100,20 +100,35 @@ server.start(Dict("host" => "127.0.0.1","port" => 8000))
 
 Features available in the current release
 ------------------
+### Data stored on request (req)
+```
+  query   # data from the query url
+  params  # data from the regular expresion
+  body    # body of the request in dict or plane text
+  version # the protocol version
+  headers # the headers sent by the client
+```
+### Data stored on response (req)
+```
+  status
+  headers
+  body
+```
+
 ### Parameters dictionary
 ```julia
-# :data> does not accept special symbols (!,#,$,etc)
 @route GET "/get/:data>" begin
   # matches "GET /get/foo" and "GET /get/bar"
-  # q.params["data"] is 'foo' or 'bar'
-  "get this back: "*q.params["data"]
+  # not accept special symbols (!,#,$,etc)
+  # req.params["data"] is 'foo' or 'bar'
+  "get this back: "*req.params["data"]
 end
 
 # it is possible to use regular expressions, enclosing them always between '(' ')'
 @route GET "/regex/(\\w+\\d+)" begin
   # matches "GET /regex/test1" and "GET /regex/test125"
-  # q.params[1] is 'test1' or 'test125'
-   "datos $(q.params[1])"
+  # req.params[1] is 'test1' or 'test125'
+   "datos $(req.params[1])"
 end
 ```
 ### url query dictionary
@@ -122,8 +137,8 @@ end
 @route POST|PUT|DELETE "/" begin
   res.headers["Content-Type"]= "text/plain"
   # matches "POST /?title=foo&author=bar"
-  title = q.query["title"]
-  author = q.query["author"]
+  title = req.query["title"]
+  author = req.query["author"]
   "I did something!"
 end
 ```
@@ -135,7 +150,7 @@ Payload
 ```julia
 @route POST|PUT|DELETE "/" begin
   res.headers["Content-Type"]= "text/plain"
-  res.body = "Payload data "*q.body["data1"]
+  res.body = "Payload data "*req.body["data1"]
 end
 ```
 
@@ -148,7 +163,7 @@ Payload
 ```julia
 @route POST|PUT|DELETE "/" begin
   res.headers["Content-Type"]= "text/plain"
-  "Payload data "*q.body["Data"]["Data1"]
+  "Payload data "*req.body["Data"]["Data1"]
 end
 ```
 

src/base.jl

@@ -2,15 +2,23 @@ mutable struct myresponse
   status::Int
   headers::Dict
   body::String
+  function myresponse(code)
+      new(code,Dict(),"")
+  end
 end
 
-mutable struct Data
+mutable struct myrequest
   query::Dict
-  params::Any
+  params::RegexMatch
   body::Any
+  version::VersionNumber
+  headers::Array
+  function myrequest()
+    new(Dict(),match(r"\s"," "),"",VersionNumber(1),[])
+  end
 end
 
-struct Fram
+struct App
   notfound::Function
   start::Function
   useCORS::Function
@@ -27,7 +35,7 @@ elseif Sys.iswindows() && root[end]=='\\'
 end
 exten="\"\""::AbstractString
 notfound_message = "NotFound"::String
-q=Data(Dict(),"","")
+
 
 function File(file::String)
     path = normpath(root, file)
@@ -47,32 +55,37 @@ function handler(request::HTTP.Messages.Request)
   data = split(request.target,"?")
   url=data[1]
   searchroute = request.method*url
-  if (length(data)>1) q.query= HTTP.queryparams(data[2]) end
-  response = myresponse(200,Dict(),"")
+
+  my_request=myrequest()
+  my_request.version=request.version
+  my_request.headers=request.headers
+  if (length(data)>1) my_request.query= HTTP.queryparams(data[2]) end
+
+  response = myresponse(200)
 
   if ((request.method=="POST"  )||(request.method=="PUT"  )||(request.method=="PATCH"))
     header_content_type = HTTP.header(request, "Content-Type")
     if(length(header_content_type)>0)
-      q.body= getindex(formats, header_content_type)(String(request.body))
+      my_request.body= getindex(formats, header_content_type)(String(request.body))
     else
-      q.body = getindex(formats, "*/*")(String(request.body))
+      my_request.body = getindex(formats, "*/*")(String(request.body))
     end
   end
 
   if (searchroute in routes_array)
-    response.body = getindex(routes, searchroute)(q,request,response)
+    response.body = getindex(routes, searchroute)(my_request,response)
   else
     pattern = searchroute_regex(searchroute)
     if (typeof(pattern) <:Regex)
-      q.params = match(pattern,searchroute)
+      my_request.params = match(pattern,searchroute)
       _function = getindex(routes_patterns,pattern)
-      response.body = _function(q,request,response)
+      response.body = _function(my_request,response)
       sal = collect((m.match for m = eachmatch(Regex("{{([a-z])+}}"), response.body)))
       for i in sal
-        response.body = replace(response.body,Regex(i) => q.params["$(i[3:end-2])"])
+        response.body = replace(response.body,Regex(i) => my_request.params["$(i[3:end-2])"])
       end
     else
-      response.body = getindex(routes, "notfound")(q,request,response)
+      response.body = getindex(routes, "notfound")(my_request,response)
     end
   end
   responsefinal = HTTP.Response(response.status,my_headers, body=response.body)
@@ -126,7 +139,7 @@ function app()
   end
 
   @info("App created")
-  return Fram(notfound,start,useCORS,webserverfiles,webserverpath)
+  return App(notfound,start,useCORS,webserverfiles,webserverpath)
 end
 
 #HSTS     HTTP.setheader(response,"Strict-Transport-Security" => "max-age=10886400; includeSubDomains; preload"

src/routes.jl

@@ -9,7 +9,7 @@ HEAD = "HEAD"
 OPTIONS = "OPTIONS"
 PATCH = "PATCH"
 
-function NotFound(q,req,res)
+function NotFound(req,res)
   res.status = 404
   return notfound_message
 end
@@ -37,15 +37,15 @@ end
 
 macro page(exp1,exp2)
   quote
-    createurl("GET"*$exp1,(q,req,res)->$exp2)
+    createurl("GET"*$exp1,(req,res)->$exp2)
   end
 end
 
 macro route(exp1,exp2,exp3)
   quote
     verbs= split($exp1,"|")
     for i=verbs
-      createurl(i*$exp2,(q,req,res)->$exp3)
+      createurl(i*$exp2,(req,res)->$exp3)
     end
   end
 end

src/webserver.jl

@@ -7,7 +7,7 @@ function files(arch::Array{Any,1})
     ext= split(roop,".")
     if(length(ext)>1) extension=mimetypes[ext[2]] end
     data = File(roop[2:end])
-    createurl("GET"*roop,(q,req,res)->(begin
+    createurl("GET"*roop,(req,res)->(begin
       res.headers["Content-Type"]= extension
       res.status = 200
       res.body= data

test/runtests.jl

@@ -33,34 +33,38 @@ u="hello"
 end
 
 @route GET "/regex/(\\w+\\d+)" begin
-   "datos $(q.params[1])"
+
+  println("req.version ",req.version)
+  println("req.headers ",req.headers)
+
+   "datos $(req.params[1])"
 end
 
 @route POST "/post" begin
   res.body = "I did something!"
 end
 
 @route POST|PUT|DELETE "/" begin
-  println("params: ",q.params)
-  println("query: ",q.query)
-  println("body: ",q.body)
+  println("params: ",req.params)
+  println("query: ",req.query)
+  println("body: ",req.body)
 
   res.headers["Content-Type"]= "text/plain"
 
   "I did something!"
 end
 
-Get("/data", (q,req,res)->(begin
+Get("/data", (req,res)->(begin
   res.headers["Content-Type"]= "text/plain"
-  println("params: ",q.params)
-  println("query: ",q.query)
+  println("params: ",req.params)
+  println("query: ",req.query)
   u*"data"
 end))
 
-Post("/data", (q,req,res)->(begin
-  println("params: ",q.params)
-  println("query: ",q.query)
-  println("body: ",q.body)
+Post("/data", (req,res)->(begin
+  println("params: ",req.params)
+  println("query: ",req.query)
+  println("body: ",req.body)
   res.headers["Content-Type"]= "text/plain"
   global u="bye"
   "I did something!"