update retrieve methods - work with named parameters

fix tag parameter conversion; lead image generation; add complex item test;
fix modification requests
2013-09-17 23:08:15 +02:00 · 2013-09-17 22:48:35 +02:00 · 2013-09-17 21:43:31 +02:00 · 2013-09-16 23:34:26 +02:00 · 2013-09-16 23:34:13 +02:00 · 2013-09-15 21:52:28 +02:00
34 changed files with 582 additions and 363 deletions
@@ -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;
                }
@@ -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",
@@ -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",
@@ -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",
@@ -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.Retrieve();
+      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);
+    }
+  }
+}
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  class AuthenticationTests : TestsBase
+  {
+    public AuthenticationTests() : base() { }
+  }
+}
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  class ModifyTagsTests : TestsBase
+  {
+    public ModifyTagsTests() : base() { }
+  }
+}
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  class ModifyTests : TestsBase
+  {
+    public ModifyTests() : base() { }
+  }
+}
@@ -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,22 @@
        <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="AuthenticationTests.cs" />
+    <Compile Include="ModifyTagsTests.cs" />
+    <Compile Include="ModifyTests.cs" />
+    <Compile Include="RetrieveTests.cs" />
    <Compile Include="Properties\AssemblyInfo.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" />
@@ -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:
 //
@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp.Models;
+
+namespace PocketSharp.Tests
+{
+  public class RetrieveTests : TestsBase
+  {
+    public RetrieveTests() : base() { }
+
+
+    [Fact]
+    public async Task AreItemsRetrieved()
+    {
+      List<PocketItem> items = await client.Retrieve();
+
+      Assert.True(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task ItemContainsUri()
+    {
+      List<PocketItem> items = await client.Retrieve(count: 1);
+
+      Assert.True(items.Count == 1);
+      Assert.True(items[0].Uri.ToString().StartsWith("http"));
+    }
+
+
+    [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 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);
+    }
+  }
+}
@@ -0,0 +1,37 @@
+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: "2c62cd50-b78a-5558-918b-65adae"
+      );
+    }
+
+
+    // teardown
+    public void Dispose() 
+    {
+      itemsToDelete.ForEach(async id =>
+      {
+        await client.Delete(id);
+      });
+    }
+  }
+}
@@ -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()
-    {
-
-    }
-  }
-}
@@ -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>
@@ -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>
@@ -53,6 +53,19 @@
      <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 +79,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,6 +122,7 @@ using PocketSharp.Models;</code></pre>

          <h2>Release History</h2>
        <ul>
+          <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>
@@ -117,8 +131,9 @@ using PocketSharp.Models;</code></pre>
        </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>
@@ -138,7 +153,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 +164,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,29 +179,29 @@ 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>
+          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Retrieve();
+// equivalent to: await _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>
+          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _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>
+          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _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>
+          <pre class="language-clike"><code>List&lt;PocketItem&gt; items = await _client.Retrieve(RetrieveFilter.Favorite); // only favorites</code></pre>

        <p>The RetrieveFilter Enum is specified as follows:</p>

@@ -203,7 +218,7 @@ var parameters = new RetrieveParameters()
 	Sort = SortEnum.oldest
 	...
 };
-List&lt;pocketitem&gt; items = _client.Retrieve(parameters);
+List&lt;pocketitem&gt; items = await _client.Retrieve(parameters);
 </code></pre>


@@ -217,63 +232,63 @@ 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>
@@ -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,15 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,14 +32,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
@@ -75,6 +74,14 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -27,7 +27,7 @@ namespace PocketSharp
        TweetID = tweetID
      };

-      Add response = await Request<Add>("add", parameters.Convert(), true);
+      Add response = await Request<Add>("add", parameters.Convert());

      return response.Item;
    }
@@ -1,5 +1,6 @@
 using PocketSharp.Models;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;

 namespace PocketSharp
@@ -22,7 +23,10 @@ namespace PocketSharp
      }

      // do request
-      RequestCode response = await Request<RequestCode>("oauth/request", Utilities.CreateParamInList("redirect_uri", CallbackUri));
+      RequestCode response = await Request<RequestCode>("oauth/request", new Dictionary<string, string>()
+      { 
+        { "redirect_uri", CallbackUri } 
+      }, false);

      // save code to client
      RequestCode = response.Code;
@@ -74,7 +78,10 @@ namespace PocketSharp
      }

      // do request
