Merge branch 'develop' into main

kekyo · Oct 25, 2022 · 287b10f · 287b10f
2 parents eb7af68 + 49300f5
commit 287b10f
Show file tree

Hide file tree

Showing 73 changed files with 856 additions and 592 deletions.
diff --git a/MarkTheRipper.Core/Expressions/ApplyExpression.cs b/MarkTheRipper.Core/Expressions/ApplyExpression.cs
@@ -50,5 +50,5 @@ public void Deconstruct(out IExpression function, out IExpression[] parameters)
     }
 
     public override string ToString() =>
-        $"{this.Function} {string.Join(" ", (object[])this.Parameters)}";
+        $"Apply: {this.Function} {string.Join(" ", (object[])this.Parameters)}";
 }
diff --git a/MarkTheRipper.Core/Expressions/ArrayExpression.cs b/MarkTheRipper.Core/Expressions/ArrayExpression.cs
@@ -42,5 +42,5 @@ public void Deconstruct(out IExpression[] elements) =>
         elements = this.Elements;
 
     public override string ToString() =>
-        $"[{string.Join(",", (object[])this.Elements)}]";
+        $"Array: [{string.Join(",", (object[])this.Elements)}]";
 }
diff --git a/MarkTheRipper.Core/Expressions/ValueExpression.cs b/MarkTheRipper.Core/Expressions/ValueExpression.cs
@@ -72,10 +72,10 @@ public void Deconstruct(out object? value) =>
     public override string ToString() =>
         this.Value switch
         {
-            string str => $"\"{str}\"",
-            char ch => $"'{ch}'",
-            IFormattable f => f.ToString(null, CultureInfo.InvariantCulture),
-            null => "(null)",
-            _ => this.Value.ToString() ?? string.Empty,
+            string str => $"Value: \"{str}\"",
+            char ch => $"Value: '{ch}'",
+            IFormattable f => $"Value: {f.ToString(null, CultureInfo.InvariantCulture)}",
+            null => "Value: (null)",
+            _ => $"Value: {this.Value}",
         };
 }
diff --git a/MarkTheRipper.Core/Expressions/VariableExpression.cs b/MarkTheRipper.Core/Expressions/VariableExpression.cs
@@ -41,5 +41,5 @@ public void Deconstruct(out string name) =>
         name = this.Name;
 
     public override string ToString() =>
-        this.Name;
+        $"Variable: {this.Name}";
 }
diff --git a/MarkTheRipper.Core/Metadata/IMetadataContext.cs b/MarkTheRipper.Core/Metadata/IMetadataContext.cs
@@ -8,8 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////////////
 
 using MarkTheRipper.Expressions;
-using System;
-using System.ComponentModel;
+using System.Collections.Generic;
 
 namespace MarkTheRipper.Metadata;
 
@@ -20,4 +19,5 @@ public interface IMetadataContext
     IExpression? Lookup(string keyName);
 
     IMetadataContext Spawn();
+    IMetadataContext InsertAndSpawn(Dictionary<string, IExpression> metadata);
 }
diff --git a/MarkTheRipper.Engine.Tests/BulkRipperTests.RipOffBreadcrumb_subNames=aaa-bbb.verified.txt b/MarkTheRipper.Engine.Tests/BulkRipperTests.RipOffBreadcrumb_subNames=aaa-bbb.verified.txt
@@ -6,6 +6,7 @@
   </head>
   <body>
     <ul>
+            <li>aaa</li>
             <li>bbb</li>
           </ul>
     <p>Hello MarkTheRipper!

diff --git a/...eRipper.Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=.verified.txt b/...eRipper.Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=.verified.txt
@@ -5,12 +5,12 @@
     <meta name="keywords" content="foo,bar" />
   </head>
   <body>
-     <h1>Tags: reftag</h1>
-     <h2>Title: <a href='ref.html' alt='ref.html'>ref</a>
-     <h1>Tags: foo</h1>
-     <h2>Title: <a href='temp.html' alt='temp.html'>hoehoe</a>
      <h1>Tags: bar</h1>
      <h2>Title: <a href='temp.html' alt='temp.html'>hoehoe</a>
+     <h1>Tags: foo</h1>
+     <h2>Title: <a href='temp.html' alt='temp.html'>hoehoe</a>
+     <h1>Tags: reftag</h1>
+     <h2>Title: <a href='ref.html' alt='ref.html'>ref</a>
     <p>Hello MarkTheRipper!
 This is test contents.</p>
 

diff --git a/....Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=aaa-bbb.verified.txt b/....Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=aaa-bbb.verified.txt
@@ -5,12 +5,12 @@
     <meta name="keywords" content="foo,bar" />
   </head>
   <body>
