From 5136fe0ac4de28384591420cbe889ebb5c299e0b Mon Sep 17 00:00:00 2001
From: ceee <cee@live.at>
Date: Sat, 21 Sep 2013 21:06:18 +0200
Subject: [PATCH] update Microsoft.Net.HTTP package; update version and docs

---
 .../PocketSharp.Silverlight.csproj            |   1 +
 .../PocketSharp.Silverlight/app.config        |  15 ++
 PocketSharp.Website/index.html                |  41 ++--
 PocketSharp/Components/Get.cs                 | 191 ++++++++++++++++++
 PocketSharp/Components/ModifyTags.cs          |  20 --
 PocketSharp/PocketClient.cs                   |   1 -
 PocketSharp/PocketSharp.csproj                |   8 +-
 PocketSharp/Properties/AssemblyInfo.cs        |   4 +-
 PocketSharp/packages.config                   |   2 +-
 README.md                                     |  43 ++--
 10 files changed, 263 insertions(+), 63 deletions(-)
 create mode 100644 PocketSharp.Examples/PocketSharp.Silverlight/app.config
 create mode 100644 PocketSharp/Components/Get.cs

diff --git a/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj b/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj
index d7b1ae7..f4c9d27 100644
--- a/PocketSharp.Examples/PocketSharp.Silverlight/PocketSharp.Silverlight.csproj
+++ b/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>
diff --git a/PocketSharp.Examples/PocketSharp.Silverlight/app.config b/PocketSharp.Examples/PocketSharp.Silverlight/app.config
new file mode 100644
index 0000000..7d285c8
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/PocketSharp.Website/index.html b/PocketSharp.Website/index.html
index c041e4e..be98d9c 100644
--- a/PocketSharp.Website/index.html
+++ b/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" />
 
@@ -33,7 +33,8 @@
       <p class="app-description">
         PocketSharp is a C#.NET class library, that integrates the Pocket API v3
         <br><br>
-        Current version: <b>1.3.0</b>
+        Current version: <b>1.4.0</b><br>
+        (<a href="https://www.nuget.org/packages/PocketSharp/">@ nuget</a>)
       </p>
       <div class="app-nuget">
         <code>Install-Package PocketSharp</code>
@@ -124,16 +125,17 @@ using PocketSharp.Models;</code></pre>
 
           <h2>Release History</h2>
         <ul>
-          <li>2013-09-19 v1.3.0 get Item by ID + tag modification bugfixes</li>
-          <li>2013-09-18 v1.2.1 correct parameter conversion for DateTime and Boolean</li>
-          <li>2013-09-17 v1.2.0 simplified retrieve methods</li>
-          <li>2013-09-17 v1.1.0 fix modification requests</li>
-          <li>2013-09-15 v1.0.0 convert to PCL &amp; implement async</li>
-          <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>1.4.0</b> (2013-09-21) rename <code>Retrieve</code> to <code>Get</code> + update IntelliSense documentation + add <code>GetTags</code> method
+          <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>
@@ -194,10 +196,10 @@ Note that <code>GetAccessCode</code> can only be called with an existing <em>req
         <h2>Retrieve</h2>
 
 <p>Get list of all items:</p>