-      AccessCode response = await Request<AccessCode>("oauth/authorize", Utilities.CreateParamInList("code", RequestCode));
+      AccessCode response = await Request<AccessCode>("oauth/authorize", new Dictionary<string, string>()
+      { 
+        { "code", RequestCode } 
+      }, false);

      // save code to client
      AccessCode = response.Code;
@@ -1,4 +1,5 @@
 using PocketSharp.Models;
+using System.Collections.Generic;
 using System.Threading.Tasks;

 namespace PocketSharp
@@ -15,7 +16,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> Archive(int itemID)
    {
-      return await PutSendActionDefault(itemID, "archive");
+      return await SendDefault(itemID, "archive");
    }


@@ -37,7 +38,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> Unarchive(int itemID)
    {
-      return await PutSendActionDefault(itemID, "readd");
+      return await SendDefault(itemID, "readd");
    }


@@ -59,7 +60,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> Favorite(int itemID)
    {
-      return await PutSendActionDefault(itemID, "favorite");
+      return await SendDefault(itemID, "favorite");
    }


@@ -81,7 +82,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> Unfavorite(int itemID)
    {
-      return await PutSendActionDefault(itemID, "unfavorite");
+      return await SendDefault(itemID, "unfavorite");
    }


@@ -103,7 +104,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> Delete(int itemID)
    {
-      return await PutSendActionDefault(itemID, "delete");
+      return await SendDefault(itemID, "delete");
    }


@@ -124,9 +125,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
@@ -16,7 +16,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> AddTags(int itemID, string[] tags)
    {
-      return await PutSendActionForTags(itemID, "tags_add", tags);
+      return await SendTags(itemID, "tags_add", tags);
    }


@@ -40,7 +40,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> RemoveTags(int itemID, string[] tags)
    {
-      return await PutSendActionForTags(itemID, "tags_remove", tags);
+      return await SendTags(itemID, "tags_remove", tags);
    }


@@ -63,7 +63,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> RemoveTags(int itemID)
    {
-      return await PutSendActionDefault(itemID, "tags_clear");
+      return await SendDefault(itemID, "tags_clear");
    }


@@ -86,7 +86,7 @@ namespace PocketSharp
    /// <returns></returns>
    public async Task<bool> ReplaceTags(int itemID, string[] tags)
    {
-      return await PutSendActionForTags(itemID, "tags_replace", tags);
+      return await SendTags(itemID, "tags_replace", tags);
    }


@@ -111,7 +111,7 @@ namespace PocketSharp
    /// <returns></returns>
    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,
@@ -141,9 +141,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,
@@ -1,4 +1,5 @@
 using PocketSharp.Models;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

@@ -14,9 +15,35 @@ namespace PocketSharp
    /// </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)
+    public async Task<List<PocketItem>> Retrieve(
+      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
+    )
    {
-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
+      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;
    }
@@ -27,7 +54,7 @@ namespace PocketSharp
    /// </summary>
    /// <param name="filter">The filter.</param>
    /// <returns></returns>
-    public async Task<List<PocketItem>> Retrieve(RetrieveFilter filter = RetrieveFilter.All)
+    public async Task<List<PocketItem>> RetrieveByFilter(RetrieveFilter filter = RetrieveFilter.All)
    {
      RetrieveParameters parameters = new RetrieveParameters();

@@ -55,7 +82,7 @@ namespace PocketSharp

      parameters.DetailType = DetailType.complete;

-      Retrieve response = await Request<Retrieve>("get", parameters.Convert(), true);
+      Retrieve response = await Request<Retrieve>("get", parameters.Convert());

      return response.Items;
    }
@@ -68,15 +95,7 @@ namespace PocketSharp
    /// <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;
+      return await Retrieve(tag: tag);
    }


@@ -87,15 +106,7 @@ namespace PocketSharp
    /// <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;
+      return await Retrieve(search: searchString);
    }
  }

