Prepare changes for v0.10

FlorianRappl · FlorianRappl · commit c0fcd2ae7f89 · 2016-11-19T23:34:29.000+01:00
diff --git a/src/AngleSharp.Io.Tests/AngleSharp.Io.Tests.csproj b/src/AngleSharp.Io.Tests/AngleSharp.Io.Tests.csproj
@@ -36,8 +36,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.10.0.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.10.0\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
diff --git a/src/AngleSharp.Io.Tests/Network/AboutTests.cs b/src/AngleSharp.Io.Tests/Network/AboutTests.cs
@@ -1,8 +1,6 @@
 ﻿namespace AngleSharp.Io.Tests.Network
 {
-    using AngleSharp.Network;
-    using AngleSharp.Network.Default;
-    using Io.Network;
+    using AngleSharp.Io.Network;
     using NUnit.Framework;
     using System.Collections.Generic;
     using System.Threading;
@@ -15,7 +13,7 @@ public class AboutTests
         public async Task InvokeAboutSettingsLowercaseShouldWorkFine()
         {
             var about = new AboutRequester();
-            var requests = new List<IRequest>();
+            var requests = new List<Request>();
             var req = new Request
             {
                 Address = Url.Create("about://settings"),
@@ -37,7 +35,7 @@ public async Task InvokeAboutSettingsLowercaseShouldWorkFine()
         public async Task InvokeAboutSettingsUppercaseShouldWorkFine()
         {
             var about = new AboutRequester();
-            var requests = new List<IRequest>();
+            var requests = new List<Request>();
             var req = new Request
             {
                 Address = Url.Create("about://Settings"),
@@ -59,7 +57,7 @@ public async Task InvokeAboutSettingsUppercaseShouldWorkFine()
         public async Task InvokeAboutUnsetUrlShouldNotFire()
         {
             var about = new AboutRequester();
-            var requests = new List<IRequest>();
+            var requests = new List<Request>();
             var req = new Request
             {
                 Address = Url.Create("about://bookmarks"),
@@ -81,7 +79,7 @@ public async Task InvokeAboutUnsetUrlShouldNotFire()
         public async Task InvokeAboutUrlWithQueryShouldFire()
         {
             var about = new AboutRequester();
-            var requests = new List<IRequest>();
+            var requests = new List<Request>();
             var req = new Request
             {
                 Address = Url.Create("about://cache?device=memory"),
diff --git a/src/AngleSharp.Io.Tests/Network/FileRequesterTests.cs b/src/AngleSharp.Io.Tests/Network/FileRequesterTests.cs
@@ -1,9 +1,8 @@
 ﻿namespace AngleSharp.Io.Tests.Network
 {
-    using AngleSharp.Dom.Html;
-    using AngleSharp.Extensions;
+    using AngleSharp.Dom;
+    using AngleSharp.Html.Dom;
     using AngleSharp.Io.Network;
-    using AngleSharp.Network.Default;
     using NUnit.Framework;
     using System;
     using System.IO;
diff --git a/src/AngleSharp.Io.Tests/Network/FtpRequesterTests.cs b/src/AngleSharp.Io.Tests/Network/FtpRequesterTests.cs
@@ -1,9 +1,8 @@
 ﻿namespace AngleSharp.Io.Tests.Network
 {
-    using AngleSharp.Dom.Html;
-    using AngleSharp.Extensions;
+    using AngleSharp.Dom;
+    using AngleSharp.Html.Dom;
     using AngleSharp.Io.Network;
-    using AngleSharp.Network.Default;
     using NUnit.Framework;
     using System.IO;
     using System.Threading;
diff --git a/src/AngleSharp.Io.Tests/Network/HttpClientRequesterTests.cs b/src/AngleSharp.Io.Tests/Network/HttpClientRequesterTests.cs
@@ -1,9 +1,7 @@
 ﻿namespace AngleSharp.Io.Tests.Network
 {
-    using AngleSharp.Extensions;
     using AngleSharp.Io.Network;
     using AngleSharp.Io.Tests.Network.Mocks;
-    using AngleSharp.Network;
     using FluentAssertions;
     using NUnit.Framework;
     using System;
@@ -13,7 +11,7 @@
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
-    using AngleSharpHttpMethod = AngleSharp.Network.HttpMethod;
+    using AngleSharpHttpMethod = AngleSharp.Io.HttpMethod;
     using NetHttpMethod = System.Net.Http.HttpMethod;
 
     [TestFixture]
@@ -129,7 +127,7 @@ public async Task EndToEnd()
                 var request = DocumentRequest.Get(Url.Create("http://httpbin.org/html"));
 
                 // ACT
-                var response = await context.Loader.DownloadAsync(request).Task;
+                var response = await context.GetService<IDocumentLoader>().FetchAsync(request).Task;
                 var document = await context.OpenAsync(response, CancellationToken.None);
 
                 // ASSERT
diff --git a/src/AngleSharp.Io.Tests/Network/Mocks/HttpMockState.cs b/src/AngleSharp.Io.Tests/Network/Mocks/HttpMockState.cs
@@ -1,7 +1,6 @@
 ﻿namespace AngleSharp.Io.Tests.Network.Mocks
 {
     using AngleSharp.Io.Network;
-    using AngleSharp.Network.Default;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -20,7 +19,7 @@ public HttpMockState()
             // data
             Request = new Request
             {
-                Method = AngleSharp.Network.HttpMethod.Post,
+                Method = AngleSharp.Io.HttpMethod.Post,
                 Address = new Url("http://example/path?query=value"),
                 Headers = new Dictionary<String, String>
                 {
diff --git a/src/AngleSharp.Io.Tests/Network/ResponseTests.cs b/src/AngleSharp.Io.Tests/Network/ResponseTests.cs
@@ -1,6 +1,5 @@
 ﻿namespace AngleSharp.Io.Tests.Network
 {
-    using AngleSharp.Network.Default;
     using FluentAssertions;
     using NUnit.Framework;
     using System.Net;
@@ -12,7 +11,7 @@ public class ResponseTests
         public void Initialize()
         {
             // ARRANGE, ACT
-            var response = new Response();
+            var response = new DefaultResponse();
 
             // ASSERT
             response.Content.Should().BeNull();
diff --git a/src/AngleSharp.Io.Tests/packages.config b/src/AngleSharp.Io.Tests/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.8" targetFramework="net45" />
+  <package id="AngleSharp" version="0.10.0" targetFramework="net45" />
   <package id="FluentAssertions" version="4.13.1" targetFramework="net45" />
   <package id="NUnit" version="3.4.1" targetFramework="net45" />
 </packages>
diff --git a/src/AngleSharp.Io/AngleSharp.Io.csproj b/src/AngleSharp.Io/AngleSharp.Io.csproj
@@ -33,8 +33,8 @@
     <DocumentationFile>bin\Release\AngleSharp.Io.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.8.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.8\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.10.0.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.10.0\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -47,9 +47,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IoConfigurationExtensions.cs" />
+    <Compile Include="ConfigurationExtensions.cs" />
     <Compile Include="Dom\WebSocketReadyState.cs" />
-    <Compile Include="Extensions\GeneralExtensions.cs" />
+    <Compile Include="GeneralExtensions.cs" />
     <Compile Include="Dom\WebSocket.cs" />
     <Compile Include="Interfaces\IStorage.cs" />
     <Compile Include="Network\AboutRequester.cs" />
diff --git a/src/AngleSharp.Io/ConfigurationExtensions.cs b/src/AngleSharp.Io/ConfigurationExtensions.cs
@@ -1,23 +1,22 @@
-﻿namespace AngleSharp
+﻿namespace AngleSharp.Io
 {
     using AngleSharp.Io.Network;
-    using AngleSharp.Network;
-    using AngleSharp.Network.Default;
     using System;
     using System.Net.Http;
+    using LoaderSetup = AngleSharp.ConfigurationExtensions.LoaderSetup;
 
     /// <summary>
     /// Additional extensions for improved requesters.
     /// </summary>
-    public static class IoConfigurationExtensions
+    public static class ConfigurationExtensions
     {
         /// <summary>
         /// Adds a loader service that comes with all (improved) requesters.
         /// </summary>
         /// <param name="configuration">The configuration to use.</param>
         /// <param name="setup">Optional setup for the loader service.</param>
         /// <returns>The new configuration.</returns>
-        public static IConfiguration WithRequesters(this IConfiguration configuration, Action<ConfigurationExtensions.LoaderSetup> setup = null)
+        public static IConfiguration WithRequesters(this IConfiguration configuration, Action<LoaderSetup> setup = null)
         {
             return configuration.WithRequesters(new HttpClientHandler { UseCookies = false, AllowAutoRedirect = false }, setup);
         }
@@ -31,7 +30,7 @@ public static IConfiguration WithRequesters(this IConfiguration configuration, A
         /// </param>
         /// <param name="setup">Optional setup for the loader service.</param>
         /// <returns>The new configuration.</returns>
-        public static IConfiguration WithRequesters(this IConfiguration configuration, HttpMessageHandler httpMessageHandler, Action<ConfigurationExtensions.LoaderSetup> setup = null)
+        public static IConfiguration WithRequesters(this IConfiguration configuration, HttpMessageHandler httpMessageHandler, Action<LoaderSetup> setup = null)
         {
             var httpClient = new HttpClient(httpMessageHandler);
             var requesters = new IRequester[] 
diff --git a/src/AngleSharp.Io/Dom/WebSocket.cs b/src/AngleSharp.Io/Dom/WebSocket.cs
@@ -3,8 +3,6 @@
     using AngleSharp.Attributes;
     using AngleSharp.Dom;
     using AngleSharp.Dom.Events;
-    using AngleSharp.Html;
-    using AngleSharp.Io.Extensions;
     using System;
     using System.Linq;
     using System.Net.WebSockets;
@@ -29,7 +27,7 @@ public class WebSocket : EventTarget, IDisposable
         private readonly ClientWebSocket _ws;
         private readonly IWindow _window;
 
-        WebSocketReadyState _state;
+        private WebSocketReadyState _state;
 
         #endregion
 
diff --git a/src/AngleSharp.Io/GeneralExtensions.cs b/src/AngleSharp.Io/GeneralExtensions.cs
@@ -1,6 +1,5 @@
-﻿namespace AngleSharp.Io.Extensions
+﻿namespace AngleSharp.Io
 {
-    using AngleSharp.Network;
     using System;
     using System.Threading.Tasks;
 
diff --git a/src/AngleSharp.Io/Network/AboutRequester.cs b/src/AngleSharp.Io/Network/AboutRequester.cs
@@ -1,6 +1,5 @@
 ﻿namespace AngleSharp.Io.Network
 {
-    using AngleSharp.Network;
     using System;
     using System.Collections.Generic;
     using System.Threading;
@@ -9,24 +8,24 @@
     /// <summary>
     /// Requester to perform about:// requests.
     /// </summary>
-    public class AboutRequester : IRequester
+    public class AboutRequester : BaseRequester
     {
-        private readonly Dictionary<String, Func<IRequest, CancellationToken, Task<IResponse>>> _routes;
+        private readonly Dictionary<String, Func<Request, CancellationToken, Task<IResponse>>> _routes;
 
         /// <summary>
         /// Creates a new about requester.
         /// </summary>
         public AboutRequester()
         {
-            _routes = new Dictionary<String, Func<IRequest, CancellationToken, Task<IResponse>>>(StringComparer.InvariantCultureIgnoreCase);
+            _routes = new Dictionary<String, Func<Request, CancellationToken, Task<IResponse>>>(StringComparer.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
         /// Sets the route for the given address.
         /// </summary>
         /// <param name="address">The address of the route.</param>
         /// <param name="route">The route to use.</param>
-        public void SetRoute(String address, Func<IRequest, CancellationToken, Task<IResponse>> route)
+        public void SetRoute(String address, Func<Request, CancellationToken, Task<IResponse>> route)
         {
             _routes[address] = route;
         }
@@ -36,9 +35,9 @@ public void SetRoute(String address, Func<IRequest, CancellationToken, Task<IRes
         /// </summary>
         /// <param name="address">The address of the route to obtain.</param>
         /// <returns>The route, if any.</returns>
-        public Func<IRequest, CancellationToken, Task<IResponse>> GetRoute(String address)
+        public Func<Request, CancellationToken, Task<IResponse>> GetRoute(String address)
         {
-            var route = default(Func<IRequest, CancellationToken, Task<IResponse>>);
+            var route = default(Func<Request, CancellationToken, Task<IResponse>>);
             _routes.TryGetValue(address, out route);
             return route;
         }
@@ -49,7 +48,7 @@ public Func<IRequest, CancellationToken, Task<IResponse>> GetRoute(String addres
         /// <param name="request">The options to consider.</param>
         /// <param name="cancel">The token for cancelling the task.</param>
         /// <returns>The task that will eventually give the response data.</returns>
-        public Task<IResponse> RequestAsync(IRequest request, CancellationToken cancel)
+        protected override Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
         {
             var address = GetAddress(request.Address.Data);
             var route = GetRoute(address);
@@ -67,7 +66,7 @@ public Task<IResponse> RequestAsync(IRequest request, CancellationToken cancel)
         /// </summary>
         /// <param name="protocol">The protocol to check for, e.g. file.</param>
         /// <returns>True if the protocol is supported, otherwise false.</returns>
-        public Boolean SupportsProtocol(String protocol)
+        public override Boolean SupportsProtocol(String protocol)
         {
             return protocol.Equals("about", StringComparison.OrdinalIgnoreCase);
         }
diff --git a/src/AngleSharp.Io/Network/FileRequester.cs b/src/AngleSharp.Io/Network/FileRequester.cs
@@ -1,7 +1,5 @@
 ﻿namespace AngleSharp.Io.Network
 {
-    using AngleSharp.Network;
-    using AngleSharp.Network.Default;
     using System;
     using System.Net;
     using System.Threading;
@@ -10,15 +8,15 @@
     /// <summary>
     /// Requester to perform file:// requests.
     /// </summary>
-    public class FileRequester : IRequester
+    public class FileRequester : BaseRequester
     {
         /// <summary>
         /// Performs an asynchronous request that can be cancelled.
         /// </summary>
         /// <param name="request">The options to consider.</param>
         /// <param name="cancel">The token for cancelling the task.</param>
         /// <returns>The task that will eventually give the response data.</returns>
-        public async Task<IResponse> RequestAsync(IRequest request, CancellationToken cancel)
+        protected override async Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
         {
             var requester = FileWebRequest.Create(request.Address.Href) as FileWebRequest;
 
@@ -27,7 +25,7 @@ public async Task<IResponse> RequestAsync(IRequest request, CancellationToken ca
                 var response = await requester.GetResponseAsync().ConfigureAwait(false);
                 var content = response.GetResponseStream();
 
-                return new Response
+                return new DefaultResponse
                 {
                     Address = request.Address,
                     Content = content,
@@ -43,7 +41,7 @@ public async Task<IResponse> RequestAsync(IRequest request, CancellationToken ca
         /// </summary>
         /// <param name="protocol">The protocol to check for, e.g. file.</param>
         /// <returns>True if the protocol is supported, otherwise false.</returns>
-        public Boolean SupportsProtocol(String protocol)
+        public override Boolean SupportsProtocol(String protocol)
         {
             return protocol.Equals(ProtocolNames.File, StringComparison.OrdinalIgnoreCase);
         }
diff --git a/src/AngleSharp.Io/Network/FtpRequester.cs b/src/AngleSharp.Io/Network/FtpRequester.cs
@@ -1,7 +1,5 @@
 ﻿namespace AngleSharp.Io.Network
 {
-    using AngleSharp.Network;
-    using AngleSharp.Network.Default;
     using System;
     using System.Net;
     using System.Threading;
@@ -10,15 +8,15 @@
     /// <summary>
     /// Requester to perform ftp:// requests.
     /// </summary>
-    public class FtpRequester : IRequester
+    public class FtpRequester : BaseRequester
     {
         /// <summary>
         /// Performs an asynchronous request that can be cancelled.
         /// </summary>
         /// <param name="request">The options to consider.</param>
         /// <param name="cancel">The token for cancelling the task.</param>
         /// <returns>The task that will eventually give the response data.</returns>
-        public async Task<IResponse> RequestAsync(IRequest request, CancellationToken cancel)
+        protected override async Task<IResponse> PerformRequestAsync(Request request, CancellationToken cancel)
         {
             var requester = FtpWebRequest.Create(request.Address.Href) as FtpWebRequest;
 
@@ -30,7 +28,7 @@ public async Task<IResponse> RequestAsync(IRequest request, CancellationToken ca
                 var response = await requester.GetResponseAsync().ConfigureAwait(false);
                 var content = response.GetResponseStream();
 
-                return new Response
+                return new DefaultResponse
                 {
                     Address = request.Address,
                     Content = content,
@@ -46,7 +44,7 @@ public async Task<IResponse> RequestAsync(IRequest request, CancellationToken ca
         /// </summary>
         /// <param name="protocol">The protocol to check for, e.g. ftp.</param>
         /// <returns>True if the protocol is supported, otherwise false.</returns>
-        public Boolean SupportsProtocol(String protocol)
+        public override Boolean SupportsProtocol(String protocol)
         {
             return protocol.Equals(ProtocolNames.Ftp, StringComparison.OrdinalIgnoreCase);
         }
diff --git a/src/AngleSharp.Io/Network/HttpClientRequester.cs b/src/AngleSharp.Io/Network/HttpClientRequester.cs
diff --git a/src/AngleSharp.Io/packages.config b/src/AngleSharp.Io/packages.config

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`namespace AngleSharp.Io.Tests.Network`
`2`	`2`	`{`
`3`		`- using AngleSharp.Network;`
`4`		`- using AngleSharp.Network.Default;`
`5`		`- using Io.Network;`
	`3`	`+ using AngleSharp.Io.Network;`
`6`	`4`	`using NUnit.Framework;`
`7`	`5`	`using System.Collections.Generic;`
`8`	`6`	`using System.Threading;`
`@@ -15,7 +13,7 @@ public class AboutTests`
`15`	`13`	`public async Task InvokeAboutSettingsLowercaseShouldWorkFine()`
`16`	`14`	`{`
`17`	`15`	`var about = new AboutRequester();`
`18`		`- var requests = new List<IRequest>();`
	`16`	`+ var requests = new List<Request>();`
`19`	`17`	`var req = new Request`
`20`	`18`	`{`
`21`	`19`	`Address = Url.Create("about://settings"),`
`@@ -37,7 +35,7 @@ public async Task InvokeAboutSettingsLowercaseShouldWorkFine()`
`37`	`35`	`public async Task InvokeAboutSettingsUppercaseShouldWorkFine()`
`38`	`36`	`{`
`39`	`37`	`var about = new AboutRequester();`
`40`		`- var requests = new List<IRequest>();`
	`38`	`+ var requests = new List<Request>();`
`41`	`39`	`var req = new Request`
`42`	`40`	`{`
`43`	`41`	`Address = Url.Create("about://Settings"),`
`@@ -59,7 +57,7 @@ public async Task InvokeAboutSettingsUppercaseShouldWorkFine()`
`59`	`57`	`public async Task InvokeAboutUnsetUrlShouldNotFire()`
`60`	`58`	`{`
`61`	`59`	`var about = new AboutRequester();`
`62`		`- var requests = new List<IRequest>();`
	`60`	`+ var requests = new List<Request>();`
`63`	`61`	`var req = new Request`
`64`	`62`	`{`
`65`	`63`	`Address = Url.Create("about://bookmarks"),`
`@@ -81,7 +79,7 @@ public async Task InvokeAboutUnsetUrlShouldNotFire()`
`81`	`79`	`public async Task InvokeAboutUrlWithQueryShouldFire()`
`82`	`80`	`{`
`83`	`81`	`var about = new AboutRequester();`
`84`		`- var requests = new List<IRequest>();`
	`82`	`+ var requests = new List<Request>();`
`85`	`83`	`var req = new Request`
`86`	`84`	`{`
`87`	`85`	`Address = Url.Create("about://cache?device=memory"),`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace AngleSharp.Io.Tests.Network.Mocks`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Io.Network;`
`4`		`- using AngleSharp.Network.Default;`
`5`	`4`	`using System;`
`6`	`5`	`using System.Collections.Generic;`
`7`	`6`	`using System.IO;`
`@@ -20,7 +19,7 @@ public HttpMockState()`
`20`	`19`	`// data`
`21`	`20`	`Request = new Request`
`22`	`21`	`{`
`23`		`- Method = AngleSharp.Network.HttpMethod.Post,`
	`22`	`+ Method = AngleSharp.Io.HttpMethod.Post,`
`24`	`23`	`Address = new Url("http://example/path?query=value"),`
`25`	`24`	`Headers = new Dictionary<String, String>`
`26`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace AngleSharp.Io.Tests.Network`
`2`	`2`	`{`
`3`		`- using AngleSharp.Network.Default;`
`4`	`3`	`using FluentAssertions;`
`5`	`4`	`using NUnit.Framework;`
`6`	`5`	`using System.Net;`
`@@ -12,7 +11,7 @@ public class ResponseTests`
`12`	`11`	`public void Initialize()`
`13`	`12`	`{`
`14`	`13`	`// ARRANGE, ACT`
`15`		`- var response = new Response();`
	`14`	`+ var response = new DefaultResponse();`
`16`	`15`
`17`	`16`	`// ASSERT`
`18`	`17`	`response.Content.Should().BeNull();`