update to v0.7

Author: neomatrixcode

README.md

@@ -8,7 +8,6 @@
   <img src="https://codecov.io/gh/codeneomatrix/Merly.jl/branch/master/graph/badge.svg" />
 </a>
 &nbsp;&nbsp
-<a href="https://pkg.julialang.org/detail/Merly"><img src="http://pkg.julialang.org/badges/Merly_0.6.svg"></a>
 <a href="https://pkg.julialang.org/detail/Merly"><img src="http://pkg.julialang.org/badges/Merly_0.7.svg"></a>
  &nbsp;&nbsp;
 <a href="https://raw.githubusercontent.com/codeneomatrix/Merly.jl/master/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
@@ -24,12 +23,12 @@ Roadmap
 - [x] optimizing routes
 - [x] refactor notfount, cors, body
 
-Below are some of the features that are planned to be added in future versions of Merly.jl once version 1.0 of the language is released.
+Below are some of the features that are planned to be added in future versions of Merly.jl once version 0.7 of the language is released.
 
 ### All contributions and suggestions are welcome !!!!
 
 #### Version 0.1.0
-- [ ] Julia version 1.0 syntax update
+- [ ] Julia version 0.7 syntax update
 
 #### Version 0.1.2
 - [ ] Implementation of a websocket module
@@ -62,21 +61,21 @@ server = Merly.app()
 end
 
 @route POST "/post" begin
-  res.data = "I did something!"
+  res.body = "I did something!"
 end
 
 @route POST|PUT|DELETE "/" begin
   println("params: ",q.params)
   println("query: ",q.query)
   println("body: ",q.body)
 
-  res.headers["Content-Type"]="text/plain"
+  q.headers["Content-Type"]= "text/plain"
 
   "I did something!"
 end
 
 Get("/data", (q,req,res)->(begin
-  res.headers["Content-Type"]="text/plain"
+  q.headers["Content-Type"]= "text/plain"
   u*"data"
 end))
 
@@ -85,13 +84,13 @@ Post("/data", (q,req,res)->(begin
   println("params: ",q.params)
   println("query: ",q.query)
   println("body: ",q.body)
-  res.headers["Content-Type"]="text/plain"
+  q.headers["Content-Type"]= "text/plain"
   global u="bye"
   "I did something!"
 end))
 
 
-server.start("localhost", 8080)
+server.start(Dict("host" => "127.0.0.1","port" => 8000))
 
 ```
 
@@ -109,7 +108,7 @@ end
 
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="text/plain"
+  q.headers["Content-Type"]= "text/plain"
   # matches "POST /?title=foo&author=bar"
   title = q.query["title"]
   author = q.query["author"]
@@ -123,8 +122,8 @@ Payload
 ```
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="text/plain"
-  res.data = "Payload data "*q.body["data1"]
+  q.headers["Content-Type"]= "text/plain"
+  res.body = "Payload data "*q.body["data1"]
 end
 ```
 
@@ -136,7 +135,7 @@ Payload
 ```
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="text/plain"
+  q.headers["Content-Type"]= "text/plain"
   "Payload data "*q.body["Data"]["Data1"]
 end
 ```
@@ -145,7 +144,7 @@ end
 
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="application/json"
+  q.headers["Content-Type"]="application/json"
   res.status = 200 #optional
   "{\"data1\":2,\"data2\":\"t\"}"
 end
@@ -154,12 +153,12 @@ end
 or
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="application/json"
+  q.headers["Content-Type"]="application/json"
   info=Dict()
   info["data1"]=2
   info["data2"]="t"
   res.status = 200 #optional
-  res.data = JSON.json(info)
+  res.body = JSON.json(info)
 end
 
 ```
@@ -168,7 +167,7 @@ end
 
 ```julia
 @route POST|PUT|DELETE "/" begin
-  res.headers["Content-Type"]="application/xml"
+  q.headers["Content-Type"]="application/xml"
 
   "<ListAllMyBucketsResult>
     <Buckets>
@@ -195,12 +194,11 @@ end
 # with the following instruction.
 server.webserverpath("C:\\path")  # example in windows
 
-
-server.webserverfiles("*") #
 ```
 ```clojure
 Possible values of webserverfiles
 
+server.webserverfiles("*") #
  "*"               Load all the files located in the path, except what started with "."
  "jl","clj|jl|py"  Extension in files that will not be exposed
 ```
