Яценко Ирина

ObjectPrinting/DataMember.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Reflection;
+
+namespace ObjectPrinting
+{
+    public class DataMember
+    {
+        public string Name { get; set; }
+        public Type Type { get; set; }
+
+        public Func<object, object> GetValue;
+        public MemberInfo MemberInfo { get; set; }
+
+        public DataMember(FieldInfo fieldInfo)
+        { 
+            Name = fieldInfo.Name;
+            GetValue = fieldInfo.GetValue;
+            Type = fieldInfo.FieldType;
+            MemberInfo = fieldInfo;
+        }
+
+        public DataMember(PropertyInfo property)
+        {
+            Name = property.Name;
+            GetValue = property.GetValue;
+            Type = property.PropertyType;
+            MemberInfo = property;
+        }
+    }
+}

ObjectPrinting/PrintingConfig.cs

@@ -12,6 +12,9 @@ public class PrintingConfig<TOwner>
     {
         private readonly HashSet<MemberInfo> excludedProperties = new HashSet<MemberInfo>();
         private readonly HashSet<Type> excludedTypes = new HashSet<Type>();
+
+        private readonly HashSet<FieldInfo> excludedFields = new HashSet<FieldInfo>();
+
         private readonly Dictionary<object, int> complexObjectLinks = new Dictionary<object, int>();
         private int maxRecursion = 2;
 
@@ -61,7 +64,8 @@ public PrintingConfig<TOwner> SerializeWith<TPropType>(Func<TPropType, string> s
         {
             Func<object, string> func = p => serialize((TPropType)p);
 
-            typeSerializesInfos[typeof(TPropType)] = func;
+            if (!typeSerializesInfos.ContainsKey(typeof(TPropType)))
+                typeSerializesInfos[typeof(TPropType)] = func;
 
             return this;
         }
@@ -96,7 +100,7 @@ public PrintingConfig<TOwner> Trim(Expression<Func<TOwner, string>> property, in
             return SerializeWith(property, func);
         }
 
-        public PrintingConfig<TOwner> Trim(int length) //
+        public PrintingConfig<TOwner> Trim(int length)
         {
             Func<string, string> func = value => value.Length <= length
                 ? value
@@ -128,32 +132,62 @@ private string PrintToString(object obj, int nestingLevel)
             var type = obj.GetType();
             var sb = new StringBuilder().AppendLine(type.Name);
 
+
+            HandleMembers(type, sb, indentation, obj, nestingLevel);
+
+
+
+
+            return sb.ToString();
+        }
+
+        private void HandleMembers(Type type, StringBuilder sb, string indentation, object obj, int nestingLevel)
+        {
             foreach (var propertyInfo in type.GetProperties())
             {
-                if (excludedProperties.Any(memberInfo => memberInfo.Name == propertyInfo.Name) ||
-                    excludedTypes.Contains(propertyInfo.PropertyType))
-                    continue;
-
-                if (membersSerializesInfos.TryGetValue(propertyInfo, out var serializeMember))
-                {
-                    sb.Append(GetSerializedString(obj, propertyInfo, indentation, serializeMember));
-                    continue;
-                }
-
-                if (typeSerializesInfos.TryGetValue(propertyInfo.PropertyType, out var serializeType))
-                {
-                    sb.Append(GetSerializedString(obj, propertyInfo, indentation, serializeType));
-                    continue;
-                }
-
-                sb.Append($"{indentation}{propertyInfo.Name} = " +
-                          PrintToString(propertyInfo.GetValue(obj),
-                              nestingLevel + 1));
+                DataMember data = new DataMember(propertyInfo);
+
+                HandleMember(sb, data, obj, indentation, nestingLevel);
             }
 
-            return sb.ToString();
+            foreach (var fieldInfo in type.GetFields())
+            {
+                DataMember data = new DataMember(fieldInfo);
+
+                HandleMember(sb, data, obj, indentation, nestingLevel);
+            }
         }
 
+        private void HandleMember(StringBuilder sb, DataMember member, object obj, string indentation, int nestingLevel)
+        {
+            if (excludedProperties.Any(memberInfo => memberInfo.Name == member.Name) ||
+                excludedTypes.Contains(member.Type))
+                return;
+
+            if (membersSerializesInfos.TryGetValue(member.MemberInfo, out var serializeMember))
+            {
+                sb.Append(GetSerializedString(obj, member, indentation, serializeMember));
+                return;
+            }
+
+            if (typeSerializesInfos.TryGetValue(member.Type, out var serializeType))
+            {
+                sb.Append(GetSerializedString(obj, member, indentation, serializeType));
+                return;
+            }
+
+            sb.Append(
+                GetSerializedString(
+                    obj, 
+                    member, 
+                    indentation, 
+                    (value) => PrintToString(
+                        value,
+                        nestingLevel + 1),
+                    false));
+        }
+
+
         private bool MaxRecursionHasBeenReached(object obj)
         {
             complexObjectLinks.TryAdd(obj, 0);
@@ -162,12 +196,17 @@ private bool MaxRecursionHasBeenReached(object obj)
             return complexObjectLinks[obj] == maxRecursion;
         }
 
-        private string GetSerializedString(object obj, PropertyInfo propertyInfo, string indentation, Func<object, string> serializeMember)
+        private string GetSerializedString(
+            object obj,
+            DataMember memberInfo,
+            string indentation,
+            Func<object, string> serializeMember,
+            bool needNewLine = true)
         {
-            var serializedString = serializeMember(propertyInfo.GetValue(obj));
+            var serializedString = serializeMember(memberInfo.GetValue(obj));
+            var stringEnd = needNewLine ? Environment.NewLine : string.Empty;
 
-            return $"{indentation}{propertyInfo.Name} = {serializedString}{Environment.NewLine}";
+            return $"{indentation}{memberInfo.Name} = {serializedString}{stringEnd}";
         }
-
     }
 }