-<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Retrieve();
-// equivalent to: await _client.RetrieveByFilter(RetrieveFilter.All)</code></pre></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.Retrieve(
+<p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Get(
   State? state = null,
   bool? favorite = null,
   string tag = null,
@@ -210,15 +212,18 @@ Note that <code>GetAccessCode</code> can only be called with an existing <em>req
   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.Retrieve(count: 10, offset: 20, sort: Sort.oldest);</code></pre></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.Retrieve(1298198);</code></pre></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:</p>
 <p><pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Search(&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.RetrieveByFilter(RetrieveFilter.Favorite);
+<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>
diff --git a/PocketSharp/Components/Get.cs b/PocketSharp/Components/Get.cs
new file mode 100644
index 0000000..bb7fba4
--- /dev/null
+++ b/PocketSharp/Components/Get.cs
@@ -0,0 +1,191 @@
+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="parameters">parameters, which are mapped to the officials from http://getpocket.com/developer/docs/v3/retrieve </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;
+      }
+
+      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 or content
+    /// </summary>
+    /// <param name="searchString">The search string.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<List<PocketItem>> Search(string searchString)
+    {
+      return await Get(search: searchString);
+    }
+  }
+
+
+  /// <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
+  }
+}
diff --git a/PocketSharp/Components/ModifyTags.cs b/PocketSharp/Components/ModifyTags.cs
index 292f997..86a1c1f 100644
--- a/PocketSharp/Components/ModifyTags.cs
+++ b/PocketSharp/Components/ModifyTags.cs
@@ -10,26 +10,6 @@ namespace PocketSharp
   /// </summary>
   public partial class PocketClient
   {
-    /// <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>
     /// Adds the specified tags to an item.
     /// </summary>
diff --git a/PocketSharp/PocketClient.cs b/PocketSharp/PocketClient.cs
index 86a9c5a..55081e8 100644
--- a/PocketSharp/PocketClient.cs
+++ b/PocketSharp/PocketClient.cs
@@ -144,7 +144,6 @@ namespace PocketSharp
           Error = (object sender, ErrorEventArgs args) =>
           {
             throw new PocketException(String.Format("Parse error: {0}", args.ErrorContext.Error.Message));
-            args.ErrorContext.Handled = true;
           },
           Converters =
           {
diff --git a/PocketSharp/PocketSharp.csproj b/PocketSharp/PocketSharp.csproj
index e5a82be..ae33302 100644
--- a/PocketSharp/PocketSharp.csproj
+++ b/PocketSharp/PocketSharp.csproj
@@ -44,7 +44,7 @@
     <Compile Include="Components\Authentification.cs" />
     <Compile Include="Components\Modify.cs" />
     <Compile Include="Components\ModifyTags.cs" />
-    <Compile Include="Components\Retrieve.cs" />
+    <Compile Include="Components\Get.cs" />
     <Compile Include="JsonExtensions.cs" />
     <Compile Include="Models\Parameters\ActionParameter.cs" />
     <Compile Include="Models\Parameters\AddParameters.cs" />
@@ -80,13 +80,13 @@
       <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>
diff --git a/PocketSharp/Properties/AssemblyInfo.cs b/PocketSharp/Properties/AssemblyInfo.cs
index 4129062..12d16dc 100644
--- a/PocketSharp/Properties/AssemblyInfo.cs
+++ b/PocketSharp/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
\ No newline at end of file
diff --git a/PocketSharp/packages.config b/PocketSharp/packages.config
index f24a6ad..4a510aa 100644
--- a/PocketSharp/packages.config
+++ b/PocketSharp/packages.config
@@ -3,6 +3,6 @@
   <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="Microsoft.Net.Http" version="2.2.15" targetFramework="portable-net403+sl40+wp71+win" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="portable-net403+sl40+wp71+win" />
 </packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index 05aaec5..10c8558 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
 
 **PocketSharp** is a C#.NET class library, that integrates the [Pocket API v3](http://getpocket.com/developer) and consists of 4 parts: [Authentication](#authentication), [Retrieve](#retrieve), [Modify](#modify) and [Add](#add).
 
-[pocketsharp.frontendplay.com](http://pocketsharp.frontendplay.com/)
+**Website:** [pocketsharp.frontendplay.com](http://pocketsharp.frontendplay.com/)
+<br>
+**NuGet:** [nuget.org/packages/PocketSharp](https://www.nuget.org/packages/PocketSharp/)
 
 ## Install using NuGet
 
@@ -141,14 +143,14 @@ Without it you would always have to redo the authentication process.
 Get list of all items:
 
 ```csharp
-List<PocketItem> items = await _client.Retrieve();
-// equivalent to: await _client.RetrieveByFilter(RetrieveFilter.All)
+List<PocketItem> items = await _client.Get();
+// equivalent to: await _client.Get(RetrieveFilter.All)
 ```
 
 Get a list with specific parameters (explanation in the [Pocket Docs](http://getpocket.com/developer/docs/v3/retrieve)):
 
 ```csharp
-List<PocketItem> items = await _client.Retrieve(
+List<PocketItem> items = await _client.Get(
   State? state = null,
   bool? favorite = null,
   string tag = null,
@@ -165,13 +167,13 @@ List<PocketItem> items = await _client.Retrieve(
 It's best to use parameters as _named parameters_, to avoid typing `null` values:
 
 ```csharp
-List<PocketItem> items = await _client.Retrieve(count: 10, offset: 20, sort: Sort.oldest);
+List<PocketItem> items = await _client.Get(count: 10, offset: 20, sort: Sort.oldest);
 ```
 
 Get item by ID:
 
 ```csharp
-PocketItem item = await _client.Retrieve(1298198);
+PocketItem item = await _client.Get(1298198);
 ```
 
 Find items by a tag:
@@ -186,10 +188,16 @@ Find items by a search string:
 List<PocketItem> items = await _client.Search("css");
 ```
 
+Get all tags:
+
+```csharp
+List<PocketTag> items = await _client.GetTags();
+```
+
 Get a filtered list:
 
 ```csharp
-List<PocketItem> items = await _client.RetrieveByFilter(RetrieveFilter.Favorite);
+List<PocketItem> items = await _client.Get(RetrieveFilter.Favorite);
 // returns favorites only
 ```
 
@@ -271,16 +279,17 @@ Renames a tag for the specified item:
 
 ## Release History
 
-- 2013-09-19 v1.3.0 get Item by ID + tag modification bugfixes
-- 2013-09-18 v1.2.1 correct parameter conversion for DateTime and Boolean
-- 2013-09-17 v1.2.0 simplified retrieve methods
-- 2013-09-17 v1.1.0 fix modification requests
-- 2013-09-15 v1.0.0 convert to PCL & implement async
-- 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
+- **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 and 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
 
 ## Dependencies