eliminating trys and add tests

Author: neomatrixcode

README.md

@@ -44,8 +44,9 @@ Below are some of the features that are planned to be added in future versions o
 Installing
 ----------
 ```julia
-Pkg.add("Merly")                                           #Release
-Pkg.clone("git://github.com/codeneomatrix/Merly.jl.git")   #Development
+```julia
+Pkg> add Diana                                             #Release
+pkg> add Diana#master                                      #Development
 ```
 
 ## Example

src/Merly.jl

@@ -19,6 +19,8 @@ mutable struct myresponse
   body::String
 end
 
+my_headers= HTTP.mkheaders(["Content-Type" => "text/plain"])
+
 cors=false::Bool
 root=pwd()
 if root[end]=='/'
@@ -50,12 +52,8 @@ function _body(data::Array{UInt8,1},format::SubString{String})
 end
 
 function File(file::String)
-  try
     path = normpath(root, file)
     return String(read(path))
-  catch
-    return file
-  end
 end
 
 function resolveroute(ruta::String)
@@ -82,36 +80,32 @@ function handler(request::HTTP.Messages.Request)
   data = split(request.target,"?")
   url=data[1]
   searchroute = request.method*url
-  try
-    q.query= HTTP.queryparams(data[2]);
-  catch
-  end
+
+  if (length(data)>1) q.query= HTTP.queryparams(data[2]) end
 
   response = myresponse(200,Dict(),"")
 
-  header_content_type = HTTP.header(request, "Content-Type")
-  if(length(header_content_type)>0)
-    q.body= _body(request.body,header_content_type)
-  else
-    q.body = _body(request.body,SubString("*/*"))
+  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))
+    else
+      q.body = getindex(formats, "*/*")(String(request.body))
+    end
   end
 
-  if (haskey(routes, searchroute))
+  if (searchroute in routes_array)
     response.body = getindex(routes, searchroute)(q,request,response)
   else
-    try
-      response.body = processroute_pattern(searchroute,request,response)
-    catch
+    #try
+    #  response.body = processroute_pattern(searchroute,request,response)
+    #catch
      response.body = getindex(routes, "notfound")(q,request,response)
-    end
+    #end
   end
 
-  responsefinal = HTTP.Response(response.status,response.body)
-  if cors
-   HTTP.setheader(responsefinal,"Access-Control-Allow-Origin" => "*")
-   HTTP.setheader(responsefinal,"Access-Control-Allow-Methods" => "POST,GET,OPTIONS")
-  end
-  HTTP.setheader(responsefinal,"Content-Type" => "text/plain" )
+  responsefinal = HTTP.Response(response.status,my_headers, body=response.body)
+
   for (key, value) in response.headers
     HTTP.setheader(responsefinal,key => value )
   end
@@ -126,11 +120,17 @@ function app()
   global cors
 
   function useCORS(activate::Bool)
-    cors=activate
+   HTTP.setheader(my_headers,"Access-Control-Allow-Origin" => "*")
+   HTTP.setheader(my_headers,"Access-Control-Allow-Methods" => "POST,GET,OPTIONS")
+   return true
   end
 
-  function notfound(text::AbstractString)
+  function notfound(text::String)
+    if occursin(".html", text)
     notfound_message= File(text)
+    else
+      notfound_message= text
+    end
   end
 
   function webserverfiles(load::AbstractString)
@@ -148,38 +148,18 @@ function app()
 
   function start(config=Dict("host" => "127.0.0.1","port" => 8000)::Dict)
     host= Sockets.IPv4("127.0.0.1")
-    port= 8000
-
-    try
-      host=Sockets.IPv4(get(config, "host", "127.0.0.1")::AbstractString)
-    catch
-      try
-        host=Sockets.IPv6(get(config, "host", "127.0.0.1")::AbstractString)
-      catch
-      end
-    end
+    port=get(config, "port", 8000)::Int
 
-    try
-      port=get(config, "port", 8000)::Int
-    catch
-      @info("Port 8000 ")
-    end
+    my_host = get(config, "host", "127.0.0.1")::String
+    if ('.' in my_host) host=Sockets.IPv4(my_host) end
+    if (':' in my_host) host=Sockets.IPv6(my_host) end
 
     http = (req)-> handler(req)
-
     myserver= HTTP.Servers.Server(http, stdout)
-
-    try
-      #@async run(server, host=IPv4(host), port=port)
-      return HTTP.Servers.serve(myserver, host, port)
-    catch
-      try
-      return HTTP.Servers.serve(myserver, host, port)
-      catch
-        @warn("Address not valid, check it")
-      end
-    end
+    @info("Listening on: $(host) : $(port)")
+    return HTTP.Servers.serve(myserver, host, port)
   end
+
   @info("App created")
   return Fram(notfound,start,useCORS,webserverfiles,webserverpath)
 end

src/allformats.jl

@@ -4,27 +4,17 @@ function toplanetext(data::String)
 end
 
 function tojson(data::String)
-  try
    return JSON.parse(data)
- catch
-   @warn("The format JSON does not match the data received")
-   return data
- end
 end
 
 function toxml(data::String)
-  try
    return parse_xml(content)
- catch
-   @warn("The format XML does not match the data received")
-   return data
- end
 end
 
 
 formats = Dict(
     "application/json" =>  tojson
-  , "application/xml"  =>  toxml
+  #, "application/xml"  =>  toxml
   , "*/*"              =>  toplanetext
   , "text/plain"       =>  toplanetext
 )

src/routes.jl

@@ -15,22 +15,20 @@ function NotFound(q,req,res)
 end
 
 routes=Dict()
+routes_array=[]
 routes_patterns=Dict()
 routes["notfound"] = NotFound
 
 function createurl(url::String,funtion::Function)
   if occursin(":",url)||occursin("(",url)
-    try
       url_ = "^"*url*"\$"
       url_ = replace(url_,":" => "(?<")
       url_ = replace(url_,">" => ">[a-z]+)")
       routes_patterns[Regex(url_)] = funtion
       @info("Url added",Regex(url_))
-    catch
-     @warn("Error in the format of the route $url, verify it\n \"VERB/get/:data>\" \n \"VERB/get/([0-9])\"")
-    end
   else
     routes[url] = funtion
+    push!(routes_array,url)
     @info("Url added",url)
   end
 end

src/webserver.jl

@@ -4,18 +4,14 @@ function files(arch::Array{Any,1})
   for i=1:length(arch)
     roop=replace(replace(arch[i],root => ""),"\\" => "/")
     extension="text/plain"
-    try
-      extension=mimetypes[split(roop,".")[end]]
-    catch
-    end
+    ext= split(roop,".")
+    if(length(ext)>1) extension=mimetypes[ext[2]] end
     data = File(roop[2:end])
-    #try
-      createurl("GET"*roop,(q,req,res)->(begin
-        HTTP.setheader(res,"Content-Type" => extension)
-        res.status = 200
-        res.body= data
-      end))
-    #end
+    createurl("GET"*roop,(q,req,res)->(begin
+      res.headers["Content-Type"]= extension
+      res.status = 200
+      res.body= data
+    end))
   end
 end
 

test/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>Document</title>
+</head>
+<body>
+<h1>hola</h1>
+</body>
+</html>

test/prueba.txt

@@ -0,0 +1 @@
+probando webserver

test/runtests.jl

@@ -2,6 +2,11 @@ using Merly
 using Test
 using HTTP
 using JSON
+#using Pkg
+#Pkg.add("BenchmarkTools")
+#using BenchmarkTools
+
+ip = "127.0.0.1" #127.0.0.1
 # write your own tests here
 server = Merly.app()
 
@@ -17,7 +22,6 @@ server = Merly.app()
               <body><h1>404, Not found</h1></body>
               </html>"
 
-
 u="hello"
 
 @page "/" "Hello World!"
@@ -43,10 +47,11 @@ end
 
 Get("/data", (q,req,res)->(begin
   res.headers["Content-Type"]= "text/plain"
+  println("params: ",q.params)
+  println("query: ",q.query)
   u*"data"
 end))
 
-
 Post("/data", (q,req,res)->(begin
   println("params: ",q.params)
   println("query: ",q.query)
@@ -56,49 +61,71 @@ Post("/data", (q,req,res)->(begin
   "I did something!"
 end))
 
-t = @async server.start(Dict("host" => "127.0.0.1","port" => 8000))
+server.webserverfiles("jl")
+
+@async server.start(Dict("host" => "$(ip)","port" => 8000))
 
 
-r = HTTP.get("http://127.0.0.1:8000/")
+r = HTTP.get("http://$(ip):8000/")
 @test r.status == 200
 @test String(r.body) == "Hello World!"
 
-r = HTTP.get("http://127.0.0.1:8000/hola/usuario")
+#=r = HTTP.get("http://$(ip):8000/hola/usuario")
 @test r.status == 200
 @test String(r.body) == "<b>Hello usuario!</b>"
 
-r = HTTP.get("http://127.0.0.1:8000/get/testdata")
+r = HTTP.get("http://$(ip):8000/get/testdata")
 @test r.status == 200
 @test String(r.body) == "get this back: testdata"
-
-r = HTTP.get("http://127.0.0.1:8000/data")
+=#
+r = HTTP.get("http://$(ip):8000/data?hola=1")
 @test r.status == 200
 @test String(r.body) == "hellodata"
 
 myjson = Dict("query"=>"data")
 my_headers = HTTP.mkheaders(["Accept" => "application/json","Content-Type" => "application/json"])
-r = HTTP.post("http://127.0.0.1:8000/data",my_headers,JSON.json(myjson))
+r = HTTP.post("http://$(ip):8000/data",my_headers,JSON.json(myjson))
 @test r.status == 200
 @test String(r.body) == "I did something!"
 
-r = HTTP.get("http://127.0.0.1:8000/data")
+r = HTTP.get("http://$(ip):8000/data")
 @test r.status == 200
 @test String(r.body) == "byedata"
 
 
 
-r = HTTP.post("http://127.0.0.1:8000/post",my_headers,JSON.json(myjson))
+r = HTTP.post("http://$(ip):8000/post",my_headers,JSON.json(myjson))
 @test r.status == 200
 @test String(r.body) == "I did something!"
 
-r = HTTP.post("http://127.0.0.1:8000/",my_headers,JSON.json(myjson))
+r = HTTP.post("http://$(ip):8000/",my_headers,JSON.json(myjson))
 @test r.status == 200
 @test String(r.body) == "I did something!"
 
-r = HTTP.put("http://127.0.0.1:8000/",my_headers,JSON.json(myjson))
+r = HTTP.put("http://$(ip):8000/",my_headers,JSON.json(myjson))
 @test r.status == 200
 @test String(r.body) == "I did something!"
 
-r = HTTP.delete("http://127.0.0.1:8000/")
+r = HTTP.delete("http://$(ip):8000/")
 @test r.status == 200
-@test String(r.body) == "I did something!"
+@test String(r.body) == "I did something!"
+@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
+
+try
+r = HTTP.get("http://$(ip):8000/nada")
+catch e
+  @test e.status == 404
+  @test String(e.response.body) == "NotFound"
+end
+
+r = HTTP.get("http://$(ip):8000/prueba.txt")
+@test r.status == 200
+@test String(r.body) == "probando webserver"
+@test r.headers == Pair{SubString{String},SubString{String}}["Content-Type"=>"text/plain", "Access-Control-Allow-Origin"=>"*", "Access-Control-Allow-Methods"=>"POST,GET,OPTIONS", "Transfer-Encoding"=>"chunked"]
+
+r = HTTP.get("http://$(ip):8000/index.html")
+@test r.status == 200
+@test String(r.body) == "<!DOCTYPE html>\r\n<html lang=\"en\">\r\n<head>\r\n\t<meta charset=\"UTF-8\">\r\n\t<title>Document</title>\r\n</head>\r\n<body>\r\n<h1>hola</h1>\r\n</body>\r\n</html>"
+@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):8000/?hola=5")