opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 19:24:14 +08:00
Code Issues Projects Releases Wiki Activity

api: correctly set the content type for object get --encoding=protobuf

Browse Source 
It used to default to `application/json` but is now correctly set to
`application/protobuf`.

fixes #2469

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
This commit is contained in:
Steven Allen
2016-03-30 11:32:23 -04:00
parent 8acd87d799
commit a72d26b875
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
commands/http/handler.go
View File

@ -65,9 +65,10 @@ const (
) )
var mimeTypes = map[string]string{ var mimeTypes = map[string]string{
cmds.JSON: "application/json", cmds.Protobuf: "application/protobuf",
cmds.XML: "application/xml", cmds.JSON: "application/json",
cmds.Text: "text/plain", cmds.XML: "application/xml",
cmds.Text: "text/plain",
} }
type ServerConfig struct { type ServerConfig struct {

7
commands/response.go
View File

@ -36,9 +36,10 @@ type EncodingType string
// Supported EncodingType constants. // Supported EncodingType constants.
const ( const (
JSON = "json" JSON = "json"
XML = "xml" XML = "xml"
Text = "text" Protobuf = "protobuf"
Text = "text"
// TODO: support more encoding types // TODO: support more encoding types
) )

2
core/commands/object/object.go
View File

@ -222,7 +222,7 @@ This command outputs data in the following encodings:
}, },
Type: Node{}, Type: Node{},
Marshalers: cmds.MarshalerMap{ Marshalers: cmds.MarshalerMap{
cmds.EncodingType("protobuf"): func(res cmds.Response) (io.Reader, error) { cmds.Protobuf: func(res cmds.Response) (io.Reader, error) {
node := res.Output().(*Node) node := res.Output().(*Node)
object, err := deserializeNode(node) object, err := deserializeNode(node)
if err != nil { if err != nil {

20
test/sharness/t0051-object.sh
View File

@ -266,12 +266,32 @@ test_object_cmd() {
' '
} }
test_object_content_type() {
test_expect_success "'ipfs object get --encoding=protobuf' returns the correct content type" '
curl -sI "http://$API_ADDR/api/v0/object/get?arg=$HASH&encoding=protobuf" | grep -q "^Content-Type: application/protobuf"
'
test_expect_success "'ipfs object get --encoding=json' returns the correct content type" '
curl -sI "http://$API_ADDR/api/v0/object/get?arg=$HASH&encoding=json" | grep -q "^Content-Type: application/json"
'
test_expect_success "'ipfs object get --encoding=text' returns the correct content type" '
curl -sI "http://$API_ADDR/api/v0/object/get?arg=$HASH&encoding=text" | grep -q "^Content-Type: text/plain"
'
test_expect_success "'ipfs object get --encoding=xml' returns the correct content type" '
curl -sI "http://$API_ADDR/api/v0/object/get?arg=$HASH&encoding=xml" | grep -q "^Content-Type: application/xml"
'
}
# should work offline # should work offline
test_object_cmd test_object_cmd
# should work online # should work online
test_launch_ipfs_daemon test_launch_ipfs_daemon
test_object_cmd test_object_cmd
test_object_content_type
test_kill_ipfs_daemon test_kill_ipfs_daemon
test_done test_done