Added a Web class to allow for closer matching Orbits functionality. …

…This allows for adding methods like web:redirect() to Orbiter. Added ability to set the response status using web.status. Very useful for writing REST APIs and such. Moved to the ability to add more headers to the Web class. Now use web.headers = { NewHeader = "My value" }. Added Web:redirect( url ). Now you can redirect the page inside your Orbiter app. (Just like Orbit)
stevedonovan · Dec 28, 2012 · ffe96c7 · ffe96c7
1 parent 702b333
commit ffe96c7
Showing 1 changed file with 38 additions and 13 deletions.
diff --git a/orbiter/init.lua b/orbiter/init.lua
@@ -291,7 +291,7 @@ local function url_split(vars)
     return res
 end
 
-local function send_error (client, code, message)
+local function send_error(client, code, message)
 	local header = "HTTP/1.1 " .. code .. "\r\nContent-Type:text/html\r\n"
 	local msg = (
     [[<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
@@ -301,14 +301,14 @@ local function send_error (client, code, message)
 <h1>%s</h1>
 <p>%s</p>
 <hr/>
-<small>Orbiter web server v0.1</small>
+<small>Orbiter web server v1.0</small>
 </body></html>]]):format(code, code, message or code)
 	header = header .. "Content-Length:" .. #msg .. "\r\n\r\n"
 	client:send(header)
 	client:send(msg)
 end
 
-local function send_headers (client,code, type, length, sheaders)
+local function send_headers (client, code, type, length, sheaders)
     local extra = ''
     if sheaders then
         local res, append = {}, table.insert
@@ -375,7 +375,6 @@ function MT:dispatch(web,path)
     return action(obj,web,unpack(captures))
 end
 
-local OK = '200 OK'
 local running,last_obj
 
 function _M.get_last_object()
@@ -413,6 +412,30 @@ local function socket_bind(host,port,backlog)
     return sock,port
 end
 
+----- Web class -----
+local Web =
+{
+	vars		= {},
+	input		= {},
+	headers		= {},
+	status		= "200 OK",
+	method		= "",
+	path_info	= ""
+}
+
+function Web:redirect(url)
+	self.status = "302 Found"
+	self.headers["Location"] = url
+	return "redirect"
+end
+
+function Web:new(o)
+	o = o or {}   -- create object if user does not provide one
+	setmetatable(o, self)
+	self.__index = self
+	return o
+end
+
 function MT:run(...)
     local args,flags
     flags,args = _M.parse_flags(...)
@@ -477,15 +500,17 @@ function MT:run(...)
                     if url then file = url end
                 end
                 vars = vars and url_split(vars) or {}
-                web = {vars = headers, input = vars,
-                            method = method:lower(), path_info = file}
+				-- setup the web object
+				web = Web:new{ vars = headers, input = vars, method = method:lower(), path_info = file }
                 web[method=='GET' and 'GET' or 'POST'] = vars
-                file,obj = process_request_filters(web,file)
-                action,captures,obj = match_patterns(method,file,obj)
+
+                file, obj = process_request_filters(web,file)
+                action, captures, obj = match_patterns(method, file, obj)
                 if action then
                     -- @doc handlers may specify the MIME type of what they
                     -- return, if they choose; default is HTML.
-                    local status,content,mime,sheaders = pcall(action,obj,web,unpack(captures))
+                    local status, content, mime = pcall(action, obj, web, unpack(captures))
+
                     if status then
                         if not content and method ~= 'POST' then
                             status = false
@@ -502,14 +527,14 @@ function MT:run(...)
                             -- it will receive the content and mime type, and is expected to
                             -- return the same.
                             if self.content_filter then
-                                content,mime = self:content_filter(content,mime)
-                             end
+                                content, mime = self:content_filter(content, mime)
+							end
                             if not testing then
-                                send_headers(client,OK,mime or 'text/html',#content,sheaders)
+                                send_headers(client, web.status, mime or 'text/html', #content, web.headers)
                             end
                             client:send(content)
                         else
-                            send_error(client,content)
+                            send_error(client, content)
                         end
                     end
                 else -- unmatched pattern!!