Updated some of the callbacks in callback.lua.

Update get.lua to use the new callbacks.
The old "code" module is now the "mime" module.
Updated all modules that depended on it.
Updated url.lua to use the new namespace scheme, and moved the
    escape and unescape functions that used to be in the code.lua module
    to it, since these are specific to urls.
Updated the callback entries in the manual.

2 files changed, 244 insertions, 8 deletions

diff --git a/test/httptest.lua b/test/httptest.lua
index 3d0db87..dc90741 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -5,14 +5,14 @@
 -- needs "AllowOverride AuthConfig" on /home/c/diego/tec/luasocket/test/auth
 dofile("noglobals.lua")
 
-local host, proxyh, proxyp, request, response
+local host, proxyhost, proxyport, request, response
 local ignore, expect, index, prefix, cgiprefix
 
 local t = socket.time()
 
 host = host or "diego.princeton.edu"
-proxyh = proxyh or "localhost"
-proxyp = proxyp or 3128
+proxyhost = proxyhost or "localhost"
+proxyport = proxyport or 3128
 prefix = prefix or "/luasocket-test"
 cgiprefix = cgiprefix or "/luasocket-test-cgi"
 
@@ -129,8 +129,8 @@ request = {
         method = "POST",
         body = index,
     headers = { ["content-length"] = string.len(index) },
-    port = proxyp,
-    host = proxyh
+    proxyport = proxyport,
+    proxyhost = proxyhost
 }
 expect = {
         body = index,
@@ -170,8 +170,8 @@ check_request(request, expect, ignore)
 io.write("testing proxy with redirection: ")
 request = {
         url = "http://" .. host .. prefix,
-    host = proxyh,
-    port = proxyp
+    proxyhost = proxyhost,
+    proxyport = proxyport
 }
 expect = {
         body = index,
@@ -267,7 +267,7 @@ io.write("testing manual basic auth: ")
 request = {
         url = "http://" .. host .. prefix .. "/auth/index.html",
         headers = {
-                authorization = "Basic " .. (socket.code.b64("luasocket:password"))
+                authorization = "Basic " .. (socket.mime.b64("luasocket:password"))
         }
 }
 expect = {
diff --git a/test/mimetest.lua b/test/mimetest.lua
new file mode 100644
index 0000000..5485db1
--- /dev/null
+++ b/test/mimetest.lua
@@ -0,0 +1,236 @@
+dofile("noglobals.lua")
+
+local qptest = "qptest.bin"
+local eqptest = "qptest.bin2"
+local dqptest = "qptest.bin3"
+
+local b64test = "luasocket"
+local eb64test = "b64test.bin"
+local db64test = "b64test.bin2"
+
+-- from Machado de Assis, "A Mão e a Rosa"
+local mao = [[
+    Cursavam estes dois moços a academia de S. Paulo, estando 
+    Luís Alves no quarto ano e Estêvão no terceiro. 
+    Conheceram-se na academia, e ficaram amigos íntimos, tanto
+    quanto podiam sê-lo dois espíritos diferentes, ou talvez por 
+    isso mesmo que o eram. Estêvão, dotado de extrema
+    sensibilidade, e não menor fraqueza de ânimo, afetuoso e
+    bom, não daquela bondade varonil, que é apanágio de uma alma
+    forte, mas dessa outra bondade mole e de cera, que vai à
+    mercê de todas as circunstâncias, tinha, além de tudo isso, 
+    o infortúnio de trazer ainda sobre o nariz os óculos 
+    cor-de-rosa de suas virginais ilusões. Luís Alves via bem
+    com os olhos da cara. Não era mau rapaz, mas tinha o seu
+    grão de egoísmo, e se não era incapaz de afeições, sabia
+    regê-las, moderá-las, e sobretudo guiá-las ao seu próprio
+    interesse.  Entre estes dois homens travara-se amizade
+    íntima, nascida para um na simpatia, para outro no costume.
+    Eram eles os naturais confidentes um do outro, com a
+    diferença que Luís Alves dava menos do que recebia, e, ainda
+    assim, nem tudo o que dava exprimia grande confiança.
+]]
+
+local fail = function(s)
+    s = s or "failed"
+        assert(nil, s)
+end
+
+local readfile = function(name)
+        local f = io.open(name, "r")
+        if not f then return nil end
+        local s = f:read("*a")
+        f:close()
+        return s
+end
+
+local function transform(input, output, filter)
+    local fi, err = io.open(input, "rb")
+    if not fi then fail(err) end
+    local fo, err = io.open(output, "wb")
+    if not fo then fail(err) end
+    while 1 do 
+        local chunk = fi:read(math.random(0, 256))
+        fo:write(filter(chunk))
+        if not chunk then break end
+    end 
+    fi:close()
+    fo:close()
+end
+
+local function compare(input, output)
+    local original = readfile(input)
+    local recovered = readfile(output)
+    if original ~= recovered then fail("recovering failed")
+    else print("ok") end
+end
+
+local function encode_qptest(mode)
+    local encode = socket.mime.qprint.encode(mode)
+    local split = socket.mime.qprint.split()
+    local chain = socket.mime.chain(encode, split)
+    transform(qptest, eqptest, chain)
+end
+
+local function compare_qptest()
+    compare(qptest, dqptest)
+end
+
+local function decode_qptest()
+    local decode = socket.mime.qprint.decode()
+    transform(eqptest, dqptest, decode)
+end
+
+local function create_qptest()
+    local f, err = io.open(qptest, "wb")
+    if not f then fail(err) end
+    -- try all characters
+    for i = 0, 255 do
+        f:write(string.char(i))
+    end
+    -- try all characters and different line sizes
+    for i = 0, 255 do
+        for j = 0, i do
+            f:write(string.char(i))
+        end
+        f:write("\r\n")
+    end
+    -- test latin text
+    f:write(mao)
+    -- force soft line breaks and treatment of space/tab in end of line
+    local tab
+    f:write(string.gsub(mao, "(%s)", function(c)
+        if tab then
+            tab = nil
+            return "\t"
+        else
+            tab = 1
+            return " "
+        end
+    end))
+    -- test crazy end of line conventions
+    local eol = { "\r\n", "\r", "\n", "\n\r" }
+    local which = 0
+    f:write(string.gsub(mao, "(\n)", function(c)
+        which = which + 1
+        if which > 4 then which = 1 end
+        return eol[which]
+    end))
+    for i = 1, 4 do
+        for j = 1, 4 do
+            f:write(eol[i])
+            f:write(eol[j])
+        end
+    end
+    -- try long spaced and tabbed lines
+    f:write("\r\n")
+    for i = 0, 255 do
+        f:write(string.char(9))
+    end
+    f:write("\r\n")
+    for i = 0, 255 do
+        f:write(' ')
+    end
+    f:write("\r\n")
+    for i = 0, 255 do
+        f:write(string.char(9),' ')
+    end
+    f:write("\r\n")
+    for i = 0, 255 do
+        f:write(' ',string.char(32))
+    end
+    f:write("\r\n")
+    
+    f:close()
+end
+
+local function cleanup_qptest()
+    os.remove(qptest)
+    os.remove(eqptest)
+    os.remove(dqptest)
+end
+
+local function encode_b64test()
+    local e1 = socket.mime.base64.encode()
+    local e2 = socket.mime.base64.encode()
+    local e3 = socket.mime.base64.encode()
+    local e4 = socket.mime.base64.encode()
+    local sp4 = socket.mime.split()
+    local sp3 = socket.mime.split(59)
+    local sp2 = socket.mime.split(30)
+    local sp1 = socket.mime.split(27)
+    local chain = socket.mime.chain(e1, sp1, e2, sp2, e3, sp3, e4, sp4)
+    transform(b64test, eb64test, chain)
+end
+
+local function decode_b64test()
+    local d1 = socket.mime.base64.decode()
+    local d2 = socket.mime.base64.decode()
+    local d3 = socket.mime.base64.decode()
+    local d4 = socket.mime.base64.decode()
+    local chain = socket.mime.chain(d1, d2, d3, d4)
+    transform(eb64test, db64test, chain)
+end
+
+local function cleanup_b64test()
+    os.remove(eb64test)
+    os.remove(db64test)
+end
+
+local function compare_b64test()
+    compare(b64test, db64test)
+end
+
+local function padcheck(original, encoded)
+    local e = (socket.mime.b64(original))
+    local d = (socket.mime.unb64(encoded))
+    if e ~= encoded then fail("encoding failed") end
+    if d ~= original then fail("decoding failed") end
+end
+
+local function chunkcheck(original, encoded)
+    local len = string.len(original)
+    for i = 0, len do
+        local a = string.sub(original, 1, i)
+        local b = string.sub(original, i+1)
+        local e, r = socket.mime.b64(a, b)
+        local f = (socket.mime.b64(r))
+        if (e .. f ~= encoded) then fail(e .. f) end
+    end
+end
+
+local function padding_b64test()
+    padcheck("a", "YQ==")
+    padcheck("ab", "YWI=")
+    padcheck("abc", "YWJj")
+    padcheck("abcd", "YWJjZA==")
+    padcheck("abcde", "YWJjZGU=")
+    padcheck("abcdef", "YWJjZGVm")
+    padcheck("abcdefg", "YWJjZGVmZw==")
+    padcheck("abcdefgh", "YWJjZGVmZ2g=")
+    padcheck("abcdefghi", "YWJjZGVmZ2hp")
+    padcheck("abcdefghij", "YWJjZGVmZ2hpag==")
+    chunkcheck("abcdefgh", "YWJjZGVmZ2g=")
+    chunkcheck("abcdefghi", "YWJjZGVmZ2hp")
+    chunkcheck("abcdefghij", "YWJjZGVmZ2hpag==")
+    print("ok")
+end
+
+local t = socket.time()
+
+create_qptest()
+encode_qptest()
+decode_qptest()
+compare_qptest()
+encode_qptest("binary")
+decode_qptest()
+compare_qptest()
+cleanup_qptest()
+
+encode_b64test()
+decode_b64test()
+compare_b64test()
+cleanup_b64test()
+padding_b64test()
+
+print(string.format("done in %.2fs", socket.time() - t))