Merge pull request #3 from AngleSharp/devel

Published v0.12

Author: FlorianRappl

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.12.0
+
+Released on Thursday, May 2 2019.
+
+- Reference latest AngleSharp
+- Improved `InnerHtml` / XML fragment parsing (#1)
+
 # 0.11.0
 
 Released on Tuesday, February 12 2019.

README.md

@@ -6,6 +6,7 @@
 [![GitHub Tag](https://img.shields.io/github/tag/AngleSharp/AngleSharp.Xml.svg?style=flat-square)](https://github.com/AngleSharp/AngleSharp.Xml/releases)
 [![NuGet Count](https://img.shields.io/nuget/dt/AngleSharp.Xml.svg?style=flat-square)](https://www.nuget.org/packages/AngleSharp.Xml/)
 [![Issues Open](https://img.shields.io/github/issues/AngleSharp/AngleSharp.Xml.svg?style=flat-square)](https://github.com/AngleSharp/AngleSharp.Xml/issues)
+[![Gitter Chat](http://img.shields.io/badge/gitter-AngleSharp/AngleSharp-blue.svg?style=flat-square)](https://gitter.im/AngleSharp/AngleSharp)
 [![StackOverflow Questions](https://img.shields.io/stackexchange/stackoverflow/t/anglesharp.svg?style=flat-square)](https://stackoverflow.com/tags/anglesharp)
 [![CLA Assistant](https://cla-assistant.io/readme/badge/AngleSharp/AngleSharp.Xml?style=flat-square)](https://cla-assistant.io/AngleSharp/AngleSharp.Xml)
 
@@ -41,6 +42,16 @@ Participation in the project is highly welcome. For this project the same rules
 
 If you have any question, concern, or spot an issue then please report it before opening a pull request. An initial discussion is appreciated regardless of the nature of the problem.
 
+Live discussions can take place in our [Gitter chat](https://gitter.im/AngleSharp/AngleSharp), which supports using GitHub accounts.
+
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+
+For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
+
+## .NET Foundation
+
+This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
+
 ## License
 
 The MIT License (MIT)

src/AngleSharp.Xml.Tests/Dom/XmlTree.cs

@@ -70,5 +70,17 @@ public void XmlValidDocumentBooksTree()
             //Assert.AreEqual(12, xml.DocumentElement.ChildElementCount);
             //Assert.AreEqual(6, xml.DocumentElement.Children[2].ChildElementCount);
         }
+
+        [Test]
+        public void FragmentParsing_Issue1()
+        {
+            var xmlParser = new XmlParser();
+            var xmlDocument = xmlParser.ParseDocument("<div></div>");
+            var querySelector = xmlDocument.QuerySelector("div");
+
+            querySelector.InnerHtml = "<a></a>";
+
+            Assert.AreEqual("<div><a></a></div>", xmlDocument.ToHtml());
+        }
     }
 }

src/AngleSharp.Xml.nuspec

@@ -14,7 +14,7 @@
     <copyright>Copyright 2016-2019, AngleSharp</copyright>
     <tags>html html5 css css3 dom requester http https xml dtd</tags>
     <dependencies>
-      <dependency id="AngleSharp" version="0.11.0" />
+      <dependency id="AngleSharp" version="0.12.0" />
     </dependencies>
   </metadata>
 </package>

src/AngleSharp.Xml/AngleSharp.Xml.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.11.0" />
+    <PackageReference Include="AngleSharp" Version="0.12.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

src/AngleSharp.Xml/AutoSelectedMarkupFormatter.cs

@@ -53,10 +53,7 @@ private IMarkupFormatter ChildFormatter
 
                 return childFormatter ?? HtmlMarkupFormatter.Instance;
             }
-            set
-            {
-                childFormatter = value;
-            }
+            set => childFormatter = value;
         }
 
         #endregion
@@ -68,10 +65,7 @@ private IMarkupFormatter ChildFormatter
         /// </summary>
         /// <param name="attribute">The attribute to serialize.</param>
         /// <returns>The formatted attribute.</returns>
-        public String Attribute(IAttr attribute)
-        {
-            return ChildFormatter.Attribute(attribute);
-        }
+        public String Attribute(IAttr attribute) => ChildFormatter.Attribute(attribute);
 
         /// <summary>
         /// Formats opening a tag with the given name.
@@ -143,10 +137,7 @@ public String Processing(IProcessingInstruction processing)
         /// </summary>
         /// <param name="text">The text to sanatize.</param>
         /// <returns>The formatted text.</returns>
-        public String Text(ICharacterData text)
-        {
-            return ChildFormatter.Text(text);
-        }
+        public String Text(ICharacterData text) => ChildFormatter.Text(text);
 
         #endregion
 

src/AngleSharp.Xml/Dom/Internal/SvgDocument.cs

@@ -35,20 +35,11 @@ internal SvgDocument(IBrowsingContext context = null)
 
         #region Properties
 
-        public override IElement DocumentElement
-        {
-            get { return RootElement; }
-        }
+        public override IElement DocumentElement => RootElement;
 
-        public ISvgSvgElement RootElement
-        {
-            get { return this.FindChild<ISvgSvgElement>(); }
-        }
+        public ISvgSvgElement RootElement => this.FindChild<ISvgSvgElement>();
 
-        public override IEntityProvider Entities
-        {
-            get { return Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver; }
-        }
+        public override IEntityProvider Entities => Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver;
 
         #endregion
 

src/AngleSharp.Xml/Dom/Internal/XmlDocument.cs

@@ -27,26 +27,17 @@ internal XmlDocument(IBrowsingContext context = null)
 
         #region Properties
 
-        public override IElement DocumentElement
-        {
-            get { return this.FindChild<IElement>(); }
-        }
+        public override IElement DocumentElement => this.FindChild<IElement>();
 
-        public override IEntityProvider Entities
-        {
-            get { return Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver; }
-        }
+        public override IEntityProvider Entities => Context.GetProvider<IEntityProvider>() ?? XmlEntityProvider.Resolver;
 
         public Boolean IsValid => true;
 
         #endregion
 
         #region Methods
 
-        public override Element CreateElementFrom(String name, String prefix)
-        {
-            return new XmlElement(this, name, prefix);
-        }
+        public override Element CreateElementFrom(String name, String prefix) => new XmlElement(this, name, prefix);
 
         public override Node Clone(Document owner, Boolean deep)
         {

src/AngleSharp.Xml/Dom/Internal/XmlElement.cs

@@ -1,6 +1,8 @@
 namespace AngleSharp.Xml.Dom
 {
     using AngleSharp.Dom;
+    using AngleSharp.Text;
+    using AngleSharp.Xml.Parser;
     using System;
 
     /// <summary>
@@ -29,6 +31,21 @@ internal String IdAttribute
 
         #region Methods
 
+        /// <inheritdoc />
+        public override IElement ParseSubtree(String html)
+        {
+            var context = ((IElement)this).Owner?.Context;
+            var source = new TextSource(html);
+            var document = new XmlDocument(context, source);
+            var parser = new XmlDomBuilder(document);
+            var options = new XmlParserOptions
+            {
+                IsSuppressingErrors = true,
+            };
+            return parser.ParseFragment(options, this).DocumentElement;
+        }
+
+        /// <inheritdoc />
         public override Node Clone(Document owner, Boolean deep)
         {
             var node = new XmlElement(owner, LocalName, Prefix);

src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeDeclarationEntry.cs

@@ -22,7 +22,7 @@ public String Name
 
         public AttributeTypeDeclaration Type
         {
-            get { return _type; }
+            get => _type;
             set
             {
                 _type = value;
@@ -32,7 +32,7 @@ public AttributeTypeDeclaration Type
 
         public AttributeValueDeclaration Default
         {
-            get { return _value; }
+            get => _value;
             set
             {
                 _value = value;

src/AngleSharp.Xml/Dtd/Declaration/Attribute/AttributeEnumeratedType.cs

@@ -29,10 +29,7 @@ public Boolean IsNotation
             set;
         }
 
-        public List<String> Names
-        {
-            get { return _names; }
-        }
+        public List<String> Names => _names;
 
         #endregion
 

src/AngleSharp.Xml/Dtd/Declaration/AttributeDeclaration.cs

@@ -29,10 +29,7 @@ public AttributeDeclarationEntry this[Int32 index]
             get { return _attrs[index]; }
         }
 
-        public Int32 Count
-        {
-            get { return _attrs.Count; }
-        }
+        public Int32 Count => _attrs.Count;
 
         public IEnumerable<AttributeDeclarationEntry> Declarations
         {

src/AngleSharp.Xml/Dtd/Declaration/Element/ElementChoiceDeclarationEntry.cs

@@ -7,10 +7,7 @@ sealed class ElementChoiceDeclarationEntry : ElementChildrenDeclarationEntry
     {
         #region Properties
 
-        public List<ElementQuantifiedDeclarationEntry> Choice
-        {
-            get { return _children; }
-        }
+        public List<ElementQuantifiedDeclarationEntry> Choice => _children;
 
         #endregion
 

src/AngleSharp.Xml/Dtd/Declaration/Element/ElementDeclarationEntry.cs

@@ -16,20 +16,11 @@ abstract class ElementDeclarationEntry
 
         #region Properties
 
-        public ElementContentType Type
-        {
-            get { return _type; }
-        }
+        public ElementContentType Type => _type;
 
-        public static ElementAnyDeclarationEntry Any
-        {
-            get { return _any ?? (_any = new ElementAnyDeclarationEntry()); }
-        }
+        public static ElementAnyDeclarationEntry Any => _any ?? (_any = new ElementAnyDeclarationEntry());
 
-        public static ElementEmptyDeclarationEntry Empty
-        {
-            get { return _empty ?? (_empty = new ElementEmptyDeclarationEntry()); }
-        }
+        public static ElementEmptyDeclarationEntry Empty => _empty ?? (_empty = new ElementEmptyDeclarationEntry());
 
         #endregion
 
@@ -46,8 +37,8 @@ abstract class ElementQuantifiedDeclarationEntry : ElementDeclarationEntry
 
         public ElementQuantifier Quantifier
         {
-            get { return _quantifier; }
-            set { _quantifier = value; }
+            get => _quantifier;
+            set => _quantifier = value;
         }
     }
 

src/AngleSharp.Xml/Dtd/Declaration/Element/ElementMixedDeclarationEntry.cs

@@ -24,10 +24,7 @@ public ElementMixedDeclarationEntry()
 
         #region Properties
 
-        public List<String> Names
-        {
-            get { return _names; }
-        }
+        public List<String> Names => _names;
 
         #endregion
 

src/AngleSharp.Xml/Dtd/Declaration/Element/ElementSequenceDeclarationEntry.cs

@@ -5,10 +5,7 @@ namespace AngleSharp.Xml.Dtd.Declaration
 
     sealed class ElementSequenceDeclarationEntry : ElementChildrenDeclarationEntry
     {
-        public List<ElementQuantifiedDeclarationEntry> Sequence
-        {
-            get { return _children; }
-        }
+        public List<ElementQuantifiedDeclarationEntry> Sequence => _children;
 
         public override Boolean Check(NodeInspector inspector)
         {

src/AngleSharp.Xml/Dtd/Declaration/Element/NodeInspector.cs

@@ -21,30 +21,18 @@ public NodeInspector(IElement element)
             }
         }
 
-        public List<INode> Children
-        {
-            get { return nodes; }
-        }
+        public List<INode> Children => nodes;
 
-        public INode Current
-        {
-            get { return Children[Index]; }
-        }
+        public INode Current => Children[Index];
 
-        public Int32 Length
-        {
-            get { return Children.Count; }
-        }
+        public Int32 Length => Children.Count;
 
         public Int32 Index
         {
             get;
             set;
         }
 
-        public Boolean IsCompleted 
-        {
-            get { return Children.Count == Index; }
-        }
+        public Boolean IsCompleted => Children.Count == Index;
     }
 }