Added JsonArrayIterator

include/ArduinoJson/Internals/JsonNode.hpp

@@ -7,12 +7,9 @@ namespace ArduinoJson
     namespace Internals
     {
         class JsonWriter;
-        class JsonNodeIterator;
 
         class JsonNode
         {
-            friend class JsonNodeIterator;
-
             enum JsonNodeType
             {
                 JSON_UNDEFINED,
@@ -63,6 +60,8 @@ namespace ArduinoJson
 
             }
 
+            JsonNode* next;
+
             void writeTo(JsonWriter&); // TODO: <- move in JsonNodeSerializer
 
             void setAsArray(JsonBuffer* buffer)
@@ -175,7 +174,6 @@ namespace ArduinoJson
 
         private:
             JsonNodeType type;
-            JsonNode* next;
             JsonNodeContent content;
 
             inline void writeArrayTo(JsonWriter&);// TODO: <- move in JsonNodeSerializer

include/ArduinoJson/Internals/JsonNodeIterator.hpp

@@ -6,6 +6,7 @@ namespace ArduinoJson
 {
     namespace Internals
     {
+        // TODO: replace by JsonArrayIterator and JsonObjectIterator
         class JsonNodeIterator
         {
         public:

include/ArduinoJson/JsonArray.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "JsonContainer.hpp"
+#include "JsonArrayIterator.hpp"
 
 namespace ArduinoJson
 {
@@ -32,5 +33,12 @@ namespace ArduinoJson
         {
             return _node && _node->isArray();
         }
+
+        JsonArrayIterator begin();
+
+        JsonArrayIterator end()
+        {
+            return JsonArrayIterator(0);
+        }
     };
 }

include/ArduinoJson/JsonArrayIterator.hpp

@@ -0,0 +1,42 @@
+#pragma once
+
+#include "ArduinoJson/JsonValue.hpp"
+
+namespace ArduinoJson
+{
+	class JsonArray;
+
+	class JsonArrayIterator
+	{
+		friend class JsonArray;
+
+	public:
+		explicit JsonArrayIterator(Internals::JsonNode* node)
+			: _node(node)
+		{
+		}
+
+		void operator++()
+		{
+			_node = _node->next;
+		}
+
+		JsonValue operator*() const
+		{
+			return JsonValue(_node);
+		}
+
+		bool operator==(const JsonArrayIterator& other) const
+		{
+			return _node == other._node;
+		}
+
+		bool operator!=(const JsonArrayIterator& other) const
+		{
+			return _node != other._node;
+		}
+
+	private:
+		Internals::JsonNode* _node;
+	};
+}

src/JsonArray.cpp

@@ -87,3 +87,11 @@ JsonObject JsonArray::createNestedObject()
     
     return JsonObject(node);
 }
+
+JsonArrayIterator JsonArray::begin()
+{
+    if (!_node)
+        return end();
+
+    return JsonArrayIterator(_node->getContainerChild());
+}

test/JsonArray_Iterator_Tests.cpp

@@ -0,0 +1,25 @@
+#include <gtest/gtest.h>
+#include <ArduinoJson/JsonArray.hpp>
+#include <ArduinoJson/StaticJsonBuffer.hpp>
+
+using namespace ArduinoJson;
+
+TEST(JsonArray_Iterator_Test, SimpleTest)
+{
+	StaticJsonBuffer<42> jsonBuffer;
+
+	JsonArray array = jsonBuffer.createArray();
+	array.add(12);
+	array.add(34);
+
+	JsonArrayIterator it = array.begin();
+	JsonArrayIterator end = array.end();
+
+	EXPECT_NE(end, it);
+	EXPECT_EQ(12, static_cast<int>(*it));
+	++it;
+	EXPECT_NE(end, it);
+	EXPECT_EQ(34, static_cast<int>(*it));
+	++it;
+	EXPECT_EQ(array.end(), it);
+}