ObjectPrintingTests/ObjectPrinterAcceptanceTests.cs

@@ -2,48 +2,12 @@
 using FluentAssertions;
 using NUnit.Framework;
 using ObjectPrinting;
-using ObjectPrinting.Tests;
 
 namespace ObjectPrintingTests
 {
     [TestFixture]
     public class ObjectPrinterAcceptanceTests
     {
-        [Test]
-        public void Demo()
-        {
-            var person = new Person { Name = "Alex", Age = 19, Height = 180.5, SubPerson = new SubPerson() };
-            person.SubPerson.Age = 15;
-            person.SubPerson.Person = person;
-
-            var printer = ObjectPrinter.For<Person>();
-
-            //Исключение из сериализации свойства/ поля определенного типа
-            //Альтернативный способ сериализации для определенного типа
-            //Для всех типов, имеющих культуру, есть возможность ее указать
-            //printer.Exclude<double>()
-            //    .SerializeWith(p => p.Age, age => (age + 1000).ToString())
-            //    .SetCulture<double>(CultureInfo.InvariantCulture)
-            //    .SerializeWith<string>((p) => p.ToUpper())
-            //    .Trim<string>(p => p.Name, 1)
-            //    .Exclude(p => p.Name)
-            //    .
-
-
-            //Корректная обработка циклических ссылок между объектами(не должны приводить к StackOverflowException)
-        }
-
-        [Test]
-        public void DoSomething_WhenSomething()
-        {
-            var person = new Person { Name = "Alex", Age = 19 };
-            var printer = ObjectPrinter.For<Person>();
-
-            printer.SerializeWith(p => p.Name, n => $"{n} :))")
-                .Trim(p => p.Name, 1)
-                .Trim(1);
-        }
-
         [Test]
         public void ShouldExcludeMember_WhenItsTypeSpecified()
         {
@@ -55,7 +19,7 @@ public void ShouldExcludeMember_WhenItsTypeSpecified()
 
             var s1 = printer.PrintToString(person);
             s1.Should().Be(
-                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Alex\r\n\tSubPerson = null\r\n");
+                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Alex\r\n\tSubPerson = null\r\n\tPublicField = null\r\n");
         }
 
         [Test]
@@ -67,7 +31,7 @@ public void ShouldUseTrimming_WhenItsSpecifiedForType()
             var s1 = printer.Trim(p => p.Name, 1).PrintToString(person);
 
             s1.Should().Be(
-                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = P\r\n\tHeight = 180\r\n\tAge = 20\r\n\tSubPerson = null\r\n");
+                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = P\r\n\tHeight = 180\r\n\tAge = 20\r\n\tSubPerson = null\r\n\tPublicField = null\r\n");
         }
 
         [Test]
@@ -79,7 +43,7 @@ public void ShouldSerializeMember_WithGivenFunc()
             var s1 = printer.SerializeWith(p => p.Age, age => (age + 1000).ToString()).PrintToString(person);
 
             s1.Should().Be(
-                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180\r\n\tAge = 1020\r\n\tSubPerson = null\r\n");
+                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180\r\n\tAge = 1020\r\n\tSubPerson = null\r\n\tPublicField = null\r\n");
         }
 
         [Test]
@@ -91,7 +55,7 @@ public void SetCulture_ShouldAddedCultureInfo()
             var s1 = printer.SetCulture<double>(CultureInfo.InvariantCulture).PrintToString(person);
 
             s1.Should().Be(
-                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180.5\r\n\tAge = 20\r\n\tSubPerson = null\r\n");
+                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180.5\r\n\tAge = 20\r\n\tSubPerson = null\r\n\tPublicField = null\r\n");
         }
 
         [Test]
@@ -105,7 +69,7 @@ public void WhenCyclicLinksWasFound_ShouldPrintWithRecursionLimit()
             var s1 = printer.PrintToString(person);
 
             s1.Should().Be(
-                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180\r\n\tAge = 20\r\n\tSubPerson = SubPerson\r\n\t\tPerson = Maximum recursion has been reached\r\n\t\tAge = 15\r\n");
+                "Person\r\n\tId = 00000000-0000-0000-0000-000000000000\r\n\tName = Petr\r\n\tHeight = 180\r\n\tAge = 20\r\n\tSubPerson = SubPerson\r\n\t\tPerson = Maximum recursion has been reached\r\n\t\tAge = 15\r\n\tPublicField = null\r\n");
         }
 
         [Test]

ObjectPrintingTests/Person.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ObjectPrinting.Tests
+namespace ObjectPrintingTests
 {
     public class Person
     {

ObjectPrintingTests/SubPerson.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ObjectPrinting.Tests
+namespace ObjectPrintingTests
 {
     public class SubPerson
     {