Merge pull request #1885 from ipfs/fix/ndjson

put newlines between streaming json output objects

commands/response.go

@@ -47,6 +47,7 @@ func marshalJson(value interface{}) (io.Reader, error) {
 	if err != nil {
 		return nil, err
 	}
+	b = append(b, '\n')
 	return bytes.NewReader(b), nil
 }
 

test/sharness/t0200-unixfs-ls.sh

@@ -122,7 +122,7 @@ test_ls_cmd() {
 			  }
 			}
 		EOF
-		printf %s "$(cat expected_json_ls_file_trailing_newline)" >expected_json_ls_file &&
+		printf "%s\n" "$(cat expected_json_ls_file_trailing_newline)" >expected_json_ls_file &&
 		test_cmp expected_json_ls_file actual_json_ls_file
 	'
 
@@ -168,7 +168,7 @@ test_ls_cmd() {
 			  }
 			}
 		EOF
-		printf %s "$(cat expected_json_ls_duplicates_file_trailing_newline)" >expected_json_ls_duplicates_file &&
+		printf "%s\n" "$(cat expected_json_ls_duplicates_file_trailing_newline)" >expected_json_ls_duplicates_file &&
 		test_cmp expected_json_ls_duplicates_file actual_json_ls_duplicates_file
 	'
 }

test/sharness/t0231-channel-streaming.sh

+#!/bin/sh
+#
+# Copyright (c) 2015 Jeromy Johnson
+# MIT Licensed; see the LICENSE file in this repository.
+#
+
+test_description="Test output of streaming json commands"
+
+. lib/test-lib.sh
+
+test_init_ipfs
+
+get_api_port() {
+	cat "$IPFS_PATH/api" | awk -F/ '{ print $5 }'
+}
+
+test_ls_cmd() {
+	test_expect_success "make a file with multiple refs" '
+		HASH=$(random 1000000 | ipfs add -q)
+	'
+
+	test_expect_success "can get refs through curl" '
+		PORT=$(get_api_port) &&
+		curl http://localhost:$PORT/api/v0/refs/$HASH > output
+	'
+
+	# make sure newlines are printed between each object
+	test_expect_success "output looks good" '
+		test_expect_code 1 grep "}{" output > /dev/null
+	'
+}
+
+# should work online (only)
+test_launch_ipfs_daemon
+test_ls_cmd
+test_kill_ipfs_daemon
+
+test_done