@@ -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 : Parameters
  {
    /// <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,31 +63,32 @@ namespace PocketSharp.Models
    /// <value>
    /// The new tag.
    /// </value>
+    [DataMember(Name = "new_tag")]
    public string NewTag { get; set; }


-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public object Convert()
-    {
-      Dictionary<string, object> parameters = new Dictionary<string, object>
-      {
-        { "item_id", ID },
-        { "action", Action }
-      };
+    ///// <summary>
+    ///// Converts this instance to a parameter list.
+    ///// </summary>
+    ///// <returns></returns>
+    //public Dictionary<string, object> Convert()
+    //{
+    //  Dictionary<string, object> parameters = new Dictionary<string, object>
+    //  {
+    //    { "item_id", ID },
+    //    { "action", Action }
+    //  };

-      if (Time != null)
-        parameters.Add("time", Utilities.GetUnixTimestamp(Time));
-      if (Tags != null)
-        parameters.Add("tags", Tags);
-      if (OldTag != null)
-        parameters.Add("old_tag", OldTag);
-      if (NewTag != null)
-        parameters.Add("new_tag", NewTag);
+    //  if (Time != null)
+    //    parameters.Add("time", Utilities.GetUnixTimestamp(Time));
+    //  if (Tags != null)
+    //    parameters.Add("tags", Tags);
+    //  if (OldTag != null)
+    //    parameters.Add("old_tag", OldTag);
+    //  if (NewTag != null)
+    //    parameters.Add("new_tag", NewTag);

-      return parameters;
-    }
+    //  return parameters;
+    //}
  }
 }
@@ -1,12 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Linq;

 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 +18,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The URI.
    /// </value>
+    [DataMember(Name="url")]
    public Uri Uri { get; set; }

    /// <summary>
@@ -22,6 +27,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The title.
    /// </value>
+    [DataMember(Name="title")]
    public string Title { get; set; }

    /// <summary>
@@ -30,6 +36,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The tags.
    /// </value>
+    [DataMember(Name="tags")]
    public string[] Tags { get; set; }

    /// <summary>
@@ -38,21 +45,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)
-      };
-    }
  }
 }
@@ -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; }
  }
 }
@@ -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);
-    }
-  }
-}
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Linq;
+using System.Collections;
+using Newtonsoft.Json;
+
+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);
+
+        if (value == null)
+        {
+          continue;
+        }
+
+        if (value is IEnumerable && value.GetType().GetElementType() == typeof(string))
+        {
+          value = string.Join(",", ((IEnumerable)value).Cast<object>().Select(x => x.ToString()).ToArray());
+        }
+
+        parameterDict.Add(name, value.ToString());
+      }
+
+      return parameterDict;
+    }
+  }
+}
@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+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 +17,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The state.
    /// </value>
+    [DataMember(Name = "state")]
    public State? State { get; set; }

    /// <summary>
@@ -22,6 +26,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The favorite.
    /// </value>
+    [DataMember(Name = "favorite")]
    public bool? Favorite { get; set; }

    /// <summary>
@@ -30,6 +35,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The tag.
    /// </value>
+    [DataMember(Name = "tag")]
    public string Tag { get; set; }

    /// <summary>
@@ -38,6 +44,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The type of the content.
    /// </value>
+    [DataMember(Name = "contentType")]
    public ContentType? ContentType { get; set; }

    /// <summary>
@@ -46,6 +53,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The sort.
    /// </value>
+    [DataMember(Name = "sort")]
    public Sort? Sort { get; set; }

    /// <summary>
@@ -54,6 +62,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The type of the detail.
    /// </value>
+    [DataMember(Name="detailType")]
    public DetailType? DetailType { get; set; }

    /// <summary>
@@ -62,6 +71,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The search.
    /// </value>
+    [DataMember(Name = "search")]
    public string Search { get; set; }

    /// <summary>
@@ -70,6 +80,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The domain.
    /// </value>
+    [DataMember(Name = "domain")]
    public string Domain { get; set; }

    /// <summary>
@@ -78,6 +89,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The since.
    /// </value>
+    [DataMember(Name = "since")]
    public DateTime? Since { get; set; }

    /// <summary>
@@ -86,6 +98,7 @@ namespace PocketSharp.Models
    /// <value>
    /// The count.
    /// </value>
+    [DataMember(Name = "count")]
    public int? Count { get; set; }

    /// <summary>
@@ -94,30 +107,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)
-      };
-    }
  }


@@ -37,7 +37,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 +205,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 +214,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 +223,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 +232,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 +244,7 @@ namespace PocketSharp.Models
    [JsonIgnore]
    public List<PocketTag> Tags
    {
-      get { return Utilities.DictionaryToList<PocketTag>(TagDictionary); }
+      get { return Utilities.DictionaryToList<PocketTag>(_TagDictionary); }
    }

    /// <summary>
