From ff8bbf17d307201f7fe03319cdd4cff92a70cdd7 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Sun, 27 Oct 2013 13:27:45 +0100 Subject: [PATCH] fix serious issue in retrieving in BodyOnly serializer for NReadability --- .../PocketSharp.Silverlight.csproj | 14 ++++++++++---- .../PocketSharp.Silverlight/packages.config | 2 +- .../PocketSharp.Wpf/PocketSharp.Wpf.csproj | 15 ++++++++------- PocketSharp.Examples/PocketSharp.Wpf/app.config | 2 +- .../PocketSharp.Wpf/packages.config | 2 +- PocketSharp.Tests/PocketSharp.Tests.csproj | 10 ++++++---- PocketSharp.Tests/ReadTests.cs | 15 ++++++++++++++- PocketSharp.Tests/app.config | 2 +- PocketSharp.Tests/packages.config | 2 +- PocketSharp/PocketSharp.csproj | 6 +++--- PocketSharp/Properties/AssemblyInfo.cs | 4 ++-- PortablePorts/NReadability/SgmlDomSerializer.cs | 2 +- 12 files changed, 49 insertions(+), 27 deletions(-) diff --git a/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj b/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj index f4c9d27..ca56cb5 100644 --- a/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj +++ b/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj @@ -74,11 +74,17 @@ - - ..\..\packages\Microsoft.Bcl.1.0.19\lib\sl5\System.Runtime.dll + + False + ..\..\packages\Microsoft.Bcl.1.1.3\lib\sl5\System.IO.dll - - ..\..\packages\Microsoft.Bcl.1.0.19\lib\sl5\System.Threading.Tasks.dll + + False + ..\..\packages\Microsoft.Bcl.1.1.3\lib\sl5\System.Runtime.dll + + + False + ..\..\packages\Microsoft.Bcl.1.1.3\lib\sl5\System.Threading.Tasks.dll diff --git a/PocketSharp.Examples/PocketSharp.Silverlight/packages.config b/PocketSharp.Examples/PocketSharp.Silverlight/packages.config index ac524f4..60ba07f 100644 --- a/PocketSharp.Examples/PocketSharp.Silverlight/packages.config +++ b/PocketSharp.Examples/PocketSharp.Silverlight/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/PocketSharp.Examples/PocketSharp.Wpf/PocketSharp.Wpf.csproj b/PocketSharp.Examples/PocketSharp.Wpf/PocketSharp.Wpf.csproj index d7c9915..7e5d7d8 100644 --- a/PocketSharp.Examples/PocketSharp.Wpf/PocketSharp.Wpf.csproj +++ b/PocketSharp.Examples/PocketSharp.Wpf/PocketSharp.Wpf.csproj @@ -1,4 +1,4 @@ - + @@ -49,12 +49,13 @@ - - ..\..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Extensions.dll - - + False - ..\..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Extensions.dll + + + False + ..\..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Primitives.dll @@ -140,4 +141,4 @@ --> - + \ No newline at end of file diff --git a/PocketSharp.Examples/PocketSharp.Wpf/app.config b/PocketSharp.Examples/PocketSharp.Wpf/app.config index daec333..6c0589c 100644 --- a/PocketSharp.Examples/PocketSharp.Wpf/app.config +++ b/PocketSharp.Examples/PocketSharp.Wpf/app.config @@ -5,7 +5,7 @@ - + diff --git a/PocketSharp.Examples/PocketSharp.Wpf/packages.config b/PocketSharp.Examples/PocketSharp.Wpf/packages.config index 63fcfd1..c595f2b 100644 --- a/PocketSharp.Examples/PocketSharp.Wpf/packages.config +++ b/PocketSharp.Examples/PocketSharp.Wpf/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/PocketSharp.Tests/PocketSharp.Tests.csproj b/PocketSharp.Tests/PocketSharp.Tests.csproj index 9498030..b47e031 100644 --- a/PocketSharp.Tests/PocketSharp.Tests.csproj +++ b/PocketSharp.Tests/PocketSharp.Tests.csproj @@ -46,11 +46,13 @@ - - ..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Extensions.dll + + False + ..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Extensions.dll - - ..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Primitives.dll + + False + ..\packages\Microsoft.Net.Http.2.2.15\lib\net45\System.Net.Http.Primitives.dll diff --git a/PocketSharp.Tests/ReadTests.cs b/PocketSharp.Tests/ReadTests.cs index ed891d3..0c8c7a6 100644 --- a/PocketSharp.Tests/ReadTests.cs +++ b/PocketSharp.Tests/ReadTests.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using System.Collections.Generic; using Xunit; using PocketSharp.Models; +using System.Diagnostics; namespace PocketSharp.Tests { @@ -42,5 +42,18 @@ namespace PocketSharp.Tests }); }); } + + + [Fact] + public async Task IsBodyOnlyProperlyResolved() + { + PocketArticle result = await reader.Read(new PocketItem() + { + ID = 99, + Uri = new Uri("http://calebjacob.com/tooltipster/") + }); + + Assert.True(result.Content.Substring(0, 4) == " - + diff --git a/PocketSharp.Tests/packages.config b/PocketSharp.Tests/packages.config index d0f3b6c..83e63fb 100644 --- a/PocketSharp.Tests/packages.config +++ b/PocketSharp.Tests/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj index 0d0c35a..5698068 100644 --- a/PocketSharp/PocketSharp.csproj +++ b/PocketSharp/PocketSharp.csproj @@ -107,15 +107,15 @@ ..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.Threading.Tasks.dll + + + {14c3ee6a-54a4-4a37-8b56-d52a3802f1c2} NReadability - - - diff --git a/PocketSharp/Properties/AssemblyInfo.cs b/PocketSharp/Properties/AssemblyInfo.cs index a3d72c0..b51fd5f 100644 --- a/PocketSharp/Properties/AssemblyInfo.cs +++ b/PocketSharp/Properties/AssemblyInfo.cs @@ -25,5 +25,5 @@ using System.Runtime.InteropServices; // 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("2.2.0")] -[assembly: AssemblyFileVersion("2.2.0")] \ No newline at end of file +[assembly: AssemblyVersion("2.2.1")] +[assembly: AssemblyFileVersion("2.2.1")] \ No newline at end of file diff --git a/PortablePorts/NReadability/SgmlDomSerializer.cs b/PortablePorts/NReadability/SgmlDomSerializer.cs index 7a075a8..5c95ec4 100644 --- a/PortablePorts/NReadability/SgmlDomSerializer.cs +++ b/PortablePorts/NReadability/SgmlDomSerializer.cs @@ -84,7 +84,7 @@ namespace PocketSharp.Ports.NReadability if (domSerializationParams.BodyOnly && document.Root != null) { - var body = document.Root.GetChildrenByTagName("body").FirstOrDefault(); + var body = document.Root.GetElementsByTagName("body").FirstOrDefault(); if (body != null) {