Fix for Issue #34

source/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NuGet.CommandLine" version="2.0.40000" />
+</packages>

source/CsQuery.Mvc/CsQuery.Mvc.csproj

@@ -100,7 +100,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_ConfigurationName="Release" BuildVersion_UpdateAssemblyVersion="True" />
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_ConfigurationName="Release" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

source/CsQuery.Tests/Csharp/Methods/Before.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Text;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
+using Assert = NUnit.Framework.Assert;
+using Description = NUnit.Framework.DescriptionAttribute;
+using TestContext = Microsoft.VisualStudio.TestTools.UnitTesting.TestContext;
+using CsQuery;
+using CsQuery.Utility;
+
+namespace CsQuery.Tests.Csharp
+{
+    /// <summary>
+    /// This method is largely covered by the jQuery tests
+    /// </summary>
+
+    public partial class Methods: CsQueryTest
+    {
+
+        [Test, TestMethod]
+        public void Before_MissingTarget()
+        {
+
+            var dom = TestDom("TestHtml");
+            var len = dom["*"].Length;
+
+            var target = dom["does-not-exist"];
+            var content = dom["<div id='content' />"];
+
+            target.Before(content);
+
+            // nothing was added
+            Assert.AreEqual(dom["*"].Length, len);
+        }
+
+
+   }
+}

source/CsQuery.Tests/Csharp/Methods/First.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Text;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
+using Assert = NUnit.Framework.Assert;
+using Description = NUnit.Framework.DescriptionAttribute;
+using TestContext = Microsoft.VisualStudio.TestTools.UnitTesting.TestContext;
+using CsQuery;
+using CsQuery.Utility;
+
+namespace CsQuery.Tests.Csharp
+{
+    /// <summary>
+    /// This method is largely covered by the jQuery tests
+    /// </summary>
+
+    public partial class Methods: CsQueryTest
+    {
+
+        [Test, TestMethod]
+        public void First()
+        {
+
+            var dom = TestDom("TestHtml");
+
+            Assert.AreEqual(1, dom["span"].First().Length);
+            Assert.AreEqual("hlinks-user", dom["span"].First().Attr("id"));
+
+            Assert.AreEqual(0, dom["not-here"].First().Length);
+        }
+
+
+
+   }
+}

source/CsQuery.Tests/Csharp/Methods/Last.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Text;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
+using Assert = NUnit.Framework.Assert;
+using Description = NUnit.Framework.DescriptionAttribute;
+using TestContext = Microsoft.VisualStudio.TestTools.UnitTesting.TestContext;
+using CsQuery;
+using CsQuery.Utility;
+
+namespace CsQuery.Tests.Csharp
+{
+    /// <summary>
+    /// This method is largely covered by the jQuery tests
+    /// </summary>
+
+    public partial class Methods: CsQueryTest
+    {
+
+        [Test, TestMethod]
+        public void Last()
+        {
+
+            var dom = TestDom("TestHtml");
+
+            Assert.AreEqual(1, dom["div"].Last().Length);
+            Assert.AreEqual("test-show-last", dom["div"].Last().Attr("id"));
+
+            Assert.AreEqual(0, dom["not-here"].Last().Length);
+        }
+
+
+   }
+}

source/CsQuery.Tests/Csharp/Methods/ReplaceWith.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Text;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
+using Assert = NUnit.Framework.Assert;
+using Description = NUnit.Framework.DescriptionAttribute;
+using TestContext = Microsoft.VisualStudio.TestTools.UnitTesting.TestContext;
+using CsQuery;
+using CsQuery.Utility;
+
+namespace CsQuery.Tests.Csharp
+{
+    /// <summary>
+    /// This method is largely covered by the jQuery tests
+    /// </summary>
+
+    public partial class Methods: CsQueryTest
+    {
+        /// <summary>
+        /// Replace with: ensure that when content is moved between domains, a CsQuery object that was
+        /// the replacement content remains connected to the content in its new home.
+        /// </summary>
+
+        [Test, TestMethod]
+        public void ReplaceWith()
+        {
+
+            var dom = TestDom("TestHtml");
+
+            var target = dom["#test-show-last"];
+            var source = CQ.Create("<div id='new-content'><span /></div>");
+
+            Assert.AreEqual(2, target.Children().Length);
+            target.ReplaceWith(source);
+
+            Assert.AreEqual(1, source["#hlinks-user"].Length);
+            Assert.AreEqual(dom["#new-content"][0], source[0]);
+        }
+
+
+   }
+}

source/CsQuery.Tests/Csquery.Tests.csproj

@@ -91,6 +91,10 @@
     <Compile Include="Csharp\Dom\DomElement.cs" />
     <Compile Include="Csharp\Dom\SpecialElements.cs" />
     <Compile Include="Csharp\ExtensionMethods\Xml.cs" />
+    <Compile Include="Csharp\Methods\Before.cs" />
+    <Compile Include="Csharp\Methods\ReplaceWith.cs" />
+    <Compile Include="Csharp\Methods\Last.cs" />
+    <Compile Include="Csharp\Methods\First.cs" />
     <Compile Include="Csharp\Methods\ParentsUntil.cs" />
     <Compile Include="Csharp\Methods\Width.cs" />
     <Compile Include="Csharp\Methods\Each.cs" />

source/CsQuery.sln

@@ -56,8 +56,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_BuildVersioningStyle = None.None.None.Increment
-		BuildVersion_UseGlobalSettings = False
 		BuildVersion_AssemblyInfoFilename = 
+		BuildVersion_UseGlobalSettings = False
+		BuildVersion_BuildVersioningStyle = None.None.None.None
 	EndGlobalSection
 EndGlobal