@@ -234,7 +256,7 @@ namespace PocketSharp.Models
    [JsonIgnore]
    public List<PocketImage> Images
    {
-      get { return Utilities.DictionaryToList<PocketImage>(ImageDictionary); }
+      get { return Utilities.DictionaryToList<PocketImage>(_ImageDictionary); }
    }

    /// <summary>
@@ -246,7 +268,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 +280,7 @@ namespace PocketSharp.Models
    [JsonIgnore]
    public List<PocketVideo> Videos
    {
-      get { return Utilities.DictionaryToList<PocketVideo>(VideoDictionary); }
+      get { return Utilities.DictionaryToList<PocketVideo>(_VideoDictionary); }
    }

    /// <summary>
@@ -270,7 +292,7 @@ namespace PocketSharp.Models
    [JsonIgnore]
    public List<PocketAuthor> Authors
    {
-      get { return Utilities.DictionaryToList<PocketAuthor>(AuthorDictionary); }
+      get { return Utilities.DictionaryToList<PocketAuthor>(_AuthorDictionary); }
    }
  }
 }
@@ -103,41 +103,27 @@ 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);

      // 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);
@@ -148,9 +134,11 @@ namespace PocketSharp
      // 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) =>
@@ -171,20 +159,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, string>> actionParamList = new List<Dictionary<string, string>>();
+
+      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;
    }


@@ -49,7 +49,7 @@
    <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" />
@@ -25,32 +25,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>
@@ -1,11 +1,6 @@
 ![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:
-
- Authentication
- Retrieve
- Modify
- Add
+**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/)

@@ -15,6 +10,23 @@
 Install-Package PocketSharp
 ```

+## Supported platforms
+
+PocketSharp is a **Portable Class Library** (since 1.0.0), therefore it's compatible with multiple platforms:
+
+- **.NET** >= 4.0.3 (including WPF)
+- **Silverlight** >= 4
+- **Windows Phone** >= 7.5
+- **Windows Store**
+
+You can find examples for Silverlight 5, WP8 and WPF in the `PocketSharp.Examples` folder.
+
+## Async Support
+
+All public methods, which communicate with the Pocket servers are asynchronous. So they should be called with the preceding `await` keyword, and the encapsulated method marked with `async`.
+
+_In PocketSharp versions < 1.0.0 all methods lacked async support and were blocking._
+
 ## Usage Example

 Request a [Consumer Key on Pocket.](http://getpocket.com/developer/apps/)
@@ -35,8 +47,9 @@ PocketClient _client = new PocketClient("[YOUR_CONSUMER_KEY]", "[YOUR_ACCESS_COD
 Do a simple request - e.g. a search for `CSS`:

 ```csharp
