support multipart/form

lib/resty/requests/request.lua

@@ -69,21 +69,24 @@ local function prepare(url_parts, session, config)
     local content
     local json = config.json
     local body = config.body
+
     local files = config.files
 
     if json then
         content = cjson.encode(json)
         headers["content-length"] = #content
         headers["content-type"] = "application/json"
+
     elseif files and is_tab(files) then
         local content_type = headers["content-type"]
         if not content_type then
-            content_type = "multipart/form-data; boundary="..util.choose_boundary()
+            content_type = "multipart/form-data; boundary=" .. util.choose_boundary()
         end
-        local multipart_body= util.make_multipart_body(files, content_type)
+        local multipart_body = util.make_multipart_body(files, content_type)
         headers["content-type"] = content_type
         headers["content-length"] = #multipart_body
         content = multipart_body
+
     else
         content = body
         if is_func(body) then

lib/resty/requests/util.lua

@@ -1,19 +1,19 @@
 -- Copyright (C) Alex Zhang
 
+local multipart = require("resty.requests.multipart")
+
 local type = type
 local pcall = pcall
 local pairs = pairs
 local error = error
 local rawget = rawget
 local ipairs = ipairs
-local require = require
 local setmetatable = setmetatable
 local lower = string.lower
 local str_sub = string.sub
 local tostring = tostring
 local ngx_gsub = ngx.re.gsub
 local base64 = ngx.encode_base64
-local Multipart = require("resty.requests.multipart")
 
 local _M = { _VERSION = '0.1' }
 
@@ -94,7 +94,7 @@ end
 
 local function set_config(opts)
     opts = opts or {}
-    local config = new_tab(0, 14)
+    local config = new_tab(0, 15)
 
     -- 1) timeouts
     local timeouts = opts.timeouts
@@ -136,9 +136,6 @@ local function set_config(opts)
     -- 4) body
     config.body = opts.body
 
-    -- 4.1) files
-    config.files = opts.files
-
     -- 5) ssl verify
     config.ssl = opts.ssl
 
@@ -196,14 +193,17 @@ local function set_config(opts)
     -- 14) use_default_type
     config.use_default_type = opts.use_default_type ~= false
 
+    -- 15) files
+    config.files = opts.files
+
     return config
 end
 
 
 local function make_multipart_body(files, content_type)
-    local m = Multipart("", content_type)
-    for _, v in ipairs(files) do
-        m:set_simple(v[1], v[2], v[3], v[4])
+    local m = multipart("", content_type)
+    for i=1,#files do
+        m:set_simple(files[i][1], files[i][2], files[i][3], files[i][4])
     end
     return m:tostring()
 end
@@ -213,6 +213,7 @@ local function choose_boundary()
     return str_sub(tostring({}), 10)
 end
 
+
 _M.new_tab = new_tab
 _M.is_str = is_str
 _M.is_num = is_num