Cleanup Builder [#216]

modelsbuilder · Sep 3, 2019 · ca188bf · ca188bf
1 parent 212cfad
commit ca188bf
Show file tree

Hide file tree

Showing 11 changed files with 1,309 additions and 1,304 deletions.
diff --git a/src/ZpqrtBnk.ModelsBuilder.Tests/BuilderTests.cs b/src/ZpqrtBnk.ModelsBuilder.Tests/BuilderTests.cs
diff --git a/src/ZpqrtBnk.ModelsBuilder.Tests/RoslynTests.cs b/src/ZpqrtBnk.ModelsBuilder.Tests/RoslynTests.cs
@@ -16,23 +16,23 @@ public interface IRandom1
     public interface IRandom2 : IRandom1
     {}
 
-    class TestBuilder : Builder
+    class TestBuilder : BuilderBase
     {
         public TestBuilder(IList<TypeModel> typeModels, ParseResult parseResult)
             : base(typeModels, parseResult)
         { }
 
-        public override void AppendModel(StringBuilder sb, TypeModel typeModel)
+        public override void WriteContentTypeModel(StringBuilder sb, TypeModel typeModel)
         {
             throw new NotImplementedException();
         }
 
-        public override void AppendModels(StringBuilder sb, IEnumerable<TypeModel> typeModels)
+        public override void WriteContentTypeModels(StringBuilder sb, IEnumerable<TypeModel> typeModels)
         {
             throw new NotImplementedException();
         }
 
-        public override void AppendMeta(StringBuilder sb, IEnumerable<TypeModel> typeModels)
+        public override void WriteContentTypesMetadata(StringBuilder sb, IEnumerable<TypeModel> typeModels)
         {
             throw new NotImplementedException();
         }

diff --git a/src/ZpqrtBnk.ModelsBuilder.Tests/SupportTests.cs b/src/ZpqrtBnk.ModelsBuilder.Tests/SupportTests.cs
@@ -95,15 +95,15 @@ public partial class SeoComposition
             };
 
             var parseResult = new CodeParser{ WriteDiagnostics = true }.Parse(code, refs);
-            var builder = new TextBuilder(types, parseResult);
-            var btypes = builder.TypeModels;
+            var builder = new Builder(types, parseResult);
+            var btypes = builder.AllTypeModels;
 
-            var modelsToGenerate = builder.GetModels().ToList();
+            var modelsToGenerate = builder.GetContentTypeModels().ToList();
 
             foreach (var modelToGenerate in modelsToGenerate)
             {
                 var sb = new StringBuilder();
-                builder.AppendModel(sb, modelToGenerate);
+                builder.WriteContentTypeModel(sb, modelToGenerate);
                 var gen = sb.ToString();
                 Console.WriteLine(gen);
             }
@@ -184,15 +184,15 @@ public partial class Page
             };
 
             var parseResult = new CodeParser { WriteDiagnostics = true }.Parse(code, refs);
-            var builder = new TextBuilder(types, parseResult);
-            var btypes = builder.TypeModels;
+            var builder = new Builder(types, parseResult);
+            var btypes = builder.AllTypeModels;
 
-            var modelsToGenerate = builder.GetModels().ToList();
+            var modelsToGenerate = builder.GetContentTypeModels().ToList();
 
             foreach (var modelToGenerate in modelsToGenerate)
             {
                 var sb = new StringBuilder();
-                builder.AppendModel(sb, modelToGenerate);
+                builder.WriteContentTypeModel(sb, modelToGenerate);
                 var gen = sb.ToString();
                 Console.WriteLine(gen);
             }