-_client.Search("css").ForEach(
-	item => Console.WriteLine(item.ID + " | " + item.Title)
+var items = await _client.Search("css");
+items.ForEach(
+	item => Debug.WriteLine(item.ID + " | " + item.Title)
 );
 ```

@@ -93,7 +106,7 @@ The authentication is a 3-step process:
 Receive the **request code** and **authentication URI** from the library by calling `string GetRequestCode()`:

 ```csharp
-string requestCode = _client.GetRequestCode();
+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&redirect_uri=http%253a%252f%252fceecore.com
@@ -107,10 +120,10 @@ Next you need to redirect the user to the `authenticationUri`, which displays a
 ![authentication screen](https://raw.github.com/ceee/PocketSharp/master/PocketSharp/authentication-screen.png)

 #### 3) Get Access Code
-Call `string GetAccessCode(string requestCode = null)`
+Call `Task<string> GetAccessCode(string requestCode = null)`

 ```csharp
-string accessCode = _client.GetAccessCode();
+string accessCode = await _client.GetAccessCode();
 // fa8bfc16-69b3-4d22-7db7-84a58d
 ```

@@ -128,26 +141,26 @@ Without it you would always have to redo the authentication process.
 Get list of all items:

 ```csharp
-List<PocketItem> items = _client.Retrieve();
-// equivalent to: _client.Retrieve(RetrieveFilter.All)
+List<PocketItem> items = await _client.Retrieve();
+// equivalent to: await _client.Retrieve(RetrieveFilter.All)
 ```

 Find items by a tag:

 ```csharp
-List<PocketItem> items = _client.SearchByTag("tutorial");
+List<PocketItem> items = await _client.SearchByTag("tutorial");
 ```

 Find items by a search string:

 ```csharp
-List<PocketItem> items = _client.Search("css");
+List<PocketItem> items = await _client.Search("css");
 ```

 Find items by a filter:

 ```csharp
-List<PocketItem> items = _client.Retrieve(RetrieveFilter.Favorite); // only favorites
+List<PocketItem> items = await _client.Retrieve(RetrieveFilter.Favorite); // only favorites
 ```

 The RetrieveFilter Enum is specified as follows:
@@ -169,7 +182,7 @@ var parameters = new RetrieveParameters()
 	...
 };

-List<PocketItem> items = _client.Retrieve(parameters);
+List<PocketItem> items = await _client.Retrieve(parameters);
 ```

 ## Add
@@ -178,13 +191,13 @@ 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)
+Task<PocketItem> Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)
 ```

 Example:

 ```csharp
-PocketItem newItem = _client.Add(
+PocketItem newItem = await _client.Add(
 	new Uri("http://www.neowin.net/news/full-build-2013-conference-sessions-listing-revealed"),
 	new string[] { "microsoft", "neowin", "build" }
 );
@@ -200,50 +213,51 @@ All Modify methods accept either the itemID (as int) or a `PocketItem` as parame

 Archive the specified item:

-	bool isSuccess = _client.Archive(myPocketItem);
+	bool isSuccess = await _client.Archive(myPocketItem);

 Un-archive the specified item:

-	bool isSuccess = _client.Unarchive(myPocketItem);
+	bool isSuccess = await _client.Unarchive(myPocketItem);

 Favorites the specified item:

-	bool isSuccess = _client.Favorite(myPocketItem);
+	bool isSuccess = await _client.Favorite(myPocketItem);

 Un-favorites the specified item:

-	bool isSuccess = _client.Unfavorite(myPocketItem);
+	bool isSuccess = await _client.Unfavorite(myPocketItem);

 Deletes the specified item:

-	bool isSuccess = _client.Delete(myPocketItem);
+	bool isSuccess = await _client.Delete(myPocketItem);

 #### Modify tags

 Add tags to the specified item:

-	bool isSuccess = _client.AddTags(myPocketItem, new string[] { "css", "2013" });
+	bool isSuccess = await _client.AddTags(myPocketItem, new string[] { "css", "2013" });

 Remove tags from the specified item:

-	bool isSuccess = _client.RemoveTags(myPocketItem, new string[] { "css", "2013" });
+	bool isSuccess = await _client.RemoveTags(myPocketItem, new string[] { "css", "2013" });

 Remove all tags from the specified item:

-	bool isSuccess = _client.RemoveTags(myPocketItem);
+	bool isSuccess = await _client.RemoveTags(myPocketItem);

 Replaces all existing tags with new ones for the specified item:

-	bool isSuccess = _client.ReplaceTags(myPocketItem, new string[] { "css", "2013" });
+	bool isSuccess = await _client.ReplaceTags(myPocketItem, new string[] { "css", "2013" });

 Renames a tag for the specified item:

-	bool isSuccess = _client.RenameTag(myPocketItem, "oldTagName", "newTagName");
+	bool isSuccess = await _client.RenameTag(myPocketItem, "oldTagName", "newTagName");

 ---

 ## Release History

+- 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 
@@ -252,8 +266,9 @@ Renames a tag for the specified item:

 ## 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/)

 ## Contributors
 | [![twitter/artistandsocial](http://gravatar.com/avatar/9c61b1f4307425f12f05d3adb930ba66?s=70)](http://twitter.com/artistandsocial "Follow @artistandsocial on Twitter") |
Author	SHA1	Message	Date
swcs	fb92cb19c8	update retrieve methods - work with named parameters	2013-09-17 23:08:15 +02:00
swcs	79184d194e	fix tag parameter conversion; lead image generation; add complex item test;	2013-09-17 22:48:35 +02:00
swcs	9d0fb6484f	fix modification requests	2013-09-17 21:43:31 +02:00
swcs	e45414bd51	remove depr. classes	2013-09-16 23:34:26 +02:00
swcs	e522c8e30a	simplify parameter creation; fix several deserialization issues	2013-09-16 23:34:13 +02:00
swcs	6cf9892f78	disposable base for tests; classes for other tests	2013-09-15 21:52:28 +02:00
swcs	d3c40c1a76	add tests for Retrieve methods	2013-09-15 21:44:09 +02:00
swcs	c01098af04	update website and docs	2013-09-15 15:46:13 +02:00