Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ multipart_data:set_simple("some-param-name", "some-value")
-- Deleting a parameter
multipart_data:delete("param-name")

-- Setting a file
multipart_data:set_simple("name", "some-value", "filename", "content_type")

-- Get a multipart/form-data representation of the object
local body = multipart_data:tostring()

Expand Down
1 change: 1 addition & 0 deletions spec/example.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello world
15 changes: 15 additions & 0 deletions spec/multipart_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -630,3 +630,18 @@ hello
local data = res:tostring()
assert.are.same(new_body, data)
end)
it("set a file example", function()
local content_type = "multipart/related; boundary=0f755aa8"
local body = ""
local res = Multipart(body, content_type)
local f = io.open("./spec/example.txt", "rb")
local value = f:read("*all")
f:close()
res:set_simple("example", value, "example.txt", "text/txt")
local body = res:tostring()
local example_body = table.concat({
"--0f755aa8",
'Content-Disposition: form-data; name="example"; filename="example.txt"',"content-type: text/txt", "\r\nhello world\n", "--0f755aa8--\r\n"
}, "\r\n")
assert.are.same(example_body, body)
end)
43 changes: 27 additions & 16 deletions src/multipart.lua
Original file line number Diff line number Diff line change
Expand Up @@ -271,23 +271,34 @@ function MultipartData:get_all()
end


function MultipartData:set_simple(name, value)
if self._data.indexes[name] then
self._data.data[self._data.indexes[name]] = {
name = name,
value = value,
headers = { 'Content-Disposition: form-data; name="' .. name .. '"' }
}
function MultipartData:set_simple(name, value, filename, content_type)
local headers = {'Content-Disposition: form-data; name="' , name , '"'}
if filename then
headers[4] = '; filename="'
headers[5] = filename
headers[6] = '"'
end
if content_type then
headers[7] = "\r\ncontent-type: "
headers[8] = content_type
end
headers = concat(headers)
if self._data.indexes[name] then
self._data.data[self._data.indexes[name]] = {
name = name,
value = value,
headers = {headers}
}

else
local part_index = table_size(self._data.indexes) + 1
self._data.indexes[name] = part_index
self._data.data[part_index] = {
name = name,
value = value,
headers = { 'Content-Disposition: form-data; name="' .. name .. '"' }
}
end
else
local part_index = table_size(self._data.indexes) + 1
self._data.indexes[name] = part_index
self._data.data[part_index] = {
name = name,
value = value,
headers = {headers}
}
end
end


Expand Down