Merge pull request #77 from bjorg/DR-103

DR-103 Building XDoc from key-value pairs can build wrong document.

src/MindTouchDream.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
+	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

src/mindtouch.core/mindtouch.core.csproj

@@ -41,7 +41,7 @@
     <DefineConstants>TRACE;DEBUG;DEBUG_DREAM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>1911,1591</NoWarn>
+    <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>..\bin\mindtouch.core.xml</DocumentationFile>
   </PropertyGroup>

src/mindtouch.dream.test/mindtouch.dream.test.csproj

@@ -41,7 +41,7 @@
     <DefineConstants>TRACE;DEBUG;DEBUG_DREAM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>1911,1591</NoWarn>
+    <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>..\bin\mindtouch.dream.test.xml</DocumentationFile>
   </PropertyGroup>

src/mindtouch.dream/Collections/DictionaryUtil.cs

@@ -118,6 +118,21 @@ public static class DictionaryUtil {
             }
             return dictionary;
         }
+
+        /// <summary>
+        /// Remove all keys from supplied dictionary.
+        /// </summary>
+        /// <returns>Keys to remove from dictionary.</returns>
+        /// <param name="dictionary">Dictionary to modify.</param>
+        /// <param name="keys">Keys to remove.</param>
+        /// <typeparam name="TKey">Dictionary key type.</typeparam>
+        /// <typeparam name="TValue">Dictionary value type.</typeparam>
+        public static IDictionary<TKey, TValue> RemoveKeys<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, IEnumerable<TKey> keys) {
+            foreach(var key in keys) {
+                dictionary.Remove(key);
+            }
+            return dictionary;
+        }
     }
 }
 

src/mindtouch.dream/IO/StreamUtil.cs

@@ -103,7 +103,9 @@ public static class StreamUtil {
         /// <param name="stream">Target <see cref="Stream"/></param>
         /// <returns><see langword="true"/> If the <see cref="Stream"/> contents are in memory</returns>
         public static bool IsStreamMemorized(this Stream stream) {
+#pragma warning disable 612,618
             return (stream is ChunkedMemoryStream) || (stream is MemoryStream);
+#pragma warning restore 612,618
         }
 
         /// <summary>

src/mindtouch.dream/Xml/XDoc.cs

@@ -1563,7 +1563,7 @@ public class XDoc : IEnumerable<XDoc>, ICloneable {
             }
 
             // check if path is empty
-            XDoc cursor = Copy();
+            XDoc cursor = CreateSelection(this);
             if(xpath.Length > 0) {
 
                 // split path
@@ -1604,13 +1604,13 @@ public class XDoc : IEnumerable<XDoc>, ICloneable {
                         XDoc current = cursor[token];
                         while(--count >= 0) {
                             if(current.IsEmpty) {
-                                current = cursor.Start(token).Copy();
+                                current = CreateSelection(cursor.Start(token));
                                 cursor.End();
                             }
                             current = current.Next;
                         }
                         if(current.IsEmpty) {
-                            current = cursor.Start(token).Copy();
+                            current = CreateSelection(cursor.Start(token));
                             cursor.End();
                         }
 
@@ -1621,7 +1621,7 @@ public class XDoc : IEnumerable<XDoc>, ICloneable {
 
                         // add one node
                         if(current.IsEmpty) {
-                            current = cursor.Start(token).Copy();
+                            current = CreateSelection(cursor.Start(token));
                             cursor.End();
                         }
                         cursor = current;

src/mindtouch.dream/mindtouch.dream.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -43,7 +43,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>1911,1591</NoWarn>
+    <NoWarn>1591</NoWarn>
     <DocumentationFile>..\bin\mindtouch.dream.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

src/tests/DreamMisc/XDoc-Test.cs

@@ -362,6 +362,18 @@ public class XDocTest {
             Assert.AreEqual(expected, text, "xpost-xml did not match");
         }
 
+        [Test]
+        public void XPost2() {
+            var keyvalues = new[] {
+                new KeyValuePair<string, string>("a/b", "123"),
+                new KeyValuePair<string, string>("a/c", "456"),
+                new KeyValuePair<string, string>("x/a/d", "789"),
+            };
+            var doc = XDocFactory.From(keyvalues, "root");
+            var text = doc.ToString();
+            Assert.AreEqual("<root><a><b>123</b><c>456</c></a><x><a><d>789</d></a></x></root>", text);
+        }
+
         [Test]
         public void XmlContents() {
             XDoc doc = new XDoc("test");