resolve conflicts; make GetAccessCode obsolete

Made CallbackUri public

.editorconfig

@@ -1,21 +1,15 @@
 ; This file is for unifying the coding style for different editors and IDEs
 ; editorconfig.org
 
-; defaults by Tobias Klika
-; 2013
-
 root = true
 
-
-; default settings for all files
 [*]
-end_of_line = crlf ; this is git standard, so it won't convert it anymore
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.nuget/NuGet.targets

@@ -18,9 +18,9 @@
     
     <ItemGroup Condition=" '$(PackageSources)' == '' ">
         <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
         <!--
-            <PackageSource Include="https://nuget.org/api/v2/" />
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
             <PackageSource Include="https://my-nuget-source/nuget/" />
         -->
     </ItemGroup>
@@ -50,9 +50,12 @@
         <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
         <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
         
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
         <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir) " </RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
 
         <!-- We need to ensure packages are restored prior to assembly resolve -->
         <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -118,7 +121,7 @@
 
                     Log.LogMessage("Downloading latest version of NuGet.exe...");
                     WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
 
                     return true;
                 }

CHANGELOG.md

@@ -0,0 +1,82 @@
+### 2.2.0 (2013-10-26)
+
+- Made `GetAccessCode` obsolete
+- Return username after authentication with `GetUser` (thanks to [ScottIsAFool](https://github.com/ScottIsAFool))
+
+### 2.1.0 (2013-10-25)
+
+- Rename `Statistics()` to `GetUserStatistics()`
+- Made `CallbackUri` public (thanks to [ScottIsAFool](https://github.com/ScottIsAFool))
+- Added Fody/PropertyChanged (thanks to [ScottIsAFool](https://github.com/ScottIsAFool))
+- Method `GetUsageLimits()` to retrieve API usage limits
+- Add PORTABLE constant to SgmlReader 
+
+### 2.0.1 (2013-10-19)
+
+- Catch HttpRequestExceptions and provide as InnerException for PocketException
+- Read Article from URI (method overload)
+
+### 2.0.0 (2013-10-17)
+
+- Add Reader API _(does not use the official Article View API, which is private. The PocketReader is based on a custom PCL port of NReadability and SgmlReader)_
+
+### 1.5.1 (2013-09-30) 
+
+- `RetrieveFilter.All` didn't work
+- improve search speed
+
+### 1.5.0 (2013-09-28) 
+
+- add statistics API
+- add registration API
+
+### 1.4.0 (2013-09-21) 
+
+- rename `Retrieve` to `Get`
+- update IntelliSense documentation
+- add `GetTags` method
+
+### 1.3.0 (2013-09-19) 
+
+- get Item by ID 
+- tag modification bugfixes
+
+### 1.2.1 (2013-09-18) 
+
+- correct parameter conversion for DateTime and Boolean
+
+### 1.2.0 (2013-09-17) 
+
+- simplified retrieve methods
+
+### 1.1.0 (2013-09-17) 
+
+- fix modification requests
+
+### 1.0.0 (2013-09-15) 
+
+- convert to PCL 
+- implement async
+
+### 0.3.2 (2013-08-16) 
+
+- tag modification fixed
+- full retrieval of items for Retrieve method
+
+### 0.3.1 (2013-07-07) 
+
+- authentication fixes
+
+### 0.3.0 (2013-07-02) 
+
+- update authentication process 
+
+### 0.2.0 (2013-06-27) 
+
+- add, modify item
+- modify tags
+
+### 0.1.0 (2013-06-26) 
+
+- authentication 
+- retrieve functionality

PocketSharp.Examples/PocketSharp.Silverlight/MainPage.xaml.cs

@@ -35,8 +35,6 @@ namespace PocketSharp.Silverlight
 
     private async void Button_Click(object sender, RoutedEventArgs e)
     {
-      // User: pocketsharp-tests
-      // PW:   pocketsharp
       // !! please don't misuse this account !!
       PocketClient client = new PocketClient(
         consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
@@ -48,7 +46,7 @@ namespace PocketSharp.Silverlight
 
       try
       {
-        items = await client.Retrieve();
+        items = await client.Get();
 
         items.ForEach(item =>
         {

PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj

@@ -112,6 +112,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\AppManifest.xml" />
   </ItemGroup>

PocketSharp.Examples/PocketSharp.Silverlight/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs

@@ -64,8 +64,6 @@ namespace PocketSharp.WP8.ViewModels
     /// </summary>
     public async Task LoadData()
     {
-      // User: pocketsharp-tests
-      // PW:   pocketsharp
       // !! please don't misuse this account !!
       PocketClient client = new PocketClient(
         consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
@@ -77,7 +75,7 @@ namespace PocketSharp.WP8.ViewModels
 
       try
       {
-        items = await client.Retrieve().ConfigureAwait(false);
+        items = await client.Get().ConfigureAwait(false);
 
         items.ForEach(item =>
         {

PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs

@@ -31,8 +31,6 @@ namespace PocketSharp.Wpf
 
     private async void Button_Click(object sender, RoutedEventArgs e)
     {
-      // User: pocketsharp-tests
-      // PW:   pocketsharp
       // !! please don't misuse this account !!
       PocketClient client = new PocketClient(
         consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
@@ -44,7 +42,7 @@ namespace PocketSharp.Wpf
 
       try
       {
-        items = await client.Retrieve();
+        items = await client.Get();
 
         items.ForEach(item =>
         {

PocketSharp.Tests/AccountTests.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class AccountTests : TestsBase
+  {
+    public AccountTests() : base() { }
+
+
+    [Fact]
+    public async Task IsUserRegistered()
+    {
+      string randomId = ((int)((DateTime)DateTime.Now - new DateTime(1970, 1, 1)).TotalSeconds).ToString();
+
+      bool success = await client.RegisterAccount("pocket-" + randomId, String.Format("pocketsharp-{0}@outlook.com", randomId), "mypassword");
+
+      Assert.True(success);
+    }
+
+
+    [Fact]
+    public async Task AreInvalidRegistrationsBlocked()
+    {
+      await ThrowsAsync<FormatException>(async () =>
+      {
+        await client.RegisterAccount("abcdefghijklmnopqrstuvwxyz", "pocketsharp@outlook.com", "mypassword");
+      });
+
+      await ThrowsAsync<FormatException>(async () =>
+      {
+        await client.RegisterAccount("oiu_my:o;", "pocketsharp@outlook.com", "mypassword");
+      });
+
+      await ThrowsAsync<FormatException>(async () =>
+      {
+        await client.RegisterAccount("myusername", "pocketsharpoutlook.com", "mypassword");
+      });
+
+      await ThrowsAsync<FormatException>(async () =>
+      {
+        await client.RegisterAccount("myusername", "pocketsharp@outlook", "mypassword");
+      });
+
+      await ThrowsAsync<FormatException>(async () =>
+      {
+        await client.RegisterAccount("myusername", "pocketsharp@outlook,com", "mypassword");
+      });
+
+      await ThrowsAsync<ArgumentNullException>(async () =>
+      {
+        await client.RegisterAccount("myusername", null, "mypassword");
+      });
+    }
+  }
+}

PocketSharp.Tests/AddTests.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class AddTests : TestsBase
+  {
+    public AddTests() : base() { }
+
+
+    [Fact]
+    public async Task AddSimpleItemWithUriOnly()
+    {
+      var uri = new Uri("http://frontendplay.com");
+
+      PocketItem item = await client.Add(uri);
+
+      Assert.Equal<Uri>(uri, item.Uri);
+
+      itemsToDelete.Add(item.ID);
+    }
+
+
+    [Fact]
+    public async Task AddComplexItem()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("http://frontendplay.com"),
+        tags: new string[] { "blog", "frontend", "cee" },
+        title: "ignored title",
+        tweetID: "380051788172632065"
+      );
+
+      List<PocketItem> items = await client.Get();
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if(itm.ID == item.ID)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      Assert.NotNull(itemDesired);
+      Assert.Equal(itemDesired.ID, item.ID);
+      Assert.Equal(itemDesired.Tags.Count, 3);
+
+      itemsToDelete.Add(item.ID);
+    }
+  }
+}

PocketSharp.Tests/GetTests.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class GetTests : TestsBase
+  {
+    public GetTests() : base() { }
+
+
+    [Fact]
+    public async Task AreItemsRetrieved()
+    {
+      List<PocketItem> items = await client.Get();
+
+      Assert.True(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task IsItemRetrievedById()
+    {
+      List<PocketItem> items = await client.Get();
+      PocketItem item = items[0];
+      PocketItem itemDuplicate = await client.Get(item.ID);
+
+      Assert.True(item.ID == itemDuplicate.ID);
+      Assert.True(item.Uri == itemDuplicate.Uri);
+    }
+
+
+    [Fact]
+    public async Task AreFilteredItemsRetrieved()
+    {
+      List<PocketItem> items = await client.Get(RetrieveFilter.Favorite);
+
+      Assert.True(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task RetrieveWithMultipleFilters()
+    {
+      List<PocketItem> items = await client.Get(
+        state: State.unread,
+        tag: "pocket",
+        sort: Sort.title,
+        since: new DateTime(2010, 12, 10),
+        count: 2
+      );
+
+      Assert.InRange<int>(items.Count, 0, 2);
+    }
+
+
+    [Fact]
+    public async Task ItemContainsUri()
+    {
+      List<PocketItem> items = await client.Get(count: 1);
+
+      Assert.True(items.Count == 1);
+      Assert.True(items[0].Uri.ToString().StartsWith("http"));
+    }
+
+
+    [Fact]
+    public async Task InvalidRetrievalReturnsNoResults()
+    {
+      List<PocketItem> items = await client.Get(
+        favorite: true,
+        search: "xoiu987a#;"
+      );
+
+      Assert.False(items.Count > 0);
+
+      PocketItem item = await client.Get(99999999);
+
+      Assert.Null(item);
+
+      items = await client.Get(RetrieveFilter.Video);
+
+      Assert.False(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task SearchReturnsResult()
+    {
+      List<PocketItem> items = await client.Search("pocket");
+
+      Assert.True(items.Count > 0);
+      Assert.True(items[0].FullTitle.ToLower().Contains("pocket"));
+    }
+
+
+    [Fact]
+    public async Task InvalidSearchReturnsNoResult()
+    {
+      List<PocketItem> items = await client.Search("adsüasd-opiu2;.398dfyx");
+
+      Assert.False(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task RetrieveTagsReturnsResult()
+    {
+      List<PocketTag> items = await client.GetTags();
+
+      Assert.True(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task SearchByTagsReturnsResult()
+    {
+      List<PocketItem> items = await client.SearchByTag("pocket");
+
+      Assert.True(items.Count == 1);
+
+      bool found = false;
+
+      items[0].Tags.ForEach(tag =>
+      {
+        if (tag.Name.Contains("pocket"))
+        {
+          found = true;
+        }
+      });
+
+      Assert.True(found);
+    }
+
+
+    [Fact]
+    public async Task InvalidSearchByTagsReturnsNoResult()
+    {
+      List<PocketItem> items = await client.SearchByTag("adsüasd-opiu2;.398dfyx");
+
+      Assert.False(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task AreStatisticsRetrieved()
+    {
+      PocketStatistics statistics = await client.Statistics();
+
+      Assert.True(statistics.CountAll > 0);
+    }
+
+
+    [Fact]
+    public async Task AreLimitsRetrieved()
+    {
+      PocketLimits limits = await client.GetUsageLimits();
+
+      Assert.True(limits.RateLimitForConsumerKey > 9999);
+    }
+  }
+}

PocketSharp.Tests/ModifyTagsTests.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+using System.Linq;
+
+namespace PocketSharp.Tests
+{
+  public class ModifyTagsTests : TestsBase
+  {
+    public ModifyTagsTests() : base() { }
+
+
+    [Fact]
+    public async Task AreTagsAddedAndDeletedToAnItem()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.AddTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.Tags.Count >= 2);
+
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "test_tag2"));
+
+      Assert.True(await client.RemoveTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.Null(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag2"));
+    }
+
+
+    [Fact]
+    public async Task AreAllTagsRemovedFromItem()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.AddTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.Tags.Count >= 2);
+
+      Assert.True(await client.RemoveTags(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item.Tags);
+    }
+
+
+    [Fact]
+    public async Task AreTagsReplaced()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.ReplaceTags(item.ID, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Equal(item.Tags.Count, 2);
+
+      Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag2"));
+    }
+
+
+    private async Task<PocketItem> Setup()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("https://github.com"),
+        tags: new string[] { "github", "code", "social" }
+      );
+
+      itemsToDelete.Add(item.ID);
+
+      return await GetItemById(item.ID);
+    }
+
+
+    private async Task<PocketItem> GetItemById(int id, bool archive = false)
+    {
+      List<PocketItem> items = await client.Get(state: archive ? State.archive : State.unread);
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if (itm.ID == id)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      return itemDesired;
+    }
+  }
+}

PocketSharp.Tests/ModifyTests.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class ModifyTests : TestsBase
+  {
+    public ModifyTests() : base() { }
+
+
+    [Fact]
+    public async Task IsAnItemArchivedAndUnarchived()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Archive(item));
+
+      item = await GetItemById(item.ID, true);
+
+      Assert.True(item.IsArchive);
+
+      Assert.True(await client.Unarchive(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.False(item.IsArchive);
+    }
+
+
+    [Fact]
+    public async Task IsAnItemFavoritedAndUnfavorited()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Favorite(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.IsFavorite);
+
+      Assert.True(await client.Unfavorite(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.False(item.IsFavorite);
+    }
+
+
+    [Fact]
+    public async Task IsAnItemDeleted()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Delete(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item);
+    }
+
+
+    private async Task<PocketItem> Setup()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("https://github.com"),
+        tags: new string[] { "github", "code", "social" }
+      );
+
+      itemsToDelete.Add(item.ID);
+
+      return await GetItemById(item.ID);
+    }
+
+
+    private async Task<PocketItem> GetItemById(int id, bool archive = false)
+    {
+      List<PocketItem> items = await client.Get(state: archive ? State.archive : State.unread);
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if (itm.ID == id)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      return itemDesired;
+    }
+  }
+}

PocketSharp.Tests/PocketSharp.Tests.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F1CEA363-7039-40BA-9744-0071F46BB90C}</ProjectGuid>
+    <ProjectGuid>{CA3C491B-A8CA-426C-A0BB-E91636767467}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PocketSharp.Tests</RootNamespace>
     <AssemblyName>PocketSharp.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -37,46 +37,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.IO">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http, Version=2.2.13.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Extensions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=2.2.13.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Primitives.dll</HintPath>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.WebRequest, Version=2.2.13.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks">
-      <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll</HintPath>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="xunit">
+      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Choose>
@@ -85,15 +63,23 @@
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
+    <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="UnitTest1.cs" />
+    <Compile Include="AddTests.cs" />
+    <Compile Include="AccountTests.cs" />
+    <Compile Include="ModifyTagsTests.cs" />
+    <Compile Include="ModifyTests.cs" />
+    <Compile Include="GetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReadTests.cs" />
+    <Compile Include="TestsBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PocketSharp\PocketSharp.csproj">
+      <Project>{817200c3-a327-4e35-9b5f-63a51c088577}</Project>
+      <Name>PocketSharp</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

PocketSharp.Tests/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fbe5a0d2-d0de-44b1-8b8a-cf8cd3ac2230")]
+[assembly: Guid("87fcf138-5e6e-4584-ac3b-58c8ee6fccaa")]
 
 // Version information for an assembly consists of the following four values:
 //

PocketSharp.Tests/ReadTests.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class ReadTests : TestsBase
+  {
+    private PocketReader reader;
+
+
+    public ReadTests() : base()
+    {
+      reader = new PocketReader();
+    }
+
+
+    [Fact]
+    public async Task ReadArticleTest()
+    {
+      PocketArticle result = await reader.Read(new PocketItem()
+      {
+        ID = 99,
+        Uri = new Uri("http://frontendplay.com/story/4/http-caching-demystified-part-2-implementation")
+      });
+
+      Assert.True(result.Content.Length > 15000);
+    }
+
+
+    [Fact]
+    public async Task ReadArticleWithInvalidUriTest()
+    {
+      await ThrowsAsync<PocketException>(async () =>
+      {
+        await reader.Read(new PocketItem()
+        {
+          ID = 99,
+          Uri = new Uri("http://frontendplayyyyy.com")
+        });
+      });
+    }
+  }
+}

PocketSharp.Tests/TestsBase.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class TestsBase : IDisposable
+  {
+    protected PocketClient client;
+
+    protected List<int> itemsToDelete = new List<int>();
+
+
+    // setup
+    public TestsBase()
+    {
+      // !! please don't misuse this account !!
+      client = new PocketClient(
+        consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
+        callbackUri: "http://frontendplay.com",
+        accessCode: "80acf6c5-c198-03c0-b94c-e74402"
+      );
+    }
+
+
+    // teardown
+    public void Dispose() 
+    {
+      itemsToDelete.ForEach(async id =>
+      {
+        await client.Delete(id);
+      });
+    }
+
+
+    // async throws
+    public static async Task ThrowsAsync<TException>(Func<Task> func)
+    {
+      var expected = typeof(TException);
+      Type actual = null;
+      try
+      {
+        await func();
+      }
+      catch (Exception e)
+      {
+        actual = e.GetType();
+      }
+      Assert.Equal(expected, actual);
+    }
+  }
+}

PocketSharp.Tests/UnitTest1.cs

@@ -1,16 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading.Tasks;
-
-namespace PocketSharp.Tests
-{
-  [TestClass]
-  public class UnitTest1
-  {
-    [TestMethod]
-    public void TestMethod1()
-    {
-
-    }
-  }
-}

PocketSharp.Tests/app.config

@@ -3,12 +3,8 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.13.0" newVersion="4.2.13.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

PocketSharp.Tests/packages.config

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
-  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net40" />
-  <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="net45" />
+  <package id="xunit" version="1.9.2" targetFramework="net45" />
 </packages>

PocketSharp.Website/index.html

@@ -16,7 +16,7 @@
   <meta property="og:site_name" content="PocketSharp" />
   <meta property="og:description" content="PocketSharp is a C#.NET class library that integrates the Pocket API" />
 
-  <meta property="og:image" content="http://frontendplay.com/Content/Images/frontendplay-200.png" />
+  <meta property="og:image" content="http://pocketsharp.frontendplay.com/Assets/Images/pocketsharp.png" />
   <link rel="icon" type="image/png" href="/Assets/Images/pocketsharp.png" />
   <link rel="image_src" href="/Assets/Images/pocketsharp.png" />
 
@@ -32,6 +32,9 @@
       </h1>
       <p class="app-description">
         PocketSharp is a C#.NET class library, that integrates the Pocket API v3
+        <br><br>
+        Current version: <b>2.0.1</b><br>
+        <a href="https://www.nuget.org/packages/PocketSharp/">@ nuget</a>
       </p>
       <div class="app-nuget">
         <code>Install-Package PocketSharp</code>
@@ -45,14 +48,28 @@
     <div class="app-main">
       <nav class="app-nav">
         <a href="#" data-id="gettingstarted" class="is-active">Getting Started</a>
-        <a href="#" data-id="authentication">Authentication</a>
-        <a href="#" data-id="retrieve">Retrieve</a>
+        <a href="#" data-id="get">Get</a>
         <a href="#" data-id="add">Add</a>
+        <a href="#" data-id="reader">Reader</a>
         <a href="#" data-id="modify">Modify</a>
+        <a href="#" data-id="account">Account</a>
       </nav>
       <article class="article">
 
         <div data-part="gettingstarted">
+          <h2>Supported platforms</h2>
+          <p>PocketSharp is a <strong>Portable Class Library</strong> (since 1.0.0), therefore it's compatible with multiple platforms:</p>
+          <ul>
+          <li><strong>.NET</strong> &gt;= 4.0.3 (including WPF)</li>
+          <li><strong>Silverlight</strong> &gt;= 4</li>
+          <li><strong>Windows Phone</strong> &gt;= 7.5</li>
+          <li><strong>Windows Store</strong></li>
+          </ul>
+          <p>You can find examples for Silverlight 5, WP8 and WPF in the <code>PocketSharp.Examples</code> folder.</p>
+          <h2>Async Support</h2>
+          <p>All public methods, which communicate with the Pocket servers are asynchronous. So they should be called with the preceding <code>await</code> keyword, and the encapsulated method marked with <code>async</code>.</p>
+          <p><em>In PocketSharp versions &lt; 1.0.0 all methods lacked async support and were blocking.</em></p>
+
           <h2>Getting Started</h2>
           <p>Request a <a href="http://getpocket.com/developer/apps/">Consumer Key on Pocket.</a></p>
           <p>Include the PocketSharp namespace and it's associated models (you will need them later):</p>
@@ -66,8 +83,8 @@ using PocketSharp.Models;</code></pre>
 
           <p>Do a simple request - e.g. a search for <code>CSS</code>:</p>
 
-            <pre class="language-clike"><code>_client.Search(&quot;css&quot;).ForEach(
-	 item =&gt; Console.WriteLine(item.ID + &quot; | &quot; + item.Title)
+            <pre class="language-clike"><code>await _client.Search(&quot;css&quot;).ForEach(
+	 item =&gt; Debug.WriteLine(item.ID + &quot; | &quot; + item.Title)
   );</code></pre>
 
           <p>Which will output:</p>
@@ -109,16 +126,27 @@ using PocketSharp.Models;</code></pre>
 
           <h2>Release History</h2>
         <ul>
-          <li>2013-08-16 v0.3.2 tag modification fixed and full retrieval of items for Retrieve method</li>
-          <li>2013-07-07 v0.3.1 authentication fixes</li>
-          <li>2013-07-02 v0.3.0 update authentication process </li>
-          <li>2013-06-27 v0.2.0 add, modify item &amp; modify tags</li>
-          <li>2013-06-26 v0.1.0 authentication &amp; retrieve functionality</li>
+          <li><b>2.0.1</b> (2013-10-19) Catch HttpRequestExceptions and provide as InnerException for PocketException + Read Article from URI (method overload)</li>
+          <li><b>2.0.0</b> (2013-10-17) Add Reader API</li>
+          <li><b>1.5.1</b> (2013-09-30) <code>RetrieveFilter.All</code> didn't work; improve search speed</li>
+          <li><b>1.5.0</b> (2013-09-28) add statistics and registration API</li>
+          <li><b>1.4.0</b> (2013-09-21) rename <code>Retrieve</code> to <code>Get</code> + update IntelliSense documentation + add <code>GetTags</code> method</li>
+          <li><b>1.3.0</b> (2013-09-19) get Item by ID + tag modification bugfixes</li>
+          <li><b>1.2.1</b> (2013-09-18) correct parameter conversion for DateTime and Boolean</li>
+          <li><b>1.2.0</b> (2013-09-17) simplified retrieve methods</li>
+          <li><b>1.1.0</b> (2013-09-17) fix modification requests</li>
+          <li><b>1.0.0</b> (2013-09-15) convert to PCL &amp; implement async</li>
+          <li><b>0.3.2</b> (2013-08-16) tag modification fixed and full retrieval of items for Retrieve method</li>
+          <li><b>0.3.1</b> (2013-07-07) authentication fixes</li>
+          <li><b>0.3.0</b> (2013-07-02) update authentication process </li>
+          <li><b>0.2.0</b> (2013-06-27) add, modify item &amp; modify tags</li>
+          <li><b>0.1.0</b> (2013-06-26) authentication &amp; retrieve functionality</li>
         </ul>
         <h2>Used Packages</h2>
         <ul>
-          <li><a href="http://restsharp.org/">RestSharp</a></li>
-          <li><a href="https://github.com/ServiceStack/ServiceStack.Text">ServiceStack.Text</a></li>
+          <li><a href="https://www.nuget.org/packages/Microsoft.Bcl.Async/">Microsoft.Bcl.Async</a></li>
+          <li><a href="https://www.nuget.org/packages/Microsoft.Net.Http/">Microsoft.Net.Http</a></li>
+          <li><a href="https://www.nuget.org/packages/Newtonsoft.Json/">Newtonsoft.Json</a></li>
         </ul>
         <h2>Contributors</h2>
         <p>
@@ -129,7 +157,7 @@ using PocketSharp.Models;</code></pre>
 
 
 
-      <div data-part="authentication">
+      <div data-part="account">
 
 
         <h2>Authentication</h2>
@@ -138,7 +166,7 @@ using PocketSharp.Models;</code></pre>
         <h4>1) Generate authentication URI</h4>
         <p>Receive the <strong>request code</strong> and <strong>authentication URI</strong> from the library by calling <code>string GetRequestCode()</code>:</p>
 
-          <pre class="language-clike"><code>string requestCode = _client.GetRequestCode();
+          <pre class="language-clike"><code>string requestCode = await _client.GetRequestCode();
 // 0f453f2d-1605-8584-28fd-39af8e
 Uri authenticationUri = _client.GenerateAuthenticationUri();
 // https://getpocket.com/auth/authorize?request_token=0f453f2d-1605-8584-28fd-39af8e&amp;redirect_uri=http%253a%252f%252fceecore.com</code></pre>
@@ -149,9 +177,9 @@ Uri authenticationUri = _client.GenerateAuthenticationUri();
         <p>
           <img src="https://raw.github.com/ceee/PocketSharp/master/PocketSharp/authentication-screen.png" alt="authentication screen" /></p>
         <h4>3) Get Access Code</h4>
-        <p>Call <code>string GetAccessCode(string requestCode = null)</code></p>
+        <p>Call <code>Task&lt;string&gt; GetAccessCode(string requestCode = null)</code></p>
 
-          <pre class="language-clike"><code>string accessCode = _client.GetAccessCode();
+          <pre class="language-clike"><code>string accessCode = await _client.GetAccessCode();
 // fa8bfc16-69b3-4d22-7db7-84a58d</code></pre>
 
         <p>
@@ -164,51 +192,62 @@ Note that <code>GetAccessCode</code> can only be called with an existing <em>req
           <br>
           Without it you would always have to redo the authentication process.
         </p>
-        
-      </div>
 
-      
-      <div data-part="retrieve">
-
-        <h2>Retrieve</h2>
-        <p>Get list of all items:</p>
-
-          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = _client.Retrieve();
-// equivalent to: _client.Retrieve(RetrieveFilter.All)</code></pre>
-
-        <p>Find items by a tag:</p>
-
-          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = _client.SearchByTag(&quot;tutorial&quot;);</code></pre>
-
-        <p>Find items by a search string:</p>
-
-          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = _client.Search(&quot;css&quot;);</code></pre>
-
-        <p>Find items by a filter:</p>
-
-          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = _client.Retrieve(RetrieveFilter.Favorite); // only favorites</code></pre>
-
-        <p>The RetrieveFilter Enum is specified as follows:</p>
-
-          <pre class="language-clike"><code>enum RetrieveFilter { All, Unread, Archive, Favorite, Article, Video, Image }</code></pre>
-
-        <h4>Custom Parameters</h4>
-        <p>You can create a completely custom parameter list for retrieval with the POCO <code>RetrieveParameters</code>:</p>
-
-          <pre class="language-clike"><code>
-var parameters = new RetrieveParameters()
-{
-	Count = 50,
-	Offset = 100,
-	Sort = SortEnum.oldest
-	...
-};
-List&lt;pocketitem&gt; items = _client.Retrieve(parameters);
+        <h2>Account Registration</h2>
+<p>The <code>RegisterAccount</code> method exists in Pocket API v3, but is currently undocumented.
+<br>The user cannot authenticate directly after registration, as the account has to be activated via an opt-in link, which is sent to the e-mail address.</p>
+<pre class="language-clike"><code>bool isSuccess = await _client.RegisterAccount(&quot;myUsername&quot;, &quot;me@mymail.com&quot;, &quot;mypassword&quot;);
 </code></pre>
 
+<p>After registration you have to remind the user to check his/her mail account.</p>
 
       </div>
 
+
+      <div data-part="get">
+
+        <h2>Get</h2>
+
+<p>Get list of all items:</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Get();
+// equivalent to: await _client.Get(RetrieveFilter.All)</code></pre></p>
+<p>Get a list with specific parameters (explanation in the <a href="http://getpocket.com/developer/docs/v3/retrieve">Pocket Docs</a>):</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Get(
+  State? state = null,
+  bool? favorite = null,
+  string tag = null,
+  ContentType? contentType = null,
+  Sort? sort = null,
+  string search = null,
+  string domain = null,
+  DateTime? since = null,
+  int? count = null,
+  int? offset = null
+);</code></pre></p>
+<p>It's best to use parameters as <em>named parameters</em>, to avoid typing <code>null</code> values:</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Get(count: 10, offset: 20, sort: Sort.oldest);</code></pre></p>
+<p>Get item by ID:</p>
+<p><pre class="language-clike"><code>PocketItem item = await _client.Get(1298198);</code></pre></p>
+<p>Find items by a tag:</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.SearchByTag(&quot;tutorial&quot;);</code></pre></p>
+<p>Find items by a search string.<br>PocketSharp uses an internal search, which is significantly faster than the Search API by Pocket.</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Search(&quot;css&quot;);</code></pre></p>
+<p>Find items by a search string by already available items:</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Search(myPocketItemList, &quot;css&quot;);</code></pre></p>
+<p>Get all tags:</p>
+<p><pre class="language-clike"><code>List&lt;PocketTag&gt; items = await _client.GetTags();</code></pre></p>
+<p>Get a filtered list:</p>
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Get(RetrieveFilter.Favorite);
+// returns favorites only</code></pre></p>
+<p>The RetrieveFilter Enum is specified as follows:</p>
+<p><pre class="language-clike"><code>enum RetrieveFilter { All, Unread, Archive, Favorite, Article, Video, Image }</code></pre></p>
+<h2>Statistics</h2>
+<p>The Pocket API supports retrieval of a simple statistics object.</p>
+<pre class="language-clike"><code>PocketStatistics statistics = await client.Statistics();
+// PocketStatistics: [CountAll], [CountRead], [CountUnread]
+</code></pre>
+      </div>
+
       <div data-part="add">
 
         <h2>Add</h2>
@@ -217,67 +256,101 @@ List&lt;pocketitem&gt; items = _client.Retrieve(parameters);
 Accepts four parameters, with <code>uri</code> being required.
         </p>
 
-          <pre class="language-clike"><code>PocketItem Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)</code></pre>
+          <pre class="language-clike"><code>Task&lt;PocketItem&gt; Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)</code></pre>
 
         <p>Example:</p>
 
-          <pre class="language-clike"><code>PocketItem newItem = _client.Add(
+          <pre class="language-clike"><code>PocketItem newItem = await _client.Add(
 	new Uri(&quot;http:&frasl;&frasl;www.neowin.net/news/full-build-2013-conference-sessions-listing-revealed&quot;),
 	new string[] { &quot;microsoft&quot;, &quot;neowin&quot;, &quot;build&quot; }
 );</code></pre>
 
         <p>The title can be included for cases where an item does not have a title, which is typical for image or PDF URLs. If Pocket detects a title from the content of the page, this parameter will be ignored.</p>
         <p>If you are adding Pocket support to a Twitter client, please send along a reference to the tweet status id (with the tweetID). This allows Pocket to show the original tweet alongside the article.</p>
-        
+
       </div>
 
       <div data-part="modify">
-        
+
         <h2>Modify</h2>
         <p>All Modify methods accept either the itemID (as int) or a <code>PocketItem</code> as parameter.</p>
         <p>Archive the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.Archive(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.Archive(myPocketItem);
 </code></pre>
 
         <p>Un-archive the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.Unarchive(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.Unarchive(myPocketItem);
 </code></pre>
 
         <p>Favorites the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.Favorite(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.Favorite(myPocketItem);
 </code></pre>
 
         <p>Un-favorites the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.Unfavorite(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.Unfavorite(myPocketItem);
 </code></pre>
 
         <p>Deletes the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.Delete(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.Delete(myPocketItem);
 </code></pre>
 
         <h4>Modify tags</h4>
         <p>Add tags to the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.AddTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
+        <pre class="language-clike"><code>bool isSuccess = await _client.AddTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
 </code></pre>
 
         <p>Remove tags from the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.RemoveTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
+        <pre class="language-clike"><code>bool isSuccess = await _client.RemoveTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
 </code></pre>
 
         <p>Remove all tags from the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.RemoveTags(myPocketItem);
+        <pre class="language-clike"><code>bool isSuccess = await _client.RemoveTags(myPocketItem);
 </code></pre>
 
         <p>Replaces all existing tags with new ones for the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.ReplaceTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
+        <pre class="language-clike"><code>bool isSuccess = await _client.ReplaceTags(myPocketItem, new string[] { &quot;css&quot;, &quot;2013&quot; });
 </code></pre>
 
         <p>Renames a tag for the specified item:</p>
-        <pre class="language-clike"><code>bool isSuccess = _client.RenameTag(myPocketItem, &quot;oldTagName&quot;, &quot;newTagName&quot;);
+        <pre class="language-clike"><code>bool isSuccess = await _client.RenameTag(myPocketItem, &quot;oldTagName&quot;, &quot;newTagName&quot;);
 </code></pre>
 
      </div>
 
+     <div data-part="reader">
+      <h2>Article Reader API</h2>
+      <p>PocketSharp 2.0 implements a new <strong>Reader API</strong>.</p>
+<p>This API does _not _use the official (and private) Article View API by Pocket. It is based on a custom PCL port of NReadability and SgmlReader, which are included in the solution.</p>
+<h3>What's it all about?</h3>
+<p>The Reader API extracts the main content of a website and returns the extracted content as HTML and it's associated title (which should already be available in the <code>PocketItem</code>).</p>
+<p>This content can be encapsulated in a <code>&lt;body&gt;</code>-Tag and displayed as a readable website with a custom CSS (it's up to you!).</p>
+<h3>Implementation</h3>
+<p>As with all PocketSharp implementations you have to require the main namespace and it's model namespace:</p>
+<p><pre class="language-clike"><code>using PocketSharp;
+using PocketSharp.Models;</code></pre></p>
+<p>The <code>PocketReader</code> is a seperated class with it's own <code>HttpClient</code>. Create an instance of it:</p>
+<p><pre class="language-clike"><code>PocketReader reader = new PocketReader();</code></pre></p>
+<p><code>PocketReader</code> needs a <code>PocketItem</code> as a parameter to correctly identify its <code>ID</code> and <code>Uri</code>. With this requirement you can successfully query for an articles content.<br>
+Don't forget exception handling in case a website is down or not accessible.</p>
+<p><pre class="language-clike"><code>PocketArticle article;
+try
+{
+  article = await reader.Read(myPocketItem);
+  // PocketArticle: {
+  //   int PocketItemID
+  //   string Content
+  //   string Title
+  //   string NextPageUrl
+  // }
+}
+catch (PocketException exc)
+{
+  // handle exception
+}
+</code></pre></p>
+
+    </di>
+
       </article>
     </div>
 

PocketSharp.sln

@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{F1CEA363-7039-40BA-9744-0071F46BB90C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{817200C3-A327-4E35-9B5F-63A51C088577}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Wpf", "PocketSharp.Examples\PocketSharp.Wpf\PocketSharp.Wpf.csproj", "{775569C2-987F-4AC4-8BA5-A315A21ED1B7}"
@@ -15,6 +13,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Silverlight", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.WP8", "PocketSharp.Examples\PocketSharp.WP8\PocketSharp.WP8.csproj", "{47721A56-2128-4C5A-8B92-995FFC353304}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{CA3C491B-A8CA-426C-A0BB-E91636767467}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19DD45B5-B849-49E7-89D6-16C89B9B96C7}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NReadability", "PortablePorts\NReadability\NReadability.csproj", "{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SgmlReader", "PortablePorts\SgmlReader\SgmlReader.csproj", "{9112414C-E2D1-43BA-A298-A89F77D94332}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PortablePorts", "PortablePorts", "{82F79DE3-76D7-4FCB-AA7E-16BA7E363E0D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,14 +38,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|x86.ActiveCfg = Release|Any CPU
 		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -43,6 +48,7 @@ Global
 		{817200C3-A327-4E35-9B5F-63A51C088577}.Release|x86.ActiveCfg = Release|Any CPU
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,6 +81,30 @@ Global
 		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.ActiveCfg = Release|x86
 		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Build.0 = Release|x86
 		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Deploy.0 = Release|x86
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x86.ActiveCfg = Release|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Release|ARM.ActiveCfg = Release|Any CPU
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}.Release|x86.ActiveCfg = Release|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9112414C-E2D1-43BA-A298-A89F77D94332}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -83,5 +113,7 @@ Global
 		{775569C2-987F-4AC4-8BA5-A315A21ED1B7} = {AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}
 		{656345D2-AF4C-4F88-9C9F-EBF54D7691DB} = {AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}
 		{47721A56-2128-4C5A-8B92-995FFC353304} = {AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}
+		{9112414C-E2D1-43BA-A298-A89F77D94332} = {82F79DE3-76D7-4FCB-AA7E-16BA7E363E0D}
+		{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2} = {82F79DE3-76D7-4FCB-AA7E-16BA7E363E0D}
 	EndGlobalSection
 EndGlobal

PocketSharp/Components/Account.cs

@@ -0,0 +1,163 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+    /// <summary>
+    /// Retrieves the requestCode from Pocket, which is used to generate the Authentication URI to authenticate the user
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="System.NullReferenceException">Authentication methods need a callbackUri on initialization of the PocketClient class</exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<string> GetRequestCode()
+    {
+      // check if request code is available
+      if (CallbackUri == null)
+      {
+        throw new NullReferenceException("Authentication methods need a callbackUri on initialization of the PocketClient class");
+      }
+
+      // do request
+      RequestCode response = await Request<RequestCode>("oauth/request", new Dictionary<string, string>()
+      { 
+        { "redirect_uri", CallbackUri } 
+      }, false);
+
+      // save code to client
+      RequestCode = response.Code;
+
+      // generate redirection URI and return
+      return RequestCode;
+    }
+
+
+    /// <summary>
+    /// Generate Authentication URI from requestCode
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>A valid URI to redirect the user to.</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    public Uri GenerateAuthenticationUri(string requestCode = null)
+    {
+      // check if request code is available
+      if(RequestCode == null && requestCode == null)
+      {
+        throw new NullReferenceException("Call GetRequestCode() first to receive a request_code");
+      }
+
+      // override property with given param if available
+      if(requestCode != null)
+      {
+        RequestCode = requestCode;
+      }
+
+      return new Uri(string.Format(authentificationUri, RequestCode, CallbackUri));
+    }
+
+
+    /// <summary>
+    /// Requests the access code after authentication
+    /// The access code has to permanently be stored within the users session, and should be passed in the constructor for all future PocketClient initializations. 
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>The permanent access code, which is used to authenticate the user with the application</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    /// <exception cref="PocketException"></exception>
+    [Obsolete("Please use GetUser instead")]
+    public async Task<string> GetAccessCode(string requestCode = null)
+    {
+      await GetUser(requestCode);
+      return AccessCode;
+    }
+
+
+    /// <summary>
+    /// Requests the access code and username after authentication
+    /// The access code has to permanently be stored within the users session, and should be passed in the constructor for all future PocketClient initializations. 
+    /// </summary>
+    /// <param name="requestCode">The request code.</param>
+    /// <returns>The authenticated user</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    public async Task<PocketUser> GetUser(string requestCode = null)
+    {
+      // check if request code is available
+      if (RequestCode == null && requestCode == null)
+      {
+        throw new NullReferenceException("Call GetRequestCode() first to receive a request_code");
+      }
+
+      // override property with given param if available
+      if (requestCode != null)
+      {
+        RequestCode = requestCode;
+      }
+
+      // do request
+      PocketUser response = await Request<PocketUser>("oauth/authorize", new Dictionary<string, string>()
+      {
+        {"code", RequestCode}
+      }, false);
+
+      // save code to client
+      AccessCode = response.Code;
+
+      return response;
+    }
+
+
+    /// <summary>
+    /// Registers a new account.
+    /// Account has to be activated via a activation email sent by Pocket.
+    /// </summary>
+    /// <param name="username">The username.</param>
+    /// <param name="email">The email.</param>
+    /// <param name="password">The password.</param>
+    /// <returns></returns>
+    /// <exception cref="System.ArgumentNullException">All parameters are required</exception>
+    /// <exception cref="System.FormatException">
+    /// Invalid email address.
+    /// or
+    /// Invalid username. Please only use letters, numbers, and/or dashes and between 1-20 characters.
+    /// </exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RegisterAccount(string username, string email, string password)
+    {
+      if (username == null || email == null || password == null)
+      {
+        throw new ArgumentNullException("All parameters are required");  
+      }
+
+      Match matchEmail = Regex.Match(email, @"^([\w\.\-]+)@([\w\-]+)((\.(\w){2,10}))$");
+      Match matchUsername = Regex.Match(username, @"^([\w\-_]{1,20})$");
+
+      if (!matchEmail.Success)
+      {
+        throw new FormatException("(1) Invalid email address.");
+      }
+
+      if (!matchUsername.Success)
+      {
+        throw new FormatException("(2) Invalid username. Please only use letters, numbers, and/or dashes and between 1-20 characters.");
+      }
+
+      RegisterParameters parameters = new RegisterParameters()
+      {
+        Username = username,
+        Email = email,
+        Password = password
+      };
+
+      ResponseBase response = await Request<ResponseBase>("signup", parameters.Convert(), false);
+
+      return response.Status;
+    }
+  }
+}

PocketSharp/Components/Add.cs

@@ -16,7 +16,8 @@ namespace PocketSharp
     /// <param name="tags">A comma-separated list of tags to apply to the item</param>
     /// <param name="title">This can be included for cases where an item does not have a title, which is typical for image or PDF URLs. If Pocket detects a title from the content of the page, this parameter will be ignored.</param>
     /// <param name="tweetID">If you are adding Pocket support to a Twitter client, please send along a reference to the tweet status id. This allows Pocket to show the original tweet alongside the article.</param>
-    /// <returns></returns>
+    /// <returns>A simple representation of the saved item which doesn't contain all data (is only returned by calling the Retrieve method)</returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<PocketItem> Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)
     {
       AddParameters parameters = new AddParameters()
@@ -27,20 +28,9 @@ namespace PocketSharp
         TweetID = tweetID
       };
 
-      Add response = await Request<Add>("add", parameters.Convert(), true);
+      Add response = await Request<Add>("add", parameters.Convert());
 
       return response.Item;
     }
-
-
-    /// <summary>
-    /// Adds a new item to pocket
-    /// </summary>
-    /// <param name="uri">The URL of the item you want to save</param>
-    /// <returns></returns>
-    public async Task<PocketItem> Add(Uri uri)
-    {
-      return await Add(uri, null);
-    }
   }
 }

PocketSharp/Components/Authentification.cs

@@ -1,85 +0,0 @@
-using PocketSharp.Models;
-using System;
-using System.Threading.Tasks;
-
-namespace PocketSharp
-{
-  /// <summary>
-  /// PocketClient
-  /// </summary>
-  public partial class PocketClient
-  {
-    /// <summary>
-    /// Retrieves the requestCode from Pocket.
-    /// </summary>
-    /// <returns></returns>
-    public async Task<string> GetRequestCode()
-    {
-      // check if request code is available
-      if (CallbackUri == null)
-      {
-        throw new PocketException("Authentication methods need a callbackUri on initialization of the PocketClient class");
-      }
-
-      // do request
-      RequestCode response = await Request<RequestCode>("oauth/request", Utilities.CreateParamInList("redirect_uri", CallbackUri));
-
-      // save code to client
-      RequestCode = response.Code;
-
-      // generate redirection URI and return
-      return RequestCode;
-    }
-
-
-    /// <summary>
-    /// Generate Authentication URI from requestCode
-    /// </summary>
-    /// <param name="requestCode">The requestCode.</param>
-    /// <returns></returns>
-    public Uri GenerateAuthenticationUri(string requestCode = null)
-    {
-      // check if request code is available
-      if(RequestCode == null && requestCode == null)
-      {
-        throw new PocketException("Call GetRequestCode() first to receive a request_code");
-      }
-
-      // override property with given param if available
-      if(requestCode != null)
-      {
-        RequestCode = requestCode;
-      }
-
-      return new Uri(string.Format(authentificationUri, RequestCode, CallbackUri));
-    }
-
-
-    /// <summary>
-    /// Requests the access code after authentification
-    /// </summary>
-    /// <returns></returns>
-    public async Task<string> GetAccessCode(string requestCode = null)
-    {
-      // check if request code is available
-      if(RequestCode == null && requestCode == null)
-      {
-        throw new PocketException("Call GetRequestCode() first to receive a request_code");
-      }
-
-      // override property with given param if available
-      if(requestCode != null)
-      {
-        RequestCode = requestCode;
-      }
-
-      // do request
-      AccessCode response = await Request<AccessCode>("oauth/authorize", Utilities.CreateParamInList("code", RequestCode));
-
-      // save code to client
-      AccessCode = response.Code;
-
-      return AccessCode;
-    }
-  }
-}

PocketSharp/Components/Get.cs

@@ -0,0 +1,228 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+      /// <summary>
+      /// Retrieves items from pocket
+      /// with the given filters
+      /// </summary>
+      /// <param name="state">The state.</param>
+      /// <param name="favorite">The favorite.</param>
+      /// <param name="tag">The tag.</param>
+      /// <param name="contentType">Type of the content.</param>
+      /// <param name="sort">The sort.</param>
+      /// <param name="search">The search.</param>
+      /// <param name="domain">The domain.</param>
+      /// <param name="since">The since.</param>
+      /// <param name="count">The count.</param>
+      /// <param name="offset">The offset.</param>
+      /// <returns></returns>
+      /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketItem>> Get(
+      State? state = null,
+      bool? favorite = null,
+      string tag = null,
+      ContentType? contentType = null,
+      Sort? sort = null,
+      string search = null,
+      string domain = null,
+      DateTime? since = null,
+      int? count = null,
+      int? offset = null
+    )
+    {
+      RetrieveParameters parameters = new RetrieveParameters()
+      {
+        State = state,
+        Favorite = favorite,
+        Tag = tag,
+        ContentType = contentType,
+        Sort = sort,
+        DetailType = DetailType.complete,
+        Search = search,
+        Domain = domain,
+        Since = since,
+        Count = count,
+        Offset = offset
+      };
+
+      Retrieve response = await Request<Retrieve>("get", parameters.Convert());
+
+      return response.Items;
+    }
+
+
+    /// <summary>
+    /// Retrieves an item by a given ID
+    /// Note: The Pocket API contains no method, which allows to retrieve a single item, so all items are retrieved and filtered locally by the ID.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketItem> Get(int itemID)
+    {
+      List<PocketItem> items = await Get(
+        state: State.all  
+      );
+      
+      return items.SingleOrDefault<PocketItem>(item => item.ID == itemID);
+    }
+
+
+    /// <summary>
+    /// Retrieves all items by a given filter
+    /// </summary>
+    /// <param name="filter">The filter.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketItem>> Get(RetrieveFilter filter)
+    {
+      RetrieveParameters parameters = new RetrieveParameters();
+
+      switch(filter)
+      {
+        case RetrieveFilter.Article:
+          parameters.ContentType = ContentType.article;
+          break;
+        case RetrieveFilter.Image:
+          parameters.ContentType = ContentType.image;
+          break;
+        case RetrieveFilter.Video:
+          parameters.ContentType = ContentType.video;
+          break;
+        case RetrieveFilter.Favorite:
+          parameters.Favorite = true;
+          break;
+        case RetrieveFilter.Unread:
+          parameters.State = State.unread;
+          break;
+        case RetrieveFilter.Archive:
+          parameters.State = State.archive;
+          break;
+        case RetrieveFilter.All:
+          parameters.State = State.all;
+          break;
+      }
+
+      parameters.DetailType = DetailType.complete;
+
+      Retrieve response = await Request<Retrieve>("get", parameters.Convert());
+
+      return response.Items;
+    }
+
+
+    /// <summary>
+    /// Retrieves all available tags.
+    /// Note: The Pocket API contains no method, which allows to retrieve all tags, so all items are retrieved and the associated tags extracted.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketTag>> GetTags()
+    {
+      List<PocketItem> items = await Get(
+        state: State.all
+      );
+
+      return items.Where(item => item.Tags != null)
+                  .SelectMany(item => item.Tags)
+                  .GroupBy(item => item.Name)
+                  .Select(item => item.First())
+                  .ToList<PocketTag>();
+    }
+
+
+    /// <summary>
+    /// Retrieves items by tag
+    /// </summary>
+    /// <param name="tag">The tag.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketItem>> SearchByTag(string tag)
+    {
+      return await Get(tag: tag);
+    }
+
+
+    /// <summary>
+    /// Retrieves items which match the specified search string in title and URI
+    /// </summary>
+    /// <param name="searchString">The search string.</param>
+    /// <returns></returns>
+    /// <exception cref="System.ArgumentOutOfRangeException">Search string length has to be a minimum of 2 chars</exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketItem>> Search(string searchString, bool searchInUri = true)
+    {
+      List<PocketItem> items = await Get(RetrieveFilter.All);
+
+      return Search(items, searchString);
+    }
+
+
+    /// <summary>
+    /// Finds the specified search string in title and URI for an available list of items
+    /// </summary>
+    /// <param name="availableItems">The available items.</param>
+    /// <param name="searchString">The search string.</param>
+    /// <returns></returns>
+    /// <exception cref="System.ArgumentOutOfRangeException">Search string length has to be a minimum of 2 chars</exception>
+    /// <exception cref="PocketException"></exception>
+    public List<PocketItem> Search(List<PocketItem> availableItems, string searchString)
+    {
+      if (searchString.Length < 2)
+      {
+        throw new ArgumentOutOfRangeException("Search string length has to be a minimum of 2 chars");
+      }
+
+      return availableItems.Where(item => (
+        (!String.IsNullOrEmpty(item.FullTitle) && item.FullTitle.ToLower().Contains(searchString))
+        || item.Uri.ToString().ToLower().Contains(searchString)
+      )).ToList();
+    }
+  }
+
+
+  /// <summary>
+  /// Filter for simple retrieve requests
+  /// </summary>
+  public enum RetrieveFilter
+  {
+    /// <summary>
+    /// All types
+    /// </summary>
+    All,
+    /// <summary>
+    /// Only unread items
+    /// </summary>
+    Unread,
+    /// <summary>
+    /// Archived items
+    /// </summary>
+    Archive,
+    /// <summary>
+    /// Favorited items
+    /// </summary>
+    Favorite,
+    /// <summary>
+    /// Only articles
+    /// </summary>
+    Article,
+    /// <summary>
+    /// Only videos
+    /// </summary>
+    Video,
+    /// <summary>
+    /// Only images
+    /// </summary>
+    Image
+  }
+}

PocketSharp/Components/Modify.cs

@@ -13,9 +13,10 @@ namespace PocketSharp
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Archive(int itemID)
     {
-      return await PutSendActionDefault(itemID, "archive");
+      return await SendDefault(itemID, "archive");
     }
 
 
@@ -24,6 +25,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="item">The item.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Archive(PocketItem item)
     {
       return await Archive(item.ID);
@@ -35,9 +37,10 @@ namespace PocketSharp
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Unarchive(int itemID)
     {
-      return await PutSendActionDefault(itemID, "readd");
+      return await SendDefault(itemID, "readd");
     }
 
 
@@ -46,6 +49,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="item">The item.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Unarchive(PocketItem item)
     {
       return await Unarchive(item.ID);
@@ -57,9 +61,10 @@ namespace PocketSharp
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Favorite(int itemID)
     {
-      return await PutSendActionDefault(itemID, "favorite");
+      return await SendDefault(itemID, "favorite");
     }
 
 
@@ -68,6 +73,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="item">The item.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Favorite(PocketItem item)
     {
       return await Favorite(item.ID);
@@ -79,9 +85,10 @@ namespace PocketSharp
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Unfavorite(int itemID)
     {
-      return await PutSendActionDefault(itemID, "unfavorite");
+      return await SendDefault(itemID, "unfavorite");
     }
 
 
@@ -90,6 +97,7 @@ namespace PocketSharp
     /// </summary>
     /// <param name="item">The item.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Unfavorite(PocketItem item)
     {
       return await Unfavorite(item.ID);
@@ -101,9 +109,10 @@ namespace PocketSharp
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> Delete(int itemID)
     {
-      return await PutSendActionDefault(itemID, "delete");
+      return await SendDefault(itemID, "delete");
     }
 
 
@@ -124,9 +133,9 @@ namespace PocketSharp
     /// <param name="itemID">The item ID.</param>
     /// <param name="action">The action.</param>
     /// <returns></returns>
-    protected async Task<bool> PutSendActionDefault(int itemID, string action)
+    protected async Task<bool> SendDefault(int itemID, string action)
     {
-      return await PutSendAction(new ActionParameter()
+      return await Send(new ActionParameter()
       {
         Action = action,
         ID = itemID

PocketSharp/Components/ModifyTags.cs

@@ -9,23 +9,25 @@ namespace PocketSharp
   public partial class PocketClient
   {
     /// <summary>
-    /// Adds the specified tags.
+    /// Adds the specified tags to an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> AddTags(int itemID, string[] tags)
     {
-      return await PutSendActionForTags(itemID, "tags_add", tags);
+      return await SendTags(itemID, "tags_add", tags);
     }
 
 
     /// <summary>
-    /// Adds the specified tags.
+    /// Adds the specified tags to an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> AddTags(PocketItem item, string[] tags)
     {
       return await AddTags(item.ID, tags);
@@ -33,23 +35,25 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Removes the specified tags.
+    /// Removes the specified tags from an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> RemoveTags(int itemID, string[] tags)
     {
-      return await PutSendActionForTags(itemID, "tags_remove", tags);
+      return await SendTags(itemID, "tags_remove", tags);
     }
 
 
     /// <summary>
-    /// Removes the specified tags.
+    /// Removes the specified tags from an item.
     /// </summary>
     /// <param name="item">The item.</param>
-    /// <param name="tags">The tags.</param>
+    /// <param name="tags">The tag.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> RemoveTags(PocketItem item, string[] tags)
     {
       return await RemoveTags(item.ID, tags);
@@ -57,21 +61,49 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Clears all tags.
+    /// Removes a tag from an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="tags">The tag.</param>
     /// <returns></returns>
-    public async Task<bool> RemoveTags(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTag(int itemID, string tag)
     {
-      return await PutSendActionDefault(itemID, "tags_clear");
+      return await SendTags(itemID, "tags_remove", new string[] { tag });
     }
 
 
     /// <summary>
-    /// Clears all tags.
+    /// Removes a tag from an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="tags">The tags.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTag(PocketItem item, string tag)
+    {
+      return await RemoveTag(item.ID, tag);
+    }
+
+
+    /// <summary>
+    /// Clears all tags from an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTags(int itemID)
+    {
+      return await SendDefault(itemID, "tags_clear");
+    }
+
+
+    /// <summary>
+    /// Clears all tags from an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> RemoveTags(PocketItem item)
     {
       return await RemoveTags(item.ID);
@@ -79,23 +111,25 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Replaces all existing tags with new ones.
+    /// Replaces all existing tags with the given tags in an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> ReplaceTags(int itemID, string[] tags)
     {
-      return await PutSendActionForTags(itemID, "tags_replace", tags);
+      return await SendTags(itemID, "tags_replace", tags);
     }
 
 
     /// <summary>
-    /// Replaces all existing tags with new ones.
+    /// Replaces all existing tags with the given new ones in an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> ReplaceTags(PocketItem item, string[] tags)
     {
       return await ReplaceTags(item.ID, tags);
@@ -103,15 +137,16 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Renames a tag.
+    /// Renames a tag in an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="oldTag">The old tag.</param>
     /// <param name="newTag">The new tag name.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> RenameTag(int itemID, string oldTag, string newTag)
     {
-      return await PutSendAction(new ActionParameter()
+      return await Send(new ActionParameter()
       {
         Action = "tag_rename",
         ID = itemID,
@@ -122,12 +157,13 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Renames a tag.
+    /// Renames a tag in an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="oldTag">The old tag.</param>
     /// <param name="newTag">The new tag name.</param>
     /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
     public async Task<bool> RenameTag(PocketItem item, string oldTag, string newTag)
     {
       return await RenameTag(item.ID, oldTag, newTag);
@@ -141,9 +177,9 @@ namespace PocketSharp
     /// <param name="action">The action.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
-    protected async Task<bool> PutSendActionForTags(int itemID, string action, string[] tags)
+    protected async Task<bool> SendTags(int itemID, string action, string[] tags)
     {
-      return await PutSendAction(new ActionParameter()
+      return await Send(new ActionParameter()
       {
         Action = action,
         ID = itemID,

PocketSharp/Components/Retrieve.cs

@@ -1,137 +0,0 @@
-using PocketSharp.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace PocketSharp
-{
-  /// <summary>
-  /// PocketClient
-  /// </summary>
-  public partial class PocketClient
-  {
-    /// <summary>
-    /// Retrieves all items from pocket
-    /// </summary>
-    /// <param name="parameters">parameters, which are mapped to the officials from http://getpocket.com/developer/docs/v3/retrieve </param>
-    /// <returns></returns>
-    public async Task<List<PocketItem>> Retrieve(RetrieveParameters parameters)
-    {
-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
-
-      return response.Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves all items with a filter from pocket
-    /// </summary>
-    /// <param name="filter">The filter.</param>
-    /// <returns></returns>
-    public async Task<List<PocketItem>> Retrieve(RetrieveFilter filter = RetrieveFilter.All)
-    {
-      RetrieveParameters parameters = new RetrieveParameters();
-
-      switch(filter)
-      {
-        case RetrieveFilter.Article:
-          parameters.ContentType = ContentType.article;
-          break;
-        case RetrieveFilter.Image:
-          parameters.ContentType = ContentType.image;
-          break;
-        case RetrieveFilter.Video:
-          parameters.ContentType = ContentType.video;
-          break;
-        case RetrieveFilter.Favorite:
-          parameters.Favorite = true;
-          break;
-        case RetrieveFilter.Unread:
-          parameters.State = State.unread;
-          break;
-        case RetrieveFilter.Archive:
-          parameters.State = State.archive;
-          break;
-      }
-
-      parameters.DetailType = DetailType.complete;
-
-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
-
-      return response.Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves items by tag from pocket
-    /// </summary>
-    /// <param name="tag">The tag.</param>
-    /// <returns></returns>
-    public async Task<List<PocketItem>> SearchByTag(string tag)
-    {
-      RetrieveParameters parameters = new RetrieveParameters()
-      {
-        Tag = tag,
-        DetailType = DetailType.complete
-      };
-
-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
-
-      return response.Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves items from pocket which match the specified search string in title or content
-    /// </summary>
-    /// <param name="searchString">The search string.</param>
-    /// <returns></returns>
-    public async Task<List<PocketItem>> Search(string searchString)
-    {
-      RetrieveParameters parameters = new RetrieveParameters()
-      {
-        Search = searchString,
-        DetailType = DetailType.complete
-      };
-
-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
-
-      return response.Items;
-    }
-  }
-
-
-  /// <summary>
-  /// Filter for simple retrieve requests
-  /// </summary>
-  public enum RetrieveFilter
-  {
-    /// <summary>
-    /// All types
-    /// </summary>
-    All,
-    /// <summary>
-    /// Only unread items
-    /// </summary>
-    Unread,
-    /// <summary>
-    /// Archived items
-    /// </summary>
-    Archive,
-    /// <summary>
-    /// Favorited items
-    /// </summary>
-    Favorite,
-    /// <summary>
-    /// Only articles
-    /// </summary>
-    Article,
-    /// <summary>
-    /// Only videos
-    /// </summary>
-    Video,
-    /// <summary>
-    /// Only images
-    /// </summary>
-    Image
-  }
-}

PocketSharp/Components/Statistics.cs

@@ -0,0 +1,63 @@
+using PocketSharp.Models;
+using System;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+    /// <summary>
+    /// Statistics from the user account.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketStatistics> GetUserStatistics()
+    {
+      return await Request<PocketStatistics>("stats");
+    }
+
+
+    /// <summary>
+    /// Statistics from the user account.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    [Obsolete("Please use GetUserStatistics instead")]
+    public async Task<PocketStatistics> Statistics()
+    {
+      return await GetUserStatistics();
+    }
+
+
+    /// <summary>
+    /// Returns API usage statistics.
+    /// If a request was made before, the data is returned synchronously from the cache.
+    /// Note: This method only works for authenticated users with a given AccessCode.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketLimits> GetUsageLimits()
+    {
+      string rateLimitForConsumerKey = TryGetHeaderValue(lastHeaders, "X-Limit-Key-Limit");
+
+      if (rateLimitForConsumerKey == null)
+      {
+        // this is the fastest way to do a non-failing request to receive the correct headers
+        await Get(count: 1);
+      }
+
+      return new PocketLimits()
+      {
+        RateLimitForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Limit")),
+        RemainingCallsForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Remaining")),
+        SecondsUntilLimitResetsForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Reset")),
+        RateLimitForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Limit")),
+        RemainingCallsForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Remaining")),
+        SecondsUntilLimitResetsForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Reset"))
+      };
+    }
+  }
+}

PocketSharp/Fody.targets

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(MSBuildProjectDirectory)\..\</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise >
+      <PropertyGroup>
+        <FodyKeyFilePath></FodyKeyFilePath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
+    <FodyMessageImportance Condition="$(FodyMessageImportance) == '' Or $(FodyMessageImportance) == '*Undefined*'">Low</FodyMessageImportance>
+    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
+    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)</FodyPath>
+  </PropertyGroup>
+  <UsingTask
+      TaskName="Fody.WeavingTask"
+      AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target
+      AfterTargets="AfterCompile"
+      Name="WinFodyTarget"
+      Condition=" '$(OS)' == 'Windows_NT'">
+
+    <Fody.WeavingTask
+          AssemblyPath="@(IntermediateAssembly)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          MessageImportance="$(FodyMessageImportance)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+  <Target
+      AfterTargets="AfterBuild"
+      Name="NonWinFodyTarget"
+      Condition=" '$(OS)' != 'Windows_NT'">
+    <Fody.WeavingTask
+          AssemblyPath="$(TargetPath)"
+          IntermediateDir="$(IntermediateDir)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          MessageImportance="$(FodyMessageImportance)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="$(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+
+  <!--Support for ncrunch-->
+  <ItemGroup>
+    <None Include="$(FodyPath)\*.*" />
+  </ItemGroup>
+
+</Project>

PocketSharp/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>

PocketSharp/Models/Parameters/ActionParameter.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed for a modify action
   /// </summary>
-  public class ActionParameter
+  [DataContract]
+  internal class ActionParameter
   {
     /// <summary>
     /// Gets or sets the action.
@@ -14,6 +16,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The action.
     /// </value>
+    [DataMember(Name = "action")]
     public string Action { get; set; }
 
     /// <summary>
@@ -22,6 +25,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The ID.
     /// </value>
+    [DataMember(Name = "item_id")]
     public int ID { get; set; }
 
     /// <summary>
@@ -30,6 +34,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The time.
     /// </value>
+    [DataMember(Name = "time")]
     public DateTime? Time { get; set; }
 
     // specific params
@@ -40,6 +45,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tags.
     /// </value>
+    [DataMember(Name = "tags")]
     public string[] Tags { get; set; }
 
     /// <summary>
@@ -48,6 +54,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The old tag.
     /// </value>
+    [DataMember(Name = "old_tag")]
     public string OldTag { get; set; }
 
     /// <summary>
@@ -56,6 +63,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The new tag.
     /// </value>
+    [DataMember(Name = "new_tag")]
     public string NewTag { get; set; }
 
 
@@ -63,16 +71,16 @@ namespace PocketSharp.Models
     /// Converts this instance to a parameter list.
     /// </summary>
     /// <returns></returns>
-    public object Convert()
+    public Dictionary<string, object> Convert()
     {
       Dictionary<string, object> parameters = new Dictionary<string, object>
       {
-        { "item_id", ID },
+        { "item_id", ID.ToString() },
         { "action", Action }
       };
 
       if (Time != null)
-        parameters.Add("time", Utilities.GetUnixTimestamp(Time));
+        parameters.Add("time", Time != null ? Utilities.GetUnixTimestamp(Time).ToString() : null);
       if (Tags != null)
         parameters.Add("tags", Tags);
       if (OldTag != null)

PocketSharp/Models/Parameters/AddParameters.cs

@@ -1,12 +1,13 @@
 using System;
-using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed to add a new item
   /// </summary>
-  public class AddParameters
+  [DataContract]
+  internal class AddParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the URI.
@@ -14,6 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
+    [DataMember(Name="url")]
     public Uri Uri { get; set; }
 
     /// <summary>
@@ -22,6 +24,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The title.
     /// </value>
+    [DataMember(Name="title")]
     public string Title { get; set; }
 
     /// <summary>
@@ -30,6 +33,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tags.
     /// </value>
+    [DataMember(Name="tags")]
     public string[] Tags { get; set; }
 
     /// <summary>
@@ -38,21 +42,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tweet ID.
     /// </value>
+    [DataMember(Name="tweet_id")]
     public string TweetID { get; set; }
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      return new List<Parameter>()
-      {
-        Utilities.CreateParam("url", Uri.ToString() ),
-        Utilities.CreateParam("title", Title),
-        Utilities.CreateParam("tags", String.Join(",", Tags)),
-        Utilities.CreateParam("tweet_id", TweetID)
-      };
-    }
   }
 }

PocketSharp/Models/Parameters/ModifyParameters.cs

@@ -1,11 +1,13 @@
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed to modify an item
   /// </summary>
-  public class ModifyParameters
+  [DataContract]
+  internal class ModifyParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the actions.
@@ -13,23 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The actions.
     /// </value>
-    public List<ActionParameter> Actions { get; set; }
-
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      List<object> actions = new List<object>();
-
-      //Actions.ForEach(action => actions.Add(action.Convert()));
-
-      return new List<Parameter>()
-      {
-      //  Utilities.CreateParam("actions", JsonSerializer.SerializeToString(actions))
-      };
-    }
+    [DataMember(Name = "actions")]
+    public List<Dictionary<string, string>> Actions { get; set; }
   }
 }

PocketSharp/Models/Parameters/Parameter.cs

@@ -1,28 +0,0 @@
-
-namespace PocketSharp.Models
-{
-  /// <summary>
-  /// Parameter
-  /// </summary>
-  public class Parameter
-  {
-    /// <summary>
-    /// Name of the parameter
-    /// </summary>
-    public string Name { get; set; }
-
-    /// <summary>
-    /// Value of the parameter
-    /// </summary>
-    public object Value { get; set; }
-
-    /// <summary>
-    /// Return a human-readable representation of this parameter
-    /// </summary>
-    /// <returns>String</returns>
-    public override string ToString()
-    {
-      return string.Format("{0}={1}", Name, Value);
-    }
-  }
-}

PocketSharp/Models/Parameters/Parameters.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Linq;
+using System.Collections;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Parameter
+  /// </summary>
+  internal class Parameters
+  {
+
+    /// <summary>
+    /// Converts an object to a list of HTTP Post parameters.
+    /// </summary>
+    /// <returns></returns>
+    public Dictionary<string, string> Convert()
+    {
+      // store HTTP parameters here
+      Dictionary<string, string> parameterDict = new Dictionary<string, string>();
+
+      // get object properties
+      IEnumerable<PropertyInfo> properties = this.GetType()
+        .GetProperties(BindingFlags.Instance | BindingFlags.Public)
+        .Where(p => Attribute.IsDefined(p, typeof(DataMemberAttribute)));
+
+      // gather attributes of object
+      foreach (PropertyInfo propertyInfo in properties)
+      {
+        DataMemberAttribute attribute = (DataMemberAttribute)propertyInfo.GetCustomAttributes(typeof(DataMemberAttribute‌), false).FirstOrDefault();
+        string name = attribute.Name ?? propertyInfo.Name.ToLower();
+        object value = propertyInfo.GetValue(this, null);
+
+        // invalid parameter
+        if (value == null)
+        {
+          continue;
+        }
+
+        // convert array to comma-seperated list
+        if (value is IEnumerable && value.GetType().GetElementType() == typeof(string))
+        {
+          value = string.Join(",", ((IEnumerable)value).Cast<object>().Select(x => x.ToString()).ToArray());
+        }
+
+        // convert booleans
+        if (value is bool)
+        {
+          value = System.Convert.ToBoolean(value) ? "1" : "0";
+        }
+
+        // convert DateTime to UNIX timestamp
+        if (value is DateTime)
+        {
+          value = (int)((DateTime)value - new DateTime(1970, 1, 1)).TotalSeconds;
+        }
+
+        parameterDict.Add(name, value.ToString());
+      }
+
+      return parameterDict;
+    }
+  }
+}

PocketSharp/Models/Parameters/RegisterParameters.cs

@@ -0,0 +1,39 @@
+using System.Runtime.Serialization;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// All parameters which can be passed to register a user
+  /// </summary>
+  [DataContract]
+  internal class RegisterParameters : Parameters
+  {
+
+    /// <summary>
+    /// Gets or sets the username.
+    /// </summary>
+    /// <value>
+    /// The username.
+    /// </value>
+    [DataMember(Name = "username")]
+    public string Username { get; set; }
+
+    /// <summary>
+    /// Gets or sets the E-Mail.
+    /// </summary>
+    /// <value>
+    /// The E-Mail.
+    /// </value>
+    [DataMember(Name = "email")]
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Gets or sets the password.
+    /// </summary>
+    /// <value>
+    /// The password.
+    /// </value>
+    [DataMember(Name = "password")]
+    public string Password { get; set; }
+  }
+}

PocketSharp/Models/Parameters/RetrieveParameters.cs

@@ -1,12 +1,13 @@
 using System;
-using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed for item retrieval
   /// </summary>
-  public class RetrieveParameters
+  [DataContract]
+  internal class RetrieveParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the state.
@@ -14,6 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The state.
     /// </value>
+    [DataMember(Name = "state")]
     public State? State { get; set; }
 
     /// <summary>
@@ -22,6 +24,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The favorite.
     /// </value>
+    [DataMember(Name = "favorite")]
     public bool? Favorite { get; set; }
 
     /// <summary>
@@ -30,6 +33,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tag.
     /// </value>
+    [DataMember(Name = "tag")]
     public string Tag { get; set; }
 
     /// <summary>
@@ -38,6 +42,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the content.
     /// </value>
+    [DataMember(Name = "contentType")]
     public ContentType? ContentType { get; set; }
 
     /// <summary>
@@ -46,6 +51,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The sort.
     /// </value>
+    [DataMember(Name = "sort")]
     public Sort? Sort { get; set; }
 
     /// <summary>
@@ -54,6 +60,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the detail.
     /// </value>
+    [DataMember(Name="detailType")]
     public DetailType? DetailType { get; set; }
 
     /// <summary>
@@ -62,6 +69,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The search.
     /// </value>
+    [DataMember(Name = "search")]
     public string Search { get; set; }
 
     /// <summary>
@@ -70,6 +78,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The domain.
     /// </value>
+    [DataMember(Name = "domain")]
     public string Domain { get; set; }
 
     /// <summary>
@@ -78,6 +87,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The since.
     /// </value>
+    [DataMember(Name = "since")]
     public DateTime? Since { get; set; }
 
     /// <summary>
@@ -86,6 +96,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The count.
     /// </value>
+    [DataMember(Name = "count")]
     public int? Count { get; set; }
 
     /// <summary>
@@ -94,30 +105,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The offset.
     /// </value>
+    [DataMember(Name = "offset")]
     public int? Offset { get; set; }
-
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      return new List<Parameter>()
-      {
-        Utilities.CreateParam("state", State != null ? State.ToString() : null ),
-        Utilities.CreateParam("favorite", Favorite != null ? (bool)Favorite ? "1" : "0" : null),
-        Utilities.CreateParam("tag", Tag),
-        Utilities.CreateParam("contentType", ContentType != null ? ContentType.ToString() : null),
-        Utilities.CreateParam("sort", Sort != null ? Sort.ToString() : null),
-        Utilities.CreateParam("detailType", DetailType != null ? DetailType.ToString() : null),
-        Utilities.CreateParam("search", Search),
-        Utilities.CreateParam("domain", Domain),
-        Utilities.CreateParam("since", Utilities.GetUnixTimestamp(Since)),
-        Utilities.CreateParam("count", Count),
-        Utilities.CreateParam("offset", Offset)
-      };
-    }
   }
 
 

PocketSharp/Models/PocketArticle.cs

@@ -0,0 +1,44 @@
+using System;
+using PropertyChanged;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Readable article
+  /// </summary>
+  [ImplementPropertyChanged]
+  public class PocketArticle
+  {
+    /// <summary>
+    /// Gets or sets the pocket item ID.
+    /// </summary>
+    /// <value>
+    /// The pocket item ID.
+    /// </value>
+    public int PocketItemID { get; set; }
+
+    /// <summary>
+    /// Gets or sets the content.
+    /// </summary>
+    /// <value>
+    /// The content.
+    /// </value>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title.
+    /// </summary>
+    /// <value>
+    /// The title.
+    /// </value>
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the next page URL.
+    /// </summary>
+    /// <value>
+    /// The next page URL.
+    /// </value>
+    public Uri NextPage { get; set; }
+  }
+}

PocketSharp/Models/PocketAuthor.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using System;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -8,6 +8,7 @@ namespace PocketSharp.Models
   /// Author
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketAuthor
   {
     /// <summary>

PocketSharp/Models/PocketImage.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using System;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -8,6 +8,7 @@ namespace PocketSharp.Models
   /// Image
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketImage
   {
     /// <summary>

PocketSharp/Models/PocketItem.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -10,6 +10,7 @@ namespace PocketSharp.Models
   /// see: http://getpocket.com/developer/docs/v3/retrieve
   /// </summary>
   [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketItem
   {
     /// <summary>
@@ -37,7 +38,29 @@ namespace PocketSharp.Models
     /// The title.
     /// </value>
     [JsonProperty("resolved_title")]
-    public string Title { get; set; }
+    private string _ResolvedTitle { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title.
+    /// </summary>
+    /// <value>
+    /// The title.
+    /// </value>
+    [JsonProperty("title")]
+    private string _InternalTitle { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title.
+    /// </summary>
+    /// <value>
+    /// The title.
+    /// </value>
+    [JsonIgnore]
+    public string Title
+    {
+      get { return _InternalTitle ?? _ResolvedTitle; }
+      set { _InternalTitle = value; _ResolvedTitle = value; }
+    }
 
     /// <summary>
     /// Gets or sets the full title.
@@ -183,7 +206,7 @@ namespace PocketSharp.Models
     /// The _ tag dictionary.
     /// </value>
     [JsonProperty("tags")]
-    public Dictionary<string, PocketTag> TagDictionary { get; set; }
+    private Dictionary<string, PocketTag> _TagDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ image dictionary.
@@ -192,7 +215,7 @@ namespace PocketSharp.Models
     /// The _ image dictionary.
     /// </value>
     [JsonProperty("images")]
-    public Dictionary<string, PocketImage> ImageDictionary { get; set; }
+    private Dictionary<string, PocketImage> _ImageDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ video dictionary.
@@ -201,7 +224,7 @@ namespace PocketSharp.Models
     /// The _ video dictionary.
     /// </value>
     [JsonProperty("videos")]
-    public Dictionary<string, PocketVideo> VideoDictionary { get; set; }
+    private Dictionary<string, PocketVideo> _VideoDictionary { get; set; }
 
     /// <summary>
     /// Gets or sets the _ author dictionary.
@@ -210,7 +233,7 @@ namespace PocketSharp.Models
     /// The _ author dictionary.
     /// </value>
     [JsonProperty("authors")]
-    public Dictionary<string, PocketAuthor> AuthorDictionary { get; set; }
+    private Dictionary<string, PocketAuthor> _AuthorDictionary { get; set; }
 
 
     /// <summary>
@@ -222,7 +245,7 @@ namespace PocketSharp.Models
     [JsonIgnore]
     public List<PocketTag> Tags
     {
-      get { return Utilities.DictionaryToList<PocketTag>(TagDictionary); }
+      get { return Utilities.DictionaryToList<PocketTag>(_TagDictionary); }
     }
 
     /// <summary>
@@ -234,7 +257,7 @@ namespace PocketSharp.Models
     [JsonIgnore]
     public List<PocketImage> Images
     {
-      get { return Utilities.DictionaryToList<PocketImage>(ImageDictionary); }
+      get { return Utilities.DictionaryToList<PocketImage>(_ImageDictionary); }
     }
 
     /// <summary>
@@ -246,7 +269,7 @@ namespace PocketSharp.Models
     [JsonIgnore]
     public PocketImage LeadImage
     {
-      get { return Images != null ? Images[0] : null; }
+      get { return Images != null && Images.Count > 0 ? Images[0] : null; }
     }
 
     /// <summary>
@@ -258,7 +281,7 @@ namespace PocketSharp.Models
     [JsonIgnore]
     public List<PocketVideo> Videos
     {
-      get { return Utilities.DictionaryToList<PocketVideo>(VideoDictionary); }
+      get { return Utilities.DictionaryToList<PocketVideo>(_VideoDictionary); }
     }
 
     /// <summary>
@@ -270,7 +293,7 @@ namespace PocketSharp.Models
     [JsonIgnore]
     public List<PocketAuthor> Authors
     {
-      get { return Utilities.DictionaryToList<PocketAuthor>(AuthorDictionary); }
+      get { return Utilities.DictionaryToList<PocketAuthor>(_AuthorDictionary); }
     }
   }
 }

PocketSharp/Models/PocketLimits.cs

@@ -0,0 +1,67 @@
+using Newtonsoft.Json;
+using PropertyChanged;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// API Limitation Statistics
+  /// </summary>
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketLimits
+  {
+    /// <summary>
+    /// Gets or sets the rate limit.
+    /// </summary>
+    /// <value>
+    /// Rate limit for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Limit")]
+    public int RateLimitForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the remaining calls.
+    /// </summary>
+    /// <value>
+    /// Remaining calls for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Remaining")]
+    public int RemainingCallsForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reset seconds.
+    /// </summary>
+    /// <value>
+    /// Seconds until limit resets for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Reset")]
+    public int SecondsUntilLimitResetsForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the rate limit.
+    /// </summary>
+    /// <value>
+    /// Rate limit for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Limit")]
+    public int RateLimitForUser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the remaining calls.
+    /// </summary>
+    /// <value>
+    /// Remaining calls for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Remaining")]
+    public int RemainingCallsForUser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reset seconds.
+    /// </summary>
+    /// <value>
+    /// Seconds until limit resets for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Reset")]
+    public int SecondsUntilLimitResetsForUser { get; set; }
+  }
+}

PocketSharp/Models/PocketStatistics.cs

@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+using PropertyChanged;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Statistics
+  /// </summary>
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketStatistics
+  {
+    /// <summary>
+    /// Gets or sets all items.
+    /// </summary>
+    /// <value>
+    /// All items count.
+    /// </value>
+    [JsonProperty("count_list")]
+    public int CountAll { get; set; }
+
+    /// <summary>
+    /// Gets or sets all read items.
+    /// </summary>
+    /// <value>
+    /// Read items count.
+    /// </value>
+    [JsonProperty("count_read")]
+    public int CountRead { get; set; }
+
+    /// <summary>
+    /// Gets or sets all unread items.
+    /// </summary>
+    /// <value>
+    /// Unread items count.
+    /// </value>
+    [JsonProperty("count_unread")]
+    public int CountUnread { get; set; }
+  }
+}

PocketSharp/Models/PocketTag.cs

@@ -1,21 +1,22 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
-  /// <summary>
-  /// Tag
-  /// </summary>
-  [JsonObject]
-  public class PocketTag
-  {
     /// <summary>
-    /// Gets or sets the name.
+    /// Tag
     /// </summary>
-    /// <value>
-    /// The name.
-    /// </value>
-    [JsonProperty("tag")]
-    public string Name { get; set; }
-  }
+    [JsonObject]
+    [ImplementPropertyChanged]
+    public class PocketTag
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>
+        /// The name.
+        /// </value>
+        [JsonProperty("tag")]
+        public string Name { get; set; }
+    }
 }

PocketSharp/Models/PocketUser.cs

@@ -1,5 +1,5 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
@@ -7,7 +7,8 @@ namespace PocketSharp.Models
   /// Access Code
   /// </summary>
   [JsonObject]
-  internal class AccessCode
+  [ImplementPropertyChanged]
+  public class PocketUser
   {
     /// <summary>
     /// Gets or sets the code.
@@ -24,7 +25,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The username.
     /// </value>
-    [JsonProperty]
+    [JsonProperty("username")]
     public string Username { get; set; }
   }
 }

PocketSharp/Models/PocketVideo.cs

@@ -1,40 +1,41 @@
 using Newtonsoft.Json;
 using System;
-using System.Runtime.Serialization;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
-  /// <summary>
-  /// Video
-  /// </summary>
-  [JsonObject]
-  public class PocketVideo
-  {
     /// <summary>
-    /// Gets or sets the ID.
+    /// Video
     /// </summary>
-    /// <value>
-    /// The ID.
-    /// </value>
-    [JsonProperty("video_id")]
-    public string ID { get; set; }
+    [JsonObject]
+    [ImplementPropertyChanged]
+    public class PocketVideo
+    {
+        /// <summary>
+        /// Gets or sets the ID.
+        /// </summary>
+        /// <value>
+        /// The ID.
+        /// </value>
+        [JsonProperty("video_id")]
+        public string ID { get; set; }
 
-    /// <summary>
-    /// Gets or sets the external ID.
-    /// </summary>
-    /// <value>
-    /// The external ID.
-    /// </value>
-    [JsonProperty("vid")]
-    public string ExternalID { get; set; }
+        /// <summary>
+        /// Gets or sets the external ID.
+        /// </summary>
+        /// <value>
+        /// The external ID.
+        /// </value>
+        [JsonProperty("vid")]
+        public string ExternalID { get; set; }
 
-    /// <summary>
-    /// Gets or sets the URI.
-    /// </summary>
-    /// <value>
-    /// The URI.
-    /// </value>
-    [JsonProperty("src")]
-    public Uri Uri { get; set; }
-  }
+        /// <summary>
+        /// Gets or sets the URI.
+        /// </summary>
+        /// <value>
+        /// The URI.
+        /// </value>
+        [JsonProperty("src")]
+        public Uri Uri { get; set; }
+    }
 }

PocketSharp/Models/Response/Add.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {

PocketSharp/Models/Response/Modify.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
@@ -15,7 +14,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The action results.
     /// </value>
-    [JsonProperty("action_results")]
-    public bool[] ActionResults { get; set; }
+    //[JsonProperty("action_results")]
+    //public bool[] ActionResults { get; set; }
   }
 }

PocketSharp/Models/Response/RequestCode.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {

PocketSharp/Models/Response/ResponseBase.cs

@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {

PocketSharp/Models/Response/Retrieve.cs

@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {

PocketSharp/PocketClient.cs

@@ -5,9 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using System.Diagnostics;
 using System.Net.Http.Headers;
 
 namespace PocketSharp
@@ -22,6 +20,11 @@ namespace PocketSharp
     /// </summary>
     protected readonly HttpClient _restClient;
 
+    /// <summary>
+    /// Caches HTTP headers from last response
+    /// </summary>
+    private HttpResponseHeaders lastHeaders;
+
     /// <summary>
     /// The base URL for the Pocket API
     /// </summary>
@@ -35,7 +38,7 @@ namespace PocketSharp
     /// <summary>
     /// callback URL for API calls
     /// </summary>
-    protected string CallbackUri { get; set; }
+    public string CallbackUri { get; set; }
 
     /// <summary>
     /// Accessor for the Pocket API key
@@ -54,6 +57,7 @@ namespace PocketSharp
     public string AccessCode { get; set; }
 
 
+
     /// <summary>
     /// Initializes a new instance of the <see cref="PocketClient"/> class.
     /// </summary>
@@ -103,60 +107,63 @@ namespace PocketSharp
     /// <param name="requireAuth">if set to <c>true</c> [require auth].</param>
     /// <returns></returns>
     /// <exception cref="PocketException">No access token available. Use authentification first.</exception>
-    protected async Task<T> Request<T>(string method, List<Parameter> parameters = null, bool requireAuth = false) where T : class, new()
+    protected async Task<T> Request<T>(string method, Dictionary<string, string> parameters = null, bool requireAuth = true) where T : class, new()
     {
       if (requireAuth && AccessCode == null)
       {
         throw new PocketException("SDK error: No access token available. Use authentification first.");
       }
 
-      // convert parameters
-      Dictionary<string, string> parameterDict = new Dictionary<string, string>();
-
-      if (parameters != null)
-      {
-        foreach (Parameter item in parameters)
-        {
-          if (item.Value != null)
-          {
-            parameterDict.Add(item.Name, item.Value.ToString());
-          }
-        }
-      }
-
       // every single Pocket API endpoint requires HTTP POST data
       HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, method);
+      HttpResponseMessage response = null;
+
+      if (parameters == null)
+      {
+        parameters = new Dictionary<string, string>();
+      }
 
       // add consumer key to each request
-      parameterDict.Add("consumer_key", ConsumerKey);
+      parameters.Add("consumer_key", ConsumerKey);
 
       // add access token (necessary for all requests except authentification)
       if (AccessCode != null)
       {
-        parameterDict.Add("access_token", AccessCode);
+        parameters.Add("access_token", AccessCode);
       }
 
       // content of the request
-      request.Content = new FormUrlEncodedContent(parameterDict);
+      request.Content = new FormUrlEncodedContent(parameters);
 
       // make async request
-      HttpResponseMessage response = await _restClient.SendAsync(request);
+      try
+      {
+        response = await _restClient.SendAsync(request);
+      }
+      catch (HttpRequestException exc)
+      {
+        throw new PocketException(exc.Message, exc);
+      }
 
       // validate HTTP response
       ValidateResponse(response);
 
+      // cache headers
+      lastHeaders = response.Headers;
+
       // read response
       var responseString = await response.Content.ReadAsStringAsync();
 
+      responseString = responseString.Replace("[]", "{}");
+
       // deserialize object
       T parsedResponse = JsonConvert.DeserializeObject<T>(
-        responseString, 
+        responseString,
         new JsonSerializerSettings
         {
           Error = (object sender, ErrorEventArgs args) =>
           {
             throw new PocketException(String.Format("Parse error: {0}", args.ErrorContext.Error.Message));
-            args.ErrorContext.Handled = true;
           },
           Converters =
           {
@@ -171,20 +178,38 @@ namespace PocketSharp
 
 
     /// <summary>
-    /// Puts an action
+    /// Sends a list of actions
+    /// </summary>
+    /// <param name="actionParameters">The action parameters.</param>
+    /// <returns></returns>
+    internal async Task<bool> Send(List<ActionParameter> actionParameters)
+    {
+      List<Dictionary<string, object>> actionParamList = new List<Dictionary<string, object>>();
+
+      foreach (var action in actionParameters)
+      {
+        actionParamList.Add(action.Convert());
+      }
+
+      Dictionary<string, string> parameters = new Dictionary<string, string>() {{
+        "actions", JsonConvert.SerializeObject(actionParamList)                                                                    
+      }};
+
+      Modify response = await Request<Modify>("send", parameters);
+
+      return response.Status;
+    }
+
+
+    /// <summary>
+    /// Sends an action
     /// </summary>
     /// <param name="actionParameter">The action parameter.</param>
     /// <returns></returns>
-    protected async Task<bool> PutSendAction(ActionParameter actionParameter)
+    internal async Task<bool> Send(ActionParameter actionParameter)
     {
-      ModifyParameters parameters = new ModifyParameters()
-      {
-        Actions = new List<ActionParameter>() { actionParameter }
-      };
-
-      Modify response = await Request<Modify>("send", parameters.Convert(), true);
-
-      return response.Status;
+      bool response = await Send(new List<ActionParameter>() { actionParameter });
+      return response;
     }
 
 
@@ -249,6 +274,11 @@ namespace PocketSharp
     {
       string result = null;
 
+      if (headers == null || String.IsNullOrEmpty(key))
+      {
+        return null;
+      }
+
       foreach (var header in headers)
       {
         if (header.Key == key)
@@ -257,6 +287,7 @@ namespace PocketSharp
           headerEnumerator.MoveNext();
 
           result = headerEnumerator.Current;
+          break;
         }
       }
 

PocketSharp/PocketReader.cs

@@ -0,0 +1,148 @@
+using PocketSharp.Ports.NReadability;
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using PocketSharp.Models;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketReader
+  /// </summary>
+  public class PocketReader
+  {
+    /// <summary>
+    /// REST client used for HTML retrieval
+    /// </summary>
+    protected readonly HttpClient _httpClient;
+
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PocketReader"/> class.
+    /// </summary>
+    public PocketReader()
+    {
+      // initialize HTTP client
+      _httpClient = new HttpClient(new HttpClientHandler()
+      {
+        AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
+        AllowAutoRedirect = true
+      });
+
+      // add accept types
+      _httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8");
+
+      // add accepted encodings
+      _httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Accept-Encoding", "gzip,deflate");
+
+      // add user agent (default for Opera with PocketSharp identifier appended)
+      _httpClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.4 Safari/537.36 OPR/18.0.1284.2 PocketSharp/2.2");
+    }
+
+
+
+    /// <summary>
+    /// Reads article content from the given URI.
+    /// This method does not use the official Article View API, which is private.
+    /// The PocketReader is based on a custom PCL port of NReadability and SgmlReader.
+    /// </summary>
+    /// <param name="uri">An URI.</param>
+    /// <returns>A Pocket article with extracted content and title.</returns>
+    /// <exception cref="PocketRequestException"></exception>
+    public async Task<PocketArticle> Read(Uri uri)
+    {
+      return await Read(new PocketItem()
+      {
+        ID = 0,
+        Uri = uri
+      });
+    }
+
+
+
+    /// <summary>
+    /// Reads article content from the given PocketItem.
+    /// This method does not use the official Article View API, which is private.
+    /// The PocketReader is based on a custom PCL port of NReadability and SgmlReader.
+    /// </summary>
+    /// <param name="item">The pocket item.</param>
+    /// <returns>A Pocket article with extracted content and title.</returns>
+    /// <exception cref="PocketRequestException"></exception>
+    public async Task<PocketArticle> Read(PocketItem item)
+    {
+      // initialize transcoder
+      NReadabilityTranscoder transcoder = new NReadabilityTranscoder(
+        dontStripUnlikelys: false,
+        dontNormalizeSpacesInTextContent: true,
+        dontWeightClasses: false,
+        readingStyle: ReadingStyle.Ebook,
+        readingMargin: ReadingMargin.Narrow,
+        readingSize: ReadingSize.Medium
+      );
+
+      // get HTML string from URI
+      string htmlResponse = await Request(item.Uri);
+
+      // set properties for processing
+      TranscodingInput transcodingInput = new TranscodingInput(htmlResponse)
+      {
+        Url = item.Uri.ToString(),
+        DomSerializationParams = new DomSerializationParams()
+        {
+          BodyOnly = true,
+          PrettyPrint = true,
+          DontIncludeContentTypeMetaElement = true,
+          DontIncludeMobileSpecificMetaElements = true,
+          DontIncludeDocTypeMetaElement = true,
+          DontIncludeGeneratorMetaElement = true
+        }
+      };
+
+      // process/transcode HTML
+      TranscodingResult transcodingResult = transcoder.Transcode(transcodingInput);
+      
+      return new PocketArticle()
+      {
+        Content = transcodingResult.ExtractedContent,
+        Title = transcodingResult.ExtractedTitle,
+        NextPage = transcodingResult.NextPageUrl != null ? new Uri(transcodingResult.NextPageUrl, UriKind.Absolute) : null,
+        PocketItemID = item.ID
+      };
+    }
+
+
+
+    /// <summary>
+    /// Fetches a resource
+    /// </summary>
+    /// <param name="uri">The URI.</param>
+    /// <returns></returns>
+    protected async Task<string> Request(Uri uri)
+    {
+      HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, uri);
+      HttpResponseMessage response = null;
+
+      // make async request
+      try
+      {
+        response = await _httpClient.SendAsync(request);
+      }
+      catch (HttpRequestException exc)
+      {
+        throw new PocketException(exc.Message, exc);
+      }
+
+      // validate HTTP response
+      if (response.StatusCode != HttpStatusCode.OK)
+      {
+        string exceptionString = String.Format("Request error: {0} ({1})", response.ReasonPhrase, (int)response.StatusCode);
+
+        throw new PocketException(exceptionString);
+      }
+
+      // read response
+      return await response.Content.ReadAsStringAsync();
+    }
+  }
+}

PocketSharp/PocketSharp.csproj

@@ -16,6 +16,7 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <FodyPath>..\packages\Fody.1.17.4.0</FodyPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,35 +37,42 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="Fody.targets" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="PocketException.cs" />
+    <Compile Include="Components\Statistics.cs" />
+    <Compile Include="Models\Parameters\RegisterParameters.cs" />
+    <Compile Include="Models\PocketArticle.cs" />
+    <Compile Include="Models\PocketLimits.cs" />
+    <Compile Include="Models\PocketStatistics.cs" />
+    <Compile Include="Utilities\PocketException.cs" />
     <Compile Include="Components\Add.cs" />
-    <Compile Include="Components\Authentification.cs" />
+    <Compile Include="Components\Account.cs" />
     <Compile Include="Components\Modify.cs" />
     <Compile Include="Components\ModifyTags.cs" />
-    <Compile Include="Components\Retrieve.cs" />
-    <Compile Include="JsonExtensions.cs" />
+    <Compile Include="Components\Get.cs" />
+    <Compile Include="Utilities\JsonExtensions.cs" />
     <Compile Include="Models\Parameters\ActionParameter.cs" />
     <Compile Include="Models\Parameters\AddParameters.cs" />
     <Compile Include="Models\Parameters\ModifyParameters.cs" />
-    <Compile Include="Models\Parameters\Parameter.cs" />
+    <Compile Include="Models\Parameters\Parameters.cs" />
     <Compile Include="Models\Parameters\RetrieveParameters.cs" />
     <Compile Include="Models\PocketAuthor.cs" />
     <Compile Include="Models\PocketImage.cs" />
     <Compile Include="Models\PocketItem.cs" />
     <Compile Include="Models\PocketTag.cs" />
     <Compile Include="Models\PocketVideo.cs" />
-    <Compile Include="Models\Response\AccessCode.cs" />
+    <Compile Include="Models\PocketUser.cs" />
     <Compile Include="Models\Response\Add.cs" />
     <Compile Include="Models\Response\Modify.cs" />
     <Compile Include="Models\Response\RequestCode.cs" />
     <Compile Include="Models\Response\ResponseBase.cs" />
     <Compile Include="Models\Response\Retrieve.cs" />
     <Compile Include="PocketClient.cs" />
+    <Compile Include="PocketReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities.cs" />
+    <Compile Include="Utilities\Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Threading.Tasks">
@@ -74,19 +82,23 @@
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.5.0.6\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PropertyChanged">
+      <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.IO">
       <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\portable-net40+sl4+win8+wp71\System.Net.Http.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.15\lib\portable-net40+sl4+win8+wp71\System.Net.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\portable-net40+sl4+win8+wp71\System.Net.Http.Extensions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.15\lib\portable-net40+sl4+win8+wp71\System.Net.Http.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Primitives">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.13\lib\portable-net40+sl4+win8+wp71\System.Net.Http.Primitives.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.15\lib\portable-net40+sl4+win8+wp71\System.Net.Http.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime">
       <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.Runtime.dll</HintPath>
@@ -95,6 +107,15 @@
       <HintPath>..\packages\Microsoft.Bcl.1.1.3\lib\portable-net40+sl4+win8+wp71\System.Threading.Tasks.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PortablePorts\NReadability\NReadability.csproj">
+      <Project>{14c3ee6a-54a4-4a37-8b56-d52a3802f1c2}</Project>
+      <Name>NReadability</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -108,6 +129,7 @@
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
     <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
   </Target>
+  <Import Project="Fody.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

PocketSharp/PocketSharp.nuspec

@@ -10,14 +10,14 @@
     <projectUrl>http://pocketsharp.frontendplay.com</projectUrl>
     <iconUrl>http://pocketsharp.frontendplay.com/Assets/Images/pocketsharp.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
+    <description>PocketSharp is a .NET class library, that integrates the Pocket API v3</description>
     <language>en-US</language>
     <releaseNotes>
       <![CDATA[
-           For full release notes see https://github.com/ceee/PocketSharp#release-history
+           For full release notes see https://github.com/ceee/PocketSharp/blob/master/CHANGELOG.md
          ]]>
     </releaseNotes>
     <copyright>Copyright by cee, 2013</copyright>
-    <tags>PocketAPI Pocket API PocketSharp Tobias Klika cee RestSharp</tags>
+    <tags>PocketAPI Pocket API PocketSharp Tobias Klika cee NReadability Reader Article SDK Pockem</tags>
   </metadata>
 </package>

PocketSharp/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("PocketSharp")]
-[assembly: AssemblyDescription("PocketSharp is a .NET class library, that integrates the Pocket API v3")]
+[assembly: AssemblyDescription("PocketSharp is a .NET class library that integrates the Pocket API v3 (support a custom Article View API)")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("cee")]
 [assembly: AssemblyProduct("PocketSharp")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyCopyright("Copyright © cee 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("2.2.0")]
+[assembly: AssemblyFileVersion("2.2.0")]

PocketSharp/Utilities/JsonExtensions.cs

@@ -1,9 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace PocketSharp
 {

PocketSharp/Utilities/PocketException.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Serialization;
 
 namespace PocketSharp
 {

PocketSharp/Utilities/Utilities.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using PocketSharp.Models;
 
 namespace PocketSharp
 {
@@ -25,32 +24,6 @@ namespace PocketSharp
     }
 
 
-    /// <summary>
-    /// Creates a Parameter object.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="value">The value.</param>
-    /// <param name="type">The type.</param>
-    /// <returns></returns>
-    public static Parameter CreateParam(string name, object value)
-    {
-      return new Parameter() { Name = name, Value = value };
-    }
-
-
-    /// <summary>
-    /// Creates a Parameter object within a list.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="value">The value.</param>
-    /// <param name="type">The type.</param>
-    /// <returns></returns>
-    public static List<Parameter> CreateParamInList(string name, object value)
-    {
-      return new List<Parameter>() { CreateParam(name, value) };
-    }
-
-
     /// <summary>
     /// Convert a dictionary to a list
     /// </summary>

PocketSharp/packages.config

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Fody" version="1.17.4.0" targetFramework="portable-net403+sl40+wp71+win" />
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="portable-net45+sl40+wp71+win" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="portable-net45+sl40+wp71+win" />
   <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="portable-net45+sl40+wp71+win" />
-  <package id="Microsoft.Net.Http" version="2.2.13" targetFramework="portable-net45+sl40+wp71+win" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="portable-net403+sl40+wp71+win" />
+  <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="portable-net403+sl40+wp71+win" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="portable-net45+sl40+wp71+win" />
+  <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="portable-net403+sl40+wp71+win" />
 </packages>

PortablePorts/NReadability/AttributeTransformationInput.cs

@@ -0,0 +1,11 @@
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class AttributeTransformationInput
+  {
+    public string AttributeValue { get; set; }
+
+    public XElement Element { get; set; }
+  }
+}

PortablePorts/NReadability/AttributeTransformationResult.cs

@@ -0,0 +1,15 @@
+namespace PocketSharp.Ports.NReadability
+{
+  public class AttributeTransformationResult
+  {
+    /// <summary>
+    /// Result of the transformation.
+    /// </summary>
+    public string TransformedValue { get; set; }
+
+    /// <summary>
+    /// Name of the attribute that will be used to store the original value. Can be null.
+    /// </summary>
+    public string OriginalValueAttributeName { get; set; }
+  }
+}

PortablePorts/NReadability/ChildNodesTraverser.cs

@@ -0,0 +1,67 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  internal class ChildNodesTraverser
+  {
+    private readonly Action<XNode> _childNodeVisitor;
+
+    #region Constructor(s)
+
+    public ChildNodesTraverser(Action<XNode> childNodeVisitor)
+    {
+      if (childNodeVisitor == null)
+      {
+        throw new ArgumentNullException("childNodeVisitor");
+      }
+
+      _childNodeVisitor = childNodeVisitor;
+    }
+
+    #endregion
+
+    #region Public methods
+
+    public void Traverse(XNode node)
+    {
+      if (!(node is XContainer))
+      {
+        throw new ArgumentException("The node must be an XContainer in order to traverse its children.");
+      }
+
+      var childNode = ((XContainer)node).FirstNode;
+
+      while (childNode != null)
+      {
+        var nextChildNode = childNode.NextNode;
+
+        _childNodeVisitor(childNode);
+
+        childNode = nextChildNode;
+      }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/Consts.cs

@@ -0,0 +1,28 @@
+using System.Reflection;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public static class Consts
+  {
+    private static readonly string _nReadabilityFullName;
+
+    #region Constructor(s)
+
+    static Consts()
+    {
+      _nReadabilityFullName = string.Format("NReadability {0}", Assembly.GetExecutingAssembly().FullName);
+    }
+    
+    #endregion
+
+    #region Properties
+
+    public static string NReadabilityFullName
+    {
+      get { return _nReadabilityFullName; }
+    }
+
+    #endregion
+
+  }
+}

PortablePorts/NReadability/DomExtensions.cs

@@ -0,0 +1,303 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public static class DomExtensions
+  {
+    #region XDocument extensions
+
+    public static XElement GetBody(this XDocument document)
+    {
+      if (document == null)
+      {
+        throw new ArgumentNullException("document");
+      }
+
+      var documentRoot = document.Root;
+
+      if (documentRoot == null)
+      {
+        return null;
+      }
+
+      return documentRoot.GetElementsByTagName("body").FirstOrDefault();
+    }
+
+    public static string GetTitle(this XDocument document)
+    {
+      if (document == null)
+      {
+        throw new ArgumentNullException("document");
+      }
+
+      var documentRoot = document.Root;
+
+      if (documentRoot == null)
+      {
+        return null;
+      }
+
+      var headElement = documentRoot.GetElementsByTagName("head").FirstOrDefault();
+
+      if (headElement == null)
+      {
+        return "";
+      }
+
+      var titleElement = headElement.GetChildrenByTagName("title").FirstOrDefault();
+
+      if (titleElement == null)
+      {
+        return "";
+      }
+
+      return (titleElement.Value ?? "").Trim();
+    }
+
+    public static XElement GetElementById(this XDocument document, string id)
+    {
+      if (document == null)
+      {
+        throw new ArgumentNullException("document");
+      }
+
+      if (string.IsNullOrEmpty(id))
+      {
+        throw new ArgumentNullException("id");
+      }
+
+      return
+        (from element in document.Descendants()
+         let idAttribute = element.Attribute("id")
+         where idAttribute != null && idAttribute.Value == id
+         select element).SingleOrDefault();
+    }
+
+    #endregion
+
+    #region XElement extensions
+
+    public static string GetId(this XElement element)
+    {
+      return element.GetAttributeValue("id", "");
+    }
+
+    public static void SetId(this XElement element, string id)
+    {
+      element.SetAttributeValue("id", id);
+    }
+
+    public static string GetClass(this XElement element)
+    {
+      return element.GetAttributeValue("class", "");
+    }
+
+    public static void SetClass(this XElement element, string @class)
+    {
+      element.SetAttributeValue("class", @class);
+    }
+
+    public static string GetStyle(this XElement element)
+    {
+      return element.GetAttributeValue("style", "");
+    }
+
+    public static void SetStyle(this XElement element, string style)
+    {
+      element.SetAttributeValue("style", style);
+    }
+
+    public static string GetAttributeValue(this XElement element, string attributeName, string defaultValue)
+    {
+      if (element == null)
+      {
+        throw new ArgumentNullException("element");
+      }
+
+      if (string.IsNullOrEmpty(attributeName))
+      {
+        throw new ArgumentNullException("attributeName");
+      }
+
+      var attribute = element.Attribute(attributeName);
+
+      return attribute != null
+               ? (attribute.Value ?? defaultValue)
+               : defaultValue;
+    }
+
+    public static void SetAttributeValue(this XElement element, string attributeName, string value)
+    {
+      if (element == null)
+      {
+        throw new ArgumentNullException("element");
+      }
+
+      if (string.IsNullOrEmpty(attributeName))
+      {
+        throw new ArgumentNullException("attributeName");
+      }
+
+      if (value == null)
+      {
+        var attribute = element.Attribute(attributeName);
+
+        if (attribute != null)
+        {
+          attribute.Remove();
+        }
+      }
+      else
+      {
+        element.SetAttributeValue(attributeName, value);
+      }
+    }
+
+    public static string GetAttributesString(this XElement element, string separator)
+    {
+      if (element == null)
+      {
+        throw new ArgumentNullException("element");
+      }
+
+      if (separator == null)
+      {
+        throw new ArgumentNullException("separator");
+      }
+
+      var resultSb = new StringBuilder();
+      bool isFirst = true;
+
+      element.Attributes().Aggregate(
+        resultSb,
+        (sb, attribute) =>
+        {
+          string attributeValue = attribute.Value;
+
+          if (string.IsNullOrEmpty(attributeValue))
+          {
+            return sb;
+          }
+
+          if (!isFirst)
+          {
+            resultSb.Append(separator);
+          }
+
+          isFirst = false;
+
+          sb.Append(attribute.Value);
+
+          return sb;
+        });
+
+      return resultSb.ToString();
+    }
+
+    public static string GetInnerHtml(this XContainer container)
+    {
+      if (container == null)
+      {
+        throw new ArgumentNullException("container");
+      }
+
+      var resultSb = new StringBuilder();
+
+      foreach (var childNode in container.Nodes())
+      {
+        resultSb.Append(childNode.ToString(SaveOptions.DisableFormatting));
+      }
+
+      return resultSb.ToString();
+    }
+
+    public static void SetInnerHtml(this XElement element, string html)
+    {
+      if (element == null)
+      {
+        throw new ArgumentNullException("element");
+      }
+
+      if (html == null)
+      {
+        throw new ArgumentNullException("html");
+      }
+
+      element.RemoveAll();
+
+      var tmpElement = new SgmlDomBuilder().BuildDocument(html);
+
+      if (tmpElement.Root == null)
+      {
+        return;
+      }
+
+      foreach (var node in tmpElement.Root.Nodes())
+      {
+        element.Add(node);
+      }
+    }
+
+    #endregion
+
+    #region XContainer extensions
+
+    public static IEnumerable<XElement> GetElementsByTagName(this XContainer container, string tagName)
+    {
+      if (container == null)
+      {
+        throw new ArgumentNullException("container");
+      }
+
+      if (string.IsNullOrEmpty(tagName))
+      {
+        throw new ArgumentNullException("tagName");
+      }
+
+      return container.Descendants()
+        .Where(e => tagName.Equals(e.Name.LocalName, StringComparison.OrdinalIgnoreCase));
+    }
+
+    public static IEnumerable<XElement> GetChildrenByTagName(this XContainer container, string tagName)
+    {
+      if (container == null)
+      {
+        throw new ArgumentNullException("container");
+      }
+
+      if (string.IsNullOrEmpty(tagName))
+      {
+        throw new ArgumentNullException("tagName");
+      }
+
+      return container.Elements()
+        .Where(e => e.Name != null && tagName.Equals(e.Name.LocalName, StringComparison.OrdinalIgnoreCase));
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/DomSerializationParams.cs

@@ -0,0 +1,53 @@
+using System;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class DomSerializationParams
+  {
+    #region Factory methods
+
+    /// <summary>
+    /// Creates an instance of DomSerializationParams with parameters set to their defaults.
+    /// </summary>
+    public static DomSerializationParams CreateDefault()
+    {
+      return new DomSerializationParams();
+    }
+
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// Determines whether the output will be formatted.
+    /// </summary>
+    public bool PrettyPrint { get; set; }
+
+    /// <summary>
+    /// Determines whether DOCTYPE will be included at the beginning of the output.
+    /// </summary>
+    public bool DontIncludeContentTypeMetaElement { get; set; }
+
+    /// <summary>
+    /// Determines whether mobile-specific elements (such as eg. meta HandheldFriendly) will be added/replaced in the output.
+    /// </summary>
+    public bool DontIncludeMobileSpecificMetaElements { get; set; }
+
+    /// <summary>
+    /// Determines whether a meta tag with a content-type specification will be added/replaced in the output.
+    /// </summary>
+    public bool DontIncludeDocTypeMetaElement { get; set; }
+
+    /// <summary>
+    /// Determines whether a meta tag with a generator specification will be added/replaced in the output.
+    /// </summary>
+    public bool DontIncludeGeneratorMetaElement { get; set; }
+
+    /// <summary>
+    /// Render complete Website or only the Body
+    /// </summary>
+    public bool BodyOnly { get; set; }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/ElementsTraverser.cs

@@ -0,0 +1,67 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class ElementsTraverser
+  {
+    private readonly Action<XElement> _elementVisitor;
+
+    #region Constructor(s)
+
+    public ElementsTraverser(Action<XElement> elementVisitor)
+    {
+      if (elementVisitor == null)
+      {
+        throw new ArgumentNullException("elementVisitor");
+      }
+
+      _elementVisitor = elementVisitor;
+    }
+
+    #endregion
+
+    #region Public methods
+
+    public void Traverse(XElement element)
+    {
+      _elementVisitor(element);
+
+      var childNode = element.FirstNode;
+
+      while (childNode != null)
+      {
+        var nextChildNode = childNode.NextNode;
+        
+        if (childNode is XElement)
+        {
+          Traverse((XElement)childNode);
+        }
+
+        childNode = nextChildNode;
+      }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/EncodedStringWriter.cs

@@ -0,0 +1,62 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.IO;
+using System.Text;
+
+namespace PocketSharp.Ports.NReadability
+{
+  internal class EncodedStringWriter : StringWriter
+  {
+    private static readonly Encoding _DefaultEncoding = Encoding.UTF8;
+
+    private readonly Encoding _encoding;
+
+    #region Constructor(s)
+
+    public EncodedStringWriter(StringBuilder sb, Encoding encoding)
+      : base(sb)
+    {
+      if (encoding == null)
+      {
+        throw new ArgumentNullException("encoding");
+      }
+
+      _encoding = encoding;
+    }
+
+    public EncodedStringWriter(StringBuilder sb)
+      : this(sb, _DefaultEncoding)
+    {
+    }
+
+    #endregion
+
+    #region Properties
+
+    public override Encoding Encoding
+    {
+      get { return _encoding; }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/EnumerableExtensions.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public static class EnumerableExtensions
+  {
+    /// <summary>
+    /// Returns the only one element in the sequence or default(T) if either the sequence doesn't contain any elements or it contains more than one element.
+    /// </summary>
+    public static T SingleOrNone<T>(this IEnumerable<T> enumerable)
+      where T : class
+    {
+      // ReSharper disable PossibleMultipleEnumeration
+
+      if (enumerable == null)
+      {
+        throw new ArgumentNullException("enumerable");
+      }
+
+      T firstElement = enumerable.FirstOrDefault();
+
+      if (firstElement == null)
+      {
+        // no elements
+        return null;
+      }
+
+      T secondElement = enumerable.Skip(1).FirstOrDefault();
+
+      if (secondElement != null)
+      {
+        // more than one element
+        return null;
+      }
+
+      return firstElement;
+
+      // ReSharper restore PossibleMultipleEnumeration
+    }
+  }
+}

PortablePorts/NReadability/Enums.cs

@@ -0,0 +1,110 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace PocketSharp.Ports.NReadability
+{
+  /// <summary>
+  /// Determines how the extracted article will be styled.
+  /// </summary>
+  public enum ReadingStyle
+  {
+    /// <summary>
+    /// Newspaper style.
+    /// </summary>
+    Newspaper,
+
+    /// <summary>
+    /// Novel style.
+    /// </summary>
+    Novel,
+
+    /// <summary>
+    /// Ebook style.
+    /// </summary>
+    Ebook,
+
+    /// <summary>
+    /// Terminal style.
+    /// </summary>
+    Terminal,
+  }
+
+  /// <summary>
+  /// Determines how wide the margin of the extracted article will be.
+  /// </summary>
+  public enum ReadingMargin
+  {
+    /// <summary>
+    /// Extra-narrow margin.
+    /// </summary>
+    XNarrow,
+
+    /// <summary>
+    /// Narrow margin.
+    /// </summary>
+    Narrow,
+
+    /// <summary>
+    /// Medium margin.
+    /// </summary>
+    Medium,
+
+    /// <summary>
+    /// Wide margin.
+    /// </summary>
+    Wide,
+
+    /// <summary>
+    /// Extra-wide margin.
+    /// </summary>
+    XWide,
+  }
+
+  /// <summary>
+  /// Determines how large the font of the extracted article will be.
+  /// </summary>
+  public enum ReadingSize
+  {
+    /// <summary>
+    /// Extra-small font.
+    /// </summary>
+    XSmall,
+
+    /// <summary>
+    /// Small font.
+    /// </summary>
+    Small,
+
+    /// <summary>
+    /// Medium font.
+    /// </summary>
+    Medium,
+
+    /// <summary>
+    /// Large font.
+    /// </summary>
+    Large,
+
+    /// <summary>
+    /// Extra-large font.
+    /// </summary>
+    XLarge,
+  }
+}

PortablePorts/NReadability/HtmlUtils.cs

@@ -0,0 +1,40 @@
+using System;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public static class HtmlUtils
+  {
+    public static string RemoveScriptTags(string htmlContent)
+    {
+      if (htmlContent == null)
+      {
+        throw new ArgumentNullException("htmlContent");
+      }
+
+      if (htmlContent.Length == 0)
+      {
+        return "";
+      }
+
+      int indexOfScriptTagStart = htmlContent.IndexOf("<script", StringComparison.OrdinalIgnoreCase);
+
+      if (indexOfScriptTagStart == -1)
+      {
+        return htmlContent;
+      }
+
+      int indexOfScriptTagEnd = htmlContent.IndexOf("</script>", indexOfScriptTagStart, StringComparison.OrdinalIgnoreCase);
+
+      if (indexOfScriptTagEnd == -1)
+      {
+        return htmlContent.Substring(0, indexOfScriptTagStart);
+      }
+
+      string strippedHtmlContent =
+        htmlContent.Substring(0, indexOfScriptTagStart) +
+        htmlContent.Substring(indexOfScriptTagEnd + "</script>".Length);
+
+      return RemoveScriptTags(strippedHtmlContent);
+    }
+  }
+}

PortablePorts/NReadability/InternalErrorException.cs

@@ -0,0 +1,62 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Runtime.Serialization;
+
+namespace PocketSharp.Ports.NReadability
+{
+  /// <summary>
+  /// An exception that is thrown when an internal error occurrs in the application.
+  /// Internal error in the application means that there is a bug in the application.
+  /// </summary>
+  public class InternalErrorException : Exception
+  {
+    #region Constructor(s)
+
+    /// <summary>
+    /// Initializes a new instance of the InternalErrorException class with a specified error message and a reference to the inner exception that is the cause of this exception.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+    public InternalErrorException(string message, Exception innerException)
+      : base(message, innerException)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the InternalErrorException class with a specified error message.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public InternalErrorException(string message)
+      : base(message)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the InternalErrorException class.
+    /// </summary>
+    public InternalErrorException()
+    {
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/NReadability.csproj

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{14C3EE6A-54A4-4A37-8B56-D52A3802F1C2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PocketSharp.Ports.NReadability</RootNamespace>
+    <AssemblyName>PocketSharp.Ports.NReadability</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile96</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <EmbeddedResource Include="Resources\readability.css" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AttributeTransformationInput.cs" />
+    <Compile Include="AttributeTransformationResult.cs" />
+    <Compile Include="ChildNodesTraverser.cs" />
+    <Compile Include="Consts.cs" />
+    <Compile Include="DomExtensions.cs" />
+    <Compile Include="DomSerializationParams.cs" />
+    <Compile Include="ElementsTraverser.cs" />
+    <Compile Include="EncodedStringWriter.cs" />
+    <Compile Include="EnumerableExtensions.cs" />
+    <Compile Include="Enums.cs" />
+    <Compile Include="HtmlUtils.cs" />
+    <Compile Include="InternalErrorException.cs" />
+    <Compile Include="NReadabilityTranscoder.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SgmlDomBuilder.cs" />
+    <Compile Include="SgmlDomSerializer.cs" />
+    <Compile Include="TranscodingInput.cs" />
+    <Compile Include="TranscodingResult.cs" />
+    <Compile Include="UtilityExtensions.cs" />
+    <Compile Include="WebTranscodingInput.cs" />
+    <Compile Include="WebTranscodingResult.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SgmlReader\SgmlReader.csproj">
+      <Project>{9112414c-e2d1-43ba-a298-a89f77d94332}</Project>
+      <Name>SgmlReader</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

PortablePorts/NReadability/Properties/AssemblyInfo.cs

@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("NReadabilityPCL")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("NReadabilityPCL")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

PortablePorts/NReadability/Resources/readability.css

@@ -0,0 +1,82 @@
+/* Document */
+body {font-size: 100%;}
+#readability-logo,#arc90-logo,.footer-twitterLink,#readTools a,a.rdbTK-powered span{background-color:transparent!important;background-image:url(http://lab.arc90.com/experiments/readability/images/sprite-readability.png)!important;background-repeat:no-repeat!important;}
+#readOverlay {display:block;position:absolute;top:0;left:0;width:100%;}
+#readInner {line-height:1.4em;max-width:800px;margin:1em auto;}
+#readInner a {color:#039;text-decoration:none;}
+#readInner a:hover {text-decoration:underline;}
+#readInner img {float:left;clear:both;margin: 0 12px 12px 0;}
+#readInner h1 {display:block;width:100%;border-bottom:1px solid #333;font-size:1.2em;padding-bottom:.5em;margin-top:0;margin-bottom:.75em;}
+#readInner sup{line-height:.8em;}
+#readInner .page-separator{clear:both;display:block;font-size:.85em;filter:alpha(opacity=20);opacity:.20;text-align:center;}
+.style-apertura #readInner h1 {border-bottom-color:#ededed;}
+#readInner blockquote {margin-left:3em;margin-right:3em;}
+#readability-inner * {margin-bottom:16px;border:none;background:none;}
+/* Footer */
+#readFooter {display:block;border-top:1px solid #333;text-align:center;clear:both;overflow:hidden;}
+.style-apertura #readFooter {border-top-color:#ededed;}
+#rdb-footer-left {display:inline;float:left;margin-top:15px;width:285px;background-position:0 -36px;}
+.rdbTypekit #rdb-footer-left {width:475px;}
+#rdb-footer-left a,#rdb-footer-left a:link {float:left;}
+#readability-logo {display:inline;background-position:0 -36px;height:29px;width:189px;text-indent:-9000px;}
+#arc90-logo {display:inline;background-position:right -36px;height:29px;width:96px;text-indent:-9000px;}
+#readability-url {display:none;}
+.style-apertura #readability-logo {background-position:0 -67px;}
+.style-apertura #arc90-logo {background-position:right -67px;}
+#rdb-footer-right {display:inline;float:right;text-align:right;font-size:.75em;margin-top:18px;}
+#rdb-footer-right a {display:inline-block;float:left;overflow:visible;line-height:16px;vertical-align:baseline;}
+.footer-twitterLink {height:20px;margin-left:20px;padding:4px 0 0 28px;background-position:0 -123px;font-size:12px;}
+#rdb-footer-left .footer-twitterLink {display:none;margin-top:1px;padding-top:2px;}
+.rdbTypekit #rdb-footer-right .footer-twitterLink {display:none;}
+.rdbTypekit #rdb-footer-left .footer-twitterLink {display:inline-block!important;}
+a.rdbTK-powered,a.rdbTK-powered:link,a.rdbTK-powered:hover {font-size:16px;color:#858789!important;text-decoration:none!important;}
+a.rdbTK-powered span {display:inline-block;height:22px;margin-left:2px;padding:4px 0 0 26px;background-position:0 -146px!important;}
+.style-apertura #rdb-inverse,.style-athelas #rdb-athelas {display:block;}
+span.version {display:none;}
+/* Tools */
+#readTools {width:34px;height:150px;position:fixed;z-index:100;top:10px;left:10px;}
+#readTools a {overflow:hidden;margin-bottom:8px;display:block;opacity:.4;text-indent:-99999px;height:34px;width:34px;text-decoration:none;filter:alpha(opacity=40);}
+#reload-page {background-position:0 0;}
+#print-page {background-position:-36px 0;}
+#email-page {background-position:-72px 0;}
+#kindle-page {background-position:-108px 0;}
+#readTools a:hover {opacity:1;filter:alpha(opacity=100);}
+/* -- USER-CONFIGURABLE STYLING -- */
+/* Size */
+.size-x-small {font-size:.75em;}
+.size-small {font-size:.938em;}
+.size-medium {font-size:1.125em;}
+.size-large {font-size:1.375em;}
+.size-x-large {font-size:1.75em;}
+/* Style */
+.style-newspaper {font-family:"Times New Roman", Times, serif;background:#fbfbfb;color:#080000;}
+.style-newspaper h1 {text-transform:capitalize;font-family:Georgia, "Times New Roman", Times, serif;}
+.style-newspaper #readInner a {color:#0924e1;}
+.style-novel {font-family:"Palatino Linotype", "Book Antiqua", Palatino, serif;background:#f4eed9;color:#1d1916;}
+.style-novel #readInner a {color:#1856ba;}
+.style-ebook {font-family:Arial, Helvetica, sans-serif;background:#edebe8;color:#2c2d32;}
+.style-ebook #readInner a {color:#187dc9;}
+.style-ebook h1 {font-family:"Arial Black", Gadget, sans-serif;font-weight:400;}
+.style-terminal {font-family:"Lucida Console", Monaco, monospace;background:#1d4e2c;color:#c6ffc6;}
+.style-terminal #readInner a {color:#093;}
+/* Typekit */
+.style-apertura {font-family:"apertura-1", "apertura-2", sans-serif;background-color:#2d2828;color:#eae8e9;}
+.style-apertura #readInner a {color:#58b0ff;}
+.style-athelas {font-family:"athelas-1", "athelas-2", "Palatino Linotype", "Book Antiqua", Palatino, serif;background-color:#f7f7f7;color:#2b373d;}
+.style-athelas #readInner a {color:#1e83cb;}
+/* Margin */
+.margin-x-narrow {width:95%;}
+.margin-narrow {width:85%;}
+.margin-medium {width:75%;}
+.margin-wide {width:55%;}
+.margin-x-wide {width:35%;}
+/* -- USER-CONFIGURABLE STYLING -- */
+/* -- DEBUG -- */
+.bug-green {background:#bbf9b0;border:4px solid green;}
+.bug-red {background:red;}
+.bug-yellow {background:#ffff8e;}
+.bug-blue {background:#bfdfff;}
+/* -- EMAIL / KINDLE POP UP -- */
+#kindle-container, #email-container {position:fixed;top:60px;left:50%;width:500px;height:490px;border:solid 3px #666;background-color:#fff;z-index:100!important;overflow:hidden;margin:0 0 0 -240px;padding:0;}
+/* Override html styling attributes */
+table, tr, td { background-color: transparent !important; }

PortablePorts/NReadability/SgmlDomBuilder.cs

@@ -0,0 +1,114 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Linq;
+using PocketSharp.Ports.Sgml;
+using System.IO;
+
+namespace PocketSharp.Ports.NReadability
+{
+  /// <summary>
+  /// A class for constructing a DOM from HTML markup.
+  /// </summary>
+  public class SgmlDomBuilder
+  {
+    #region Public methods
+
+    /// <summary>
+    /// Constructs a DOM (System.Xml.Linq.XDocument) from HTML markup.
+    /// </summary>
+    /// <param name="htmlContent">HTML markup from which the DOM is to be constructed.</param>
+    /// <returns>System.Linq.Xml.XDocument instance which is a DOM of the provided HTML markup.</returns>
+    public XDocument BuildDocument(string htmlContent)
+    {
+      if (htmlContent == null)
+      {
+        throw new ArgumentNullException("htmlContent");
+      }
+
+      if (htmlContent.Trim().Length == 0)
+      {
+        return new XDocument();
+      }
+
+      // "trim end" htmlContent to ...</html>$ (codinghorror.com puts some scripts after the </html> - sic!)
+      const string htmlEnd = "</html";
+      int indexOfHtmlEnd = htmlContent.LastIndexOf(htmlEnd);
+
+      if (indexOfHtmlEnd != -1)
+      {
+        int indexOfHtmlEndBracket = htmlContent.IndexOf('>', indexOfHtmlEnd);
+
+        if (indexOfHtmlEndBracket != -1)
+        {
+          htmlContent = htmlContent.Substring(0, indexOfHtmlEndBracket + 1);
+        }
+      }
+
+      XDocument document;
+
+      try
+      {
+        document = LoadDocument(htmlContent);
+      }
+      catch (InvalidOperationException exc)
+      {
+        // sometimes SgmlReader doesn't handle <script> tags well and XDocument.Load() throws,
+        // so we can retry with the html content with <script> tags stripped off
+
+        if (!exc.Message.Contains("EndOfFile"))
+        {
+          throw;
+        }
+
+        htmlContent = HtmlUtils.RemoveScriptTags(htmlContent);
+
+        document = LoadDocument(htmlContent);
+      }
+
+      return document;
+    }
+
+    private static XDocument LoadDocument(string htmlContent)
+    {
+      using (var sgmlReader = new SgmlReader())
+      {
+        sgmlReader.CaseFolding = CaseFolding.ToLower;
+        sgmlReader.DocType = "HTML";
+        sgmlReader.WhitespaceHandling = WhitespaceHandling.None;
+
+        using (var sr = new StreamReader(new MemoryStream(Encoding.UTF8.GetBytes(htmlContent))))
+        {
+          sgmlReader.InputStream = sr;
+
+          var document = XDocument.Load(sgmlReader);
+
+          return document;
+        }
+      }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/SgmlDomSerializer.cs

@@ -0,0 +1,208 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  /// <summary>
+  /// A class for serializing a DOM to string.
+  /// </summary>
+  public class SgmlDomSerializer
+  {
+    #region Public methods
+
+    /// <summary>
+    /// Serializes given DOM (System.Xml.Linq.XDocument object) to a string.
+    /// </summary>
+    /// <param name="document">System.Xml.Linq.XDocument instance containing the DOM to be serialized.</param>
+    /// <param name="domSerializationParams">Contains parameters that modify the behaviour of the output serialization.</param>
+    /// <param name="bodyOnly">if set to <c>true</c> [returns body only].</param>
+    /// <returns>
+    /// Serialized representation of the DOM.
+    /// </returns>
+    /// <exception cref="System.ArgumentException">
+    /// The document must have a root.
+    /// or
+    /// The document's root must be an html element.
+    /// </exception>
+    public string SerializeDocument(XDocument document, DomSerializationParams domSerializationParams)
+    {
+      if (!domSerializationParams.DontIncludeContentTypeMetaElement
+       || !domSerializationParams.DontIncludeMobileSpecificMetaElements
+       || !domSerializationParams.DontIncludeGeneratorMetaElement)
+      {
+        var documentRoot = document.Root;
+
+        if (documentRoot == null)
+        {
+          throw new ArgumentException("The document must have a root.");
+        }
+
+        if (documentRoot.Name == null || !"html".Equals(documentRoot.Name.LocalName, StringComparison.OrdinalIgnoreCase))
+        {
+          throw new ArgumentException("The document's root must be an html element.");
+        }
+
+        // add <head> element if not present
+        var headElement = documentRoot.GetChildrenByTagName("head").FirstOrDefault();
+
+        if (headElement == null)
+        {
+          headElement = new XElement("head");
+          documentRoot.AddFirst(headElement);
+        }
+
+        ProcessMetaElements(headElement, domSerializationParams);
+      }
+
+      string result = document.ToString(domSerializationParams.PrettyPrint ? SaveOptions.None : SaveOptions.DisableFormatting);
+
+      if (!domSerializationParams.DontIncludeDocTypeMetaElement)
+      {
+        result = "<!DOCTYPE html>\r\n" + result;
+      }
+
+      if (domSerializationParams.BodyOnly && document.Root != null)
+      {
+        var body = document.Root.GetChildrenByTagName("body").FirstOrDefault();
+
+        if (body != null)
+        {
+          result = body.GetInnerHtml();
+        }
+      }
+
+      return result;
+    }
+
+    /// <summary>
+    /// Serializes given DOM (System.Xml.Linq.XDocument object) to a string.
+    /// </summary>
+    /// <param name="document">System.Xml.Linq.XDocument instance containing the DOM to be serialized.</param>
+    /// <returns>Serialized representation of the DOM.</returns>
+    public string SerializeDocument(XDocument document)
+    {
+      return SerializeDocument(document, DomSerializationParams.CreateDefault());
+    }
+
+    #endregion
+
+    #region Private helper methods
+
+    private static void ProcessMetaElements(XElement headElement, DomSerializationParams domSerializationParams)
+    {
+      ProcessMetaContentTypeElement(headElement, domSerializationParams);
+      ProcessMobileSpecificMetaElements(headElement, domSerializationParams);
+      ProcessMetaGeneratorElement(headElement, domSerializationParams);
+    }
+
+    private static void ProcessMetaContentTypeElement(XElement headElement, DomSerializationParams domSerializationParams)
+    {
+      if (!domSerializationParams.DontIncludeContentTypeMetaElement)
+      {
+        XElement metaContentTypeElement =
+          (from metaElement in headElement.GetChildrenByTagName("meta")
+           where "content-type".Equals(metaElement.GetAttributeValue("http-equiv", ""), StringComparison.OrdinalIgnoreCase)
+           select metaElement).FirstOrDefault();
+
+        // remove meta 'http-equiv' element if present
+        if (metaContentTypeElement != null)
+        {
+          metaContentTypeElement.Remove();
+        }
+
+        // add <meta name="http-equiv" ... /> element
+        metaContentTypeElement =
+          new XElement(
+            XName.Get("meta", headElement.Name != null ? (headElement.Name.NamespaceName ?? "") : ""),
+            new XAttribute("http-equiv", "Content-Type"),
+            new XAttribute("content", "text/html; charset=utf-8"));
+
+        headElement.AddFirst(metaContentTypeElement);
+      }
+    }
+
+    private static void ProcessMobileSpecificMetaElements(XElement headElement, DomSerializationParams domSerializationParams)
+    {
+      XElement metaViewportElement =
+        (from metaElement in headElement.GetChildrenByTagName("meta")
+         where "viewport".Equals(metaElement.GetAttributeValue("name", ""), StringComparison.OrdinalIgnoreCase)
+         select metaElement).FirstOrDefault();
+
+      // remove meta 'viewport' element if present
+      if (metaViewportElement != null)
+      {
+        metaViewportElement.Remove();
+      }
+
+      XElement metaHandheldFriendlyElement =
+        (from metaElement in headElement.GetChildrenByTagName("meta")
+         where "HandheldFriendly".Equals(metaElement.GetAttributeValue("name", ""), StringComparison.OrdinalIgnoreCase)
+         select metaElement).FirstOrDefault();
+
+      // remove meta 'HandheldFriendly' element if present
+      if (metaHandheldFriendlyElement != null)
+      {
+        metaHandheldFriendlyElement.Remove();
+      }
+
+      if (!domSerializationParams.DontIncludeMobileSpecificMetaElements)
+      {
+        // add <meta name="HandheldFriendly" ... /> element
+        metaHandheldFriendlyElement = new XElement(
+          XName.Get("meta", headElement.Name != null ? (headElement.Name.NamespaceName ?? "") : ""),
+          new XAttribute("name", "HandheldFriendly"),
+          new XAttribute("content", "true"));
+
+        headElement.AddFirst(metaHandheldFriendlyElement);
+      }
+    }
+
+    private static void ProcessMetaGeneratorElement(XElement headElement, DomSerializationParams domSerializationParams)
+    {
+      if (!domSerializationParams.DontIncludeGeneratorMetaElement)
+      {
+        XElement metaGeneratorElement =
+          (from metaElement in headElement.GetChildrenByTagName("meta")
+           where "Generator".Equals(metaElement.GetAttributeValue("name", ""), StringComparison.OrdinalIgnoreCase)
+           select metaElement).FirstOrDefault();
+
+        // remove meta 'generator' element if present
+        if (metaGeneratorElement != null)
+        {
+          metaGeneratorElement.Remove();
+        }
+
+        // add <meta name="Generator" ... /> element
+        metaGeneratorElement = new XElement(
+          XName.Get("meta", headElement.Name != null ? (headElement.Name.NamespaceName ?? "") : ""),
+          new XAttribute("name", "Generator"),
+          new XAttribute("content", Consts.NReadabilityFullName));
+
+        headElement.AddFirst(metaGeneratorElement);
+      }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/TranscodingInput.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class TranscodingInput
+  {
+    private DomSerializationParams _domSerializationParams;
+
+    public TranscodingInput(string htmlContent)
+    {
+      if (string.IsNullOrEmpty(htmlContent))
+      {
+        throw new ArgumentException("Argument can't be null nor empty.", "htmlContent");
+      }
+
+      HtmlContent = htmlContent;
+    }
+
+    public string HtmlContent { get; private set; }
+
+    public string Url { get; set; }
+
+    public DomSerializationParams DomSerializationParams
+    {
+      get { return _domSerializationParams ?? (_domSerializationParams = DomSerializationParams.CreateDefault()); }
+      set { _domSerializationParams = value; }
+    }
+  }
+}

PortablePorts/NReadability/TranscodingResult.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Xml.Linq;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class TranscodingResult
+  {
+    public TranscodingResult(bool contentExtracted, bool titleExtracted)
+    {
+      ContentExtracted = contentExtracted;
+      TitleExtracted = titleExtracted;
+    }
+
+    public bool ContentExtracted { get; private set; }
+
+    public bool TitleExtracted { get; private set; }
+
+    public string ExtractedContent { get; set; }
+
+    public string ExtractedTitle { get; set; }
+
+    public string NextPageUrl { get; set; }
+
+    public XDocument RawDocument { get; set; }
+  }
+}

PortablePorts/NReadability/UtilityExtensions.cs

@@ -0,0 +1,45 @@
+/*
+ * NReadability
+ * http://code.google.com/p/nreadability/
+ * 
+ * Copyright 2010 Marek Stój
+ * http://immortal.pl/
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+
+namespace PocketSharp.Ports.NReadability
+{
+  internal static class UtilityExtensions
+  {
+    #region Public methods
+
+    public static bool IsCloseToZero(this float x)
+    {
+      return Math.Abs(x) < float.Epsilon;
+    }
+
+    public static void ForEach<T>(this IEnumerable<T> enumerable, Action<T> action)
+    {
+      foreach (var element in enumerable)
+      {
+        action(element);
+      }
+    }
+
+    #endregion
+  }
+}

PortablePorts/NReadability/WebTranscodingInput.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace PocketSharp.Ports.NReadability
+{
+  public class WebTranscodingInput
+  {
+    private DomSerializationParams _domSerializationParams;
+
+    public WebTranscodingInput(string url)
+    {
+      if (string.IsNullOrEmpty(url))
+      {
+        throw new ArgumentException("Argument can't be null nor empty.", "url");
+      }
+
+      Url = url;
+    }
+
+    public string Url { get; private set; }
+
+    public DomSerializationParams DomSerializationParams
+    {
+      get { return _domSerializationParams ?? (_domSerializationParams = DomSerializationParams.CreateDefault()); }
+      set { _domSerializationParams = value; }
+    }
+  }
+}

PortablePorts/NReadability/WebTranscodingResult.cs

@@ -0,0 +1,19 @@
+namespace PocketSharp.Ports.NReadability
+{
+  public class WebTranscodingResult
+  {
+    public WebTranscodingResult(bool contentExtracted, bool titleExtracted)
+    {
+      ContentExtracted = contentExtracted;
+      TitleExtracted = titleExtracted;
+    }
+
+    public bool ContentExtracted { get; private set; }
+
+    public bool TitleExtracted { get; private set; }
+
+    public string ExtractedContent { get; set; }
+
+    public string ExtractedTitle { get; set; }
+  }
+}

PortablePorts/SgmlReader/HTMLspecial.ent

@@ -0,0 +1,77 @@
+<!-- Special characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLspecial PUBLIC
+       "-//W3C//ENTITIES Special//EN//HTML">
+     %HTMLspecial; -->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 list) do not clash with any
+     existing ISO 8879 entity names. ISO 10646 character numbers
+     are given for each character, in hex. CDATA values are decimal
+     conversions of the ISO 10646 values and refer to the document
+     character set. Names are ISO 10646 names. 
+
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot    CDATA "&#34;"   -- quotation mark = APL quote,
+                                    U+0022 ISOnum -->
+<!ENTITY amp     CDATA "&#38;"   -- ampersand, U+0026 ISOnum -->
+<!ENTITY lt      CDATA "&#60;"   -- less-than sign, U+003C ISOnum -->
+<!ENTITY gt      CDATA "&#62;"   -- greater-than sign, U+003E ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig   CDATA "&#338;"  -- latin capital ligature OE,
+                                    U+0152 ISOlat2 -->
+<!ENTITY oelig   CDATA "&#339;"  -- latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron  CDATA "&#352;"  -- latin capital letter S with caron,
+                                    U+0160 ISOlat2 -->
+<!ENTITY scaron  CDATA "&#353;"  -- latin small letter s with caron,
+                                    U+0161 ISOlat2 -->
+<!ENTITY Yuml    CDATA "&#376;"  -- latin capital letter Y with diaeresis,
+                                    U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ    CDATA "&#710;"  -- modifier letter circumflex accent,
+                                    U+02C6 ISOpub -->
+<!ENTITY tilde   CDATA "&#732;"  -- small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp    CDATA "&#8194;" -- en space, U+2002 ISOpub -->
+<!ENTITY emsp    CDATA "&#8195;" -- em space, U+2003 ISOpub -->
+<!ENTITY thinsp  CDATA "&#8201;" -- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj    CDATA "&#8204;" -- zero width non-joiner,
+                                    U+200C NEW RFC 2070 -->
+<!ENTITY zwj     CDATA "&#8205;" -- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm     CDATA "&#8206;" -- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm     CDATA "&#8207;" -- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash   CDATA "&#8211;" -- en dash, U+2013 ISOpub -->
+<!ENTITY mdash   CDATA "&#8212;" -- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo   CDATA "&#8216;" -- left single quotation mark,
+                                    U+2018 ISOnum -->
+<!ENTITY rsquo   CDATA "&#8217;" -- right single quotation mark,
+                                    U+2019 ISOnum -->
+<!ENTITY sbquo   CDATA "&#8218;" -- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo   CDATA "&#8220;" -- left double quotation mark,
+                                    U+201C ISOnum -->
+<!ENTITY rdquo   CDATA "&#8221;" -- right double quotation mark,
+                                    U+201D ISOnum -->
+<!ENTITY bdquo   CDATA "&#8222;" -- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger  CDATA "&#8224;" -- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger  CDATA "&#8225;" -- double dagger, U+2021 ISOpub -->
+<!ENTITY permil  CDATA "&#8240;" -- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo  CDATA "&#8249;" -- single left-pointing angle quotation mark,
+                                    U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo  CDATA "&#8250;" -- single right-pointing angle quotation mark,
+                                    U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+<!ENTITY euro   CDATA "&#8364;"  -- euro sign, U+20AC NEW -->

PortablePorts/SgmlReader/HTMLsymbol.ent

@@ -0,0 +1,241 @@
+<!-- Mathematical, Greek and Symbolic characters for HTML -->
+
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLsymbol PUBLIC
+       "-//W3C//ENTITIES Symbols//EN//HTML">
+     %HTMLsymbol; -->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 list) do not clash with any
+     existing ISO 8879 entity names. ISO 10646 character numbers
+     are given for each character, in hex. CDATA values are decimal
+     conversions of the ISO 10646 values and refer to the document
+     character set. Names are ISO 10646 names. 
+
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof     CDATA "&#402;" -- latin small f with hook = function
+                                    = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha    CDATA "&#913;" -- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta     CDATA "&#914;" -- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma    CDATA "&#915;" -- greek capital letter gamma,
+                                    U+0393 ISOgrk3 -->
+<!ENTITY Delta    CDATA "&#916;" -- greek capital letter delta,
+                                    U+0394 ISOgrk3 -->
+<!ENTITY Epsilon  CDATA "&#917;" -- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta     CDATA "&#918;" -- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta      CDATA "&#919;" -- greek capital letter eta, U+0397 -->
+<!ENTITY Theta    CDATA "&#920;" -- greek capital letter theta,
+                                    U+0398 ISOgrk3 -->
+<!ENTITY Iota     CDATA "&#921;" -- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa    CDATA "&#922;" -- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda   CDATA "&#923;" -- greek capital letter lambda,
+                                    U+039B ISOgrk3 -->
+<!ENTITY Mu       CDATA "&#924;" -- greek capital letter mu, U+039C -->
+<!ENTITY Nu       CDATA "&#925;" -- greek capital letter nu, U+039D -->
+<!ENTITY Xi       CDATA "&#926;" -- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron  CDATA "&#927;" -- greek capital letter omicron, U+039F -->
+<!ENTITY Pi       CDATA "&#928;" -- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho      CDATA "&#929;" -- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma    CDATA "&#931;" -- greek capital letter sigma,
+                                    U+03A3 ISOgrk3 -->
+<!ENTITY Tau      CDATA "&#932;" -- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon  CDATA "&#933;" -- greek capital letter upsilon,
+                                    U+03A5 ISOgrk3 -->
+<!ENTITY Phi      CDATA "&#934;" -- greek capital letter phi,
+                                    U+03A6 ISOgrk3 -->
+<!ENTITY Chi      CDATA "&#935;" -- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi      CDATA "&#936;" -- greek capital letter psi,
+                                    U+03A8 ISOgrk3 -->
+<!ENTITY Omega    CDATA "&#937;" -- greek capital letter omega,
+                                    U+03A9 ISOgrk3 -->
+
+<!ENTITY alpha    CDATA "&#945;" -- greek small letter alpha,
+                                    U+03B1 ISOgrk3 -->
+<!ENTITY beta     CDATA "&#946;" -- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma    CDATA "&#947;" -- greek small letter gamma,
+                                    U+03B3 ISOgrk3 -->
+<!ENTITY delta    CDATA "&#948;" -- greek small letter delta,
+                                    U+03B4 ISOgrk3 -->
+<!ENTITY epsilon  CDATA "&#949;" -- greek small letter epsilon,
+                                    U+03B5 ISOgrk3 -->
+<!ENTITY zeta     CDATA "&#950;" -- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta      CDATA "&#951;" -- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta    CDATA "&#952;" -- greek small letter theta,
+                                    U+03B8 ISOgrk3 -->
+<!ENTITY iota     CDATA "&#953;" -- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa    CDATA "&#954;" -- greek small letter kappa,
+                                    U+03BA ISOgrk3 -->
+<!ENTITY lambda   CDATA "&#955;" -- greek small letter lambda,
+                                    U+03BB ISOgrk3 -->
+<!ENTITY mu       CDATA "&#956;" -- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu       CDATA "&#957;" -- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi       CDATA "&#958;" -- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron  CDATA "&#959;" -- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi       CDATA "&#960;" -- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho      CDATA "&#961;" -- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf   CDATA "&#962;" -- greek small letter final sigma,
+                                    U+03C2 ISOgrk3 -->
+<!ENTITY sigma    CDATA "&#963;" -- greek small letter sigma,
+                                    U+03C3 ISOgrk3 -->
+<!ENTITY tau      CDATA "&#964;" -- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon  CDATA "&#965;" -- greek small letter upsilon,
+                                    U+03C5 ISOgrk3 -->
+<!ENTITY phi      CDATA "&#966;" -- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi      CDATA "&#967;" -- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi      CDATA "&#968;" -- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega    CDATA "&#969;" -- greek small letter omega,
+                                    U+03C9 ISOgrk3 -->
+<!ENTITY thetasym CDATA "&#977;" -- greek small letter theta symbol,
+                                    U+03D1 NEW -->
+<!ENTITY upsih    CDATA "&#978;" -- greek upsilon with hook symbol,
+                                    U+03D2 NEW -->
+<!ENTITY piv      CDATA "&#982;" -- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull     CDATA "&#8226;" -- bullet = black small circle,
+                                     U+2022 ISOpub  -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip   CDATA "&#8230;" -- horizontal ellipsis = three dot leader,
+                                     U+2026 ISOpub  -->
+<!ENTITY prime    CDATA "&#8242;" -- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime    CDATA "&#8243;" -- double prime = seconds = inches,
+                                     U+2033 ISOtech -->
+<!ENTITY oline    CDATA "&#8254;" -- overline = spacing overscore,
+                                     U+203E NEW -->
+<!ENTITY frasl    CDATA "&#8260;" -- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp   CDATA "&#8472;" -- script capital P = power set
+                                     = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image    CDATA "&#8465;" -- blackletter capital I = imaginary part,
+                                     U+2111 ISOamso -->
+<!ENTITY real     CDATA "&#8476;" -- blackletter capital R = real part symbol,
+                                     U+211C ISOamso -->
+<!ENTITY trade    CDATA "&#8482;" -- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym  CDATA "&#8501;" -- alef symbol = first transfinite cardinal,
+                                     U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef,
+     U+05D0 although the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr     CDATA "&#8592;" -- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr     CDATA "&#8593;" -- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr     CDATA "&#8594;" -- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr     CDATA "&#8595;" -- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr     CDATA "&#8596;" -- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr    CDATA "&#8629;" -- downwards arrow with corner leftwards
+                                     = carriage return, U+21B5 NEW -->
+<!ENTITY lArr     CDATA "&#8656;" -- leftwards double arrow, U+21D0 ISOtech -->
+<!-- ISO 10646 does not say that lArr is the same as the 'is implied by' arrow
+    but also does not have any other character for that function. So ? lArr can
+    be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr     CDATA "&#8657;" -- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr     CDATA "&#8658;" -- rightwards double arrow,
+                                     U+21D2 ISOtech -->
+<!-- ISO 10646 does not say this is the 'implies' character but does not have 
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
+<!ENTITY dArr     CDATA "&#8659;" -- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr     CDATA "&#8660;" -- left right double arrow,
+                                     U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall   CDATA "&#8704;" -- for all, U+2200 ISOtech -->
+<!ENTITY part     CDATA "&#8706;" -- partial differential, U+2202 ISOtech  -->
+<!ENTITY exist    CDATA "&#8707;" -- there exists, U+2203 ISOtech -->
+<!ENTITY empty    CDATA "&#8709;" -- empty set = null set = diameter,
+                                     U+2205 ISOamso -->
+<!ENTITY nabla    CDATA "&#8711;" -- nabla = backward difference,
+                                     U+2207 ISOtech -->
+<!ENTITY isin     CDATA "&#8712;" -- element of, U+2208 ISOtech -->
+<!ENTITY notin    CDATA "&#8713;" -- not an element of, U+2209 ISOtech -->
+<!ENTITY ni       CDATA "&#8715;" -- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
+<!ENTITY prod     CDATA "&#8719;" -- n-ary product = product sign,
+                                     U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+     the same glyph might be used for both -->
+<!ENTITY sum      CDATA "&#8721;" -- n-ary sumation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+     though the same glyph might be used for both -->
+<!ENTITY minus    CDATA "&#8722;" -- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast   CDATA "&#8727;" -- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic    CDATA "&#8730;" -- square root = radical sign,
+                                     U+221A ISOtech -->
+<!ENTITY prop     CDATA "&#8733;" -- proportional to, U+221D ISOtech -->
+<!ENTITY infin    CDATA "&#8734;" -- infinity, U+221E ISOtech -->
+<!ENTITY ang      CDATA "&#8736;" -- angle, U+2220 ISOamso -->
+<!ENTITY and      CDATA "&#8743;" -- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or       CDATA "&#8744;" -- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap      CDATA "&#8745;" -- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup      CDATA "&#8746;" -- union = cup, U+222A ISOtech -->
+<!ENTITY int      CDATA "&#8747;" -- integral, U+222B ISOtech -->
+<!ENTITY there4   CDATA "&#8756;" -- therefore, U+2234 ISOtech -->
+<!ENTITY sim      CDATA "&#8764;" -- tilde operator = varies with = similar to,
+                                     U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+     although the same glyph might be used to represent both  -->
+<!ENTITY cong     CDATA "&#8773;" -- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp    CDATA "&#8776;" -- almost equal to = asymptotic to,
+                                     U+2248 ISOamsr -->
+<!ENTITY ne       CDATA "&#8800;" -- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv    CDATA "&#8801;" -- identical to, U+2261 ISOtech -->
+<!ENTITY le       CDATA "&#8804;" -- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge       CDATA "&#8805;" -- greater-than or equal to,
+                                     U+2265 ISOtech -->
+<!ENTITY sub      CDATA "&#8834;" -- subset of, U+2282 ISOtech -->
+<!ENTITY sup      CDATA "&#8835;" -- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  --> 
+<!ENTITY nsub     CDATA "&#8836;" -- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube     CDATA "&#8838;" -- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe     CDATA "&#8839;" -- superset of or equal to,
+                                     U+2287 ISOtech -->
+<!ENTITY oplus    CDATA "&#8853;" -- circled plus = direct sum,
+                                     U+2295 ISOamsb -->
+<!ENTITY otimes   CDATA "&#8855;" -- circled times = vector product,
+                                     U+2297 ISOamsb -->
+<!ENTITY perp     CDATA "&#8869;" -- up tack = orthogonal to = perpendicular,
+                                     U+22A5 ISOtech -->
+<!ENTITY sdot     CDATA "&#8901;" -- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil    CDATA "&#8968;" -- left ceiling = apl upstile,
+                                     U+2308 ISOamsc  -->
+<!ENTITY rceil    CDATA "&#8969;" -- right ceiling, U+2309 ISOamsc  -->
+<!ENTITY lfloor   CDATA "&#8970;" -- left floor = apl downstile,
+                                     U+230A ISOamsc  -->
+<!ENTITY rfloor   CDATA "&#8971;" -- right floor, U+230B ISOamsc  -->
+<!ENTITY lang     CDATA "&#9001;" -- left-pointing angle bracket = bra,
+                                     U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than' 
+     or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang     CDATA "&#9002;" -- right-pointing angle bracket = ket,
+                                     U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than' 
+     or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz      CDATA "&#9674;" -- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades   CDATA "&#9824;" -- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs    CDATA "&#9827;" -- black club suit = shamrock,
+                                     U+2663 ISOpub -->
+<!ENTITY hearts   CDATA "&#9829;" -- black heart suit = valentine,
+                                     U+2665 ISOpub -->
+<!ENTITY diams    CDATA "&#9830;" -- black diamond suit, U+2666 ISOpub -->

PortablePorts/SgmlReader/Properties/AssemblyInfo.cs

@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SgmlReader")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SgmlReader")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

PortablePorts/SgmlReader/SgmlReader.csproj

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9112414C-E2D1-43BA-A298-A89F77D94332}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PocketSharp.Ports.SgmlReader</RootNamespace>
+    <AssemblyName>PocketSharp.Ports.SgmlReader</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile96</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;PORTABLE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <EmbeddedResource Include="Html.dtd" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="SgmlParser.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SgmlReader.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

PortablePorts/SgmlReader/htmllat1.ent

@@ -0,0 +1,194 @@
+<!-- Portions (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLlat1 PUBLIC
+       "-//W3C//ENTITIES Latin 1//EN//HTML">
+     %HTMLlat1;
+-->
+
+<!ENTITY nbsp   CDATA "&#160;" -- no-break space = non-breaking space,
+                                  U+00A0 ISOnum -->
+<!ENTITY iexcl  CDATA "&#161;" -- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent   CDATA "&#162;" -- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound  CDATA "&#163;" -- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren CDATA "&#164;" -- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen    CDATA "&#165;" -- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar CDATA "&#166;" -- broken bar = broken vertical bar,
+                                  U+00A6 ISOnum -->
+<!ENTITY sect   CDATA "&#167;" -- section sign, U+00A7 ISOnum -->
+<!ENTITY uml    CDATA "&#168;" -- diaeresis = spacing diaeresis,
+                                  U+00A8 ISOdia -->
+<!ENTITY copy   CDATA "&#169;" -- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf   CDATA "&#170;" -- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo  CDATA "&#171;" -- left-pointing double angle quotation mark
+                                  = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not    CDATA "&#172;" -- not sign, U+00AC ISOnum -->
+<!ENTITY shy    CDATA "&#173;" -- soft hyphen = discretionary hyphen,
+                                  U+00AD ISOnum -->
+<!ENTITY reg    CDATA "&#174;" -- registered sign = registered trade mark sign,
+                                  U+00AE ISOnum -->
+<!ENTITY macr   CDATA "&#175;" -- macron = spacing macron = overline
+                                  = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg    CDATA "&#176;" -- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn CDATA "&#177;" -- plus-minus sign = plus-or-minus sign,
+                                  U+00B1 ISOnum -->
+<!ENTITY sup2   CDATA "&#178;" -- superscript two = superscript digit two
+                                  = squared, U+00B2 ISOnum -->
+<!ENTITY sup3   CDATA "&#179;" -- superscript three = superscript digit three
+                                  = cubed, U+00B3 ISOnum -->
+<!ENTITY acute  CDATA "&#180;" -- acute accent = spacing acute,
+                                  U+00B4 ISOdia -->
+<!ENTITY micro  CDATA "&#181;" -- micro sign, U+00B5 ISOnum -->
+<!ENTITY para   CDATA "&#182;" -- pilcrow sign = paragraph sign,
+                                  U+00B6 ISOnum -->
+<!ENTITY middot CDATA "&#183;" -- middle dot = Georgian comma
+                                  = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil  CDATA "&#184;" -- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1   CDATA "&#185;" -- superscript one = superscript digit one,
+                                  U+00B9 ISOnum -->
+<!ENTITY ordm   CDATA "&#186;" -- masculine ordinal indicator,
+                                  U+00BA ISOnum -->
+<!ENTITY raquo  CDATA "&#187;" -- right-pointing double angle quotation mark
+                                  = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 CDATA "&#188;" -- vulgar fraction one quarter
+                                  = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 CDATA "&#189;" -- vulgar fraction one half
+                                  = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 CDATA "&#190;" -- vulgar fraction three quarters
+                                  = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest CDATA "&#191;" -- inverted question mark
+                                  = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave CDATA "&#192;" -- latin capital letter A with grave
+                                  = latin capital letter A grave,
+                                  U+00C0 ISOlat1 -->
+<!ENTITY Aacute CDATA "&#193;" -- latin capital letter A with acute,
+                                  U+00C1 ISOlat1 -->
+<!ENTITY Acirc  CDATA "&#194;" -- latin capital letter A with circumflex,
+                                  U+00C2 ISOlat1 -->
+<!ENTITY Atilde CDATA "&#195;" -- latin capital letter A with tilde,
+                                  U+00C3 ISOlat1 -->
+<!ENTITY Auml   CDATA "&#196;" -- latin capital letter A with diaeresis,
+                                  U+00C4 ISOlat1 -->
+<!ENTITY Aring  CDATA "&#197;" -- latin capital letter A with ring above
+                                  = latin capital letter A ring,
+                                  U+00C5 ISOlat1 -->
+<!ENTITY AElig  CDATA "&#198;" -- latin capital letter AE
+                                  = latin capital ligature AE,
+                                  U+00C6 ISOlat1 -->
+<!ENTITY Ccedil CDATA "&#199;" -- latin capital letter C with cedilla,
+                                  U+00C7 ISOlat1 -->
+<!ENTITY Egrave CDATA "&#200;" -- latin capital letter E with grave,
+                                  U+00C8 ISOlat1 -->
+<!ENTITY Eacute CDATA "&#201;" -- latin capital letter E with acute,
+                                  U+00C9 ISOlat1 -->
+<!ENTITY Ecirc  CDATA "&#202;" -- latin capital letter E with circumflex,
+                                  U+00CA ISOlat1 -->
+<!ENTITY Euml   CDATA "&#203;" -- latin capital letter E with diaeresis,
+                                  U+00CB ISOlat1 -->
+<!ENTITY Igrave CDATA "&#204;" -- latin capital letter I with grave,
+                                  U+00CC ISOlat1 -->
+<!ENTITY Iacute CDATA "&#205;" -- latin capital letter I with acute,
+                                  U+00CD ISOlat1 -->
+<!ENTITY Icirc  CDATA "&#206;" -- latin capital letter I with circumflex,
+                                  U+00CE ISOlat1 -->
+<!ENTITY Iuml   CDATA "&#207;" -- latin capital letter I with diaeresis,
+                                  U+00CF ISOlat1 -->
+<!ENTITY ETH    CDATA "&#208;" -- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde CDATA "&#209;" -- latin capital letter N with tilde,
+                                  U+00D1 ISOlat1 -->
+<!ENTITY Ograve CDATA "&#210;" -- latin capital letter O with grave,
+                                  U+00D2 ISOlat1 -->
+<!ENTITY Oacute CDATA "&#211;" -- latin capital letter O with acute,
+                                  U+00D3 ISOlat1 -->
+<!ENTITY Ocirc  CDATA "&#212;" -- latin capital letter O with circumflex,
+                                  U+00D4 ISOlat1 -->
+<!ENTITY Otilde CDATA "&#213;" -- latin capital letter O with tilde,
+                                  U+00D5 ISOlat1 -->
+<!ENTITY Ouml   CDATA "&#214;" -- latin capital letter O with diaeresis,
+                                  U+00D6 ISOlat1 -->
+<!ENTITY times  CDATA "&#215;" -- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash CDATA "&#216;" -- latin capital letter O with stroke
+                                  = latin capital letter O slash,
+                                  U+00D8 ISOlat1 -->
+<!ENTITY Ugrave CDATA "&#217;" -- latin capital letter U with grave,
+                                  U+00D9 ISOlat1 -->
+<!ENTITY Uacute CDATA "&#218;" -- latin capital letter U with acute,
+                                  U+00DA ISOlat1 -->
+<!ENTITY Ucirc  CDATA "&#219;" -- latin capital letter U with circumflex,
+                                  U+00DB ISOlat1 -->
+<!ENTITY Uuml   CDATA "&#220;" -- latin capital letter U with diaeresis,
+                                  U+00DC ISOlat1 -->
+<!ENTITY Yacute CDATA "&#221;" -- latin capital letter Y with acute,
+                                  U+00DD ISOlat1 -->
+<!ENTITY THORN  CDATA "&#222;" -- latin capital letter THORN,
+                                  U+00DE ISOlat1 -->
+<!ENTITY szlig  CDATA "&#223;" -- latin small letter sharp s = ess-zed,
+                                  U+00DF ISOlat1 -->
+<!ENTITY agrave CDATA "&#224;" -- latin small letter a with grave
+                                  = latin small letter a grave,
+                                  U+00E0 ISOlat1 -->
+<!ENTITY aacute CDATA "&#225;" -- latin small letter a with acute,
+                                  U+00E1 ISOlat1 -->
+<!ENTITY acirc  CDATA "&#226;" -- latin small letter a with circumflex,
+                                  U+00E2 ISOlat1 -->
+<!ENTITY atilde CDATA "&#227;" -- latin small letter a with tilde,
+                                  U+00E3 ISOlat1 -->
+<!ENTITY auml   CDATA "&#228;" -- latin small letter a with diaeresis,
+                                  U+00E4 ISOlat1 -->
+<!ENTITY aring  CDATA "&#229;" -- latin small letter a with ring above
+                                  = latin small letter a ring,
+                                  U+00E5 ISOlat1 -->
+<!ENTITY aelig  CDATA "&#230;" -- latin small letter ae
+                                  = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil CDATA "&#231;" -- latin small letter c with cedilla,
+                                  U+00E7 ISOlat1 -->
+<!ENTITY egrave CDATA "&#232;" -- latin small letter e with grave,
+                                  U+00E8 ISOlat1 -->
+<!ENTITY eacute CDATA "&#233;" -- latin small letter e with acute,
+                                  U+00E9 ISOlat1 -->
+<!ENTITY ecirc  CDATA "&#234;" -- latin small letter e with circumflex,
+                                  U+00EA ISOlat1 -->
+<!ENTITY euml   CDATA "&#235;" -- latin small letter e with diaeresis,
+                                  U+00EB ISOlat1 -->
+<!ENTITY igrave CDATA "&#236;" -- latin small letter i with grave,
+                                  U+00EC ISOlat1 -->
+<!ENTITY iacute CDATA "&#237;" -- latin small letter i with acute,
+                                  U+00ED ISOlat1 -->
+<!ENTITY icirc  CDATA "&#238;" -- latin small letter i with circumflex,
+                                  U+00EE ISOlat1 -->
+<!ENTITY iuml   CDATA "&#239;" -- latin small letter i with diaeresis,
+                                  U+00EF ISOlat1 -->
+<!ENTITY eth    CDATA "&#240;" -- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde CDATA "&#241;" -- latin small letter n with tilde,
+                                  U+00F1 ISOlat1 -->
+<!ENTITY ograve CDATA "&#242;" -- latin small letter o with grave,
+                                  U+00F2 ISOlat1 -->
+<!ENTITY oacute CDATA "&#243;" -- latin small letter o with acute,
+                                  U+00F3 ISOlat1 -->
+<!ENTITY ocirc  CDATA "&#244;" -- latin small letter o with circumflex,
+                                  U+00F4 ISOlat1 -->
+<!ENTITY otilde CDATA "&#245;" -- latin small letter o with tilde,
+                                  U+00F5 ISOlat1 -->
+<!ENTITY ouml   CDATA "&#246;" -- latin small letter o with diaeresis,
+                                  U+00F6 ISOlat1 -->
+<!ENTITY divide CDATA "&#247;" -- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash CDATA "&#248;" -- latin small letter o with stroke,
+                                  = latin small letter o slash,
+                                  U+00F8 ISOlat1 -->
+<!ENTITY ugrave CDATA "&#249;" -- latin small letter u with grave,
+                                  U+00F9 ISOlat1 -->
+<!ENTITY uacute CDATA "&#250;" -- latin small letter u with acute,
+                                  U+00FA ISOlat1 -->
+<!ENTITY ucirc  CDATA "&#251;" -- latin small letter u with circumflex,
+                                  U+00FB ISOlat1 -->
+<!ENTITY uuml   CDATA "&#252;" -- latin small letter u with diaeresis,
+                                  U+00FC ISOlat1 -->
+<!ENTITY yacute CDATA "&#253;" -- latin small letter y with acute,
+                                  U+00FD ISOlat1 -->
+<!ENTITY thorn  CDATA "&#254;" -- latin small letter thorn,
+                                  U+00FE ISOlat1 -->
+<!ENTITY yuml   CDATA "&#255;" -- latin small letter y with diaeresis,
+                                  U+00FF ISOlat1 -->

README.md

@@ -1,42 +1,30 @@
 ![PocketSharp](https://raw.github.com/ceee/PocketSharp/master/PocketSharp.Website/Assets/Images/github-header.png)
 
-**PocketSharp** is a C#.NET class library, that integrates the [Pocket API v3](http://getpocket.com/developer) and consists of 4 parts:
+**PocketSharp** is a C#.NET portable class library that integrates the [Pocket API v3](http://getpocket.com/developer).
 
-- Authentication
-- Retrieve
-- Modify
-- Add
-
-[pocketsharp.frontendplay.com](http://pocketsharp.frontendplay.com/)
-
-## Install using NuGet
+## Install using [NuGet](https://www.nuget.org/packages/PocketSharp/)
 
 ```
 Install-Package PocketSharp
 ```
 
-## Usage Example
+## Documentation
 
-Request a [Consumer Key on Pocket.](http://getpocket.com/developer/apps/)
+See [wiki](https://github.com/ceee/PocketSharp/wiki)
 
-Include the PocketSharp namespace and it's associated models (you will need them later):
+---
+
+## Usage Example:
+
+A search for items containing `CSS`:
 
 ```csharp
-using PocketSharp;
-using PocketSharp.Models;
-```
+PocketClient client = new PocketClient("[YOUR_CONSUMER_KEY]", "[YOUR_ACCESS_CODE]");
 
-Initialize PocketClient with:
+List<PocketItem> items = await client.Search("css");
 
-```csharp
-PocketClient _client = new PocketClient("[YOUR_CONSUMER_KEY]", "[YOUR_ACCESS_CODE]");
-```
-
-Do a simple request - e.g. a search for `CSS`:
-
-```csharp
-_client.Search("css").ForEach(
-	item => Console.WriteLine(item.ID + " | " + item.Title)
+items.ForEach(
+	item => Debug.WriteLine(item.ID + " | " + item.Title)
 );
 ```
 
@@ -48,217 +36,40 @@ Which will output:
     343693149 | CSS3 Transitions - Thank God We Have A Specification!
 	...
 
-## Create an instance
-
-Constructor:
-
-```csharp
-PocketClient(string consumerKey, string accessCode = null, Uri callbackUri = null)
-```
-
-`consumerKey`: The API key
-<br>
-`accessCode`: Provide an access code if the user is already authenticated
-<br>
-`callbackUri`: The callback URL is called by Pocket after authentication
-
-Example:
-
-```csharp
-PocketClient _client = new PocketClient(
-	consumerKey: "123498237423498723498723",
-	callbackUri: new Uri("http://ceecore.com"),
-	accessCode: "097809-oi987-izi8-jk98-oiuu89"
-);
-```
-
-You can change the _Access Code_ after initialization:
-
-```csharp
-_client.AccessCode = "[YOU_ACCESS_CODE]";
-```
-
-**Before authentication** you will need to provide the `callbackUri` for authentication requests.
-<br>
-**After authentication** you will need to provide the `accessCode`.
-
-## Authentication
-
-In order to communicate with a Pocket User, you will need a consumer key (which is generated by [creating a new application on Pocket](http://getpocket.com/developer/apps/)) and an **Access Code**.
-
-The authentication is a 3-step process:
-
-#### 1) Generate authentication URI
-
-Receive the **request code** and **authentication URI** from the library by calling `string GetRequestCode()`:
-
-```csharp
-string requestCode = _client.GetRequestCode();
-// 0f453f2d-1605-8584-28fd-39af8e
-Uri authenticationUri = _client.GenerateAuthenticationUri();
-// https://getpocket.com/auth/authorize?request_token=0f453f2d-1605-8584-28fd-39af8e&redirect_uri=http%253a%252f%252fceecore.com
-```
-
-The _request code_ is stored internally, but you can also provide it as param in `GenerateAuthenticationUri(string requestCode = null)`.
-
-#### 2) Redirect to Pocket
-Next you need to redirect the user to the `authenticationUri`, which displays a prompt to grant permissions for the application (see image). After the user granted or denied, he/she is redirected to the `callbackUri`.
-
-![authentication screen](https://raw.github.com/ceee/PocketSharp/master/PocketSharp/authentication-screen.png)
-
-#### 3) Get Access Code
-Call `string GetAccessCode(string requestCode = null)`
-
-```csharp
-string accessCode = _client.GetAccessCode();
-// fa8bfc16-69b3-4d22-7db7-84a58d
-```
-
-Again, the received _access code_ is stored internally.
-Note that `GetAccessCode` can only be called with an existing _request code_. If you need to re-authenticate a user, start again with Step 1).
-
-#### Important
-
-**Be sure to permanently store the _Access Code_ for your user.**
-<br>
-Without it you would always have to redo the authentication process.
-
-## Retrieve
-
-Get list of all items:
-
-```csharp
-List<PocketItem> items = _client.Retrieve();
-// equivalent to: _client.Retrieve(RetrieveFilter.All)
-```
-
-Find items by a tag:
-
-```csharp
-List<PocketItem> items = _client.SearchByTag("tutorial");
-```
-
-Find items by a search string:
-
-```csharp
-List<PocketItem> items = _client.Search("css");
-```
-
-Find items by a filter:
-
-```csharp
-List<PocketItem> items = _client.Retrieve(RetrieveFilter.Favorite); // only favorites
-```
-
-The RetrieveFilter Enum is specified as follows:
-
-```csharp
-enum RetrieveFilter { All, Unread, Archive, Favorite, Article, Video, Image }
-```
-
-#### Custom Parameters
-
-You can create a completely custom parameter list for retrieval with the POCO `RetrieveParameters`:
-
-```csharp
-var parameters = new RetrieveParameters()
-{
-	Count = 50,
-	Offset = 100,
-	Sort = Sort.oldest
-	...
-};
-
-List<PocketItem> items = _client.Retrieve(parameters);
-```
-
-## Add
-
-Adds a new item to your pocket list.
-Accepts four parameters, with `uri` being required.
-
-```csharp
-PocketItem Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)
-```
-
-Example:
-
-```csharp
-PocketItem newItem = _client.Add(
-	new Uri("http://www.neowin.net/news/full-build-2013-conference-sessions-listing-revealed"),
-	new string[] { "microsoft", "neowin", "build" }
-);
-```
-
-The title can be included for cases where an item does not have a title, which is typical for image or PDF URLs. If Pocket detects a title from the content of the page, this parameter will be ignored.
-
-If you are adding Pocket support to a Twitter client, please send along a reference to the tweet status id (with the tweetID). This allows Pocket to show the original tweet alongside the article.
-
-## Modify
-
-All Modify methods accept either the itemID (as int) or a `PocketItem` as parameter.
-
-Archive the specified item:
-
-	bool isSuccess = _client.Archive(myPocketItem);
-
-Un-archive the specified item:
-
-	bool isSuccess = _client.Unarchive(myPocketItem);
-
-Favorites the specified item:
-
-	bool isSuccess = _client.Favorite(myPocketItem);
-
-Un-favorites the specified item:
-
-	bool isSuccess = _client.Unfavorite(myPocketItem);
-
-Deletes the specified item:
-
-	bool isSuccess = _client.Delete(myPocketItem);
-
-#### Modify tags
-
-Add tags to the specified item:
-
-	bool isSuccess = _client.AddTags(myPocketItem, new string[] { "css", "2013" });
-
-Remove tags from the specified item:
-
-	bool isSuccess = _client.RemoveTags(myPocketItem, new string[] { "css", "2013" });
-
-Remove all tags from the specified item:
-
-	bool isSuccess = _client.RemoveTags(myPocketItem);
-
-Replaces all existing tags with new ones for the specified item:
-
-	bool isSuccess = _client.ReplaceTags(myPocketItem, new string[] { "css", "2013" });
-
-Renames a tag for the specified item:
-
-	bool isSuccess = _client.RenameTag(myPocketItem, "oldTagName", "newTagName");
-
 ---
 
-## Release History
 
-- 2013-08-16 v0.3.2 tag modification fixed and full retrieval of items for Retrieve method
-- 2013-07-07 v0.3.1 authentication fixes
-- 2013-07-02 v0.3.0 update authentication process 
-- 2013-06-27 v0.2.0 add, modify item & modify tags
-- 2013-06-26 v0.1.0 authentication & retrieve functionality
+## Supported platforms
+
+PocketSharp is a **Portable Class Library** (since 1.0.0), therefore it's compatible with multiple platforms:
+
+- **.NET** >= 4.5 (including WPF)
+- **Silverlight** >= 4
+- **Windows Phone** >= 7.5
+- **Windows Store**
+
+You can find examples for Silverlight 5, WP8 and WPF in the `PocketSharp.Examples` ([@github](https://github.com/ceee/PocketSharp/tree/master/PocketSharp.Examples)) folder.
+
+## What's next?
+
+- `cancellationToken` support for all methods
 
 ## Dependencies
 
-- [RestSharp](http://restsharp.org/)
-- [ServiceStack.Text](https://github.com/ServiceStack/ServiceStack.Text)
+- [Microsoft.Bcl.Async](https://www.nuget.org/packages/Microsoft.Bcl.Async/)
+- [Microsoft.Net.Http](https://www.nuget.org/packages/Microsoft.Net.Http/)
+- [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/)
+- [PropertyChanged.Fody](https://github.com/Fody/PropertyChanged)
+
+## Forked Dependencies
+
+- [NReadability](https://github.com/marek-stoj/NReadability) - converted to a PCL with minor adaptations
+- [SgmlReader](https://github.com/MindTouch/SGMLReader) - converted to a PCL
 
 ## Contributors
-| [![twitter/artistandsocial](http://gravatar.com/avatar/9c61b1f4307425f12f05d3adb930ba66?s=70)](http://twitter.com/artistandsocial "Follow @artistandsocial on Twitter") |
-|---|
-| [Tobias Klika @ceee](https://github.com/ceee) |
+| [![ceee](http://gravatar.com/avatar/9c61b1f4307425f12f05d3adb930ba66?s=70)](https://github.com/ceee "Tobias Klika") | [![ScottIsAFool](http://gravatar.com/avatar/6df656872a87b09a7470feb4867ed927?s=70)](https://github.com/ScottIsAFool "Scott Lovegrove") |
+|---|---|
+| [ceee](https://github.com/ceee) | [ScottIsAFool](https://github.com/ScottIsAFool) |
 
 ## License