+ Fixed gura-conf/gura#1

gura-conf · Jun 9, 2021 · f3fb9c7 · f3fb9c7
1 parent f8feb32
commit f3fb9c7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/gura/GuraParser.py b/gura/GuraParser.py
@@ -375,9 +375,11 @@ def list(self) -> MatchResult:
                 item = item.value[0]
             else:
                 item = item.value
+
             result.append(item)
 
             self.maybe_match('ws')
+            self.maybe_match('new_line')
             if not self.maybe_keyword(','):
                 break
 

diff --git a/tests/arrays/test.py b/tests/arrays/test.py
@@ -52,6 +52,15 @@ def setUp(self):
             ]
         }
 
+        self.expected_inside_object = {
+            "model": {
+                "columns": [
+                    ["var1", "str"],
+                    ["var2", "str"]
+                ]
+            }
+        }
+
     def __get_file_parsed_data(self, file_name) -> Dict:
         """
         Gets the content of a specific file parsed
@@ -73,6 +82,13 @@ def test_with_comments(self):
         parsed_data = self.__get_file_parsed_data('with_comments.ura')
         self.assertDictEqual(parsed_data, self.expected)
 
+    def test_array_in_object(self):
+        """Tests issue https://github.com/gura-conf/gura/issues/1"""
+        parsed_data = self.__get_file_parsed_data('array_in_object.ura')
+        self.assertDictEqual(parsed_data, self.expected_inside_object)
+        parsed_data = self.__get_file_parsed_data('array_in_object_trailing_comma.ura')
+        self.assertDictEqual(parsed_data, self.expected_inside_object)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/arrays/tests-files/array_in_object.ura b/tests/arrays/tests-files/array_in_object.ura
@@ -0,0 +1,5 @@
+model:
+    columns: [
+        [ "var1", "str" ],
+        [ "var2", "str" ]
+    ]
diff --git a/tests/arrays/tests-files/array_in_object_trailing_comma.ura b/tests/arrays/tests-files/array_in_object_trailing_comma.ura
@@ -0,0 +1,5 @@
+model:
+    columns: [
+        [ "var1", "str" ],
+        [ "var2", "str" ],
+    ]