@@ -224,5 +222,6 @@ server.useCORS(true)
 ### Bonus
 If you forgot the MIME type of a file you can use the next instruction
 ```julia
-res.headers["Content-Type"]=mimetypes["file extension"]
-```
+q.headers["Content-Type"]= mimetypes["file extension"]
+```
+the file mimetypes.jl was taken from https://github.com/JuliaWeb/HttpServer.jl  guys are great

REQUIRE

@@ -1,5 +1,3 @@
-julia 0.6
-HttpServer
+julia 0.7-
 HttpCommon
 JSON
-XMLDict

src/Merly.jl

@@ -1,59 +1,55 @@
 __precompile__()
 module Merly
-import HttpServer.mimetypes
 import Base.|
 
-using HttpServer,
+using Sockets,
       HttpCommon,
       JSON,
+      HTTP,
       XMLDict
 
+include("mimetypes.jl")
 include("routes.jl")
 include("allformats.jl")
 include("webserver.jl")
 
 export app, @page, @route, GET,POST,PUT,DELETE,HEAD,OPTIONS,PATCH,Get,Post,Put,Delete
 
 cors=false::Bool
-debug=true::Bool
 root=pwd()
 if root[end]=='/'
   root=root[1:end-1]
-elseif is_windows() && root[end]=='\\'
+elseif Sys.iswindows() && root[end]=='\\'
   root=root[1:end-1]
 end
 
 exten="\"\""::AbstractString
 
-type Q
+mutable struct Data
   query::Dict
   params::Any
-  body::AbstractString
-  notfound_message::AbstractString
+  body::Any
+  headers::Dict
 end
+global notfound_message = "NotFound"::AbstractString
+global q=Data(Dict(),"","",Dict())
 
-global q=Q(Dict(),Dict(),"","NotFound")
-
-type Fram
+mutable struct Fram
   notfound::Function
   start::Function
   useCORS::Function
   webserverfiles::Function
   webserverpath::Function
 end
 
-function _body(data::Array{UInt8,1},format::String)
-  content=""
-  for i=1:length(data)
-   content*="$(Char(data[i]))"
-  end
-  return getindex(formats, format)(content)
+function _body(data::Array{UInt8,1},format::SubString{String})
+  return getindex(formats, format)(String(data))
 end
 
 function File(file::String)
   try
     path = normpath(root, file)
-    return readstring(path)
+    return String(read(path))
   catch
     return file
   end
@@ -68,51 +64,56 @@ function resolveroute(ruta::String)
   end
 end
 
-function processroute_pattern(searchroute::String,request::HttpCommon.Request,response::HttpCommon.Response)
+function processroute_pattern(searchroute::String,request,response)
   q.params, _function  = resolveroute(searchroute)
   respond = _function(q,request,response)
-  sal = matchall(Regex("{{([a-z])+}}"),respond)
+  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])"])
+    respond = replace(respond,Regex(i) => q.params["$(i[3:end-2])"])
   end
+  response.status = 200
   return respond
 end
 
-function handler(request::HttpCommon.Request,response::HttpCommon.Response)
-
-  data = split(request.resource,"?")
+function handler(request::HTTP.Messages.Request)
+  data = split(request.target,"?")
   url=data[1]
-
   searchroute = request.method*url
-
   try
-    q.query= parsequerystring(data[2]);
+    q.query= HTTP.queryparams(data[2]);
+  catch
   end
+   response = HTTP.Response()
 
   try
-    q.body = _body(request.data,request.headers["Content-Type"])
+   q.body= _body(request.body,HTTP.header(request, "Content-Type"))
   catch
-    q.body = _body(request.data,"*/*")
+   q.body = _body(request.body,SubString("*/*"))
   end
 
   if cors
-   response.headers["Access-Control-Allow-Origin"]="*"
-   response.headers["Access-Control-Allow-Methods"]="POST,GET,OPTIONS"
+   HTTP.setheader(response,"Access-Control-Allow-Origin" => "*")
+   HTTP.setheader(response,"Access-Control-Allow-Methods" => "POST,GET,OPTIONS")
   end
 
-  if debug
-    info("METODO : ",request.method,"    URL : ",url)
-  end
-  try
-    response.data = getindex(routes, searchroute)(q,request,response)
-  catch
+  HTTP.setheader(response,"Content-Type" => "text/plain" )
+
+ #try
+    response.status= 200
+    response.body = getindex(routes, searchroute)(q,request,response)
+  #=catch
     try
-      response.data = processroute_pattern(searchroute,request,response)
+      response.body = processroute_pattern(searchroute,request,response)
     catch
-      response.data = getindex(routes, "notfound")(q,request,response)
+     response.body = getindex(routes, "notfound")(q,request,response)
     end
+  end=#
+
+  for (key, value) in q.headers
+    HTTP.setheader(response,key => value )
   end
 
+
   return response
 end
 
@@ -121,14 +122,13 @@ function app()
 global root
 global exten
 global cors
-global debug
 
   function useCORS(activate::Bool)
       cors=activate
   end
 
   function notfound(text::AbstractString)
-      q.notfound_message= File(text)
+      notfound_message= File(text)
   end
 
   function webserverfiles(load::AbstractString)
@@ -144,48 +144,40 @@ global debug
       root= path
   end
 
-  function start(config=Dict("host" => "127.0.0.1","port" => 8000,"debug"  => true)::Dict)
-    host= "127.0.0.1"
+  function start(config=Dict("host" => "127.0.0.1","port" => 8000)::Dict)
+    host= Sockets.IPv4("127.0.0.1")
     port= 8000
 
     try
-    host=get(config, "host", "127.0.0.1")::AbstractString
+    host=Sockets.IPv4(get(config, "host", "127.0.0.1")::AbstractString)
     catch
-      error("Verify the format of the ip address \n AbstractString \"127.0.0.1\"")
+      try
+        host=Sockets.IPv6(get(config, "host", "127.0.0.1")::AbstractString)
+      catch
+      end
     end
 
     try
     port=get(config, "port", 8000)::Int
     catch
-      error("Verify the port format \n Int 8000 ")
+      @info("Port 8000 ")
     end
 
-    try
-    debug=get(config, "debug", true)::Bool
-    catch
-      error("Verify the debug format \n Bool true ")
-    end
+    http = (req)-> handler(req)
 
-    http = HttpHandler((req, res)-> handler(req,res))
-    http.events["error"]  = (client, error) -> println(error)
-    http.events["listen"] = (port)          -> println("Listening on $port...")
-    server = Server(http)
+    myserver= HTTP.Servers.Server(http, stdout)
 
-    if host=="localhost"
-      host="127.0.0.1"
-    end
     try
       #@async run(server, host=IPv4(host), port=port)
-      run(server, host=IPv4(host), port=port)
+      HTTP.Servers.serve(myserver, host, port)
     catch
       try
-        run(server, host=IPv6(host), port=port)
+        HTTP.Servers.serve(myserver, host, port)
       catch
-        warn("Address not valid, check it")
+        @warn("Address not valid, check it")
       end
     end
   end
-
   return Fram(notfound,start,useCORS,webserverfiles,webserverpath)
 end
 end # module