refactor: avoided using package.seeall in module definitions.

Author: agentzh

README.markdown

@@ -145,14 +145,14 @@ not want to save the data on local file systems.
 Author
 ======
 
-Zhang "agentzh" Yichun (章亦春) <agentzh@gmail.com>
+Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>
 
 Copyright and License
 =====================
 
 This module is licensed under the BSD license.
 
-Copyright (C) 2012, by Zhang "agentzh" Yichun (章亦春) <agentzh@gmail.com>.
+Copyright (C) 2012, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>.
 
 All rights reserved.
 

lib/resty/upload.lua

@@ -1,27 +1,35 @@
--- Copyright (C) 2012 Zhang "agentzh" Yichun (章亦春)
+-- Copyright (C) 2012 Yichun Zhang (agentzh)
 
-module("resty.upload", package.seeall)
+
+local sub = string.sub
+local req_socket = ngx.req.socket
+local insert = table.insert
+local len = string.len
+local null = ngx.null
+local match = string.match
+local setmetatable = setmetatable
+local error = error
+local get_headers = ngx.req.get_headers
+
+
+module(...)
 
 _VERSION = '0.03'
 
+
 local MAX_LINE_SIZE = 512
 
 local STATE_BEGIN = 1
 local STATE_READING_HEADER = 2
 local STATE_READING_BODY = 3
 local STATE_EOF = 4
 
-local class = resty.upload
 
-local mt = { __index = class }
+local mt = { __index = _M }
 
-local sub = string.sub
-local req_socket = ngx.req.socket
-local insert = table.insert
-local len = string.len
-local null = ngx.null
 local state_handlers
 
+
 function new(self, chunk_size)
  local boundary = get_boundary()
  if not boundary then
@@ -180,7 +188,7 @@ function read_header(self)
  return read_body_part(self)
  end
 
- local key, value = string.match(line, "([^: \t]+)%s*:%s*(.+)")
+ local key, value = match(line, "([^: \t]+)%s*:%s*(.+)")
  if not key then
  return 'header', line
  end
@@ -232,12 +240,12 @@ end
 
 
 function get_boundary()
- local header = ngx.var.content_type
+ local header = get_headers().content_type
  if not header then
  return nil
  end
 
- return string.match(header, ";%s+boundary=(%S+)")
+ return match(header, ";%s+boundary=(%S+)")
 end
 
 
@@ -249,9 +257,12 @@ state_handlers = {
 }
 
 
--- to prevent use of casual module global variables
-getmetatable(class).__newindex = function (table, key, val)
- error('attempt to write to undeclared variable "' .. key .. '": '
- .. debug.traceback())
-end
+local class_mt = {
+ -- to prevent use of casual module global variables
+ __newindex = function (table, key, val)
+ error('attempt to write to undeclared variable "' .. key .. '"')
+ end
+}
+
+setmetatable(_M, class_mt)
 

t/sanity.t

@@ -5,7 +5,7 @@ use Cwd qw(cwd);
 
 repeat_each(2);
 
-plan tests => repeat_each() * (2 * blocks());
+plan tests => repeat_each() * (3 * blocks());
 
 my $pwd = cwd();
 
@@ -79,4 +79,6 @@ read: ["body","\r\n"]
 read: ["part_end"]
 read: ["eof"]
 read: ["eof"]
+--- no_error_log
+[error]