-     <h1>Tags: reftag</h1>
-     <h2>Title: <a href='../../ref.html' alt='ref.html'>ref</a>
-     <h1>Tags: foo</h1>
-     <h2>Title: <a href='temp.html' alt='aaa/bbb/temp.html'>hoehoe</a>
      <h1>Tags: bar</h1>
      <h2>Title: <a href='temp.html' alt='aaa/bbb/temp.html'>hoehoe</a>
+     <h1>Tags: foo</h1>
+     <h2>Title: <a href='temp.html' alt='aaa/bbb/temp.html'>hoehoe</a>
+     <h1>Tags: reftag</h1>
+     <h2>Title: <a href='../../ref.html' alt='ref.html'>ref</a>
     <p>Hello MarkTheRipper!
 This is test contents.</p>
 

diff --git a/...pper.Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=aaa.verified.txt b/...pper.Engine.Tests/BulkRipperTests.RipOffRelativePathCalculation_subNames=aaa.verified.txt
@@ -5,12 +5,12 @@
     <meta name="keywords" content="foo,bar" />
   </head>
   <body>
-     <h1>Tags: reftag</h1>
-     <h2>Title: <a href='../ref.html' alt='ref.html'>ref</a>
-     <h1>Tags: foo</h1>
-     <h2>Title: <a href='temp.html' alt='aaa/temp.html'>hoehoe</a>
      <h1>Tags: bar</h1>
      <h2>Title: <a href='temp.html' alt='aaa/temp.html'>hoehoe</a>
+     <h1>Tags: foo</h1>
+     <h2>Title: <a href='temp.html' alt='aaa/temp.html'>hoehoe</a>
+     <h1>Tags: reftag</h1>
+     <h2>Title: <a href='../ref.html' alt='ref.html'>ref</a>
     <p>Hello MarkTheRipper!
 This is test contents.</p>
 

diff --git a/MarkTheRipper.Engine.Tests/BulkRipperTests.cs b/MarkTheRipper.Engine.Tests/BulkRipperTests.cs
@@ -238,7 +238,7 @@ This is test contents.
   </head>
   <body>
     <ul>
-      {foreach category.breadcrumb}
+      {foreach category.breadcrumbs}
       <li>{item.name}</li>
       {end}
     </ul>

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories1.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories1.verified.txt
@@ -5,7 +5,7 @@
       Name: cat1,
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories2.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories2.verified.txt
@@ -8,7 +8,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories3.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories3.verified.txt
@@ -5,7 +5,7 @@
       Name: cat1,
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {
@@ -16,7 +16,7 @@
           }
         },
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories4.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories4.verified.txt
@@ -8,7 +8,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {
@@ -26,7 +26,7 @@
       },
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories5.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories5.verified.txt
@@ -8,7 +8,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {
@@ -26,7 +26,7 @@
       },
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {
@@ -42,7 +42,7 @@
       Name: cat3,
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat3,
               Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories6.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories6.verified.txt
@@ -2,7 +2,7 @@
   Name: (root),
   Entries: [
     {
-      Metadata: {
+      HeaderMetadata: {
         path: content1
       }
     }

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories7.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories7.verified.txt
@@ -8,7 +8,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {
@@ -22,7 +22,7 @@
               }
             },
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {
@@ -40,7 +40,7 @@
       },
       Entries: [
         {
-          Metadata: {
+          HeaderMetadata: {
             category: {
               Name: cat1,
               Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories8.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateCategories8.verified.txt
@@ -8,7 +8,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {
@@ -32,7 +32,7 @@
           Name: cat2,
           Entries: [
             {
-              Metadata: {
+              HeaderMetadata: {
                 category: {
                   Name: cat2,
                   Parent: {

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags1.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags1.verified.txt
@@ -2,7 +2,7 @@
   tag1: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1
         ]

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags2.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags2.verified.txt
@@ -2,7 +2,7 @@
   tag1: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2
@@ -13,7 +13,7 @@
   tag2: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags3.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags3.verified.txt
@@ -2,15 +2,15 @@
   tag1: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1
         ]
       }
     },
     {
       RelativeContentPath: content2,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1
         ]

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags4.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags4.verified.txt
@@ -2,15 +2,15 @@
   tag1: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1
         ]
       }
     },
     {
       RelativeContentPath: content2,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2
@@ -21,7 +21,7 @@
   tag2: [
     {
       RelativeContentPath: content2,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2

diff --git a/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags5.verified.txt b/MarkTheRipper.Engine.Tests/CategoriesTests.AggregateTags5.verified.txt
@@ -2,15 +2,15 @@
   tag1: [
     {
       RelativeContentPath: content1,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1
         ]
       }
     },
     {
       RelativeContentPath: content2,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2
@@ -21,7 +21,7 @@
   tag2: [
     {
       RelativeContentPath: content2,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag1,
           tag2
@@ -32,7 +32,7 @@
   tag3: [
     {
       RelativeContentPath: content3,
-      Metadata: {
+      HeaderMetadata: {
         tags: [
           tag3
         ]