Upgraded to AngleSharp v0.9.4

Author: FlorianRappl

AngleSharp.Io.Tests/AngleSharp.Io.Tests.csproj

@@ -36,8 +36,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.3.41352, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.3\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FluentAssertions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">

AngleSharp.Io.Tests/Network/HttpClientRequesterTests.cs

@@ -130,7 +130,7 @@ public async Task EndToEnd()
                 var request = DocumentRequest.Get(Url.Create("http://httpbin.org/html"));
 
                 // ACT
-                var response = await context.Loader.LoadAsync(request, CancellationToken.None);
+                var response = await context.Loader.DownloadAsync(request).Task;
                 var document = await context.OpenAsync(response, CancellationToken.None);
 
                 // ASSERT

AngleSharp.Io.Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.3" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.4" targetFramework="net45" />
   <package id="FluentAssertions" version="4.0.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net46" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net46" />

AngleSharp.Io/AngleSharp.Io.csproj

@@ -33,8 +33,8 @@
     <DocumentationFile>bin\Release\AngleSharp.Io.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.3.41352, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\packages\AngleSharp.0.9.3\lib\net45\AngleSharp.dll</HintPath>
+    <Reference Include="AngleSharp, Version=0.9.4.42449, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
+      <HintPath>..\packages\AngleSharp.0.9.4\lib\net45\AngleSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

AngleSharp.Io/Services/LoaderService.cs

@@ -1,25 +1,46 @@
 namespace AngleSharp.Io.Services
 {
-    using AngleSharp.Dom;
     using AngleSharp.Network;
     using AngleSharp.Network.Default;
     using AngleSharp.Services;
+    using System;
     using System.Collections.Generic;
 
     /// <summary>
     /// The adjusted loader service to use.
     /// </summary>
     public class LoaderService : ILoaderService
     {
+        #region Fields
+
         readonly IEnumerable<IRequester> _requesters;
+        readonly Predicate<IRequest> _filter;
+
+        #endregion
+
+        #region ctor
 
         /// <summary>
         /// Creates a new loader service with the provided requesters.
         /// </summary>
         /// <param name="requesters">The requesters to use.</param>
-        public LoaderService(IEnumerable<IRequester> requesters)
+        /// <param name="filter">The request filter to use, if any.</param>
+        public LoaderService(IEnumerable<IRequester> requesters, Predicate<IRequest> filter = null)
         {
             _requesters = requesters;
+            _filter = filter;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the filter to use, if any.
+        /// </summary>
+        public Predicate<IRequest> Filter
+        {
+            get { return _filter; }
         }
 
         /// <summary>
@@ -30,6 +51,10 @@ public IEnumerable<IRequester> Requesters
             get { return _requesters; }
         }
 
+        #endregion
+
+        #region Methods
+
         /// <summary>
         /// Gets the appropriate requester for the provided address.
         /// </summary>
@@ -42,7 +67,9 @@ public IRequester GetRequester(Url address)
             foreach (var requester in _requesters)
             {
                 if (requester.SupportsProtocol(address.Scheme))
+                {
                     return requester;
+                }
             }
 
             return default(IRequester);
@@ -55,17 +82,19 @@ public IRequester GetRequester(Url address)
         /// <returns>The created document loader.</returns>
         public IDocumentLoader CreateDocumentLoader(IBrowsingContext context)
         {
-            return new DocumentLoader(_requesters, context);
+            return new DocumentLoader(_requesters, context.Configuration, _filter);
         }
 
         /// <summary>
-        /// Creates the resource loader for the given document.
+        /// Creates the resource loader for the given context.
         /// </summary>
-        /// <param name="document">The document to host the loading.</param>
+        /// <param name="context">The context to use.</param>
         /// <returns>The created resource loader.</returns>
-        public IResourceLoader CreateResourceLoader(IDocument document)
+        public IResourceLoader CreateResourceLoader(IBrowsingContext context)
         {
-            return new ResourceLoader(_requesters, document);
+            return new ResourceLoader(_requesters, context.Configuration, _filter);
         }
+
+        #endregion
     }
 }

AngleSharp.Io/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AngleSharp" version="0.9.3" targetFramework="net45" />
+  <package id="AngleSharp" version="0.9.4" targetFramework="net45" />
 </packages>