source/CsQuery/CQ.cs

@@ -518,7 +518,7 @@ protected bool AddSelection(IDomObject element)
 
         protected bool AddSelection(IEnumerable<IDomObject> elements)
         {
-            bool result = false;
+            bool result = false; 
             foreach (IDomObject elm in elements)
             {
                 result = true;

source/CsQuery/CQ_jQuery/After.cs

@@ -77,7 +77,7 @@ public CQ After(IDomObject element)
 
         public CQ After(IEnumerable<IDomObject> elements)
         {
-            EnsureCsQuery(elements).InsertAtOffset(SelectionSet, 1);
+            EnsureCsQuery(elements).InsertAtOffset(this, 1);
             return this;
         }
         #endregion
@@ -131,21 +131,39 @@ protected CQ InsertAtOffset(IEnumerable<IDomObject> target, int offset)
 
         protected CQ InsertAtOffset(IEnumerable<IDomObject> target, int offset, out CQ insertedElements)
         {
-            SelectionSet<IDomObject> sel = target as SelectionSet<IDomObject>;
-            bool isCsQuery = sel != null;
+            CQ cq = target as CQ;
+            SelectionSet<IDomObject> sel = null;
 
+            if (cq!=null) {
+                sel = cq.SelectionSet;
+            }
+
+            bool isTargetCsQuery = cq != null;
+
             bool isFirst = true;
 
             // Copy the target list: it could change otherwise
             List<IDomObject> targets = new List<IDomObject>(target);
-
             insertedElements = new CQ();
+            bool isEmptyTarget = sel.Count == 0;
+
+            // bind the source to the target's document if it was itself a CsQuery object, and update its selection set to reflect the 
+            // current document.
+
+            if (isTargetCsQuery)
+            {
+                Document = cq.Document;
+            }
 
-            if (isCsQuery && sel.Count == 0)
+            if (isTargetCsQuery && isEmptyTarget)
             {
                 // If appending items to an empty selection, just add them to the selection set
                 sel.AddRange(SelectionSet);
                 insertedElements.AddSelection(SelectionSet);
+
+                // selection set will be messed up if document was changed; rebuild it
+                SelectionSet.Clear();
+                SelectionSet.AddRange(insertedElements);
             }
             else
             {
@@ -154,7 +172,7 @@ protected CQ InsertAtOffset(IEnumerable<IDomObject> target, int offset, out CQ i
                     if (el.IsDisconnected)
                     {
                         // Disconnected items are added to the selection set (if that's the target)
-                        if (!isCsQuery)
+                        if (!isTargetCsQuery)
                         {
                             throw new InvalidOperationException("You can't add elements to a disconnected element list, it must be in a selection set");
                         }
@@ -167,14 +185,21 @@ protected CQ InsertAtOffset(IEnumerable<IDomObject> target, int offset, out CQ i
                             sel.Insert(index + offset, item);
                         }
                         insertedElements.AddSelection(SelectionSet);
+
+                        // selection set will be messed up if document was changed; rebuild it
+                        SelectionSet.Clear();
+                        SelectionSet.AddRange(insertedElements);
                     }
                     else
                     {
                         if (isFirst)
                         {
+                            insertedElements.AddSelection(SelectionSet);
                             InsertAtOffset(el, offset);
                             isFirst = false;
-                            insertedElements.AddSelection(SelectionSet);
+                            // selection set will be messed up if document was changed; rebuild it
+                            SelectionSet.Clear();
+                            SelectionSet.AddRange(insertedElements);
                         }
                         else
                         {
@@ -185,6 +210,9 @@ protected CQ InsertAtOffset(IEnumerable<IDomObject> target, int offset, out CQ i
                     }
                 }
             }
+
+
+
             return this;
         }
         #endregion

source/CsQuery/CQ_jQuery/Before.cs

@@ -77,7 +77,7 @@ public CQ Before(IDomObject element)
 
         public CQ Before(IEnumerable<IDomObject> elements)
         {
-            EnsureCsQuery(elements).InsertAtOffset(SelectionSet, 0);
+            EnsureCsQuery(elements).InsertAtOffset(this, 0);
             return this;
         }
 

source/CsQuery/CsQuery.csproj

@@ -435,7 +435,7 @@ xcopy $(TargetDir)CsQuery.xml $(SolutionDir)..\Distribution /Y
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_ConfigurationName="Release" BuildVersion_UpdateAssemblyVersion="True" />
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_ConfigurationName="Any" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

source/CsQuery/CsQuery.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>CsQuery</id>
-    <version>1.2</version>
+    <version>1.2.0.8</version>
     <title>CsQuery</title>
     <authors>James Treworgy</authors>
     <owners>James Treworgy</owners>

source/CsQuery/Implementation/SelectionSet.cs

@@ -86,7 +86,6 @@ public SelectionSet(IEnumerable<T> elements, SelectionSetOrder inputOrder, Selec
         /// Cached count
         /// </summary>
 
-        private int _Count=-1;
         private bool _IsDirty;
 
         private SelectionSetOrder OriginalOrder;
@@ -221,11 +220,7 @@ public int Count
                 {
                     return MutableList.Count;
                 } else {
-                    if (_Count == -1)
-                    {
-                        _Count = OriginalList.Count();
-                    }
-                    return _Count;
+                    return OriginalList.Count();
                 }
             }
         }
@@ -681,7 +676,6 @@ private IEnumerable<T> EmptyList()
         private void Touch()
         {
             _IsDirty = true;
-
         }
 
         private void Clean()

source/CsQuery/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.5")]
+[assembly: AssemblyVersion("1.2.0.8")]