performance routes regex

Author: neomatrixcode

README.md

@@ -30,21 +30,20 @@ Below are some of the features that are planned to be added in future versions o
 #### Version 0.1.0
 - [x] Julia version 0.7 syntax update
 
-#### Version 0.1.1
+#### Version 0.2.0
 - [x] Julia version 1.0 syntax update
 - [x] Update and refactor
 
-#### Version 0.1.2
+#### Version 0.2.2
 - [ ] Implementation of a websocket module
 
-#### Version 0.1.3
+#### Version 0.2.3
 - [ ] Performance improvement
 
 
 Installing
 ----------
 ```julia
-```julia
 Pkg> add Diana                                             #Release
 pkg> add Diana#master                                      #Development
 ```

src/base.jl

@@ -34,24 +34,13 @@ function File(file::String)
     return String(read(path))
 end
 
-function resolveroute(ruta::String)
-  for key in keys(routes_patterns)
-    params= match(key,ruta)
-    if params!= nothing
-      return params, getindex(routes_patterns,key)
+function searchroute_regex(ruta::String)
+  for i in 1:length(routes_patterns_array)
+    if(occursin(routes_patterns_array[i],ruta))
+      return routes_patterns_array[i]
     end
-  end
-end
-
-function processroute_pattern(searchroute::String,request,response)
-  q.params, _function  = resolveroute(searchroute)
-  respond = _function(q,request,response)
-  sal = collect((m.match for m = eachmatch(Regex("{{([a-z])+}}"), respond)))
-  for i in sal
-    respond = replace(respond,Regex(i) => q.params["$(i[3:end-2])"])
-  end
-  response.status = 200
-  return respond
+ end
+ return ""
 end
 
 function handler(request::HTTP.Messages.Request)
@@ -73,11 +62,18 @@ function handler(request::HTTP.Messages.Request)
   if (searchroute in routes_array)
     response.body = getindex(routes, searchroute)(q,request,response)
   else
-    #try
-    #  response.body = processroute_pattern(searchroute,request,response)
-    #catch
-     response.body = getindex(routes, "notfound")(q,request,response)
-    #end
+    pattern = searchroute_regex(searchroute)
+    if (typeof(pattern) <:Regex)
+      q.params = match(pattern,searchroute)
+      _function = getindex(routes_patterns,pattern)
+      response.body = _function(q,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])"])
+      end
+    else
+      response.body = getindex(routes, "notfound")(q,request,response)
+    end
   end
   responsefinal = HTTP.Response(response.status,my_headers, body=response.body)
   for (key, value) in response.headers

src/routes.jl

@@ -17,6 +17,7 @@ end
 routes=Dict()
 routes_array=[]
 routes_patterns=Dict()
+routes_patterns_array=[]
 routes["notfound"] = NotFound
 
 function createurl(url::String,funtion::Function)
@@ -25,6 +26,7 @@ function createurl(url::String,funtion::Function)
       url_ = replace(url_,":" => "(?<")
       url_ = replace(url_,">" => ">[a-z]+)")
       routes_patterns[Regex(url_)] = funtion
+      push!(routes_patterns_array,Regex(url_))
       @info("Url added",Regex(url_))
   else
     routes[url] = funtion

test/runtests.jl

@@ -72,14 +72,14 @@ r = HTTP.get("http://$(ip):$(port)/")
 @test r.status == 200
 @test String(r.body) == "Hello World!"
 
-#=r = HTTP.get("http://$(ip):$(port)/hola/usuario")
+r = HTTP.get("http://$(ip):$(port)/hola/usuario")
 @test r.status == 200
 @test String(r.body) == "<b>Hello usuario!</b>"
 
 r = HTTP.get("http://$(ip):$(port)/get/testdata")
 @test r.status == 200
 @test String(r.body) == "get this back: testdata"
-=#
+
 r = HTTP.get("http://$(ip):$(port)/data?hola=1")
 @test r.status == 200
 @test String(r.body) == "hellodata"
@@ -135,4 +135,6 @@ end
 
 @test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/html", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
 
-#@btime HTTP.get("http://$(ip):$(port)/?hola=5")
+#@btime HTTP.get("http://$(ip):$(port)/?hola=5") # 3.864 ms (8304 allocations: 381.20 KiB)
+#@btime HTTP.get("http://$(ip):$(port)/hola/usuario") # 4.211 ms (7685 allocations: 353.44 KiB)
+#@btime r= HTTP.get("http://$(ip):$(port)/get/testdata") # 3.906 ms (7693 allocations: 353.78 KiB)