CORS

neomatrixcode · neomatrixcode · commit 9ea33b5fa84b · 2016-07-13T14:47:42.000-05:00
diff --git a/README.md b/README.md
@@ -67,21 +67,6 @@ server.start("localhost", 8080)
 
 ```
 
-Features available in the development version
-------------------
-* Place a message in case of not finding a resource:
-```julia
-server.notfound("<!DOCTYPE html>
-<html>
-<head><title>Not found</title></head>
-<body><h1>404, Not found</h1></body>
-</html>")
-```
-```julia
-server.notfound("notfound.html")
-```
-
-
 Features available in the current release
 ------------------
 ###Parameters dictionary
@@ -178,10 +163,24 @@ Possible values of load
  ""               Any file, Default
 ```
 
+### Not found message
+```julia
+server.notfound("<!DOCTYPE html>
+<html>
+<head><title>Not found</title></head>
+<body><h1>404, Not found</h1></body>
+</html>")
+```
+```julia
+server.notfound("notfound.html")
+```
+###CORS
+```julia
+server.use("CORS")
+```
+
 ### Bonus
 If you forgot the MIME type of a file you can use the next instruction
 ```julia
 r.headers["Content-Type"]=mimetypes["file extension"]
 ```
-
-
diff --git a/examples/CORS.jl b/examples/CORS.jl
@@ -0,0 +1,46 @@
+using Merly
+
+global u
+u="hello"
+
+server = Merly.app()
+server.use("CORS")
+
+@page "/" "Hello World!"
+@page "/hola/:usr" "<b>Hello {{usr}}!</b>"
+
+@route GET "/get/:data" begin
+  "get this back: {{data}}"
+end
+
+@route POST "/post" begin
+  "I did something!"
+end
+
+@route POST|PUT|DELETE "/" begin
+  println("params: ",q.params)
+  println("query: ",q.query)
+  println("body: ",q.body)
+
+  r.headers["Content-Type"]="text/plain"
+
+  "I did something!"
+end
+
+Get("/data", (q,r)->(begin
+  r.headers["Content-Type"]="text/plain"
+  "$u data"
+end))
+
+
+Post("/data", (q,r)->(begin
+  println("params: ",q.params)
+  println("query: ",q.query)
+  println("body: ",q.body)
+  r.headers["Content-Type"]="text/plain"
+  global u="bye"
+  "I did something!"
+end))
+
+
+server.start("localhost", 8080)
diff --git a/src/Merly.jl b/src/Merly.jl
@@ -38,6 +38,7 @@ end
 type Fram
   notfound::Function
   start::Function
+  use::Function
 end
 
 function pag(url::ASCIIString,code::Function)
@@ -215,15 +216,19 @@ function process(element::Merly.Pag,q,res::HttpCommon.Response,req::HttpCommon.R
 
   if !(ismatch(Regex("GET"),req.method))
     #println("interpetando los Bytes de req.data como caracteres: ")
+    global cors
     try
     body= _body(req.data,req.headers["Accept"])
     catch
     body= _body(req.data,"")
     end
   end
   #h["Content-Type"]="text/html"
+  if cors
+    res.headers["Access-Control-Allow-Origin"]="*"
+    res.headers["Access-Control-Allow-Methods"]="POST,GET,OPTIONS"
+  end
   res.status = 200
-  println(element)
   #----------aqui escribe el programador-----------
   respond = element.code(q,res)
   #----------------------------------------------
@@ -269,6 +274,8 @@ function app(r=pwd()::AbstractString,load=""::AbstractString)
 global root
 global exten
 global q
+global cors
+cors=false
 root=r
 q=Q("","","")
 if root[end]=='/'
@@ -290,6 +297,14 @@ if length(load)>0
 end
 cd(root)
   
+  function use(y::AbstractString)
+    if(y=="CORS")
+      cors=true
+    else
+      cors=false
+    end
+  end
+
   function notfound(x::AbstractString)
     global nfmessage
     nfmessage=x
@@ -320,6 +335,6 @@ cd(root)
       "only IPv4 addresses"
     end
   end
-  return Fram(notfound,start)
+  return Fram(notfound,start,use)
 end
 end # module
