fix bugs in Model

Author: L0ndra

src/SolidifyProject.Engine.Infrastructure/Models/PageModel.cs

@@ -69,7 +69,14 @@ public override void Parse()
 
         public void MapDataToModel(ExpandoObject data)
         {
-            MapDataToPageModel(Model, data);
+            if (Model is ExpandoObject)
+            {
+                MapDataToPageModel(Model, data);
+            }
+            else
+            {
+                Model = getValueFromDataObject(Model, data);
+            }
         }
 
         private void ParseAttributeLine(string line)
@@ -112,6 +119,12 @@ private void ParseAttributeLine(string line)
                 return;
             }
 
+            if (MODEL_ATTRIBUTE_PREFIX.Any(x => x.Equals(attributeName, StringComparison.OrdinalIgnoreCase)))
+            {
+                Model = attributeValue;
+                return;
+            }
+
             if (CUSTOM_ATTRIBUTE_PREFIX_SEPARATOR.Any(x => attributeName.Contains(x)))
             {
                 var customAttributeNames = attributeName.Split(CUSTOM_ATTRIBUTE_PREFIX_SEPARATOR, StringSplitOptions.RemoveEmptyEntries);
@@ -136,42 +149,34 @@ private void ParseAttributeLine(string line)
                 return;
             }
 
-            if (CUSTOM_ATTRIBUTE_PREFIX_SEPARATOR.Any(x => attributeName.Contains(x)))
-            {
-                var modelAttributeNames = attributeName.Split(CUSTOM_ATTRIBUTE_PREFIX_SEPARATOR, StringSplitOptions.RemoveEmptyEntries);
-                if (modelAttributeNames.Length >= 2 && MODEL_ATTRIBUTE_PREFIX.Any(x => x.Equals(modelAttributeNames[0], StringComparison.InvariantCultureIgnoreCase)))
-                {
-                    ParseCustomAttribute(Model, modelAttributeNames.Skip(1), attributeValue);
-                }
-                else
-                {
-                    throw new ArgumentException($"Unknown name format of custom attribute \"{attributeName}\" at line \"{line}\"");
-                }
-                
-                return;
-            }
 
             throw new ArgumentException($"Unknown attribute \"{attributeName}\" at line \"{line}\"");
         }
 
         private void ParseCustomAttribute(ExpandoObject obj, IEnumerable<string> attributeNames, string attributeValue)
         {
-            ICollection<KeyValuePair<string, object>> node = obj;
+            IDictionary<string, object> node = obj;
             var currentSection = attributeNames.First();
-            object currentValue;
-            
+
             if (attributeNames.Count() > 1)
             {
-                var subNode = new ExpandoObject();
-                currentValue = subNode;
-                ParseCustomAttribute(subNode, attributeNames.Skip(1), attributeValue);
+                ExpandoObject currentNode;
+                if (node.ContainsKey(currentSection))
+                {
+                    currentNode = node[currentSection] as ExpandoObject;
+                }
+                else
+                {
+                    currentNode = new ExpandoObject();
+                    node.Add(new KeyValuePair<string, object>(currentSection, currentNode));
+                }
+
+                ParseCustomAttribute(currentNode, attributeNames.Skip(1), attributeValue);
             }
             else
             {
-                currentValue = attributeValue;
+                node.Add(new KeyValuePair<string, object>(currentSection, attributeValue));
             }
-            
-            node.Add(new KeyValuePair<string, object>(currentSection, currentValue));
         }
 
         private void ParseContent(IEnumerable<string> lines)
@@ -182,7 +187,8 @@ private void ParseContent(IEnumerable<string> lines)
         private void MapDataToPageModel(ExpandoObject model, ExpandoObject data)
         {
             IDictionary<string, object> modelDict = model;
-            foreach (var keyValuePair in model)
+            Dictionary<string, object> objectToIterate = model.ToDictionary(k => k.Key, v => v.Value);
+            foreach (var keyValuePair in objectToIterate)
             {
                 if (keyValuePair.Value is ExpandoObject expObject)
                 {
@@ -207,7 +213,7 @@ private object getValueFromDataObject(string path, ExpandoObject data)
             {
                 if (attributeNames.Length == 1)
                 {
-                    return null;
+                    return data;
                 }
 
                 attributeNames = attributeNames.Skip(1).ToArray();
@@ -216,14 +222,15 @@ private object getValueFromDataObject(string path, ExpandoObject data)
             object value = data;
             foreach (var attribute in attributeNames)
             {
-                if (value is IDictionary<string,object> dict)
-                {
-                    value = dict[attribute];
-                }
-                else
+                IDictionary<string, object> dict = value as IDictionary<string, object>;
+
+                if (dict == null)
                 {
-                    return null;
+                    dict = value.GetType().GetProperties()
+                        .ToDictionary(x => x.Name, x => x.GetValue(value, null));
                 }
+
+                value = dict[attribute];
             }
 
             return value;

src/Test/SolidifyProject.Engine.Test.Unit/Infrastructure/Models/PageModelTest.cs

@@ -214,7 +214,7 @@ public void ParseModelComplexMultipleItemsTest()
 
             var actualModel = new PageModel { ContentRaw = @"
                 Model.category.goods:            Data.goods
-                model.category.bannerUrl:        Data.banner.url
+                model.bannerUrl:        Data.banner.url
                 ---
             "};