Lower case tag names for XHTML.

denis-ivanov · denis-ivanov · commit cbf85d2ced1c · 2021-06-15T14:46:49.000+04:00
diff --git a/src/AngleSharp.XPath.Tests/HtmlDocumentNavigatorTests.cs b/src/AngleSharp.XPath.Tests/HtmlDocumentNavigatorTests.cs
@@ -3,6 +3,7 @@
 using AngleSharp.Html.Parser;
 using NUnit.Framework;
 using System.Threading.Tasks;
+using AngleSharp.Dom;
 
 namespace AngleSharp.XPath.Tests
 {
@@ -116,5 +117,34 @@ public void SelectNodes_CanReturnAttribute()
             Assert.That(nodes, Has.Count.EqualTo(2));
             Assert.That(nodes, Is.All.InstanceOf<Dom.IAttr>());
         }
+
+        [Test]
+        public void TestNameXPathFunctionOnXMLDoc()
+        {
+            // Arrange
+            var xml = @"<html><head><title>Test</title></head><body><h1>Test</h1></body></html>";
+            var angleSharpXmlDoc = new XmlParser().ParseDocument(xml);
+
+            // Act
+            var xmlNav = angleSharpXmlDoc.CreateNavigator();
+
+            // Assert
+            Assert.AreEqual(TagNames.Html, xmlNav.Evaluate("name()"));
+        }
+
+        [Test]
+        public void TestNameXPathFunctionOnHTMLDoc()
+        {
+            // Arrange
+            var html = @"<html><head><title>Test</title></head><body><h1>Test</h1></body></html>";
+
+            var angleSharpHtmlDoc = new HtmlParser().ParseDocument(html);
+
+            // Act
+            var htmlNav = angleSharpHtmlDoc.CreateNavigator();
+
+            // Assert
+            Assert.AreEqual(TagNames.Html, htmlNav.Evaluate("name()"));
+        }
     }
 }
diff --git a/src/AngleSharp.XPath/AngleSharp.XPath.csproj b/src/AngleSharp.XPath/AngleSharp.XPath.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.0.0-alpha-1</Version>
+    <Version>2.0.0-alpha-2</Version>
     <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0-alpha-1</FileVersion>
+    <FileVersion>2.0.0-alpha-2</FileVersion>
     <Authors>Denis Ivanov</Authors>
     <PackageId>AngleSharp.XPath</PackageId>
     <AssemblyName>AngleSharp.XPath</AssemblyName>
     <RootNamespace>AngleSharp.XPath</RootNamespace>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net46;net461;net472</TargetFrameworks>
     <Description>XPath support for AngleSharp</Description>
     <PackageProjectUrl>https://github.com/AngleSharp/AngleSharp.XPath/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/src/AngleSharp.XPath/HtmlDocumentNavigator.cs b/src/AngleSharp.XPath/HtmlDocumentNavigator.cs
@@ -52,10 +52,23 @@ CurrentNode is IAttr attr
                 : NameTable.GetOrAdd(CurrentNode is IElement e ? e.LocalName : string.Empty);
 
         /// <inheritdoc />
-        public override string Name =>
-            CurrentNode is IAttr attr
-                ? NameTable.GetOrAdd(attr.Name)
-                : NameTable.GetOrAdd(_currentNode.NodeName);
+        public override string Name
+        {
+            get
+            {
+                if (CurrentNode is IAttr attr)
+                {
+                    return NameTable.GetOrAdd(attr.Name);
+                }
+
+                if (CurrentElement != null)
+                {
+                    return NameTable.GetOrAdd(CurrentElement.LocalName);
+                }
+
+                return NameTable.GetOrAdd(_currentNode.NodeName);
+            }
+        }
 
         /// <inheritdoc />
         public override string NamespaceURI
