Move http server to metatable

Author: bigbes

http/server.lua

@@ -23,6 +23,15 @@ local function sprintf(fmt, ...)
     return string.format(fmt, ...)
 end
 
+local function assertf(ok, fmt, ...)
+    if not ok then
+        fmt = tostring(fmt)
+        if select('#', ...) > 0 then fmt = fmt:format(...) end
+        error(fmt, 2)
+    end
+    return ok
+end
+
 local function uri_escape(str)
     local res = {}
     if type(str) == 'table' then
@@ -1149,62 +1158,61 @@ local function httpd_start(self)
     return self
 end
 
-local exports = {
-    DETACHED = DETACHED,
-
-    new = function(host, port, options)
-        if options == nil then
-            options = {}
-        end
-        if type(options) ~= 'table' then
-            errorf("options must be table not '%s'", type(options))
-        end
-        local default = {
-            max_header_size     = 4096,
-            header_timeout      = 100,
-            handler             = handler,
-            app_dir             = '.',
-            charset             = 'utf-8',
-            cache_templates     = true,
-            cache_controllers   = true,
-            cache_static        = true,
-            log_requests        = true,
-            log_errors          = true,
-            display_errors      = true,
-        }
+local http_server_methods = {
+    stop    = httpd_stop,
+    start   = httpd_start,
+    route   = add_route,
+    match   = match_route,
+    helper  = set_helper,
+    hook    = set_hook,
+    url_for = url_for_httpd,
+}
 
-        local self = {
-            host    = host,
-            port    = port,
-            is_run  = false,
-            stop    = httpd_stop,
-            start   = httpd_start,
-            options = extend(default, options, true),
-
-            routes  = {  },
-            iroutes = {  },
-            helpers = {
-                url_for = url_for_helper,
-            },
-            hooks   = {  },
-
-            -- methods
-            route   = add_route,
-            match   = match_route,
-            helper  = set_helper,
-            hook    = set_hook,
-            url_for = url_for_httpd,
-
-            -- caches
-            cache   = {
-                tpl         = {},
-                ctx         = {},
-                static      = {},
-            },
-        }
+local http_server_mt = {
+    __index = http_server_methods
+}
 
-        return self
-    end
+local http_server_options_default = {
+    max_header_size     = 4096,
+    header_timeout      = 100,
+    handler             = handler,
+    app_dir             = '.',
+    charset             = 'utf-8',
+    cache_templates     = true,
+    cache_controllers   = true,
+    cache_static        = true,
+    log_requests        = true,
+    log_errors          = true,
+    display_errors      = true,
 }
 
-return exports
+local function http_server_new(host, port, options)
+    options = options or {}
+    local opts_tp = type(options)
+    assertf(opts_tp == 'table', "options must be table, not '%s'", opts_tp)
+
+    -- populate options table with default values
+    options = extend(table.copy(http_server_options_default), options, true)
+
+    local self = setmetatable({
+        host    = host,
+        port    = port,
+        is_run  = false,
+        options = options,
+
+        routes  = { },
+        iroutes = { },
+        helpers = { url_for = url_for_helper, },
+        hooks   = { },
+
+        -- caches
+        cache   = { tpl = {}, ctx = {}, static = {}, },
+    }, http_server_mt)
+
+    return self
+end
+
+return {
+    DETACHED = DETACHED,
+    new = http_server_new
+}