Merge pull request FirebaseExtended#180 from ed7coyne/fix-modem-streaming

ed7coyne · ed7coyne · commit 1dc56d8e8867 · 2016-06-07T20:37:05.000-07:00
Add json parsing to modem streaming
diff --git a/src/modem/stream-command.cpp b/src/modem/stream-command.cpp
@@ -23,17 +23,19 @@ bool StreamCommand::execute(const String& command,
   }
 
   bool running = true;
+  DynamicJsonBuffer buffer;
   while(running) {
     if (stream->available()) {
       std::string json;
       FirebaseStream::Event event = stream->read(json);
       out->print("+");
       out->print(FirebaseStream::EventToName(event).c_str());
       out->print(" ");
-      // TODO(edcoyne): add json parsing and get real path.
-      out->println("/dummy/path");
-      out->println(json.length());
-      out->println(json.c_str());
+      const auto& object = buffer.parseObject(json.c_str());
+      String data = object["data"];
+      out->println(object["path"].asString());
+      out->println(data.length());
+      out->println(data);
     } else if (in->available()) {
       String command = in->readLine();
       if (command == "END_STREAM") {
diff --git a/test/modem/stream-command_test.cpp b/test/modem/stream-command_test.cpp
@@ -46,7 +46,8 @@ TEST_F(StreamCommandTest, streams) {
       .WillOnce(Return(path))
       .WillOnce(Return("END_STREAM"));
 
-  const String value("Test value");
+  const String data = "Test Value";
+  const String value(String("{\"path\" : \"/test/path\", \"data\" : \"") + data + "\"}");
   EXPECT_CALL(*stream_, available())
       .WillOnce(Return(true))
       .WillRepeatedly(Return(false));
@@ -63,12 +64,12 @@ TEST_F(StreamCommandTest, streams) {
       .WillOnce(Return(1));
   EXPECT_CALL(out_, print(String(" ")))
       .WillOnce(Return(1));
-  EXPECT_CALL(out_, println(String("/dummy/path")))
+  EXPECT_CALL(out_, println(path))
       .WillOnce(Return(1));
 
-  EXPECT_CALL(out_, println(value.length()))
+  EXPECT_CALL(out_, println(data.length()))
       .WillOnce(Return(1));
-  EXPECT_CALL(out_, println(value))
+  EXPECT_CALL(out_, println(data))
       .WillOnce(Return(1));
 
   EXPECT_CALL(out_, println(String("+OK")))
